Convertit "param" a variable global en lloc de anar marejant amb punterets i passant 8.000.000 de paràmetres
This commit is contained in:
@@ -1,13 +1,13 @@
|
||||
#include "game_logo.h"
|
||||
#include "param.h"
|
||||
|
||||
// Constructor
|
||||
GameLogo::GameLogo(SDL_Renderer *renderer, Screen *screen, Asset *asset, param_t *param, int x, int y)
|
||||
GameLogo::GameLogo(SDL_Renderer *renderer, Screen *screen, Asset *asset, int x, int y)
|
||||
{
|
||||
// Copia los punteros
|
||||
this->renderer = renderer;
|
||||
this->screen = screen;
|
||||
this->asset = asset;
|
||||
this->param = param;
|
||||
this->x = x;
|
||||
this->y = y;
|
||||
|
||||
@@ -19,7 +19,7 @@ GameLogo::GameLogo(SDL_Renderer *renderer, Screen *screen, Asset *asset, param_t
|
||||
|
||||
coffeeBitmap = new SmartSprite(coffeeTexture);
|
||||
crisisBitmap = new SmartSprite(crisisTexture);
|
||||
arcadeEditionBitmap = new Sprite((param->game.width - arcadeEditionTexture->getWidth()) / 2, param->title.arcadeEditionPosition, arcadeEditionTexture->getWidth(), arcadeEditionTexture->getHeight(), arcadeEditionTexture);
|
||||
arcadeEditionBitmap = new Sprite((param.game.width - arcadeEditionTexture->getWidth()) / 2, param.title.arcadeEditionPosition, arcadeEditionTexture->getWidth(), arcadeEditionTexture->getHeight(), arcadeEditionTexture);
|
||||
dustBitmapL = new AnimatedSprite(dustTexture, asset->get("title_dust.ani"));
|
||||
dustBitmapR = new AnimatedSprite(dustTexture, asset->get("title_dust.ani"));
|
||||
|
||||
@@ -207,7 +207,7 @@ void GameLogo::reLoad()
|
||||
int GameLogo::getInitialVerticalDesp()
|
||||
{
|
||||
int despUp = y;
|
||||
int despDown = param->game.height - y;
|
||||
int despDown = param.game.height - y;
|
||||
|
||||
return std::max(despUp, despDown);
|
||||
}
|
||||
Reference in New Issue
Block a user