From 64369921ec803819e6e77f714e4fc31293e2c131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Wed, 1 Sep 2021 17:23:12 +0200 Subject: [PATCH] bug fixes --- source/director.cpp | 13 +++++++++---- source/game.cpp | 6 +++--- source/main.cpp | 5 +---- source/title.cpp | 4 ++-- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/source/director.cpp b/source/director.cpp index 7cc0ba9..0440cb5 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -123,7 +123,7 @@ void Director::init(Uint8 name) mInput->bindGameControllerButton(INPUT_BUTTON_1, SDL_CONTROLLER_BUTTON_X); mInput->bindGameControllerButton(INPUT_BUTTON_2, SDL_CONTROLLER_BUTTON_Y); mInput->bindGameControllerButton(INPUT_BUTTON_3, SDL_CONTROLLER_BUTTON_B); - mInput->bindGameControllerButton(INPUT_BUTTON_PAUSE, SDL_CONTROLLER_BUTTON_GUIDE); // PAUSE + mInput->bindGameControllerButton(INPUT_BUTTON_PAUSE, SDL_CONTROLLER_BUTTON_GUIDE); // PAUSE mInput->bindGameControllerButton(INPUT_BUTTON_ESCAPE, SDL_CONTROLLER_BUTTON_GUIDE); // ESCAPE } @@ -148,6 +148,9 @@ bool Director::initSDL() } else { + // Inicia el generador de numeros aleatorios + std::srand(static_cast(SDL_GetTicks())); + // Establece el filtro de la textura a nearest if (!SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, std::to_string(mOptions->filter).c_str())) { @@ -257,9 +260,11 @@ void Director::setFileList() mFileList[27] = mExecutablePath + "/" + "../media/font/8bithud.png"; mFileList[46] = mExecutablePath + "/" + "../media/font/8bithud.txt"; mFileList[28] = mExecutablePath + "/" + "../media/font/nokia.png"; - mFileList[54] = mExecutablePath + "/" + "../media/font/nokia_big.png"; + mFileList[54] = mExecutablePath + "/" + "../media/font/nokia_big2.png"; mFileList[52] = mExecutablePath + "/" + "../media/font/nokia.txt"; - mFileList[55] = mExecutablePath + "/" + "../media/font/nokia_big.txt"; + mFileList[56] = mExecutablePath + "/" + "../media/font/nokia2.png"; + mFileList[57] = mExecutablePath + "/" + "../media/font/nokia2.txt"; + mFileList[55] = mExecutablePath + "/" + "../media/font/nokia_big2.txt"; mFileList[29] = mExecutablePath + "/" + "../media/font/smb2_big.png"; mFileList[47] = mExecutablePath + "/" + "../media/font/smb2_big.txt"; mFileList[30] = mExecutablePath + "/" + "../media/font/smb2.png"; @@ -269,7 +274,7 @@ void Director::setFileList() mFileList[49] = mExecutablePath + "/" + "../media/lang/es_ES.txt"; mFileList[50] = mExecutablePath + "/" + "../media/lang/en_UK.txt"; mFileList[51] = mExecutablePath + "/" + "../media/lang/ba_BA.txt"; - + // DATA mFileList[53] = mExecutablePath + "/" + "../data/gamecontrollerdb.txt"; } diff --git a/source/game.cpp b/source/game.cpp index 5088dcf..6cb6b52 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -2979,10 +2979,10 @@ void Game::renderMessages() { mSpriteGetReady->setPosX((int)mGetReadyBitmapPath[mCounter]); //mSpriteGetReady->render(); - const color_t color = {0x17, 0x17, 0x26}; + //const color_t color = {0x17, 0x17, 0x26}; //mTextBig->writeShadowed((int)mGetReadyBitmapPath[mCounter], PLAY_AREA_CENTER_Y - 8, mLang->getText(75), color, 2); //mTextBig->writeDX(TXT_STROKE, (int)mGetReadyBitmapPath[mCounter], PLAY_AREA_CENTER_Y - 8, mLang->getText(75), 1, noColor, 1, shdwTxtColor); - mTextNokiaBig->write((int)mGetReadyBitmapPath[mCounter], PLAY_AREA_CENTER_Y - 8, mLang->getText(75), -4); + mTextNokiaBig->write((int)mGetReadyBitmapPath[mCounter], PLAY_AREA_CENTER_Y - 8, mLang->getText(75), -2); } // Time Stopped @@ -3457,7 +3457,7 @@ void Game::initPaths() } // Letrero de GetReady - const int size = mTextBig->lenght(mLang->getText(75), -4); + const int size = mTextBig->lenght(mLang->getText(75), -2); const float start1 = PLAY_AREA_LEFT - size; const float finish1 = PLAY_AREA_CENTER_X - (size / 2); diff --git a/source/main.cpp b/source/main.cpp index 2855002..da9b9e4 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -36,13 +36,9 @@ un tipo asociado diferente a NO_KIND #include "director.h" #include -#include int main(int argc, char *args[]) { - // Inicia el generador de numeros aleatorios - std::srand(static_cast(SDL_GetTicks())); - printf("Starting the game...\n\n"); // Crea el objeto Director @@ -54,6 +50,7 @@ int main(int argc, char *args[]) // Destruye el objeto Director delete mDirector; mDirector = nullptr; + printf("\nShutting down the game...\n"); return 0; diff --git a/source/title.cpp b/source/title.cpp index 37bae5e..e1e96c3 100644 --- a/source/title.cpp +++ b/source/title.cpp @@ -1018,7 +1018,7 @@ void Title::checkInputDevices() temp.name = mInput->getControllerName(i); temp.deviceType = INPUT_USE_GAMECONTROLLER; mAvailableInputDevices.push_back(temp); - printf("Device %i:\t%s\n", mAvailableInputDevices.size(), temp.name.c_str()); + printf("Device %i:\t%s\n", (int)mAvailableInputDevices.size(), temp.name.c_str()); } // Añade el teclado al final @@ -1026,5 +1026,5 @@ void Title::checkInputDevices() temp.name = "KEYBOARD"; temp.deviceType = INPUT_USE_KEYBOARD; mAvailableInputDevices.push_back(temp); - printf("Device %i:\t%s\n\n", mAvailableInputDevices.size(), temp.name.c_str()); + printf("Device %i:\t%s\n\n", (int)mAvailableInputDevices.size(), temp.name.c_str()); } \ No newline at end of file