working on 2p

This commit is contained in:
2021-08-24 13:01:33 +02:00
parent 52ea512eab
commit b61fd84e22
8 changed files with 199 additions and 147 deletions

View File

@@ -224,12 +224,13 @@ void Title::init(bool demo, Uint8 subsection)
}
// Inicializa los objetos de menu
mMenu.title->init("TITLE", 0, 15 * BLOCK, MENU_BACKGROUND_SOLID);
mMenu.title->addItem(mTextStrings[0]); // PLAY
mMenu.title->init("TITLE", 0, 14 * BLOCK, MENU_BACKGROUND_SOLID);
mMenu.title->addItem(mTextStrings[51]); // 1 PLAYER
mMenu.title->addItem(mTextStrings[52]); // 2 PLAYERS
mMenu.title->addItem(mTextStrings[1]); // OPTIONS
mMenu.title->addItem(mTextStrings[2], 0, 5); // HOW TO PLAY
mMenu.title->addItem(mTextStrings[3]); // QUIT
mMenu.title->setDefaultActionWhenCancel(3);
mMenu.title->setDefaultActionWhenCancel(4);
mMenu.title->setBackgroundColor(0x30, 0x30, 0x40, 192);
mMenu.title->setSelectorColor(0xe5, 0x1c, 0x23, 255);
mMenu.title->setSelectorTextColor(0xFF, 0xF1, 0x76);
@@ -335,10 +336,11 @@ void Title::updateMenuLabels()
mMenu.options->centerMenu(SCREEN_CENTER_X);
mMenu.options->centerMenuElements();
mMenu.title->setItemCaption(0, mTextStrings[0]);
mMenu.title->setItemCaption(1, mTextStrings[1]);
mMenu.title->setItemCaption(2, mTextStrings[2]);
mMenu.title->setItemCaption(3, mTextStrings[3]);
mMenu.title->setItemCaption(0, mTextStrings[51]);
mMenu.title->setItemCaption(1, mTextStrings[52]);
mMenu.title->setItemCaption(2, mTextStrings[1]);
mMenu.title->setItemCaption(3, mTextStrings[2]);
mMenu.title->setItemCaption(4, mTextStrings[3]);
mMenu.title->centerMenu(SCREEN_CENTER_X);
mMenu.title->centerMenuElements();
@@ -494,17 +496,24 @@ section_t Title::run(Uint8 subsection)
{
switch (mPostFade)
{
case 0: // PLAY
case 0: // 1 PLAYER
mSection.name = PROG_SECTION_GAME;
mSection.subsection = GAME_SECTION_PLAY_1P;
JA_StopMusic();
break;
case 1: // QUIT
case 1: // 2 PLAYERS
mSection.name = PROG_SECTION_GAME;
mSection.subsection = GAME_SECTION_PLAY_2P;
JA_StopMusic();
break;
case 2: // QUIT
mSection.name = PROG_SECTION_QUIT;
JA_StopMusic();
break;
case 2: // TIME OUT
case 3: // TIME OUT
mCounter = TITLE_COUNTER;
mMenu.active->reset();
if (mDemo)
@@ -531,21 +540,25 @@ section_t Title::run(Uint8 subsection)
{
switch (mMenu.active->getItemSelected())
{
case 0: // PLAY
case 0: // 1 PLAYER
mPostFade = 0;
mFade->activateFade();
break;
case 1: // OPTIONS
case 1: // 2 PLAYERS
mPostFade = 1;
mFade->activateFade();
break;
case 2: // OPTIONS
mMenu.active = mMenu.options;
mOptions->fullScreenModePrevious = mOptions->fullScreenMode;
mOptions->windowSizePrevious = mOptions->windowSize;
mOptions->languagePrevious = mOptions->language;
break;
case 2: // HOW TO PLAY
case 3: // HOW TO PLAY
runInstructions(INSTRUCTIONS_MODE_MANUAL);
break;
case 3: // QUIT
mPostFade = 1;
case 4: // QUIT
mPostFade = 2;
mFade->activateFade();
break;