diff --git a/media/lang/ba_BA.txt b/media/lang/ba_BA.txt index d17c888..c02e6ac 100644 --- a/media/lang/ba_BA.txt +++ b/media/lang/ba_BA.txt @@ -151,4 +151,8 @@ DESACTIVADA ## 75 - MENU DE OPCIONES ENDAVANT! ## 76 - JUEGO -1.000.000 DE PUNTS! \ No newline at end of file +1.000.000 DE PUNTS! +## 77 - PANTALLA DE GAME OVER +PUNTS J1: +## 78 - PANTALLA DE GAME OVER +PUNTS J2: \ No newline at end of file diff --git a/media/lang/en_UK.txt b/media/lang/en_UK.txt index a706281..cf3eee0 100644 --- a/media/lang/en_UK.txt +++ b/media/lang/en_UK.txt @@ -149,6 +149,10 @@ ON ## 74 - MENU DE OPCIONES OFF ## 75 - JUEGO -GET READY! +Get Ready! ## 76 - JUEGO -1.000.000 POINTS! \ No newline at end of file +1.000.000 POINTS! +## 77 - PANTALLA DE GAME OVER +PLAYER1 SCORE: +## 78 - PANTALLA DE GAME OVER +PLAYER2 SCORE: \ No newline at end of file diff --git a/media/lang/es_ES.txt b/media/lang/es_ES.txt index 40713dc..20dbb63 100644 --- a/media/lang/es_ES.txt +++ b/media/lang/es_ES.txt @@ -151,4 +151,8 @@ DESACTIVADA ## 75 - MENU DE OPCIONES ADELANTE! ## 76 - JUEGO -1.000.000 DE PUNTOS! \ No newline at end of file +1.000.000 DE PUNTOS! +## 77 - PANTALLA DE GAME OVER +PUNTUACION J1: +## 78 - PANTALLA DE GAME OVER +PUNTUACION J2: \ No newline at end of file diff --git a/source/director.cpp b/source/director.cpp index acc2938..7cc0ba9 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -257,7 +257,9 @@ 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[52] = mExecutablePath + "/" + "../media/font/nokia.txt"; + mFileList[55] = mExecutablePath + "/" + "../media/font/nokia_big.txt"; mFileList[29] = mExecutablePath + "/" + "../media/font/smb2_big.png"; mFileList[47] = mExecutablePath + "/" + "../media/font/smb2_big.txt"; mFileList[30] = mExecutablePath + "/" + "../media/font/smb2.png"; diff --git a/source/game.cpp b/source/game.cpp index e945da0..5088dcf 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -50,10 +50,14 @@ Game::Game(int numPlayers, SDL_Renderer *renderer, std::string *filelist, Lang * mTextureText = new LTexture(); mTextureTextScoreBoard = new LTexture(); mTextureTextBig = new LTexture(); + mTextureTextNokia = new LTexture(); + mTextureTextNokiaBig = new LTexture(); mText = new Text(mFileList[48], mTextureText, mRenderer); mTextScoreBoard = new Text(mFileList[46], mTextureTextScoreBoard, mRenderer); mTextBig = new Text(mFileList[47], mTextureTextBig, mRenderer); + mTextNokia = new Text(mFileList[52], mTextureTextNokia, mRenderer); + mTextNokiaBig = new Text(mFileList[55], mTextureTextNokiaBig, mRenderer); mMenuGameOver = new Menu(mRenderer, mText, mInput, mFileList); mMenuPause = new Menu(mRenderer, mText, mInput, mFileList); @@ -190,14 +194,28 @@ Game::~Game() delete mTextureTextBig; mTextureTextBig = nullptr; + mTextureTextNokia->unload(); + delete mTextureTextNokia; + mTextureTextNokia = nullptr; + + mTextureTextNokiaBig->unload(); + delete mTextureTextNokiaBig; + mTextureTextNokiaBig = nullptr; + delete mText; mText = nullptr; + delete mTextBig; + mTextBig = nullptr; + delete mTextScoreBoard; mTextScoreBoard = nullptr; - delete mTextureTextBig; - mTextureTextBig = nullptr; + delete mTextNokia; + mTextNokia = nullptr; + + delete mTextNokiaBig; + mTextNokiaBig = nullptr; delete mMenuGameOver; mMenuGameOver = nullptr; @@ -523,6 +541,8 @@ bool Game::loadMedia() success &= loadTextureFromFile(mTextureText, mFileList[30], mRenderer); success &= loadTextureFromFile(mTextureTextScoreBoard, mFileList[27], mRenderer); success &= loadTextureFromFile(mTextureTextBig, mFileList[29], mRenderer); + success &= loadTextureFromFile(mTextureTextNokia, mFileList[28], mRenderer); + success &= loadTextureFromFile(mTextureTextNokiaBig, mFileList[54], mRenderer); success &= loadTextureFromFile(mTexturePlayer1Legs, mFileList[39], mRenderer); success &= loadTextureFromFile(mTexturePlayer1Head, mFileList[41], mRenderer); @@ -2065,8 +2085,8 @@ void Game::destroyBalloon(Uint8 index) } // Otorga los puntos correspondientes al globo - mPlayer[0]->addScore(Uint32(score * mPlayer[0]->getScoreMultiplier() * mDifficultyScoreMultiplier)); - //setScore(mPlayer[0]->getScore()); + for (int i = 0; i < mNumPlayers; i++) + mPlayer[i]->addScore(Uint32(score * mPlayer[i]->getScoreMultiplier() * mDifficultyScoreMultiplier)); updateHiScore(); // Aumenta el poder de la fase @@ -2259,7 +2279,7 @@ void Game::moveBullets() for (int i = 0; i < MAX_BULLETS; i++) if (mBullet[i]->isActive()) if (mBullet[i]->move() == MSG_BULLET_OUT) - mPlayer[0]->decScoreMultiplier(); + mPlayer[mBullet[i]->getOwner()]->decScoreMultiplier(); } // Pinta las balas activas @@ -2861,7 +2881,7 @@ void Game::checkGameInput() if (mPlayer[i]->isAlive()) { // Input a la izquierda - if (mInput->checkInput(INPUT_LEFT, REPEAT_TRUE, mOptions->input[i].deviceType)) + if (mInput->checkInput(INPUT_LEFT, REPEAT_TRUE, mOptions->input[i].deviceType, mOptions->input[i].id)) { mPlayer[i]->setInput(INPUT_LEFT); mDemo.keys.left = 1; @@ -2869,7 +2889,7 @@ void Game::checkGameInput() else { // Input a la derecha - if (mInput->checkInput(INPUT_RIGHT, REPEAT_TRUE, mOptions->input[i].deviceType)) + if (mInput->checkInput(INPUT_RIGHT, REPEAT_TRUE, mOptions->input[i].deviceType, mOptions->input[i].id)) { mPlayer[i]->setInput(INPUT_RIGHT); mDemo.keys.right = 1; @@ -2882,7 +2902,7 @@ void Game::checkGameInput() } } // Comprueba el input de disparar al centro - if (mInput->checkInput(INPUT_BUTTON_2, REPEAT_TRUE, mOptions->input[i].deviceType)) + if (mInput->checkInput(INPUT_BUTTON_2, REPEAT_TRUE, mOptions->input[i].deviceType, mOptions->input[i].id)) { if (mPlayer[i]->canFire()) { @@ -2898,7 +2918,7 @@ void Game::checkGameInput() } // Comprueba el input de disparar a la izquierda - if (mInput->checkInput(INPUT_BUTTON_1, REPEAT_TRUE, mOptions->input[i].deviceType)) + if (mInput->checkInput(INPUT_BUTTON_1, REPEAT_TRUE, mOptions->input[i].deviceType, mOptions->input[i].id)) { if (mPlayer[i]->canFire()) { @@ -2914,7 +2934,7 @@ void Game::checkGameInput() } // Comprueba el input de disparar a la derecha - if (mInput->checkInput(INPUT_BUTTON_3, REPEAT_TRUE, mOptions->input[i].deviceType)) + if (mInput->checkInput(INPUT_BUTTON_3, REPEAT_TRUE, mOptions->input[i].deviceType, mOptions->input[i].id)) { if (mPlayer[i]->canFire()) { @@ -2930,7 +2950,7 @@ void Game::checkGameInput() } // Comprueba el input de pausa - if (mInput->checkInput(INPUT_CANCEL, REPEAT_FALSE, mOptions->input[i].deviceType)) + if (mInput->checkInput(INPUT_CANCEL, REPEAT_FALSE, mOptions->input[i].deviceType, mOptions->input[i].id)) { mSection.subsection = GAME_SECTION_PAUSE; @@ -2961,7 +2981,8 @@ void Game::renderMessages() //mSpriteGetReady->render(); 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); + //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); } // Time Stopped @@ -3273,7 +3294,7 @@ void Game::runGameOverScreen() { // Guarda los puntos saveScoreFile(); - + // Reinicia el menu mMenuGameOver->reset(); @@ -3330,8 +3351,17 @@ void Game::runGameOverScreen() SDL_RenderClear(mRenderer); // Dibuja los objetos - mTextBig->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_CENTER_Y - (BLOCK * 4), mLang->getText(43)); - mText->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_CENTER_Y - (BLOCK * 1), mLang->getText(44) + std::to_string(mPlayer[0]->getScore())); + if (mNumPlayers == 1) + { + mTextBig->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_CENTER_Y - (BLOCK * 4), mLang->getText(43)); + mText->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_CENTER_Y - (BLOCK * 1), mLang->getText(44) + std::to_string(mPlayer[0]->getScore())); + } + else + { + mTextBig->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_CENTER_Y - 36, mLang->getText(43)); + mText->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_CENTER_Y - 12, mLang->getText(77) + std::to_string(mPlayer[0]->getScore())); + mText->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_CENTER_Y, mLang->getText(78) + std::to_string(mPlayer[1]->getScore())); + } mText->writeCentered(PLAY_AREA_CENTER_X, PLAY_AREA_CENTER_Y + BLOCK * 2, mLang->getText(45)); mMenuGameOver->render(); mFade->render(); @@ -3427,7 +3457,7 @@ void Game::initPaths() } // Letrero de GetReady - const int size = mTextBig->lenght(mLang->getText(75)); + const int size = mTextBig->lenght(mLang->getText(75), -4); const float start1 = PLAY_AREA_LEFT - size; const float finish1 = PLAY_AREA_CENTER_X - (size / 2); @@ -3470,6 +3500,7 @@ void Game::updateGameCompleted() // Actualiza las variables de ayuda void Game::updateHelper() { + // El ayudante solo funciona para un jugador // Solo ofrece ayuda cuando la amenaza o la velocidad es elevada if (mMenaceCurrent > 15) { diff --git a/source/game.h b/source/game.h index da4939e..6c86040 100644 --- a/source/game.h +++ b/source/game.h @@ -108,10 +108,14 @@ private: LTexture *mTextureText; // Textura para el texto del juego LTexture *mTextureTextScoreBoard; // Textura para el texto del marcador LTexture *mTextureTextBig; // Textura para el texto grande + LTexture *mTextureTextNokia; // Textura para la fuente de texto Nokia + LTexture *mTextureTextNokiaBig; // Textura para la fuente de texto Nokia grande Text *mText; // Fuente para los textos del juego - Text *mTextScoreBoard; // Fuente para el marcador del juego Text *mTextBig; // Fuente de texto grande + Text *mTextScoreBoard; // Fuente para el marcador del juego + Text *mTextNokia; // Otra fuente de texto para mesajes + Text *mTextNokiaBig; // Y la versión en grande Menu *mMenuGameOver; // Menú de la pantalla de game over Menu *mMenuPause; // Menú de la pantalla de pausa diff --git a/source/title.cpp b/source/title.cpp index ccb1f63..37bae5e 100644 --- a/source/title.cpp +++ b/source/title.cpp @@ -136,7 +136,7 @@ void Title::init(bool demo, Uint8 subsection) mFade->init(0x17, 0x17, 0x26); mDemo = demo; - if (!mInput->gameControllerFound()) + //if (!mInput->gameControllerFound()) { mOptions->input[0].id = 0; mOptions->input[0].name = "KEYBOARD"; @@ -152,6 +152,13 @@ void Title::init(bool demo, Uint8 subsection) mDeviceIndex[0] = mAvailableInputDevices.size() - 1; mDeviceIndex[1] = 0; + if (mInput->gameControllerFound()) + { + mOptions->input[1].id = mAvailableInputDevices[mDeviceIndex[1]].id; + mOptions->input[1].name = mAvailableInputDevices[mDeviceIndex[1]].name; + mOptions->input[1].deviceType = mAvailableInputDevices[mDeviceIndex[1]].deviceType; + } + // Inicializa el bitmap de Coffee mCoffeeBitmap->init(mTitleTexture, mRenderer); mCoffeeBitmap->setId(0); @@ -942,18 +949,29 @@ bool Title::updatePlayerInputs(int numPlayer) } else // Si hay mas de un dispositivo, se recorre el vector { + printf("numplayer:%i\n",numPlayer); + printf("deviceindex:%i\n",mDeviceIndex[numPlayer]); + // Incrementa el indice if (mDeviceIndex[numPlayer] < numDevices - 1) mDeviceIndex[numPlayer]++; else mDeviceIndex[numPlayer] = 0; + printf("deviceindex:%i\n",mDeviceIndex[numPlayer]); // Si coincide con el del otro jugador, se lo intercambian if (mDeviceIndex[0] == mDeviceIndex[1]) { - const int temp = mDeviceIndex[0]; - mDeviceIndex[0] = mDeviceIndex[1]; - mDeviceIndex[1] = temp; + printf("%i:%i\n",mDeviceIndex[0],mDeviceIndex[1]); + + //const int temp = mDeviceIndex[0]; + //mDeviceIndex[0] = mDeviceIndex[1]; + //mDeviceIndex[1] = temp; + const int theOtherPlayer = (numPlayer + 1) % 2; + mDeviceIndex[theOtherPlayer]--; + if (mDeviceIndex[theOtherPlayer] < 0) + mDeviceIndex[theOtherPlayer]=numDevices-1; + printf("%i:%i\n",mDeviceIndex[0],mDeviceIndex[1]); } // Copia el dispositivo marcado por el indice a la variable de opciones de cada jugador