actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

make the character select screen optional for modes that don't require a character.

Browse Source
This commit is contained in:
Thad Ward
2003-08-27 02:48:32 +00:00
parent bccafc6bec
commit 1a6d60a6f1
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+1 -1
View File
@@ -107,7 +107,7 @@ void GameState::Reset()
for( p=0; p<NUM_PLAYERS; p++ )
{
if( PREFSMAN->m_bShowDancingCharacters )
if( PREFSMAN->m_ShowDancingCharacters == PrefsManager::CO_RANDOM)
m_pCurCharacters[p] = GetRandomCharacter();
else
m_pCurCharacters[p] = NULL;
stepmania/src/PrefsManager.cpp
+3 -3
View File
@@ -95,7 +95,7 @@ PrefsManager::PrefsManager()
m_bAutogenMissingTypes = true;
m_bAutogenGroupCourses = true;
m_bBreakComboToGetItem = false;
m_bShowDancingCharacters = false;
m_ShowDancingCharacters = CO_OFF;
m_bUseUnlockSystem = false;
m_bFirstRun = true;
m_bAutoMapJoysticks = true;
@@ -241,7 +241,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame )
ini.GetValueB( "Options", "AutogenGroupCourses", m_bAutogenGroupCourses );
ini.GetValueB( "Options", "Timestamping", m_bTimestamping );
ini.GetValueB( "Options", "BreakComboToGetItem", m_bBreakComboToGetItem );
ini.GetValueB( "Options", "ShowDancingCharacters", m_bShowDancingCharacters );
ini.GetValueI( "Options", "ShowDancingCharacters", (int&)m_ShowDancingCharacters );
ini.GetValueB( "Options", "TenFooterInRed", m_bTenFooterInRed );
ini.GetValueI( "Options", "CourseSortOrder", (int&)m_iCourseSortOrder );
@@ -357,7 +357,7 @@ void PrefsManager::SaveGlobalPrefsToDisk()
ini.SetValueB( "Options", "AutogenGroupCourses", m_bAutogenGroupCourses );
ini.SetValueB( "Options", "Timestamping", m_bTimestamping );
ini.SetValueB( "Options", "BreakComboToGetItem", m_bBreakComboToGetItem );
ini.SetValueB( "Options", "ShowDancingCharacters", m_bShowDancingCharacters );
ini.SetValueI( "Options", "ShowDancingCharacters", m_ShowDancingCharacters );
ini.SetValueB( "Options", "UseUnlockSystem", m_bUseUnlockSystem );
ini.SetValueB( "Options", "FirstRun", m_bFirstRun );
ini.SetValueB( "Options", "AutoMapJoysticks", m_bAutoMapJoysticks );
stepmania/src/PrefsManager.h
+2 -1
View File
@@ -80,7 +80,8 @@ public:
bool m_bAutogenMissingTypes;
bool m_bAutogenGroupCourses;
bool m_bBreakComboToGetItem;
bool m_bShowDancingCharacters;
enum CharacterOption { CO_OFF = 0, CO_RANDOM = 1, CO_SELECT = 2};
CharacterOption m_ShowDancingCharacters;
bool m_bUseUnlockSystem;
bool m_bFirstRun;
bool m_bAutoMapJoysticks;
stepmania/src/ScreenBackgroundOptions.cpp
+3 -3
View File
@@ -37,7 +37,7 @@ OptionRow g_BackgroundOptionsLines[NUM_BACKGROUND_OPTIONS_LINES] = {
OptionRow( "Mode", true, "OFF","ANIMATIONS","VISUALIZATIONS","RANDOM MOVIES" ),
OptionRow( "Brightness", true, "0%","10%","20%","30%","40%","50%","60%","70%","80%","90%","100%" ),
OptionRow( "Danger", true, "HIDE","SHOW" ),
OptionRow( "Dancing\nCharacters", true, "DEFAULT TO OFF","DEFAULT TO RANDOM" ),
OptionRow( "Dancing\nCharacters", true, "DEFAULT TO OFF","DEFAULT TO RANDOM","SELECT" ),
OptionRow( "Show Beginner\nHelper", true, "OFF","ON" ),
OptionRow( "Random\nBackgrounds", true, "5","10","15","20" ),
};
@@ -62,7 +62,7 @@ void ScreenBackgroundOptions::ImportOptions()
m_iSelectedOption[0][BO_MODE] = PREFSMAN->m_BackgroundMode;
m_iSelectedOption[0][BO_BRIGHTNESS] = (int)( PREFSMAN->m_fBGBrightness*10+0.5f );
m_iSelectedOption[0][BO_DANGER] = PREFSMAN->m_bShowDanger ? 1:0;
m_iSelectedOption[0][BO_DANCING_CHARACTERS] = PREFSMAN->m_bShowDancingCharacters? 1:0;
m_iSelectedOption[0][BO_DANCING_CHARACTERS] = PREFSMAN->m_ShowDancingCharacters;
m_iSelectedOption[0][BO_SHOW_BEGINNER_HELPER] = PREFSMAN->m_bShowBeginnerHelper? 1:0;
m_iSelectedOption[0][BO_RANDOM_BACKGROUNDS] = clamp((PREFSMAN->m_iNumBackgrounds/5)-1, 0, 3);
}
@@ -72,7 +72,7 @@ void ScreenBackgroundOptions::ExportOptions()
(int&)PREFSMAN->m_BackgroundMode = m_iSelectedOption[0][BO_MODE];
PREFSMAN->m_fBGBrightness = m_iSelectedOption[0][BO_BRIGHTNESS] / 10.0f;
PREFSMAN->m_bShowDanger = m_iSelectedOption[0][BO_DANGER] == 1;
PREFSMAN->m_bShowDancingCharacters = m_iSelectedOption[0][BO_DANCING_CHARACTERS] == 1;
PREFSMAN->m_ShowDancingCharacters = (PrefsManager::CharacterOption)m_iSelectedOption[0][BO_DANCING_CHARACTERS];
PREFSMAN->m_bShowBeginnerHelper = m_iSelectedOption[0][BO_SHOW_BEGINNER_HELPER] == 1;
PREFSMAN->m_iNumBackgrounds = (m_iSelectedOption[0][BO_RANDOM_BACKGROUNDS]+1) * 5;
}
stepmania/src/ScreenSelectCharacter.cpp
+3 -1
View File
@@ -20,6 +20,7 @@
#include "AnnouncerManager.h"
#include "GameState.h"
#include "Character.h"
#include "PrefsManager.h"
#define TITLE_ON_COMMAND( p ) THEME->GetMetric ("ScreenSelectCharacter",ssprintf("TitleP%dOnCommand",p+1))
@@ -53,7 +54,8 @@ ScreenSelectCharacter::ScreenSelectCharacter() : Screen("ScreenSelectCharacter")
{
LOG->Trace( "ScreenSelectCharacter::ScreenSelectCharacter()" );
if( GAMESTATE->m_pCharacters.empty() )
if( GAMESTATE->m_pCharacters.empty() ||
(GAMESTATE->m_PlayMode != PLAY_MODE_BATTLE && GAMESTATE->m_PlayMode != PLAY_MODE_RAVE && PREFSMAN->m_ShowDancingCharacters != PrefsManager::CO_SELECT ))
{
HandleScreenMessage( SM_GoToNextScreen );
return;