Afegint smart pointers
Actualitzat Resources Actualitzades les classes Sprite i derivades Afegida nova tipografia Actualitzat Asset Actualitzat Text
This commit is contained in:
@@ -26,24 +26,24 @@ Logo::Logo()
|
||||
// Reserva memoria para los punteros
|
||||
jailgames_texture_ = resource_->getTexture("jailgames.png");
|
||||
since_1998_texture_ = resource_->getTexture("since_1998.png");
|
||||
since_1998_sprite_ = new Sprite((256 - since_1998_texture_->getWidth()) / 2, 83 + jailgames_texture_->getHeight() + 5, since_1998_texture_->getWidth(), since_1998_texture_->getHeight(), since_1998_texture_, renderer_);
|
||||
since_1998_sprite_ = std::make_shared<Sprite>((256 - since_1998_texture_->getWidth()) / 2, 83 + jailgames_texture_->getHeight() + 5, since_1998_texture_->getWidth(), since_1998_texture_->getHeight(), since_1998_texture_, renderer_);
|
||||
since_1998_sprite_->setClip(0, 0, since_1998_texture_->getWidth(), since_1998_texture_->getHeight());
|
||||
since_1998_texture_->setColor(0, 0, 0);
|
||||
|
||||
// Crea los sprites de cada linea
|
||||
for (int i = 0; i < jailgames_texture_->getHeight(); ++i)
|
||||
{
|
||||
jailgames_sprite_.push_back(new Sprite(0, i, jailgames_texture_->getWidth(), 1, jailgames_texture_, renderer_));
|
||||
jailgames_sprite_.push_back(std::make_shared<Sprite>(0, i, jailgames_texture_->getWidth(), 1, jailgames_texture_, renderer_));
|
||||
jailgames_sprite_.back()->setClip(0, i, jailgames_texture_->getWidth(), 1);
|
||||
if (i % 2 == 0)
|
||||
{
|
||||
jailgames_sprite_[i]->setPosX(256 + (i * 3));
|
||||
jailgames_sprite_[i]->setX(256 + (i * 3));
|
||||
}
|
||||
else
|
||||
{
|
||||
jailgames_sprite_[i]->setPosX(-181 - (i * 3));
|
||||
jailgames_sprite_[i]->setX(-181 - (i * 3));
|
||||
}
|
||||
jailgames_sprite_[i]->setPosY(83 + i);
|
||||
jailgames_sprite_[i]->setY(83 + i);
|
||||
}
|
||||
|
||||
// Inicializa variables
|
||||
@@ -60,17 +60,6 @@ Logo::Logo()
|
||||
screen_->setBorderColor(stringToColor(options.video.palette, "black"));
|
||||
}
|
||||
|
||||
// Destructor
|
||||
Logo::~Logo()
|
||||
{
|
||||
for (auto s : jailgames_sprite_)
|
||||
{
|
||||
delete s;
|
||||
}
|
||||
|
||||
delete since_1998_sprite_;
|
||||
}
|
||||
|
||||
// Comprueba el manejador de eventos
|
||||
void Logo::checkEvents()
|
||||
{
|
||||
@@ -96,22 +85,22 @@ void Logo::updateJAILGAMES()
|
||||
{
|
||||
const int speed = 8;
|
||||
const int dest = 37;
|
||||
if (jailgames_sprite_[i]->getPosX() != 37)
|
||||
if (jailgames_sprite_[i]->getX() != 37)
|
||||
{
|
||||
if (i % 2 == 0)
|
||||
{
|
||||
jailgames_sprite_[i]->incPosX(-speed);
|
||||
if (jailgames_sprite_[i]->getPosX() < dest)
|
||||
jailgames_sprite_[i]->incX(-speed);
|
||||
if (jailgames_sprite_[i]->getX() < dest)
|
||||
{
|
||||
jailgames_sprite_[i]->setPosX(dest);
|
||||
jailgames_sprite_[i]->setX(dest);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
jailgames_sprite_[i]->incPosX(speed);
|
||||
if (jailgames_sprite_[i]->getPosX() > dest)
|
||||
jailgames_sprite_[i]->incX(speed);
|
||||
if (jailgames_sprite_[i]->getX() > dest)
|
||||
{
|
||||
jailgames_sprite_[i]->setPosX(dest);
|
||||
jailgames_sprite_[i]->setX(dest);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user