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

Ya carga las imagenes del juego y la demo desde la cache de rescursos

Browse Source
This commit is contained in:
Sergio
2022-10-26 20:29:07 +02:00
parent c6e8050f95
commit 397e1e89e3
16 changed files with 286 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/room.cpp
View File

@@ -4,9 +4,10 @@
#include <sstream>
// Constructor
Room::Room(std::string file, SDL_Renderer *renderer, Screen *screen, Asset *asset, options_t *options, ItemTracker *itemTracker, int *items, Debug *debug)
Room::Room(std::string file, SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *asset, options_t *options, ItemTracker *itemTracker, int *items, Debug *debug)
{
// Copia los punteros a objetos
this->resource = resource;
this->renderer = renderer;
this->asset = asset;
this->screen = screen;
@@ -27,7 +28,8 @@ Room::Room(std::string file, SDL_Renderer *renderer, Screen *screen, Asset *asse
// Crea los objetos
loadMapFile(file);
texture = new Texture(renderer, asset->get(tileset));
//texture = new Texture(renderer, asset->get(tileset));
texture = resource->getTexture(tileset);
tilesetWidth = texture->getWidth() / tileSize;
itemSound = JA_LoadSound(asset->get("item.wav").c_str());
@@ -64,7 +66,7 @@ Room::Room(std::string file, SDL_Renderer *renderer, Screen *screen, Asset *asse
Room::~Room()
{
// Reclama la memoria utilizada por los objetos
delete texture;
//delete texture;
JA_DeleteSound(itemSound);
SDL_DestroyTexture(mapTexture);
@@ -102,6 +104,7 @@ bool Room::loadMapFile(std::string file_path)
if (line == "[enemy]")
{
enemy_t enemy;
enemy.resource = resource;
enemy.asset = asset;
enemy.renderer = renderer;
enemy.flip = false;
@@ -128,6 +131,7 @@ bool Room::loadMapFile(std::string file_path)
else if (line == "[item]")
{
item_t item;
item.resource = resource;
item.asset = asset;
item.renderer = renderer;
item.counter = 0;