JailDoctor/jdd_opendingux
1
0
Fork 0
forked from jaildesigner-jailgames/jaildoctors_dilemma
Code Issues Pull Requests Projects Releases Wiki Activity

Eliminado el resto de accesos a vector mediante at()

Browse Source
This commit is contained in:
Sergio
2022-11-30 12:09:45 +01:00
parent 357eec20b1
commit 75228cc451
6 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
source/ending.cpp
View File

@@ -119,16 +119,16 @@ void Ending::render()
screen->clean(stringToColor(options->palette, "black"));
// Dibuja las imagenes de la escena
spritePics.at(scene).sprite->render();
spritePics.at(scene).coverSprite->render();
spritePics[scene].sprite->render();
spritePics[scene].coverSprite->render();
// Dibuja los textos de la escena
for (auto ti : scenes.at(scene).textIndex)
for (auto ti : scenes[scene].textIndex)
{
if (counter > ti.trigger)
{
spriteTexts.at(ti.index).sprite->render();
spriteTexts.at(ti.index).coverSprite->render();
spriteTexts[ti.index].sprite->render();
spriteTexts[ti.index].coverSprite->render();
}
}
@@ -511,7 +511,7 @@ void Ending::updateCounters()
counter++;
}
if (counter > scenes.at(scene).counterEnd - 100)
if (counter > scenes[scene].counterEnd - 100)
{
coverCounter++;
}
@@ -522,20 +522,20 @@ void Ending::updateSpriteCovers()
{ // Actualiza la cortinilla de los textos
if (counter % 4 == 0)
{
for (auto ti : scenes.at(scene).textIndex)
for (auto ti : scenes[scene].textIndex)
{
if (counter > ti.trigger)
{
if (spriteTexts.at(ti.index).clipDesp > 0)
if (spriteTexts[ti.index].clipDesp > 0)
{
spriteTexts.at(ti.index).clipDesp -= 2;
spriteTexts[ti.index].clipDesp -= 2;
}
else if (spriteTexts.at(ti.index).clipHeight > 0)
else if (spriteTexts[ti.index].clipHeight > 0)
{
spriteTexts.at(ti.index).clipHeight -= 2;
spriteTexts.at(ti.index).coverSprite->setPosY(spriteTexts.at(ti.index).coverSprite->getPosY() + 2);
spriteTexts[ti.index].clipHeight -= 2;
spriteTexts[ti.index].coverSprite->setPosY(spriteTexts[ti.index].coverSprite->getPosY() + 2);
}
spriteTexts.at(ti.index).coverSprite->setSpriteClip(0, spriteTexts.at(ti.index).clipDesp, spriteTexts.at(ti.index).coverSprite->getWidth(), spriteTexts.at(ti.index).clipHeight);
spriteTexts[ti.index].coverSprite->setSpriteClip(0, spriteTexts[ti.index].clipDesp, spriteTexts[ti.index].coverSprite->getWidth(), spriteTexts[ti.index].clipHeight);
}
}
}
@@ -543,27 +543,27 @@ void Ending::updateSpriteCovers()
// Actualiza la cortinilla de las imagenes
if (counter % 2 == 0)
{
if (spritePics.at(scene).clipDesp > 0)
if (spritePics[scene].clipDesp > 0)
{
spritePics.at(scene).clipDesp -= 2;
spritePics[scene].clipDesp -= 2;
}
else if (spritePics.at(scene).clipHeight > 0)
else if (spritePics[scene].clipHeight > 0)
{
spritePics.at(scene).clipHeight -= 2;
if (spritePics.at(scene).clipHeight < 0)
spritePics[scene].clipHeight -= 2;
if (spritePics[scene].clipHeight < 0)
{
spritePics.at(scene).clipHeight = 0;
spritePics[scene].clipHeight = 0;
}
spritePics.at(scene).coverSprite->setPosY(spritePics.at(scene).coverSprite->getPosY() + 2);
spritePics[scene].coverSprite->setPosY(spritePics[scene].coverSprite->getPosY() + 2);
}
spritePics.at(scene).coverSprite->setSpriteClip(0, spritePics.at(scene).clipDesp, spritePics.at(scene).coverSprite->getWidth(), spritePics.at(scene).clipHeight);
spritePics[scene].coverSprite->setSpriteClip(0, spritePics[scene].clipDesp, spritePics[scene].coverSprite->getWidth(), spritePics[scene].clipHeight);
}
}
// Comprueba si se ha de cambiar de escena
void Ending::checkChangeScene()
{
if (counter > scenes.at(scene).counterEnd)
if (counter > scenes[scene].counterEnd)
{
scene++;
counter = 0;
@@ -639,20 +639,20 @@ void Ending::switchPalette()
{
options->palette = p_zxarne;
spritePics.at(0).sprite->setTexture(resource->getTexture("ending1_zxarne.png"));
spritePics.at(1).sprite->setTexture(resource->getTexture("ending2_zxarne.png"));
spritePics.at(2).sprite->setTexture(resource->getTexture("ending3_zxarne.png"));
spritePics.at(3).sprite->setTexture(resource->getTexture("ending4_zxarne.png"));
spritePics.at(4).sprite->setTexture(resource->getTexture("ending5_zxarne.png"));
spritePics[0].sprite->setTexture(resource->getTexture("ending1_zxarne.png"));
spritePics[1].sprite->setTexture(resource->getTexture("ending2_zxarne.png"));
spritePics[2].sprite->setTexture(resource->getTexture("ending3_zxarne.png"));
spritePics[3].sprite->setTexture(resource->getTexture("ending4_zxarne.png"));
spritePics[4].sprite->setTexture(resource->getTexture("ending5_zxarne.png"));
}
else
{
options->palette = p_zxspectrum;
spritePics.at(0).sprite->setTexture(resource->getTexture("ending1.png"));
spritePics.at(1).sprite->setTexture(resource->getTexture("ending2.png"));
spritePics.at(2).sprite->setTexture(resource->getTexture("ending3.png"));
spritePics.at(3).sprite->setTexture(resource->getTexture("ending4.png"));
spritePics.at(4).sprite->setTexture(resource->getTexture("ending5.png"));
spritePics[0].sprite->setTexture(resource->getTexture("ending1.png"));
spritePics[1].sprite->setTexture(resource->getTexture("ending2.png"));
spritePics[2].sprite->setTexture(resource->getTexture("ending3.png"));
spritePics[3].sprite->setTexture(resource->getTexture("ending4.png"));
spritePics[4].sprite->setTexture(resource->getTexture("ending5.png"));
}
}