JailDoctor/thepool
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 6 Wiki Activity

- [FIX] Ja funcionen les eixides per el piso

Browse Source
This commit is contained in:
Raimon Zamora
2024-06-17 08:10:00 +02:00
parent 219bdd96b3
commit 04d5c41328
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/rooms/00.txt
View File

@@ -8,7 +8,7 @@ wall-texture: 2
door-texture: 0 door-texture: 0
under-door-texture: 0 under-door-texture: 0
exit-xn: 1 exit-xn: 1
exit-zn: 0 exit-zn: 2
actor{ actor{
name: PLATFORM00 name: PLATFORM00

2
source/actor.cpp
View File

@@ -719,7 +719,7 @@ namespace actor
// Si estic sobre el piso, no faig res [TODO]: Si no hi ha piso ha de caure // Si estic sobre el piso, no faig res [TODO]: Si no hi ha piso ha de caure
if (act->pos.z == 0) if (act->pos.z == 0)
{ {
if ((act->flags&FLAG_HERO)==0 || room::getExit(ZN)==-1) return; if ( ((act->flags&FLAG_HERO)==0) || (room::getExit(ZN)==-1) ) return;
room::load(room::getExit(ZN)); room::load(room::getExit(ZN));
act->pos.z = room::getMax().z; act->pos.z = room::getMax().z;

8
source/room.cpp
View File

@@ -339,22 +339,22 @@ namespace room
return max; return max;
} }
uint8_t getDoors() int getDoors()
{ {
return doors; return doors;
} }
uint8_t getDoor(const int d) int getDoor(const int d)
{ {
return door_height[d]; return door_height[d];
} }
uint8_t getExit(const int d) int getExit(const int d)
{ {
return exits[d]; return exits[d];
} }
uint8_t getColor() int getColor()
{ {
return color; return color;
} }

8
source/room.h
View File

@@ -27,10 +27,10 @@ namespace room
vec3_t getSize(); vec3_t getSize();
vec3_t getMin(); vec3_t getMin();
vec3_t getMax(); vec3_t getMax();
uint8_t getDoors(); int getDoors();
uint8_t getDoor(const int d); int getDoor(const int d);
uint8_t getExit(const int d); int getExit(const int d);
uint8_t getColor(); int getColor();
namespace editor namespace editor
{ {