From 75d5b63d960c21b5fe321748959108bb0757db38 Mon Sep 17 00:00:00 2001 From: Andrew Livy Date: Sun, 24 May 2009 14:26:38 +0000 Subject: [PATCH] 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. --- stepmania/src/GameManager.cpp | 52 +++++++++++++++---------------- stepmania/src/NoteField.cpp | 1 + stepmania/src/NoteSkinManager.cpp | 15 +++++++++ 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index cce9eea834..4595f59d1e 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -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] diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index b8c2996f90..2f418f84cb 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -142,6 +142,7 @@ void NoteField::CacheAllUsedNoteSkins() void NoteField::Init( const PlayerState* pPlayerState, float fYReverseOffsetPixels ) { m_pPlayerState = pPlayerState; + m_fYReverseOffsetPixels = fYReverseOffsetPixels; CacheAllUsedNoteSkins(); } diff --git a/stepmania/src/NoteSkinManager.cpp b/stepmania/src/NoteSkinManager.cpp index 506d2aa97c..e54ea1f0d6 100644 --- a/stepmania/src/NoteSkinManager.cpp +++ b/stepmania/src/NoteSkinManager.cpp @@ -242,6 +242,21 @@ void NoteSkinManager::GetAllNoteSkinNamesForGame( const Game *pGame, vectorWarn("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();