Corregido bug en los colores del texto del marcador

data/room/55.room

@@ -7,30 +7,46 @@ roomUp=0
 roomDown=0
 roomLeft=54.room
 roomRight=56.room
-itemColor1=yellow
+itemColor1=magenta
 itemColor2=red
 autoSurface=left
 
+[enemy]
+tileset=dimallas.png
+animation=dimallas.ani
+width=16
+height=16
+x=15
+y=13
+vx=0.6
+vy=0
+x1=9
+y1=13
+x2=25
+y2=13
+color=green
+[/enemy]
+
 [enemy]
 tileset=heavy.png
 animation=heavy.ani
 width=16
 height=16
-x=2
+x=16
-y=2
+y=4
 vx=0
-vy=0
+vy=0.3
-x1=2
+x1=16
-y1=2
+y1=4
-x2=2
+x2=16
-y2=2
+y2=10
-color=magenta
+color=red
 [/enemy]
 
 [item]
 tileset=items.png
-tile=33
+tile=25
-x=1
+x=9
-y=1
+y=4
 counter=1
 [/item]

data/room/55.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
+<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
@@ -7,15 +7,15 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,
-0,0,0,523,302,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
+0,0,0,0,0,0,0,0,0,302,0,0,0,0,302,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,
-0,0,523,0,0,0,0,0,302,0,0,0,0,302,0,0,0,0,302,0,0,0,0,302,0,0,0,0,0,0,0,134,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,302,0,0,0,0,302,0,0,0,0,0,0,16,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,433,0,0,0,134,
+0,0,0,0,0,0,0,0,0,0,0,0,0,302,0,0,0,0,0,0,0,0,0,0,0,0,0,477,0,0,0,16,
-0,0,0,0,0,0,0,0,326,0,0,0,0,326,0,0,0,0,326,0,0,0,0,326,0,0,0,0,0,0,0,134,
+0,0,0,0,0,0,0,0,326,0,0,0,0,0,0,0,0,0,326,0,0,0,0,326,0,0,0,0,0,0,0,16,
-16,16,16,16,538,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
+16,16,16,16,538,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,
 16,16,16,16,16,538,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 16,16,16,16,16,16,538,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349

source/game.cpp

@@ -24,10 +24,10 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D
 	// currentRoom = "06.room";
 	// spawnPoint = {14 * 8, 9 * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
 
-	 currentRoom = "55.room";
+	currentRoom = "55.room";
-	 const int x = 30;
+	const int x = 30;
-	 const int y = 13;
+	const int y = 13;
-	 spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
+	spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
 	//   ****
 
 	// Crea los objetos
@@ -48,7 +48,8 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D
 	board.lives = 9;
 	board.items = 0;
 	board.rooms = 1;
-	board.color = room->getBorderColor();
+	const color_t c = room->getBorderColor();
+	board.color = (c.r + c.g + c.b == 0) ? stringToColor("white") : c; // Si el color es negro lo cambia a blanco
 	roomTracker->addRoom(currentRoom);
 	paused = false;
 	blackScreen = false;
@@ -316,8 +317,8 @@ bool Game::changeRoom(std::string file)
 			room = new Room(asset->get(file), renderer, screen, asset, itemTracker, &board.items, debug);
 
 			// Actualiza el marcador
-			const color_t c = room->getBorderColor();						   // Pon el color del marcador
+			const color_t c = room->getBorderColor();						   // Pone el color del marcador
-			board.color = (c.r + c.g + c.b == 0) ? stringToColor("white") : c; // Si el color es negrom cambialo a blanco
+			board.color = (c.r + c.g + c.b == 0) ? stringToColor("white") : c; // Si el color es negro lo cambia a blanco
 			if (roomTracker->addRoom(file))
 			{ // Incrementa el contador de habitaciones visitadas
 				board.rooms++;
@@ -390,7 +391,7 @@ void Game::killPlayer()
 		return;
 	}
 
-	//board.lives--;
+	// board.lives--;
 
 	// Destruye la habitacion y el jugador
 	delete room;