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

- Ja mostra el panel de propietats que toca segons el que està seleccionat.

Browse Source
This commit is contained in:
Raimon Zamora
2024-06-10 21:56:32 +02:00
parent 042dd3c505
commit c71ee1bbb5
1 changed files with 85 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
source/main.cpp
View File

@@ -320,27 +320,6 @@ bool game::loop()
draw::color(WHITE); draw::color(WHITE);
draw::fillrect(0, 0, 100, 240); draw::fillrect(0, 0, 100, 240);
/*
bool change = false;
change |= btn("ROOM WIDTH:", 10, 40, room::editor::refWidth(), 0, 3);
change |= btn("ROOM HEIGHT:", 10, 55, room::editor::refHeight(), 0, 3);
draw::print("DOORS:", 10, 80, 15, 0);
change |= btn_small(32, 80, room::editor::refDoor(XN), -1, 5);
change |= btn_small(49, 80, room::editor::refDoor(YP), -1, 5);
change |= btn_small(66, 80, room::editor::refDoor(XP), -1, 5);
change |= btn_small(83, 80, room::editor::refDoor(YN), -1, 5);
btn("COLOR:", 10, 140, room::editor::refColor(), 5, 11);
btn("FLOOR:", 10, 155, room::editor::refFloorTex(), 0, 5);
btn("WALLS:", 10, 170, room::editor::refWallTex(), 0, 5);
btn("DOORS:", 10, 185, room::editor::refDoorTex(), 0, 4);
btn("WDOORS:", 10, 200, room::editor::refWallDoorTex(), 0, 5);
if (change) room::update();
*/
draw::color(LIGHT+WHITE); draw::color(LIGHT+WHITE);
draw::fillrect(2, 2, 96, 236); draw::fillrect(2, 2, 96, 236);
draw::color(PAPER); draw::color(PAPER);
@@ -410,40 +389,38 @@ bool game::loop()
draw::color(WHITE); draw::color(WHITE);
draw::fillrect(0, 0, 100, 240); draw::fillrect(0, 0, 100, 240);
draw::setViewport(420, 2, 100, 238); bool room_changed = false;
draw::color(LIGHT+WHITE); switch (section)
draw::fillrect(2, 0, 96, 100); {
draw::color(PAPER); case SECTION_GENERAL:
draw::rect(2, 0, 96, 100); break;
/* case SECTION_ROOM:
const int mx = draw::getLocalX(input::mouseX());
const int my = draw::getLocalY(input::mouseY());
const bool btnDown = input::mouseBtn(1) || input::mouseBtn(3);
int line = 0; room_changed |= btn("ROOM WIDTH:", 10, 40, room::editor::refWidth(), 0, 3);
act = actor::getFirst(); room_changed |= btn("ROOM HEIGHT:", 10, 55, room::editor::refHeight(), 0, 3);
while (act) {
if ((act->flags&FLAG_NOEDITOR)!=FLAG_NOEDITOR) { draw::print("DOORS:", 10, 80, 15, 0);
if (act==actor::getSelected()) { room_changed |= btn_small(32, 80, room::editor::refDoor(XN), -1, 5);
draw::color(LIGHT+BLUE); room_changed |= btn_small(49, 80, room::editor::refDoor(YP), -1, 5);
draw::fillrect(4, 2+line*9, 92, 9); room_changed |= btn_small(66, 80, room::editor::refDoor(XP), -1, 5);
} room_changed |= btn_small(83, 80, room::editor::refDoor(YN), -1, 5);
if ((mx>=2) && (mx<98) && (my>=2+line*9) && (my<2+9+line*9) && btnDown) {
actor::select(act); room_changed |= btn("COLOR:", 10, 140, room::editor::refColor(), 5, 11);
//section=1; room_changed |= btn("FLOOR:", 10, 155, room::editor::refFloorTex(), 0, 5);
} room_changed |= btn("WALLS:", 10, 170, room::editor::refWallTex(), 0, 5);
draw::print(act->name, 6, 4+line*9, LIGHT+WHITE, BLACK); room_changed |= btn("DOORS:", 10, 185, room::editor::refDoorTex(), 0, 4);
line++; room_changed |= btn("WDOORS:", 10, 200, room::editor::refWallDoorTex(), 0, 5);
}
act = act->next; if (room_changed) room::update();
} break;
*/
case SECTION_ACTOR:
act = actor::getSelected(); act = actor::getSelected();
if (act) if (act)
{ {
draw::setViewport(420, 90, 100, 150); //draw::setViewport(420, 90, 100, 150);
btn_txt("NAME:", 2, 0, act->name); btn_txt("NAME:", 2, 0, act->name);
if (btn_opt2("BMP:", 2, 10, act->bmp, gifs)) { if (btn_opt2("BMP:", 2, 10, act->bmp, gifs)) {
@@ -503,6 +480,9 @@ bool game::loop()
btn_check(24+38, 140, "YN", act->react_push, PUSH_YN); btn_check(24+38, 140, "YN", act->react_push, PUSH_YN);
btn_check(24+50, 140, "ZP", act->react_push, PUSH_ZP); btn_check(24+50, 140, "ZP", act->react_push, PUSH_ZP);
btn_check(24+62, 140, "ZN", act->react_push, PUSH_ZN); btn_check(24+62, 140, "ZN", act->react_push, PUSH_ZN);
}
break;
};
/* /*
break; break;
@@ -538,7 +518,6 @@ bool game::loop()
} }
break; break;
*/ */
}
draw::render(); draw::render();