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

add "cross" mod

Browse Source
This commit is contained in:
Chris Danford
2004-02-23 05:33:33 +00:00
parent 5e1952da57
commit 380a2d00ee
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+3 -2
View File
@@ -4082,12 +4082,13 @@ Insert,6=mod,skippy;name,Skippy
Insert,7=mod,echo;name,Echo
Insert,8=mod,stomp;name,Stomp
Scroll=4
ScrollDefault=mod,no reverse,no split,no alternate
Scroll=5
ScrollDefault=mod,no reverse,no split,no alternate,no cross
Scroll,1=name,Standard
Scroll,2=mod,reverse;name,Reverse
Scroll,3=mod,split;name,Split
Scroll,4=mod,alternate;name,Alternate
Scroll,5=mod,cross;name,Cross
Holds=6
HoldsDefault=mod,no noholds,no planted,no twister,no nojumps,no nohands
stepmania/src/OptionIconRow.cpp
+1
View File
@@ -67,6 +67,7 @@ const OptionColumnEntry g_OptionColumnEntries[] =
{"Reverse", 5},
{"Split", 5},
{"Alternate", 5},
{"Cross", 5},
{"Incoming", 6},
{"Space", 6},
{"Hallway", 6},
stepmania/src/PlayerOptions.cpp
+13 -1
View File
@@ -126,6 +126,7 @@ CString PlayerOptions::GetString() const
sReturn += AddPart( m_fScrolls[SCROLL_REVERSE], "Reverse" );
sReturn += AddPart( m_fScrolls[SCROLL_SPLIT], "Split" );
sReturn += AddPart( m_fScrolls[SCROLL_ALTERNATE], "Alternate" );
sReturn += AddPart( m_fScrolls[SCROLL_CROSS], "Cross" );
sReturn += AddPart( m_fDark, "Dark");
@@ -292,6 +293,7 @@ void PlayerOptions::FromString( CString sOptions )
else if( sBit == "reverse" ) SET_FLOAT( fScrolls[SCROLL_REVERSE] )
else if( sBit == "split" ) SET_FLOAT( fScrolls[SCROLL_SPLIT] )
else if( sBit == "alternate" ) SET_FLOAT( fScrolls[SCROLL_ALTERNATE] )
else if( sBit == "cross" ) SET_FLOAT( fScrolls[SCROLL_CROSS] )
else if( sBit == "noholds" || sBit == "nofreeze" ) m_bTransforms[TRANSFORM_NOHOLDS] = on;
else if( sBit == "nomines" ) m_bTransforms[TRANSFORM_NOMINES] = on;
else if( sBit == "dark" ) SET_FLOAT( fDark )
@@ -459,11 +461,21 @@ void PlayerOptions::SetOneScroll( Scroll s )
float PlayerOptions::GetReversePercentForColumn( int iCol )
{
float f = 0;
int iNumCols = GAMESTATE->GetCurrentStyleDef()->m_iColsPerPlayer;
f += m_fScrolls[SCROLL_REVERSE];
if( iCol >= GAMESTATE->GetCurrentStyleDef()->m_iColsPerPlayer/2 )
if( iCol >= iNumCols/2 )
f += m_fScrolls[SCROLL_SPLIT];
if( (iCol%2)==1 )
f += m_fScrolls[SCROLL_ALTERNATE];
int iFirstCrossCol = iNumCols/4;
int iLastCrossCol = iNumCols-1-iFirstCrossCol;
if( iCol>=iFirstCrossCol && iCol<=iLastCrossCol )
f += m_fScrolls[SCROLL_CROSS];
if( f > 2 )
f = fmodf( f, 2 );
if( f > 1 )
stepmania/src/PlayerOptions.h
+1
View File
@@ -83,6 +83,7 @@ struct PlayerOptions
SCROLL_REVERSE=0,
SCROLL_SPLIT,
SCROLL_ALTERNATE,
SCROLL_CROSS,
NUM_SCROLLS
};
float GetReversePercentForColumn( int iCol ); // accounts for all Directions
stepmania/src/ScreenOptionsMaster.cpp
-3
View File
@@ -30,10 +30,7 @@
#define ENTRY_MODE(s,i) THEME->GetMetric ("ScreenOptionsMaster",ssprintf("%s,%i",(s).c_str(),(i+1)))
#define ENTRY_DEFAULT(s) THEME->GetMetric ("ScreenOptionsMaster",(s) + "Default")
#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen")
// #define NEXT_SCREEN( play_mode ) THEME->GetMetric (m_sName,"NextScreen"+Capitalize(PlayModeToString(play_mode)))
#define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen")
// #define PREV_SCREEN( play_mode ) THEME->GetMetric (m_sName,"PrevScreen"+Capitalize(PlayModeToString(play_mode)))
/* Add the list named "ListName" to the given row/handler. */
void ScreenOptionsMaster::SetList( OptionRowData &row, OptionRowHandler &hand, CString ListName, CString &TitleOut )