From 2ef01a14d90b1759f75a4a4031261cf44efd3a80 Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Thu, 9 Mar 2023 18:58:25 +0100
Subject: [PATCH] - Comencem a treballar en les habitacions

---
 data/test.gif    | Bin 1553 -> 2942 bytes
 source/actor.cpp |  44 ++++++++++++++++++++++----------------------
 source/actor.h   |   6 +-----
 source/main.cpp  |  11 ++++-------
 source/misc.h    |  11 +++++++++++
 source/room.cpp  |  46 ++++++++++++++++++++++++++++++++++++++++++++++
 source/room.h    |  12 ++++++++++++
 7 files changed, 96 insertions(+), 34 deletions(-)
 create mode 100644 source/misc.h
 create mode 100644 source/room.cpp
 create mode 100644 source/room.h

diff --git a/data/test.gif b/data/test.gif
index a6a0fe4d3de997bbba70995ebfb1088818d1b04a..0a3bb92cc45e3da66db4d952c62c8c881a3cca5c 100644
GIT binary patch
delta 2908
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
G0RTI-I-aWl

delta 1508
zcmV<A1snSQ7Lg1IM@dFFH(`JPfRPD7e}Djh000F45XecZy*TU5yZ@kdj7PYUrJ12>
ztBy#FjP8W8HE@%8f5EaK?RA)uj6)L)g-rQ!z@XF!+F5y@>-E`+PQS^O_SWQ#$vAGu
z`)yNy=;CsW*%|L=wTA8PhmU7-TQ-7YO*?uOe0_{}hjM{{M>2Mil0b<Ri;Yr4e?V7F
zp=6<tg`!MvnS`8RP5?7PmZMQcl(MLps*1I&VG?qVriHa$z@LzFhcRBdaE-nbu&~F-
zv%o^j!NZeFLCtl%ovtF&)^?84+11q6l-}Rqu^iIf;oa!j*m&vt`26sDu$U=l4BsMq
z1g9Ac=S~JdF4*o><JWKsBzmI2f4qCxgH}OQ6#w%Lv850s!+adMT<mu*<T5!FUedef
z5<yBe=ZqDz$ZOoIk~^i`)KkwQI(rO#N{HBV<4~1FJ?cBCfn>v{nJyC37R#m53NjsH
z&9rYF(uzVnI324;Cb5G4PR3wM7c5Y?Mupbh8`E9OymR>q?pwA^t-*-xfBv14xUpiF
zjw9P;EV(jao0c<cZmV}*=M9uMgLs6ws-1bKdl*>Fn)Q^{s{z1v{TeoCP^PVvzEG-&
z>e&WJ+Xik6i0#~|G4$STVfk;^%UjEa{t}gR)1<K{=WUj`3gV!o&n`acdIohU&nuKx
zb^YNS<D;{l-kM<f`RymIf9<PZEN>*CwJ_fQHCu@X9f8@Hr=D*4ZP#2W-i0tA8$}pc
zUw^PDs2qdHF>#xN-%Th90v2A#1PmH(_(_Cdal>LvE<R@>8N-Rl#Bu5+1e!W9?5LxR
zCc0DOghHkW<09u_7#Md*!bhDlv(ZNzlsGmwqD)M#bVrs)`Bp=He*k__Vs&j8`AQ_r
z_2yxVfxOs(YbW-EVr+0;2_Sw}ZgT{iX7$LYnr?Einwoad8JsL68o=clyJ^GWQkUQ+
zASt>Xq3EI9RD$B7m3j$jq-%cKXF-!@+9`>$g{j3Iism_LI!6xU-<f*8<tYe*f_e$6
zxz>6oljLQZW<4WDe-q1TTbj_To(W!xDgUz>w)!AD$EFFOoTaG>(o##}+G}+u#$YI>
z-~uA9w10|Y6D+`nwWL2J$>^4;iAp&yHT7;-uAeLhdn>p82I@hO>dG)Kxdorwpdf*2
z`){nt%Ij~1V@{kXo=IYhT(t|n=Yx%Rmbff37svKtyczTKe_}ZTe*hk~LlVrYnMb1B
zZdckp?83_=#aw64G)Hp`yIIPqv(OO(`K?SoFFiBHH<O{Ft=+cE1<(74ymU7~)9R6*
zu7c}kC{GYs?!{6%O{2*juAB5^qBgwe#|PqKsk1X0O>qZU0{j7h3%4w2e3mkecito#
zF51q(1$VCFe+oBlIOJ@%x1VyKSw8Fk;;2deVW=5{&UxsbPhEP^qL1$C>8qz6E9<KB
zX>Nzz&<;%Oq+dfjd%5$Dd+Tq@e$nn=|1Lbyy&o-fxW=Piyz|P7>U#6peLlDCf^*)9
zz(#q7P4m-kn>#PqXTKStE3axg?6~70sqiEN`@Zq^e=*G6DG$3JsrixVzrU5IsM@vS
z@VwFa&lCXM)v%aVyY?}Ve2Q67@dlWa0*YoP6^sy>`UbFl^(c533<<p+)P{6%>?iz7
zO#Qrpyw`<;O=sI2{hafP^<B?c0RvyUZpfuDX;2wDjG)bmMiL8(Er>AWAQ6vvKMU%x
zEH5;nf7g!2G9>=VezL=i5?h21E570{7wP&*^k@Y*B>E7HT;f*ec=*J?$nZb>3zHSc
z^2RyZ@s4=RqaOFj$3FV;kAMuMAO}gvLK^arh)kp+7s<#*I`WZ_jHDzdNy$pWaV`#F
zg(ex{MFx0M1`Jr2Cqs#VQN|#Yq%>tIKe@_OQnJ#Noh;=kLy1CCp7NHd41z5|iOXKb
z(w4Mrr6^rV%vsX%6~z?hFL`-ODeUr@zC>m(dD+QVTC<o-NhU0%sZ42lag$=<L<iqd
KM@#ZC0suQF5c_Qa

diff --git a/source/actor.cpp b/source/actor.cpp
index 1d8f6f6..ab21f56 100644
--- a/source/actor.cpp
+++ b/source/actor.cpp
@@ -1,6 +1,7 @@
 #include "actor.h"
 #include "jdraw.h"
 #include "jinput.h"
+#include "room.h"
 
 namespace actor
 {
@@ -25,6 +26,7 @@ namespace actor
         act->size = s;
         act->bmp_rect = r;
         act->bmp_offset = o;
+        act->anim_cycle = 0;
         act->below = act->above = nullptr;
         act->prev = act->next = nullptr;
         return act;
@@ -100,32 +102,23 @@ namespace actor
 
         if (act1->pos.x >= act2->pos.x+act2->size.x) { return true; }
         else if (act2->pos.x >= act1->pos.x+act1->size.x) { return false; }
-
-        if (act1->pos.y >= act2->pos.y+act2->size.y) { return true; }
+        else if (act1->pos.y >= act2->pos.y+act2->size.y) { return true; }
         else if (act2->pos.y >= act1->pos.y+act1->size.y) { return false; }
-
-        if (act1->pos.z >= act2->pos.z+act2->size.z) { return true; }
+        else if (act1->pos.z >= act2->pos.z+act2->size.z) { return true; }
         else if (act2->pos.z >= act1->pos.z+act1->size.z) { return false; }
+        else { return false; }
     }
 
     void reorder()
     {
         anim_frame=(anim_frame+1)%4;
-        //dirty=first;
-        //first=nullptr;
         while (dirty)
         {
-            //const int z_index = dirty->pos.x + dirty->pos.y + dirty->pos.z;
             if (first)
             {
                 actor_t *current = first;
                 while (true)
                 {
-                    //const int z_index2 = current->pos.x + current->pos.y + current->pos.z;
-                    //if ((dirty->pos.z < current->pos.z+current->size.z) && (current->pos.x+current->size.x+current->pos.y > dirty->pos.x+dirty->size.x+dirty->pos.y))
-
-                    //if (current->pos.x+current->pos.y>dirty->pos.y+dirty->pos.x || current->pos.z+current->size.z>dirty->pos.z)
-                    //if (current->pos.x>dirty->pos.x+dirty->size.x || current->pos.y>dirty->pos.y+dirty->size.y || current->pos.z>dirty->pos.z+dirty->size.z)
                     if (isInFront(current, dirty))
                     {
                         dirty->prev = current->prev;
@@ -164,11 +157,14 @@ namespace actor
 
     void updateUserInput(actor_t *act)
     {
+        vec3_t min = room::getMin();
+        vec3_t max = room::getMax();
+
         bool moving = false;
-        if (input::keyDown(SDL_SCANCODE_LEFT) && act->pos.x>0) { act->push |= PUSH_XN; act->orient=PUSH_XN; moving = true; }
-        if (input::keyDown(SDL_SCANCODE_RIGHT) && act->pos.x<56) { act->push |= PUSH_XP; act->orient=PUSH_XP; moving = true; }
-        if (input::keyDown(SDL_SCANCODE_UP) && act->pos.y>0) { act->push |= PUSH_YN; act->orient=PUSH_YN; moving = true; }
-        if (input::keyDown(SDL_SCANCODE_DOWN) && act->pos.y<56) { act->push |= PUSH_YP; act->orient=PUSH_YP; moving = true; }
+        if (input::keyDown(SDL_SCANCODE_LEFT) && act->pos.x>min.x) { act->push |= PUSH_XN; act->orient=PUSH_XN; moving = true; }
+        if (input::keyDown(SDL_SCANCODE_RIGHT) && act->pos.x<max.x) { act->push |= PUSH_XP; act->orient=PUSH_XP; moving = true; }
+        if (input::keyDown(SDL_SCANCODE_UP) && act->pos.y>min.y) { act->push |= PUSH_YN; act->orient=PUSH_YN; moving = true; }
+        if (input::keyDown(SDL_SCANCODE_DOWN) && act->pos.y<max.y) { act->push |= PUSH_YP; act->orient=PUSH_YP; moving = true; }
         if (input::keyDown(SDL_SCANCODE_SPACE) && act->react_mask==0 && (act->pos.z==0 || act->below)) {
             act->react_mask=1;
             act->react_push=0;
@@ -179,7 +175,7 @@ namespace actor
             }
         }
         if (input::keyDown(SDL_SCANCODE_Z) && act->pos.z>0) { act->push |= PUSH_ZN; moving = true; }
-        if (input::keyDown(SDL_SCANCODE_A) && act->pos.z<56) { act->push |= PUSH_ZP; moving = true; }
+        if (input::keyDown(SDL_SCANCODE_A) && act->pos.z<max.z) { act->push |= PUSH_ZP; moving = true; }
 
         if (act->react_mask)
         {
@@ -259,8 +255,11 @@ namespace actor
 
     void updatePushable(actor_t *act)
     {
+        vec3_t min = room::getMin();
+        vec3_t max = room::getMax();
+
         if (act->push & PUSH_ZP) {
-            if (act->pos.z>=56)
+            if (act->pos.z>=max.z)
             {
                 if (act->flags & FLAG_MOVING) changeMoving(act);
             }
@@ -281,7 +280,7 @@ namespace actor
         if (act->push & PUSH_XN) {
             act->pos.x--;
             actor::actor_t *other = actor::get_collision(act);
-            if (act->pos.x<0 || other)
+            if (act->pos.x<min.x || other)
             {
                 if (other && other->flags & FLAG_PUSHABLE) other->push |= PUSH_XN;
                 act->pos.x++;
@@ -306,7 +305,7 @@ namespace actor
         if (act->push & PUSH_XP) {
             act->pos.x++;
             actor::actor_t *other = actor::get_collision(act);
-            if (act->pos.x>56 || other)
+            if (act->pos.x>max.x || other)
             {
                 if (other && other->flags & FLAG_PUSHABLE) other->push |= PUSH_XP;
                 act->pos.x--;
@@ -331,7 +330,7 @@ namespace actor
         if (act->push & PUSH_YN) {
             act->pos.y--;
             actor::actor_t *other = actor::get_collision(act);
-            if (act->pos.y<0 || other)
+            if (act->pos.y<min.y || other)
             {
                 if (other && other->flags & FLAG_PUSHABLE) other->push |= PUSH_YN;
                 act->pos.y++;
@@ -356,7 +355,7 @@ namespace actor
         if (act->push & PUSH_YP) {
             act->pos.y++;
             actor::actor_t *other = actor::get_collision(act);
-            if (act->pos.y>56 ||other)
+            if (act->pos.y>max.y ||other)
             {
                 if (other && other->flags & FLAG_PUSHABLE) other->push |= PUSH_YP;
                 act->pos.y--;
@@ -477,6 +476,7 @@ namespace actor
         //print(x+5,y,act->pos.x);
         //print(x+5,y+6,act->pos.y);
         //print(x+5,y+12,order);
+        print(x+5,y,act->flags);
         
         if (draw_all && act->next) draw(act->next);
     }
diff --git a/source/actor.h b/source/actor.h
index de766f5..3746541 100644
--- a/source/actor.h
+++ b/source/actor.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <SDL2/SDL.h>
+#include "misc.h"
 
 #define FLAG_NONE       0
 #define FLAG_HERO       1
@@ -30,11 +31,6 @@
 
 namespace actor
 {
-    struct vec3_t
-    {
-        int x, y, z;
-    };
-
     struct actor_t
     {
         SDL_Rect bmp_rect;
diff --git a/source/main.cpp b/source/main.cpp
index d0fe3ac..eb58b6b 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -3,6 +3,7 @@
 #include "jinput.h"
 #include <SDL2/SDL.h>
 #include "actor.h"
+#include "room.h"
 
 draw::surface *surf;
 actor::actor_t *box;
@@ -15,6 +16,8 @@ void game::init()
     draw::loadPalette("test.gif");
     game::setUpdateTicks(64);
 
+    room::load(0,3);
+
     box = actor::create({16,16,0}, {8,8,4}, {64,0,32,24}, {0,24});
     box->flags = FLAG_MOVING;
     box->movement = MOV_Z;
@@ -43,13 +46,7 @@ bool game::loop()
     actor::reorder();
 
     draw::cls(8);
-    for (int y=0;y<8;++y)
-    {
-        for (int x=0;x<8;++x)
-        {
-            draw::draw(148+x*16-y*16,76+x*8+y*8,32,15,0,1);
-        }
-    }
+    room::draw();
     actor::draw(actor::getFirst());
     //draw::draw(148+sx*2-sy*2, 67+sx+sy,24,24,24,0);
     draw::render();
diff --git a/source/misc.h b/source/misc.h
new file mode 100644
index 0000000..32033cf
--- /dev/null
+++ b/source/misc.h
@@ -0,0 +1,11 @@
+#pragma once
+
+struct vec2_t
+{
+    int x, y;
+};
+
+struct vec3_t
+{
+    int x, y, z;
+};
diff --git a/source/room.cpp b/source/room.cpp
new file mode 100644
index 0000000..973807b
--- /dev/null
+++ b/source/room.cpp
@@ -0,0 +1,46 @@
+#include "room.h"
+#include "jdraw.h"
+
+namespace room
+{
+    static vec3_t size = {8,8,8};
+    static vec3_t tmin = {0,0,0};
+    static vec3_t tmax = {7,7,7};
+    static vec3_t min = {0,0,0};
+    static vec3_t max = {56,56,56};
+
+    void load(int x, int y)
+    {
+        size = {(x+1)*2,(y+1)*2,3};
+        tmin = {3-x,3-y,0};
+        tmax = {4+x,4+y,3};
+        min = {tmin.x*8,tmin.y*8,0};
+        max = {tmax.x*8,tmax.y*8,24};
+    }
+    
+    void draw()
+    {
+        for (int y=tmin.y;y<=tmax.y;++y)
+        {
+            for (int x=tmin.x;x<=tmax.x;++x)
+            {
+                draw::draw(148+x*16-y*16,76+x*8+y*8,32,15,0,1);
+            }
+        }
+    }
+
+    vec3_t getSize()
+    {
+        return size;
+    }
+
+    vec3_t getMin()
+    {
+        return min;
+    }
+
+    vec3_t getMax()
+    {
+        return max;
+    }
+}
diff --git a/source/room.h b/source/room.h
new file mode 100644
index 0000000..beef806
--- /dev/null
+++ b/source/room.h
@@ -0,0 +1,12 @@
+#pragma once
+#include "misc.h"
+
+namespace room
+{
+    void load(int x, int y);
+    void draw();
+    
+    vec3_t getSize();
+    vec3_t getMin();
+    vec3_t getMax();
+}