forked from jaildesigner-jailgames/jaildoctors_dilemma
Trabajando en el marcador
This commit is contained in:
@@ -4,12 +4,13 @@
|
||||
#include <sstream>
|
||||
|
||||
// Constructor
|
||||
Room::Room(std::string file_path, SDL_Renderer *renderer, Asset *asset, ItemTracker *itemTracker)
|
||||
Room::Room(std::string file_path, SDL_Renderer *renderer, Asset *asset, ItemTracker *itemTracker, int *items)
|
||||
{
|
||||
// Copia los punteros a objetos
|
||||
this->asset = asset;
|
||||
this->renderer = renderer;
|
||||
this->itemTracker = itemTracker;
|
||||
this->itemsPicked = items;
|
||||
|
||||
// Crea los objetos
|
||||
texture = new LTexture();
|
||||
@@ -551,19 +552,10 @@ bool Room::itemCollision(SDL_Rect &rect)
|
||||
delete items[i];
|
||||
items.erase(items.begin()+i);
|
||||
JA_PlaySound(itemSound);
|
||||
*itemsPicked = *itemsPicked + 1;
|
||||
collision = true;
|
||||
}
|
||||
}
|
||||
//for (auto item : items)
|
||||
//{
|
||||
// if (checkCollision(rect, item->getCollider()))
|
||||
// {
|
||||
// itemTracker->addItem(name, item->getPos());
|
||||
// item->pick();
|
||||
// JA_PlaySound(itemSound);
|
||||
// collision = true;
|
||||
// }
|
||||
//}
|
||||
|
||||
return collision;
|
||||
}
|
||||
Reference in New Issue
Block a user