Actualizadas las librerias comunes

This commit is contained in:
2022-12-05 09:55:15 +01:00
parent 09a205a288
commit a32582f1ec
11 changed files with 86 additions and 74 deletions

View File

@@ -32,28 +32,28 @@ Intro::Intro(SDL_Renderer *renderer, Screen *screen, Asset *asset, Lang *lang)
ss->setWidth(128);
ss->setHeight(96);
ss->setEnabledCounter(20);
ss->setDestX(SCREEN_CENTER_X - 64);
ss->setDestY(SCREEN_FIRST_QUARTER_Y - 24);
ss->setDestX(GAMECANVAS_CENTER_X - 64);
ss->setDestY(GAMECANVAS_FIRST_QUARTER_Y - 24);
bitmaps.push_back(ss);
}
bitmaps.at(0)->setPosX(-128);
bitmaps.at(0)->setPosY(SCREEN_FIRST_QUARTER_Y - 24);
bitmaps.at(0)->setPosY(GAMECANVAS_FIRST_QUARTER_Y - 24);
bitmaps.at(0)->setVelX(0.0f);
bitmaps.at(0)->setVelY(0.0f);
bitmaps.at(0)->setAccelX(0.6f);
bitmaps.at(0)->setAccelY(0.0f);
bitmaps.at(0)->setSpriteClip(0, 0, 128, 96);
bitmaps.at(1)->setPosX(GAME_WIDTH);
bitmaps.at(1)->setPosY(SCREEN_FIRST_QUARTER_Y - 24);
bitmaps.at(1)->setPosX(GAMECANVAS_WIDTH);
bitmaps.at(1)->setPosY(GAMECANVAS_FIRST_QUARTER_Y - 24);
bitmaps.at(1)->setVelX(-1.0f);
bitmaps.at(1)->setVelY(0.0f);
bitmaps.at(1)->setAccelX(-0.3f);
bitmaps.at(1)->setAccelY(0.0f);
bitmaps.at(1)->setSpriteClip(128, 0, 128, 96);
bitmaps.at(2)->setPosX(SCREEN_CENTER_X - 64);
bitmaps.at(2)->setPosX(GAMECANVAS_CENTER_X - 64);
bitmaps.at(2)->setPosY(-96);
bitmaps.at(2)->setVelX(0.0f);
bitmaps.at(2)->setVelY(3.0f);
@@ -62,15 +62,15 @@ Intro::Intro(SDL_Renderer *renderer, Screen *screen, Asset *asset, Lang *lang)
bitmaps.at(2)->setSpriteClip(0, 96, 128, 96);
bitmaps.at(2)->setEnabledCounter(250);
bitmaps.at(3)->setPosX(SCREEN_CENTER_X - 64);
bitmaps.at(3)->setPosY(GAME_HEIGHT);
bitmaps.at(3)->setPosX(GAMECANVAS_CENTER_X - 64);
bitmaps.at(3)->setPosY(GAMECANVAS_HEIGHT);
bitmaps.at(3)->setVelX(0.0f);
bitmaps.at(3)->setVelY(-0.7f);
bitmaps.at(3)->setAccelX(0.0f);
bitmaps.at(3)->setAccelY(0.0f);
bitmaps.at(3)->setSpriteClip(128, 96, 128, 96);
bitmaps.at(4)->setPosX(SCREEN_CENTER_X - 64);
bitmaps.at(4)->setPosX(GAMECANVAS_CENTER_X - 64);
bitmaps.at(4)->setPosY(-96);
bitmaps.at(4)->setVelX(0.0f);
bitmaps.at(4)->setVelY(3.0f);
@@ -78,8 +78,8 @@ Intro::Intro(SDL_Renderer *renderer, Screen *screen, Asset *asset, Lang *lang)
bitmaps.at(4)->setAccelY(0.3f);
bitmaps.at(4)->setSpriteClip(0, 192, 128, 96);
bitmaps.at(5)->setPosX(GAME_WIDTH);
bitmaps.at(5)->setPosY(SCREEN_FIRST_QUARTER_Y - 24);
bitmaps.at(5)->setPosX(GAMECANVAS_WIDTH);
bitmaps.at(5)->setPosY(GAMECANVAS_FIRST_QUARTER_Y - 24);
bitmaps.at(5)->setVelX(-0.7f);
bitmaps.at(5)->setVelY(0.0f);
bitmaps.at(5)->setAccelX(0.0f);
@@ -92,7 +92,7 @@ Intro::Intro(SDL_Renderer *renderer, Screen *screen, Asset *asset, Lang *lang)
{
Writer *w = new Writer(text);
w->setPosX(BLOCK * 0);
w->setPosY(GAME_HEIGHT - (BLOCK * 6));
w->setPosY(GAMECANVAS_HEIGHT - (BLOCK * 6));
w->setKerning(-1);
w->setEnabled(false);
w->setEnabledCounter(180);
@@ -137,7 +137,7 @@ Intro::Intro(SDL_Renderer *renderer, Screen *screen, Asset *asset, Lang *lang)
for (auto text : texts)
{
text->center(SCREEN_CENTER_X);
text->center(GAMECANVAS_CENTER_X);
}
}