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

- [FIX] El minimapa ja pinta les unions dalt-baix

Browse Source
This commit is contained in:
Raimon Zamora
2024-09-24 13:26:48 +02:00
parent e7224cc376
commit a3ada11daf
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/m_editor_map.cpp
View File

@@ -34,11 +34,15 @@ namespace modules
if (minirooms[room].exits[YN] != 255) { draw::isoline(x,y,+1,-1,14); /*draw::isoline(x,y-1,+1,-1,14);*/ draw::isoline(x,y+1,+1,-1,14); } if (minirooms[room].exits[YN] != 255) { draw::isoline(x,y,+1,-1,14); /*draw::isoline(x,y-1,+1,-1,14);*/ draw::isoline(x,y+1,+1,-1,14); }
if (minirooms[room].exits[XP] != 255) { draw::isoline(x,y,+1,+1,14); /*draw::isoline(x,y-1,+1,+1,14);*/ draw::isoline(x,y+1,+1,+1,14); } if (minirooms[room].exits[XP] != 255) { draw::isoline(x,y,+1,+1,14); /*draw::isoline(x,y-1,+1,+1,14);*/ draw::isoline(x,y+1,+1,+1,14); }
if (minirooms[room].exits[YP] != 255) { draw::isoline(x,y,-1,+1,14); /*draw::isoline(x,y-1,-1,+1,14);*/ draw::isoline(x,y+1,-1,+1,14); } if (minirooms[room].exits[YP] != 255) { draw::isoline(x,y,-1,+1,14); /*draw::isoline(x,y-1,-1,+1,14);*/ draw::isoline(x,y+1,-1,+1,14); }
if (minirooms[room].exits[ZN] != 255) { draw::vline(x,y,24); /*draw::isoline(x,y-1,-1,+1,14);*/ draw::vline(x+1,y,24); }
if (minirooms[room].exits[ZP] != 255) { draw::vline(x,y-24,24); /*draw::isoline(x,y-1,-1,+1,14);*/ draw::vline(x+1,y-24,24); }
} }
if (minirooms[room].exits[XN] != 255) drawLines(minirooms[room].exits[XN], x-24, y-12); if (minirooms[room].exits[XN] != 255) drawLines(minirooms[room].exits[XN], x-24, y-12);
if (minirooms[room].exits[XP] != 255) drawLines(minirooms[room].exits[XP], x+24, y+12); if (minirooms[room].exits[XP] != 255) drawLines(minirooms[room].exits[XP], x+24, y+12);
if (minirooms[room].exits[YN] != 255) drawLines(minirooms[room].exits[YN], x+24, y-12); if (minirooms[room].exits[YN] != 255) drawLines(minirooms[room].exits[YN], x+24, y-12);
if (minirooms[room].exits[YP] != 255) drawLines(minirooms[room].exits[YP], x-24, y+12); if (minirooms[room].exits[YP] != 255) drawLines(minirooms[room].exits[YP], x-24, y+12);
if (minirooms[room].exits[ZN] != 255) drawLines(minirooms[room].exits[ZN], x, y+24);
if (minirooms[room].exits[ZP] != 255) drawLines(minirooms[room].exits[ZP], x, y-24);
} }
void drawRoom(const int room, const int x, const int y, const bool shadow=false) void drawRoom(const int room, const int x, const int y, const bool shadow=false)
@@ -61,6 +65,8 @@ namespace modules
if (minirooms[room].exits[XP] != 255) drawRoom(minirooms[room].exits[XP], x+24, y+12, shadow); if (minirooms[room].exits[XP] != 255) drawRoom(minirooms[room].exits[XP], x+24, y+12, shadow);
if (minirooms[room].exits[YN] != 255) drawRoom(minirooms[room].exits[YN], x+24, y-12, shadow); if (minirooms[room].exits[YN] != 255) drawRoom(minirooms[room].exits[YN], x+24, y-12, shadow);
if (minirooms[room].exits[YP] != 255) drawRoom(minirooms[room].exits[YP], x-24, y+12, shadow); if (minirooms[room].exits[YP] != 255) drawRoom(minirooms[room].exits[YP], x-24, y+12, shadow);
if (minirooms[room].exits[ZN] != 255) drawRoom(minirooms[room].exits[ZN], x, y+24, shadow);
if (minirooms[room].exits[ZP] != 255) drawRoom(minirooms[room].exits[ZP], x, y-24, shadow);
} }
void loadMiniRoom() void loadMiniRoom()
@@ -72,9 +78,9 @@ namespace modules
minirooms[room].color = room::getColor(0); minirooms[room].color = room::getColor(0);
minirooms[room].w = (room::getSize().x >> 1)-1; minirooms[room].w = (room::getSize().x >> 1)-1;
minirooms[room].h = (room::getSize().y >> 1)-1; minirooms[room].h = (room::getSize().y >> 1)-1;
for (int i=0; i<ZN; ++i) minirooms[room].exits[i] = room::getExit(i); for (int i=0; i<=ZN; ++i) minirooms[room].exits[i] = room::getExit(i);
for (int i=0; i<ZN; ++i) { for (int i=0; i<=ZN; ++i) {
const int next_room = minirooms[room].exits[i]; const int next_room = minirooms[room].exits[i];
if ( (next_room >= 0) && (next_room <= 64) && (!drawn[next_room]) ) { if ( (next_room >= 0) && (next_room <= 64) && (!drawn[next_room]) ) {
room::load(next_room); room::load(next_room);