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

Fine-tunes Ez2dancers Real Squished Column Spacing and if a Noteskin fails to be loaded by the time the notes need to be displayed, attempt to force the default theme on and throw errors into the log rather than crashing SM.

Browse Source
This commit is contained in:
Andrew Livy
2009-05-24 14:26:38 +00:00
parent 5604b19d04
commit 75d5b63d96
3 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameManager.cpp
+26 -26
View File
@@ -929,7 +929,7 @@ static const Game g_Game_KB7 =
};
static const int EZ2_COL_SPACING = 46;
static const int EZ2_REAL_COL_SPACING = 32;
static const int EZ2_REAL_COL_SPACING = 46;
static const Style g_Style_Ez2_Single =
{ // STYLE_EZ2_SINGLE
true, // m_bUsedForGameplay
@@ -980,22 +980,22 @@ static const Style g_Style_Ez2_Real =
7, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1
{ TRACK_1, -EZ2_REAL_COL_SPACING*3.0f, NULL },
{ TRACK_2, -EZ2_REAL_COL_SPACING*2.0f, NULL },
{ TRACK_3, -EZ2_REAL_COL_SPACING*1.0f, NULL },
{ TRACK_1, -EZ2_REAL_COL_SPACING*2.3f, NULL },
{ TRACK_2, -EZ2_REAL_COL_SPACING*1.6f, NULL },
{ TRACK_3, -EZ2_REAL_COL_SPACING*0.9f, NULL },
{ TRACK_4, +EZ2_REAL_COL_SPACING*0.0f, NULL },
{ TRACK_5, +EZ2_REAL_COL_SPACING*1.0f, NULL },
{ TRACK_6, +EZ2_REAL_COL_SPACING*2.0f, NULL },
{ TRACK_7, +EZ2_REAL_COL_SPACING*3.0f, NULL },
{ TRACK_5, +EZ2_REAL_COL_SPACING*0.9f, NULL },
{ TRACK_6, +EZ2_REAL_COL_SPACING*1.6f, NULL },
{ TRACK_7, +EZ2_REAL_COL_SPACING*2.3f, NULL },
},
{ // PLAYER_2
{ TRACK_1, -EZ2_REAL_COL_SPACING*3.0f, NULL },
{ TRACK_2, -EZ2_REAL_COL_SPACING*2.0f, NULL },
{ TRACK_3, -EZ2_REAL_COL_SPACING*1.0f, NULL },
{ TRACK_1, -EZ2_REAL_COL_SPACING*2.3f, NULL },
{ TRACK_2, -EZ2_REAL_COL_SPACING*1.6f, NULL },
{ TRACK_3, -EZ2_REAL_COL_SPACING*0.9f, NULL },
{ TRACK_4, +EZ2_REAL_COL_SPACING*0.0f, NULL },
{ TRACK_5, +EZ2_REAL_COL_SPACING*1.0f, NULL },
{ TRACK_6, +EZ2_REAL_COL_SPACING*2.0f, NULL },
{ TRACK_7, +EZ2_REAL_COL_SPACING*3.0f, NULL },
{ TRACK_5, +EZ2_REAL_COL_SPACING*0.9f, NULL },
{ TRACK_6, +EZ2_REAL_COL_SPACING*1.6f, NULL },
{ TRACK_7, +EZ2_REAL_COL_SPACING*2.3f, NULL },
},
},
{ // m_iInputColumn[NUM_GameController][NUM_GameButton]
@@ -1003,7 +1003,7 @@ static const Style g_Style_Ez2_Real =
{ 0, 6, 3, 2, 4, 1, 5, Style::END_MAPPING },
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
3,0,6,2,4,1,5 // This should be from back to front: Down, UpLeft, UpRight, Lower Left Hand, Lower Right Hand, Upper Left Hand, Upper Right Hand
3,0,6,1,5,2,4 // This should be from back to front: Down, UpLeft, UpRight, Lower Left Hand, Lower Right Hand, Upper Left Hand, Upper Right Hand
},
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
@@ -1060,22 +1060,22 @@ static const Style g_Style_Ez2_Real_Versus =
7, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1
{ TRACK_1, -EZ2_REAL_COL_SPACING*3.0f, NULL },
{ TRACK_2, -EZ2_REAL_COL_SPACING*2.0f, NULL },
{ TRACK_3, -EZ2_REAL_COL_SPACING*1.0f, NULL },
{ TRACK_1, -EZ2_REAL_COL_SPACING*2.3f, NULL },
{ TRACK_2, -EZ2_REAL_COL_SPACING*1.6f, NULL },
{ TRACK_3, -EZ2_REAL_COL_SPACING*0.9f, NULL },
{ TRACK_4, +EZ2_REAL_COL_SPACING*0.0f, NULL },
{ TRACK_5, +EZ2_REAL_COL_SPACING*1.0f, NULL },
{ TRACK_6, +EZ2_REAL_COL_SPACING*2.0f, NULL },
{ TRACK_7, +EZ2_REAL_COL_SPACING*3.0f, NULL },
{ TRACK_5, +EZ2_REAL_COL_SPACING*0.9f, NULL },
{ TRACK_6, +EZ2_REAL_COL_SPACING*1.6f, NULL },
{ TRACK_7, +EZ2_REAL_COL_SPACING*2.3f, NULL },
},
{ // PLAYER_2
{ TRACK_1, -EZ2_REAL_COL_SPACING*3.0f, NULL },
{ TRACK_2, -EZ2_REAL_COL_SPACING*2.0f, NULL },
{ TRACK_3, -EZ2_REAL_COL_SPACING*1.0f, NULL },
{ TRACK_1, -EZ2_REAL_COL_SPACING*2.3f, NULL },
{ TRACK_2, -EZ2_REAL_COL_SPACING*1.6f, NULL },
{ TRACK_3, -EZ2_REAL_COL_SPACING*0.9f, NULL },
{ TRACK_4, +EZ2_REAL_COL_SPACING*0.0f, NULL },
{ TRACK_5, +EZ2_REAL_COL_SPACING*1.0f, NULL },
{ TRACK_6, +EZ2_REAL_COL_SPACING*2.0f, NULL },
{ TRACK_7, +EZ2_REAL_COL_SPACING*3.0f, NULL },
{ TRACK_5, +EZ2_REAL_COL_SPACING*0.9f, NULL },
{ TRACK_6, +EZ2_REAL_COL_SPACING*1.6f, NULL },
{ TRACK_7, +EZ2_REAL_COL_SPACING*2.3f, NULL },
},
},
{ // m_iInputColumn[NUM_GameController][NUM_GameButton]
stepmania/src/NoteField.cpp
+1
View File
@@ -142,6 +142,7 @@ void NoteField::CacheAllUsedNoteSkins()
void NoteField::Init( const PlayerState* pPlayerState, float fYReverseOffsetPixels )
{
m_pPlayerState = pPlayerState;
m_fYReverseOffsetPixels = fYReverseOffsetPixels;
CacheAllUsedNoteSkins();
}
stepmania/src/NoteSkinManager.cpp
+15
View File
@@ -242,6 +242,21 @@ void NoteSkinManager::GetAllNoteSkinNamesForGame( const Game *pGame, vector<RStr
RString NoteSkinManager::GetMetric( const RString &sButtonName, const RString &sValue )
{
// if no noteskin has loaded by now, something seriously went wrong!
if( m_sCurrentNoteSkin.empty() )
{
// try selecting the default noteskin
if( DoesNoteSkinExist( "default" ) )
{
m_sCurrentNoteSkin = "default";
LOG->Warn("A noteskin was not loaded before NoteSkinManager::GetMetric() so the default noteskin was forced.");
}
else
{
LOG->Warn("A noteskin was not loaded before NoteSkinManager::GetMetric() and none could be loaded.");
}
}
ASSERT( !m_sCurrentNoteSkin.empty() );
RString sNoteSkinName = m_sCurrentNoteSkin;
sNoteSkinName.MakeLower();