ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated menus for battle mode. 1) don't add AI karts 2) don't show useless screens like kart amount or AI difficulty

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2357 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2008-10-20 15:53:47 +00:00
parent 96ff469173
commit fc5bce275a
2 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/gui/race_options.cpp
View File

@ -75,38 +75,44 @@ RaceOptions::RaceOptions()
// Difficulty // Difficulty
// ========== // ==========
widget_manager->addTextWgt( WTOK_DIFFICULTY_TITLE, DESC_WIDTH, 7, _("Difficulty") ); // if there is no AI, no point asking for its difficulty...
widget_manager->hideWgtRect(WTOK_DIFFICULTY_TITLE); // There's also no point asking the player for the amount of karts
widget_manager->setWgtTextSize(WTOK_DIFFICULTY_TITLE, WGT_FNT_LRG); // since tt will always be the same as the number of human players
widget_manager->addTextButtonWgt( WTOK_DIFFICULTY_DOWN, 3, 7, " < " ); if(!RaceManager::isBattleMode( race_manager->getMinorMode() ))
{
widget_manager->addTextWgt( WTOK_DIFFICULTY, ITEM_WIDTH, 7, getDifficultyString(m_difficulty)); widget_manager->addTextWgt( WTOK_DIFFICULTY_TITLE, DESC_WIDTH, 7, _("Difficulty") );
widget_manager->setWgtBorderPercentage( WTOK_DIFFICULTY, 10 ); widget_manager->hideWgtRect(WTOK_DIFFICULTY_TITLE);
widget_manager->showWgtBorder( WTOK_DIFFICULTY ); widget_manager->setWgtTextSize(WTOK_DIFFICULTY_TITLE, WGT_FNT_LRG);
widget_manager->hideWgtRect( WTOK_DIFFICULTY ); widget_manager->addTextButtonWgt( WTOK_DIFFICULTY_DOWN, 3, 7, " < " );
widget_manager->addTextButtonWgt( WTOK_DIFFICULTY_UP, 3, 7, " > " ); widget_manager->addTextWgt( WTOK_DIFFICULTY, ITEM_WIDTH, 7, getDifficultyString(m_difficulty));
widget_manager->setWgtBorderPercentage( WTOK_DIFFICULTY, 10 );
widget_manager->breakLine(); widget_manager->showWgtBorder( WTOK_DIFFICULTY );
widget_manager->hideWgtRect( WTOK_DIFFICULTY );
// Number of karts
// =============== widget_manager->addTextButtonWgt( WTOK_DIFFICULTY_UP, 3, 7, " > " );
widget_manager->addTextWgt( WTOK_KARTS_TITLE, DESC_WIDTH, 7, _("Number of karts") );
widget_manager->hideWgtRect(WTOK_KARTS_TITLE); widget_manager->breakLine();
widget_manager->setWgtTextSize(WTOK_KARTS_TITLE, WGT_FNT_LRG);
widget_manager->addTextButtonWgt( WTOK_KARTS_DOWN, 3, 7, " < " ); // Number of karts
// ===============
char string_num_karts[MAX_MESSAGE_LENGTH]; widget_manager->addTextWgt( WTOK_KARTS_TITLE, DESC_WIDTH, 7, _("Number of karts") );
snprintf(string_num_karts, MAX_MESSAGE_LENGTH, "%d", m_num_karts); widget_manager->hideWgtRect(WTOK_KARTS_TITLE);
widget_manager->addTextWgt( WTOK_KARTS, ITEM_WIDTH, 7, string_num_karts ); widget_manager->setWgtTextSize(WTOK_KARTS_TITLE, WGT_FNT_LRG);
widget_manager->setWgtBorderPercentage( WTOK_KARTS, 10 ); widget_manager->addTextButtonWgt( WTOK_KARTS_DOWN, 3, 7, " < " );
widget_manager->showWgtBorder( WTOK_KARTS );
widget_manager->hideWgtRect( WTOK_KARTS ); char string_num_karts[MAX_MESSAGE_LENGTH];
snprintf(string_num_karts, MAX_MESSAGE_LENGTH, "%d", m_num_karts);
widget_manager->addTextButtonWgt( WTOK_KARTS_UP, 3, 7, " > " ); widget_manager->addTextWgt( WTOK_KARTS, ITEM_WIDTH, 7, string_num_karts );
widget_manager->setWgtBorderPercentage( WTOK_KARTS, 10 );
widget_manager->breakLine(); widget_manager->showWgtBorder( WTOK_KARTS );
widget_manager->hideWgtRect( WTOK_KARTS );
widget_manager->addTextButtonWgt( WTOK_KARTS_UP, 3, 7, " > " );
widget_manager->breakLine();
}
// Number of laps // Number of laps
// ============== // ==============
if( race_manager->getMajorMode() != RaceManager::MAJOR_MODE_GRAND_PRIX && if( race_manager->getMajorMode() != RaceManager::MAJOR_MODE_GRAND_PRIX &&
@ -146,6 +152,11 @@ RaceOptions::RaceOptions()
// Select 'start' by default. // Select 'start' by default.
widget_manager->setSelectedWgt( WTOK_START ); widget_manager->setSelectedWgt( WTOK_START );
// hack. in battle mode this screen is totally useless. so I'm calling 'select'
// to select the start button, so the screen is entirely skipped (FIXME - find cleaner way)
if(RaceManager::isBattleMode( race_manager->getMinorMode() )) select();
} // RaceOptions } // RaceOptions
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -268,7 +279,13 @@ void RaceOptions::select()
race_manager->setDifficulty( RaceManager::RD_EASY ); race_manager->setDifficulty( RaceManager::RD_EASY );
} }
race_manager->setNumKarts(m_num_karts); // if there is no AI, there's no point asking the player for the amount of karts.
// It will always be the same as the number of human players
if(RaceManager::isBattleMode( race_manager->getMinorMode() ))
race_manager->setNumKarts(race_manager->getNumLocalPlayers());
else
race_manager->setNumKarts(m_num_karts);
if( race_manager->getMajorMode() != RaceManager::MAJOR_MODE_GRAND_PRIX && if( race_manager->getMajorMode() != RaceManager::MAJOR_MODE_GRAND_PRIX &&
RaceManager::modeHasLaps( race_manager->getMinorMode() ) ) RaceManager::modeHasLaps( race_manager->getMinorMode() ) )

3
src/utils/random_generator.cpp
View File

@ -28,6 +28,7 @@ RandomGenerator::RandomGenerator()
m_a = 1103515245; m_a = 1103515245;
m_c = 12345; m_c = 12345;
m_all_random_generators.push_back(this); m_all_random_generators.push_back(this);
m_random_value = 3141591;
} // RandomGenerator } // RandomGenerator
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -62,7 +63,7 @@ void RandomGenerator::seed(int s)
int RandomGenerator::get(int n) int RandomGenerator::get(int n)
{ {
m_random_value = m_random_value*m_a+m_c; m_random_value = m_random_value*m_a+m_c;
return m_random_value % n; return (m_random_value >> 8) % n;
} // get } // get
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------