jailers/jaildoctors_dilemma
5
0
Fork 0
forked from jaildesigner-jailgames/jaildoctors_dilemma
Code Pull Requests Activity

Solucionado un bug nuevo con los colores de los items

Browse Source
This commit is contained in:
Sergio
2022-10-30 14:35:05 +01:00
parent c79c25d59d
commit 995b3516e6
1 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/room.cpp
View File

@@ -385,16 +385,15 @@ Room::Room(room_t *room, SDL_Renderer *renderer, Screen *screen, Asset *asset, o
textureA = room->textureA; textureA = room->textureA;
textureB = room->textureB; textureB = room->textureB;
tileMap = room->tileMap; tileMap = room->tileMap;
texture = (options->palette == p_zxspectrum) ? textureA : textureB;
// Inicializa variables // Inicializa variables
tileSize = 8; tileSize = 8;
tileSetWidth = texture->getWidth() / tileSize;
mapWidth = 32; mapWidth = 32;
mapHeight = 16; mapHeight = 16;
paused = false; paused = false;
counter = 0; counter = 0;
// itemColor1 = "magenta";
// itemColor2 = "yellow";
// autoSurfaceDirection = 1;
// Crea los enemigos // Crea los enemigos
for (auto &enemy : room->enemies) for (auto &enemy : room->enemies)
@@ -411,27 +410,14 @@ Room::Room(room_t *room, SDL_Renderer *renderer, Screen *screen, Asset *asset, o
if (!itemTracker->hasBeenPicked(room->name, itemPos)) if (!itemTracker->hasBeenPicked(room->name, itemPos))
{ {
item.renderer = renderer; item.renderer = renderer;
item.color1 = stringToColor(options->palette, itemColor1);
item.color2 = stringToColor(options->palette, itemColor2);
items.push_back(new Item(item)); items.push_back(new Item(item));
} }
} }
// Crea los objetos // Carga los sonidos
// loadRoomFile(file);
// texture = new Texture(renderer, asset->get(tileSetFile));
// texture = resource->getTexture(tileSetFile);
if (options->palette == p_zxspectrum)
{
texture = textureA;
}
else
{
texture = textureB;
}
tileSetWidth = texture->getWidth() / tileSize;
itemSound = JA_LoadSound(asset->get("item.wav").c_str()); itemSound = JA_LoadSound(asset->get("item.wav").c_str());
// loadRoomTileFile(asset->get(tileMapFile));
// Calcula las superficies // Calcula las superficies
setBottomSurfaces(); setBottomSurfaces();
@@ -901,7 +887,6 @@ void Room::setBottomSurfaces()
// Recorre el vector de tiles buscando tiles consecutivos para localizar las superficies // Recorre el vector de tiles buscando tiles consecutivos para localizar las superficies
int i = 0; int i = 0;
int lastOne = 0; int lastOne = 0;
// while (i < (int)tile.size())
do do
{ {
h_line_t line; h_line_t line;
@@ -953,7 +938,6 @@ void Room::setTopSurfaces()
// Recorre el vector de tiles buscando tiles consecutivos para localizar las superficies // Recorre el vector de tiles buscando tiles consecutivos para localizar las superficies
int i = 0; int i = 0;
int lastOne = 0; int lastOne = 0;
// while (i < (int)tile.size())
do do
{ {
h_line_t line; h_line_t line;
@@ -1004,7 +988,6 @@ void Room::setLeftSurfaces()
// (Los tiles de la misma columna, la diferencia entre ellos es de mapWidth) // (Los tiles de la misma columna, la diferencia entre ellos es de mapWidth)
// para localizar las superficies // para localizar las superficies
int i = 0; int i = 0;
// while (i < (int)tile.size())
do do
{ {
v_line_t line; v_line_t line;
@@ -1047,7 +1030,6 @@ void Room::setRightSurfaces()
// (Los tiles de la misma columna, la diferencia entre ellos es de mapWidth) // (Los tiles de la misma columna, la diferencia entre ellos es de mapWidth)
// para localizar las superficies // para localizar las superficies
int i = 0; int i = 0;
// while (i < (int)tile.size())
do do
{ {
v_line_t line; v_line_t line;