forked from jaildesigner-jailgames/jaildoctors_dilemma
canvi de pc enmig de la enfangà
This commit is contained in:
@@ -275,7 +275,7 @@ bool setEnemy(enemy_t *enemy, std::string var, std::string value)
|
||||
|
||||
if (var == "animation")
|
||||
{
|
||||
enemy->animationString = value;
|
||||
enemy->animation_path = value;
|
||||
}
|
||||
|
||||
else if (var == "width")
|
||||
@@ -404,7 +404,7 @@ bool setItem(item_t *item, std::string var, std::string value)
|
||||
}
|
||||
|
||||
// Constructor
|
||||
Room::Room(room_t *room, ItemTracker *itemTracker, int *itemsPicked, bool jailEnabled)
|
||||
Room::Room(std::shared_ptr<room_t> room, std::shared_ptr<ItemTracker> itemTracker, int *itemsPicked, bool jailEnabled)
|
||||
: screen(Screen::get()),
|
||||
renderer(Screen::get()->getRenderer()),
|
||||
asset(Asset::get()),
|
||||
@@ -427,7 +427,7 @@ Room::Room(room_t *room, ItemTracker *itemTracker, int *itemsPicked, bool jailEn
|
||||
autoSurfaceDirection = room->autoSurfaceDirection;
|
||||
textureA = room->textureA;
|
||||
textureB = room->textureB;
|
||||
tileMap = *room->tileMap;
|
||||
tileMap = room->tileMap;
|
||||
texture = (options.video.palette == Palette::ZXSPECTRUM) ? textureA : textureB;
|
||||
this->jailEnabled = jailEnabled;
|
||||
|
||||
@@ -566,7 +566,7 @@ void Room::fillMapTexture()
|
||||
{
|
||||
clip.x = (tileMap[index] % tileSetWidth) * tileSize;
|
||||
clip.y = (tileMap[index] / tileSetWidth) * tileSize;
|
||||
texture->render(renderer, x * tileSize, y * tileSize, &clip);
|
||||
texture->render(x * tileSize, y * tileSize, &clip);
|
||||
|
||||
#ifdef DEBUG
|
||||
// ****
|
||||
|
||||
Reference in New Issue
Block a user