diff --git a/media/lang/en_UK.txt b/media/lang/en_UK.txt index 42cd474..b5a0ab6 100644 --- a/media/lang/en_UK.txt +++ b/media/lang/en_UK.txt @@ -99,7 +99,7 @@ YES ## 49 - MENU GAME OVER NO ## 50 - TEXTO DE COMPLETAR EL JUEGO -Perfect!! +Congratulations!! ## 51 - MENU DEL TITULO 1 PLAYER ## 52 - MENU DEL TITULO diff --git a/source/director.cpp b/source/director.cpp index 0440cb5..dca9901 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -48,6 +48,11 @@ Director::Director(std::string path) // Inicializa JailAudio initJailAudio(); + // Aplica las opciones + SDL_SetWindowFullscreen(mWindow, mOptions->fullScreenMode); + SDL_SetWindowSize(mWindow, SCREEN_WIDTH * mOptions->windowSize, SCREEN_HEIGHT * mOptions->windowSize); + mLang->setLang(mOptions->language); + #ifdef __MIPSEL__ DIR *dir = opendir("/media/data/local/home/.coffee_crisis"); if (dir) @@ -416,11 +421,6 @@ bool Director::loadConfigFile() if ((mOptions->language < 0) || (mOptions->language > MAX_LANGUAGES)) mOptions->language = en_UK; - // Aplica las opciones - SDL_SetWindowFullscreen(mWindow, mOptions->fullScreenMode); - SDL_SetWindowSize(mWindow, SCREEN_WIDTH * mOptions->windowSize, SCREEN_HEIGHT * mOptions->windowSize); - mLang->setLang(mOptions->language); - // Cierra el fichero SDL_RWclose(file); } diff --git a/source/game.cpp b/source/game.cpp index 33bec7a..a1d43e1 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -336,7 +336,7 @@ void Game::init() mMenaceCurrent = 0; mMenaceThreshold = 0; mHiScoreAchieved = false; - mCurrentStage = 0; + mCurrentStage = 9; mStageBitmapCounter = STAGE_COUNTER; mDeathCounter = DEATH_COUNTER; mExplosionTime = false; @@ -388,6 +388,9 @@ void Game::init() initEnemyPools(); initGameStages(); + // BORRAR + mStage[mCurrentStage].currentPower = mStage[mCurrentStage].powerToComplete - 10; + // Modo debug mDebug.enabled = false; mDebug.enemySet = 0; @@ -2989,7 +2992,7 @@ void Game::renderMessages() if (mTimeStopped) { if ((mTimeStoppedCounter > 100) || (mTimeStoppedCounter % 10 > 4)) - mTextNokia2->writeDX(TXT_CENTER, PLAY_AREA_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, mLang->getText(36) + std::to_string(mTimeStoppedCounter / 10), 0, noColor, 1, shdwTxtColor); + mTextNokia2->writeDX(TXT_CENTER, PLAY_AREA_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, mLang->getText(36) + std::to_string(mTimeStoppedCounter / 10), -1, noColor, 1, shdwTxtColor); if (mTimeStoppedCounter > 100) { @@ -3020,7 +3023,7 @@ void Game::renderMessages() { // Texto de juego completado text = mLang->getText(50); mTextNokiaBig2->writeDX(TXT_CENTER, PLAY_AREA_CENTER_X, mStageBitmapPath[mStageBitmapCounter], text, -2, noColor, 1, shdwTxtColor); - mTextNokia2->writeDX(TXT_CENTER, PLAY_AREA_CENTER_X, mStageBitmapPath[mStageBitmapCounter] + 17, mLang->getText(76), 0, noColor, 1, shdwTxtColor); + mTextNokiaBig2->writeDX(TXT_CENTER, PLAY_AREA_CENTER_X, mStageBitmapPath[mStageBitmapCounter] + mTextNokiaBig2->getCharacterWidth() + 2, mLang->getText(76), -1, noColor, 1, shdwTxtColor); } } }