From 79d97e7fecf0c57cc48801b4d99adda50d627b72 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 2 May 2010 11:25:00 -0500 Subject: [PATCH] re-add dance-threepanel now that the StepsDisplayList issue has been resolved. (Turns out that was the reason it wasn't working.) thanks to kurisu for the base code. also update docs --- Docs/Changelog_sm-ssc.txt | 10 ++++++++++ Docs/credits.txt | 12 +++++++++--- Themes/_fallback/Languages/en.ini | 2 ++ Themes/default/Languages/en.ini | 1 + src/DifficultyList.cpp | 2 +- src/GameConstantsAndTypes.h | 2 +- src/GameManager.cpp | 20 +++++++++----------- 7 files changed, 33 insertions(+), 16 deletions(-) diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 51139bbc3a..2295e8d49c 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -9,6 +9,16 @@ Not all changes are documented, for various reasons. supported but exist anyways.) _____________________________________________________________________________ +20100502 +-------- +* Add dance-threepanel StepsType. Thanks to kurisu for the original 3.9 code. +* XMode mod added, thanks to v1toko/StepNXA. + +20100501 +-------- +* Fixed an issue with StepsDisplayList crashing if more than 21 difficulties are + playable. This allows Technomotion to work with AutoSetStyle and Autogen on. + sm-ssc v1.0 Public Beta 3 | 20100430 ------------------------------------ There's an important change for themers that needs to be noted: diff --git a/Docs/credits.txt b/Docs/credits.txt index 15eec75dee..2b9008fed5 100644 --- a/Docs/credits.txt +++ b/Docs/credits.txt @@ -41,11 +41,17 @@ Daisuke Master David Santamarķa Rogado (howl) * Various patches (see Changelog_sm-ssc.txt for more details and links) -Kita K. +Kita K./D. Trucks * sm-ssc default theme music +kurisu + * Dance-threepanel gametype code (3.9; re-adapted for sm-ssc) + +v1toko + * Lead coder of StepNXA, which is where we got the original XMode code from. + Macgravel - * Orbular noteskin (the kb7 noteskin; not included in private beta wave 1.3) + * Orbular noteskin (the kb7 noteskin) theDtTvB * Keysound patch (http://share11.appspot.com/20421) @@ -71,7 +77,7 @@ Henke37 ==the beta testers== [SSC Beta Testing Team] KeithD -tweak62 +tweak/tweak62 [Friends of the Devs] And4713 diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 0d88741ff4..06747a8d81 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1626,6 +1626,7 @@ lights-cabinet=Lights # SSC Dance_Single=Single Dance_Double=Double +Dance_Threepanel=3 Panels [TapNoteScore] AvoidMine=Avoid Mine @@ -2177,6 +2178,7 @@ Dance_Double=Double Dance_Couple=Couple Dance_Solo=Solo Dance_Routine=Routine +Dance_Threepanel=3 Panels Pump_Single=Single Pump_Double=Double Pump_Halfdouble=Half-Double diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index b729d21f5a..81190cf95e 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -57,6 +57,7 @@ Dance_Double=DB Dance_Couple=DC Dance_Solo=DX Dance_Routine=DR +Dance_Threepanel=D3 Pump_Single=PS Pump_Double=PD Pump_Halfdouble=HD diff --git a/src/DifficultyList.cpp b/src/DifficultyList.cpp index d78e076e28..fd0f9f3a4f 100644 --- a/src/DifficultyList.cpp +++ b/src/DifficultyList.cpp @@ -18,7 +18,7 @@ // My first thought to fix this was: // (NUM_Difficulty (6) * NUM_StepsType (32)) + MAX_EDITS_PER_SONG (5*profileSlot (2)) = 202 // However, 202 rows may be a bit overkill. -// Dance has 6 stepstypes counting 3panel (disabled), Pump and Techno have 5. +// Dance has 6 stepstypes counting 3panel, Pump and Techno have 5. // (6 difficulties * 6 stepstypes) + MAX_EDITS_PER_SONG (which is 5 * profileSlots) = 46 rows // 46 seems to be a good enough number for this. If we get a crash again, up the // "magic" 6. -aj diff --git a/src/GameConstantsAndTypes.h b/src/GameConstantsAndTypes.h index 5463bf5b19..6a2a3d59de 100644 --- a/src/GameConstantsAndTypes.h +++ b/src/GameConstantsAndTypes.h @@ -55,7 +55,7 @@ enum StepsType StepsType_dance_double, StepsType_dance_couple, StepsType_dance_solo, - //StepsType_dance_three, // kurisu calls this "3panel" + StepsType_dance_threepanel, StepsType_dance_routine, StepsType_pump_single, StepsType_pump_halfdouble, diff --git a/src/GameManager.cpp b/src/GameManager.cpp index dc2eb3f6f3..cd15ee070a 100644 --- a/src/GameManager.cpp +++ b/src/GameManager.cpp @@ -48,7 +48,7 @@ static const StepsTypeInfo g_StepsTypeInfos[] = { { "dance-double", 8, true, StepsTypeCategory_Double }, { "dance-couple", 8, true, StepsTypeCategory_Couple }, { "dance-solo", 6, true, StepsTypeCategory_Single }, - //{ "dance-three", 3, true, StepsTypeCategory_Single }, // kurisu calls this "3panel" + { "dance-threepanel", 3, true, StepsTypeCategory_Single }, // thanks to kurisu { "dance-routine", 8, false, StepsTypeCategory_Routine }, // pump { "pump-single", 5, true, StepsTypeCategory_Single }, @@ -323,16 +323,14 @@ static const Style g_Style_Dance_Solo = false, // m_bLockDifficulties }; -// todo: "easy solo" or whatever the proper name for the 3 panel \|/ mode is. -/* -static const Style g_Style_Dance_Three = -{ // STYLE_DANCE_THREE +static const Style g_Style_Dance_ThreePanel = +{ // STYLE_DANCE_THREEPANEL true, // m_bUsedForGameplay true, // m_bUsedForEdit false, // m_bUsedForDemonstration false, // m_bUsedForHowToPlay - "3panel", // m_szName - StepsType_dance_3panel, // m_StepsType + "threepanel", // m_szName + StepsType_dance_threepanel, // m_StepsType StyleType_OnePlayerOneSide, // m_StyleType 3, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; @@ -348,8 +346,9 @@ static const Style g_Style_Dance_Three = }, }, { // m_iInputColumn[NUM_GameController][NUM_GameButton] - { 0, 1, 2, Style::END_MAPPING }, - { 0, 1, 2, Style::END_MAPPING } + // 4 3 5 + { Style::NO_MAPPING, Style::NO_MAPPING, Style::NO_MAPPING, 1, 0, 2, Style::END_MAPPING }, + { Style::NO_MAPPING, Style::NO_MAPPING, Style::NO_MAPPING, 1, 0, 2, Style::END_MAPPING } }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2 @@ -358,7 +357,6 @@ static const Style g_Style_Dance_Three = false, // m_bCanUseBeginnerHelper false, // m_bLockDifficulties }; -*/ static const Style g_Style_Dance_Couple_Edit = { // STYLE_DANCE_EDIT_COUPLE @@ -494,9 +492,9 @@ static const Style *g_apGame_Dance_Styles[] = &g_Style_Dance_Double, &g_Style_Dance_Couple, &g_Style_Dance_Solo, - //&g_Style_Dance_Three, &g_Style_Dance_Couple_Edit, &g_Style_Dance_Routine, + &g_Style_Dance_ThreePanel, NULL };