From f21029f973a40ec6ea031b8efbad1ddeba897e4f Mon Sep 17 00:00:00 2001 From: JailDoctor Date: Tue, 6 Jun 2023 19:46:57 +0200 Subject: [PATCH] =?UTF-8?q?-=20Es=20pot=20canviar=20el=20color=20de=20l'ha?= =?UTF-8?q?bitaci=C3=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/test.gif | Bin 3710 -> 3831 bytes source/main.cpp | 4 +++- source/room.cpp | 8 +++++++- source/room.h | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/data/test.gif b/data/test.gif index 5dc8a9b4de3ec78d8c5b52438d1287186e681def..e0596d8956bef6ebdc294ef3ac04937b8518cdff 100644 GIT binary patch delta 3684 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 Cc_vi= delta 3644 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 Oq|Y*nq`Gn;002As@DZQ@ diff --git a/source/main.cpp b/source/main.cpp index 34ad9e1..d8669f5 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -13,11 +13,12 @@ int room_xp = -1; int room_xn = -1; int room_yp = -1; int room_yn = -1; +int room_color = 5; void restart() { actor::clear(); - room::load(room_w, room_h, room_xp, room_xn, room_yp, room_yn); + room::load(room_w, room_h, room_xp, room_xn, room_yp, room_yn, room_color); /* box = actor::create("ASCENSOR",{16,32,0}, {8,8,4}, {64,0,32,24}, {0,24}); @@ -113,6 +114,7 @@ bool game::loop() btn("DOOR XN:", 330, 65, room_xn, -1, 5); btn("DOOR YP:", 330, 80, room_yp, -1, 5); btn("DOOR YN:", 330, 95, room_yn, -1, 5); + btn("COLOR:", 330, 110, room_color, 3, 7); draw::render(); diff --git a/source/room.cpp b/source/room.cpp index 01108c2..ad74022 100644 --- a/source/room.cpp +++ b/source/room.cpp @@ -12,9 +12,11 @@ namespace room static uint8_t doors = DOOR_XP /*| DOOR_YP*/ ; static uint8_t door_height[4]; + static uint8_t color = 5; - void load(int x, int y, int8_t xp, int8_t xn, int8_t yp, int8_t yn) + void load(int x, int y, int8_t xp, int8_t xn, int8_t yp, int8_t yn, uint8_t col) { + color = col; size = {(x+1)*2,(y+1)*2,3}; tmin = {3-x,3-y,0}; tmax = {4+x,4+y,3}; @@ -49,6 +51,8 @@ namespace room void draw() { + draw::swapcol(1, color); + // RUTINES DE PINTAT DE LA PORTA DE DALT A LA DRETA if (doors & DOOR_YN) { @@ -112,6 +116,8 @@ namespace room void draw2() { + draw::swapcol(1, color); + if (doors & DOOR_YP) { // Pintem les voreres dels dos tiles extra per a la porta YP diff --git a/source/room.h b/source/room.h index e57f36f..3de3784 100644 --- a/source/room.h +++ b/source/room.h @@ -13,7 +13,7 @@ namespace room { - void load(int x, int y, int8_t xp, int8_t xn, int8_t yp, int8_t yn); + void load(int x, int y, int8_t xp, int8_t xn, int8_t yp, int8_t yn, uint8_t col); void draw(); void draw2();