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

- Ja es pot moure entre habitacions (falten dalt i baix)

Browse Source
This commit is contained in:
Raimon Zamora
2024-06-13 14:21:57 +02:00
parent d04176b363
commit 377ca978e2
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/actor.cpp
View File

@@ -588,7 +588,8 @@ namespace actor
// Si ja havem atravesat la porta, ens movem a la porta de l'altra costat // Si ja havem atravesat la porta, ens movem a la porta de l'altra costat
// [TODO] que es moga a l'habitació que toca!!! // [TODO] que es moga a l'habitació que toca!!!
if (act->pos.x<min.x-4) { if (act->pos.x<min.x-4) {
act->pos.x = max.x; room::load(room::getExit(XN));
act->pos.x = room::getMax().x+3;
act->pos.z = room::getDoor(XP)*4; act->pos.z = room::getDoor(XP)*4;
} }
@@ -613,7 +614,8 @@ namespace actor
} }
if (act->pos.x>max.x+4) { if (act->pos.x>max.x+4) {
act->pos.x = min.x; room::load(room::getExit(XP));
act->pos.x = room::getMin().x-3;
act->pos.z = room::getDoor(XN)*4; act->pos.z = room::getDoor(XN)*4;
} }
@@ -638,7 +640,8 @@ namespace actor
} }
if (act->pos.y<min.y-4) { if (act->pos.y<min.y-4) {
act->pos.y = max.y; room::load(room::getExit(YN));
act->pos.y = room::getMax().y+3;
act->pos.z = room::getDoor(YP)*4; act->pos.z = room::getDoor(YP)*4;
} }
@@ -663,7 +666,8 @@ namespace actor
} }
if (act->pos.y>max.y+4) { if (act->pos.y>max.y+4) {
act->pos.y = min.y; room::load(room::getExit(YP));
act->pos.y = room::getMin().y-3;
act->pos.z = room::getDoor(YN)*4; act->pos.z = room::getDoor(YN)*4;
} }

10
source/main.cpp
View File

@@ -536,23 +536,23 @@ switch (section)
line += 10; line += 10;
ui::label("YP", 2, line, 48, 11); ui::label("YP", 2, line, 48, 11);
changed |= btn_small(48, line, room::editor::refExit(YP), -1, 64, 36); changed |= btn_small(48, line, room::editor::refExit(YP), -1, 64, 36);
ui::button("GO", 84, line, 13, 11); if (ui::button("GO", 84, line, 13, 11)) room::load(room::editor::refExit(YP));
line += 10; line += 10;
ui::label("XP", 2, line, 48, 11); ui::label("XP", 2, line, 48, 11);
changed |= btn_small(48, line, room::editor::refExit(XP), -1, 64, 36); changed |= btn_small(48, line, room::editor::refExit(XP), -1, 64, 36);
ui::button("GO", 84, line, 13, 11); if (ui::button("GO", 84, line, 13, 11)) room::load(room::editor::refExit(XP));
line += 10; line += 10;
ui::label("YN", 2, line, 48, 11); ui::label("YN", 2, line, 48, 11);
changed |= btn_small(48, line, room::editor::refExit(YN), -1, 64, 36); changed |= btn_small(48, line, room::editor::refExit(YN), -1, 64, 36);
ui::button("GO", 84, line, 13, 11); if (ui::button("GO", 84, line, 13, 11)) room::load(room::editor::refExit(YN));
line += 10; line += 10;
ui::label("ZP", 2, line, 48, 11); ui::label("ZP", 2, line, 48, 11);
changed |= btn_small(48, line, room::editor::refExit(ZP), -1, 64, 36); changed |= btn_small(48, line, room::editor::refExit(ZP), -1, 64, 36);
ui::button("GO", 84, line, 13, 11); if (ui::button("GO", 84, line, 13, 11)) room::load(room::editor::refExit(ZP));
line += 10; line += 10;
ui::label("ZN", 2, line, 48, 11); ui::label("ZN", 2, line, 48, 11);
changed |= btn_small(48, line, room::editor::refExit(ZN), -1, 64, 36); changed |= btn_small(48, line, room::editor::refExit(ZN), -1, 64, 36);
ui::button("GO", 84, line, 13, 11); if (ui::button("GO", 84, line, 13, 11)) room::load(room::editor::refExit(ZN));
line += 10; line += 10;
/*changed |= btn("COLOR:", 10, 140, room::editor::refColor(), 5, 11); /*changed |= btn("COLOR:", 10, 140, room::editor::refColor(), 5, 11);