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

Add Skippy to PlayerOptions

Browse Source
This commit is contained in:
Chris Danford
2003-03-13 09:25:57 +00:00
parent b4b8815cb7
commit b8d8eb589d
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+1
View File
@@ -125,6 +125,7 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, ScoreDi
case PlayerOptions::TRANSFORM_WIDE: NoteDataUtil::Wide(*this); break;
case PlayerOptions::TRANSFORM_BIG: NoteDataUtil::Big(*this); break;
case PlayerOptions::TRANSFORM_QUICK: NoteDataUtil::Quick(*this); break;
case PlayerOptions::TRANSFORM_SKIPPY: NoteDataUtil::Skippy(*this); break;
default: ASSERT(0);
}
stepmania/src/PlayerOptions.cpp
+2
View File
@@ -115,6 +115,7 @@ CString PlayerOptions::GetString()
case TRANSFORM_WIDE: sReturn += "Wide, "; break;
case TRANSFORM_BIG: sReturn += "Big, "; break;
case TRANSFORM_QUICK: sReturn += "Quick, "; break;
case TRANSFORM_SKIPPY: sReturn += "Skippy, "; break;
default: ASSERT(0); // invalid
}
@@ -174,6 +175,7 @@ void PlayerOptions::FromString( CString sOptions )
else if( sBit == "wide" ) m_Transform = TRANSFORM_WIDE;
else if( sBit == "big" ) m_Transform = TRANSFORM_BIG;
else if( sBit == "quick" ) m_Transform = TRANSFORM_QUICK;
else if( sBit == "skippy" ) m_Transform = TRANSFORM_SKIPPY;
else if( sBit == "reverse" ) m_fReverseScroll = 1;
else if( sBit == "noholds" ) m_bHoldNotes = false;
else if( sBit == "nofreeze" ) m_bHoldNotes = false;
stepmania/src/PlayerOptions.h
+1
View File
@@ -67,6 +67,7 @@ struct PlayerOptions
TRANSFORM_WIDE,
TRANSFORM_BIG,
TRANSFORM_QUICK,
TRANSFORM_SKIPPY,
NUM_TRANSFORMS
};
stepmania/src/ScreenPlayerOptions.cpp
+3 -2
View File
@@ -40,7 +40,7 @@ OptionRowData g_PlayerOptionsLines[NUM_PLAYER_OPTIONS_LINES] = {
{ "Effect", 7, {"OFF","DRUNK","DIZZY","SPACE","MINI","FLIP","TORNADO"} },
{ "Appear\n-ance", 5, {"VISIBLE","HIDDEN","SUDDEN","STEALTH","BLINK"} },
{ "Turn", 6, {"OFF","MIRROR","LEFT","RIGHT","SHUFFLE","SUPER SHUFFLE"} },
{ "Trans\n-form", 5, {"OFF","LITTLE","WIDE","BIG","QUICK"} },
{ "Trans\n-form", 6, {"OFF","LITTLE","WIDE","BIG","QUICK","SKIPPY"} },
{ "Scroll", 2, {"STANDARD","REVERSE"} },
{ "Note\nSkin", 0, {""} },
{ "Holds", 2, {"OFF","ON"} },
@@ -219,7 +219,8 @@ void ScreenPlayerOptions::DrawPrimitives()
void ScreenPlayerOptions::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{
if( !m_Menu.m_In.IsTransitioning() &&
if( !GAMESTATE->m_bEditing &&
!m_Menu.m_In.IsTransitioning() &&
MenuI.IsValid() &&
MenuI.button == MENU_BUTTON_START &&
type != IET_RELEASE &&