diff --git a/BackgroundEffects/SongBgWithMovieViz.lua b/BackgroundEffects/SongBgWithMovieViz.lua index d69c30b20c..5d145e652f 100644 --- a/BackgroundEffects/SongBgWithMovieViz.lua +++ b/BackgroundEffects/SongBgWithMovieViz.lua @@ -7,7 +7,7 @@ local t = Def.ActorFrame { }; LoadActor(Var "File1") .. { - OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color2;effectclock,"music"); + OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color2;effectclock,"music"); GainFocusCommand=cmd(play); LoseFocusCommand=cmd(pause); }; diff --git a/BackgroundEffects/StretchNoLoop.lua b/BackgroundEffects/StretchNoLoop.lua index b73cc97797..c48fe01b0a 100644 --- a/BackgroundEffects/StretchNoLoop.lua +++ b/BackgroundEffects/StretchNoLoop.lua @@ -2,7 +2,7 @@ local Color1 = color(Var "Color1"); local t = Def.ActorFrame { LoadActor(Var "File1") .. { - OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;loop,false;effectclock,"music"); + OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;loop,false;effectclock,"music"); GainFocusCommand=cmd(play); LoseFocusCommand=cmd(pause); }; diff --git a/BackgroundEffects/StretchNormalAlignLeft.lua b/BackgroundEffects/StretchNormalAlignLeft.lua index ac6ba6f1ce..b145ef69d2 100644 --- a/BackgroundEffects/StretchNormalAlignLeft.lua +++ b/BackgroundEffects/StretchNormalAlignLeft.lua @@ -3,7 +3,7 @@ local Color1 = color(Var "Color1"); local t = Def.ActorFrame { LoadActor(Var "File1") .. { - OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music"); + OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music"); GainFocusCommand=cmd(play); LoseFocusCommand=cmd(pause); }; diff --git a/BackgroundEffects/StretchNormalBlue.lua b/BackgroundEffects/StretchNormalBlue.lua index e76dddb1e0..b5b7c629fb 100644 --- a/BackgroundEffects/StretchNormalBlue.lua +++ b/BackgroundEffects/StretchNormalBlue.lua @@ -3,7 +3,7 @@ local Color1 = color("0,0,1,1"); local t = Def.ActorFrame { LoadActor(Var "File1") .. { - OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music"); + OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music"); GainFocusCommand=cmd(play); LoseFocusCommand=cmd(pause); }; diff --git a/BackgroundEffects/StretchNormalGreen.lua b/BackgroundEffects/StretchNormalGreen.lua index 4a00110253..f90436b90f 100644 --- a/BackgroundEffects/StretchNormalGreen.lua +++ b/BackgroundEffects/StretchNormalGreen.lua @@ -3,7 +3,7 @@ local Color1 = color("0,1,0,1"); local t = Def.ActorFrame { LoadActor(Var "File1") .. { - OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music"); + OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music"); GainFocusCommand=cmd(play); LoseFocusCommand=cmd(pause); }; diff --git a/BackgroundEffects/StretchNormalRed.lua b/BackgroundEffects/StretchNormalRed.lua index 8a32d67168..caa8ccbfa9 100644 --- a/BackgroundEffects/StretchNormalRed.lua +++ b/BackgroundEffects/StretchNormalRed.lua @@ -3,7 +3,7 @@ local Color1 = color("1,0,0,1"); local t = Def.ActorFrame { LoadActor(Var "File1") .. { - OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music"); + OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music"); GainFocusCommand=cmd(play); LoseFocusCommand=cmd(pause); }; diff --git a/BackgroundEffects/StretchPaused.lua b/BackgroundEffects/StretchPaused.lua index d1049964b4..41c81bdd52 100644 --- a/BackgroundEffects/StretchPaused.lua +++ b/BackgroundEffects/StretchPaused.lua @@ -2,7 +2,7 @@ local Color1 = color(Var "Color1"); local t = Def.ActorFrame { LoadActor(Var "File1") .. { - OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;pause;effectclock,"music"); + OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;pause;effectclock,"music"); GainFocusCommand=cmd(play); LoseFocusCommand=cmd(pause); }; diff --git a/BackgroundEffects/StretchRewind.lua b/BackgroundEffects/StretchRewind.lua index 9f1da9946e..05778de7ce 100644 --- a/BackgroundEffects/StretchRewind.lua +++ b/BackgroundEffects/StretchRewind.lua @@ -2,7 +2,7 @@ local Color = color(Var "Color1"); local t = Def.ActorFrame { LoadActor(Var "File1") .. { - OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;position,0;effectclock,"music"); + OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;position,0;effectclock,"music"); GainFocusCommand=cmd(play); LoseFocusCommand=cmd(pause); }; diff --git a/BackgroundEffects/Vizualization2File.lua b/BackgroundEffects/Vizualization2File.lua index bd689b0c08..c729ed7b9d 100644 --- a/BackgroundEffects/Vizualization2File.lua +++ b/BackgroundEffects/Vizualization2File.lua @@ -3,7 +3,7 @@ local Color2 = color(Var "Color2"); local t = Def.ActorFrame { LoadActor(Var "File1") .. { - OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music"); + OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music"); GainFocusCommand=cmd(play); LoseFocusCommand=cmd(pause); }; diff --git a/Courses/Default/Jupiter.crs b/Courses/Default/Jupiter.crs index 529005cdb3..c33647c7f9 100644 --- a/Courses/Default/Jupiter.crs +++ b/Courses/Default/Jupiter.crs @@ -1,8 +1,9 @@ #COURSE:Jupiter; #SCRIPTER:Midiman; +#METER:Medium:5; #GAINSECONDS:120; -#SONG:StepMania 5\Springtime:Hard; +#SONG:StepMania 5\Springtime:Medium;nodifficult; #GAINSECONDS:25; -#SONG:StepMania 5\MechaTribe Assault:Hard; \ No newline at end of file +#SONG:StepMania 5\MechaTribe Assault:Easy;nodifficult; \ No newline at end of file diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 0c9bc25055..c4e34a237b 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -5,6 +5,18 @@ from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt. ________________________________________________________________________________ ================================================================================ + +StepMania 5.0 alpha 2 | 20120??? +-------------------------------------------------------------------------------- + +2012/03/01 +---------- +* [MemoryCardManager] Disable Memory Cards by default. If you want to use them, +set MemoryCards=1 in Save/Preferences.ini (or Save/Static.ini). [AJ] +* [GameState] Set Premium to Premium_DoubleFor1Credit by default. [AJ] +* [ScreenSelectMusic] Added PlaySoundOnEnteringOptionsMenu metric. [AJ] +* [MusicWheel, WheelBase] Added collapse sound. [AJ] + StepMania 5.0 alpha 1a | 20120219 -------------------------------------------------------------------------------- diff --git a/Docs/credits.txt b/Docs/credits.txt index d25b949511..d70374bac2 100644 --- a/Docs/credits.txt +++ b/Docs/credits.txt @@ -84,7 +84,7 @@ v1toko Macgravel * Orbular noteskin (the default kb7 noteskin) -sy567 +hanubeki (@803832, formerly sy567) * Small beginner helper fix (http://www.stepmania.com/forums/showpost.php?p=158721&postcount=12) diff --git a/Docs/license-ext/theme_lang-ja.txt b/Docs/license-ext/theme_lang-ja.txt index 49b0a6e592..40a53606aa 100644 --- a/Docs/license-ext/theme_lang-ja.txt +++ b/Docs/license-ext/theme_lang-ja.txt @@ -1,23 +1,19 @@ -Stepmania 5系本体用　日本語化セット6(2012/02/19) +Stepmania 5系本体用　日本語化セット7(2012/02/26) 作者：ナイラー ----------- Stepmania5系本体では従来の日本語テーマ、および日本語ランゲージファイルが使用できなくなっています。 個人的に日本語が見えているほうが安心できるので、とりあえずファイルを製作してみました。 ----------- 以下のファイルが同梱されています。 -・fallbackja.ini(_fallbackテーマ用日本語ランゲージファイル) Ver 1.05γ +・fallbackja.ini(_fallbackテーマ用日本語ランゲージファイル) Ver 1.06-A ・themeja.ini(デフォルトテーマ用日本語ランゲージファイル) Ver 1.03γ -(添字がβからγになったのに強い意味はありません。番号動かしたくなかったので) ----------- 今回の更新点 -おそらくalpha 1に対するファイルとしては最終更新となります。 +今回からalpha 1a正式対応ということで。ああ石投げないで「てめー文章打ってるだけだろ」とか言わないで。 fallbackja.iniに対して -・エディットの曲選択時の解説を微変更。 -・詳細オプションの名前を一部変更。 -・一部プレイオプションが紛れ込んでいたのを削除。 +・エディットにとある設定項目が追加されたのでその部分の翻訳。 themeja.iniに対して -・プレイオプションの解説を少し充実した。 -・テーマ固有オプションの名前、および解説の微変更。 +・今回は更新されていません。セット6と同内容が収録されています。 ----------- それぞれのファイルは、次の場所に配置してください。 ・fallbackja.iniは、「Theme」フォルダの「_fallback」フォルダ内の「Language」フォルダに、 diff --git a/Themes/HelloWorld/Graphics/Common splash.png b/Themes/HelloWorld/Graphics/Common splash.png new file mode 100644 index 0000000000..c48c599d90 Binary files /dev/null and b/Themes/HelloWorld/Graphics/Common splash.png differ diff --git a/Themes/HelloWorld/Graphics/ScreenGuideMain scroll.lua b/Themes/HelloWorld/Graphics/ScreenGuideMain scroll.lua index 71946e43aa..60a721afad 100644 --- a/Themes/HelloWorld/Graphics/ScreenGuideMain scroll.lua +++ b/Themes/HelloWorld/Graphics/ScreenGuideMain scroll.lua @@ -4,19 +4,19 @@ local itemName = gc:GetName() local t = Def.ActorFrame{ -- focused frame LoadActor( THEME:GetPathG("SectionMenu","ItemFocused") )..{ - GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1); - LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0); + GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1); + LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0); }; -- unfocused LoadActor( THEME:GetPathG("SectionMenu","ItemUnfocused") )..{ - GainFocusCommand=cmd(decelerate,0.5;diffusealpha,0); - LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1); + GainFocusCommand=cmd(decelerate,0.25;diffusealpha,0); + LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,1); }; LoadActor( THEME:GetPathG("_section", "Guide") )..{ - InitCommand=cmd(x,-244;y,-23;Real;halign,0); - GainFocusCommand=cmd(decelerate,0.5;diffusealpha,0.9); - LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.45); + InitCommand=cmd(x,-240;y,-23;Real;halign,0); + GainFocusCommand=cmd(decelerate,0.25;diffusealpha,0.9); + LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.45); }; Def.ActorFrame{ @@ -24,15 +24,15 @@ local t = Def.ActorFrame{ Name="SectionName"; Text=THEME:GetString("ScreenGuideMain",itemName); InitCommand=cmd(x,-250;y,-6;halign,0;diffuse,color("#222222FF")); - GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1); - LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.5); + GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1); + LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.5); }; LoadFont("_frutiger roman 24px")..{ Name="SectionDesc"; Text=THEME:GetString("ScreenGuideMain",itemName.."Desc"); InitCommand=cmd(x,-248;y,10;align,0,0;diffuse,color("#222222FF");zoom,0.5); - GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1); - LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.5); + GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1); + LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.5); }; }; }; diff --git a/Themes/HelloWorld/Graphics/ScreenReferenceMain scroll.lua b/Themes/HelloWorld/Graphics/ScreenReferenceMain scroll.lua index d0e5e6ed14..7e7df6e825 100644 --- a/Themes/HelloWorld/Graphics/ScreenReferenceMain scroll.lua +++ b/Themes/HelloWorld/Graphics/ScreenReferenceMain scroll.lua @@ -4,19 +4,19 @@ local itemName = gc:GetName() local t = Def.ActorFrame{ -- focused frame LoadActor( THEME:GetPathG("SectionMenu","ItemFocused") )..{ - GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1); - LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0); + GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1); + LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0); }; -- unfocused LoadActor( THEME:GetPathG("SectionMenu","ItemUnfocused") )..{ - GainFocusCommand=cmd(decelerate,0.5;diffusealpha,0); - LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1); + GainFocusCommand=cmd(decelerate,0.25;diffusealpha,0); + LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,1); }; LoadActor( THEME:GetPathG("_section", "Reference") )..{ - InitCommand=cmd(x,-244;y,-23;Real;halign,0); - GainFocusCommand=cmd(decelerate,0.5;diffusealpha,0.9); - LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.45); + InitCommand=cmd(x,-240;y,-23;Real;halign,0); + GainFocusCommand=cmd(decelerate,0.25;diffusealpha,0.9); + LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.45); }; Def.ActorFrame{ @@ -24,15 +24,15 @@ local t = Def.ActorFrame{ Name="SectionName"; Text=THEME:GetString("ScreenReferenceMain",itemName); InitCommand=cmd(x,-250;y,-6;halign,0;diffuse,color("#222222FF")); - GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1); - LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.5); + GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1); + LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.5); }; LoadFont("_frutiger roman 24px")..{ Name="SectionDesc"; Text=THEME:GetString("ScreenReferenceMain",itemName.."Desc"); InitCommand=cmd(x,-248;y,10;align,0,0;diffuse,color("#222222FF");zoom,0.5); - GainFocusCommand=cmd(decelerate,0.5;diffusealpha,1); - LoseFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,0.5); + GainFocusCommand=cmd(decelerate,0.25;diffusealpha,1); + LoseFocusCommand=cmd(stoptweening;decelerate,0.25;diffusealpha,0.5); }; }; }; diff --git a/Themes/HelloWorld/Graphics/SectionMenu ItemFocused (doubleres).png b/Themes/HelloWorld/Graphics/SectionMenu ItemFocused (doubleres).png new file mode 100644 index 0000000000..2a62b7d8a4 Binary files /dev/null and b/Themes/HelloWorld/Graphics/SectionMenu ItemFocused (doubleres).png differ diff --git a/Themes/HelloWorld/Graphics/SectionMenu ItemFocused.png b/Themes/HelloWorld/Graphics/SectionMenu ItemFocused.png deleted file mode 100644 index 5f4d043bcf..0000000000 Binary files a/Themes/HelloWorld/Graphics/SectionMenu ItemFocused.png and /dev/null differ diff --git a/Themes/HelloWorld/Graphics/SectionMenu ItemUnfocused (doubleres).png b/Themes/HelloWorld/Graphics/SectionMenu ItemUnfocused (doubleres).png new file mode 100644 index 0000000000..c3686f141b Binary files /dev/null and b/Themes/HelloWorld/Graphics/SectionMenu ItemUnfocused (doubleres).png differ diff --git a/Themes/HelloWorld/Graphics/SectionMenu ItemUnfocused.png b/Themes/HelloWorld/Graphics/SectionMenu ItemUnfocused.png deleted file mode 100644 index 77cd6b9733..0000000000 Binary files a/Themes/HelloWorld/Graphics/SectionMenu ItemUnfocused.png and /dev/null differ diff --git a/Themes/HelloWorld/Graphics/_common/_generic.png b/Themes/HelloWorld/Graphics/_common/_generic.png index 687ff39b0a..db0e2428dc 100644 Binary files a/Themes/HelloWorld/Graphics/_common/_generic.png and b/Themes/HelloWorld/Graphics/_common/_generic.png differ diff --git a/Themes/HelloWorld/Graphics/_section Guide (doubleres).png b/Themes/HelloWorld/Graphics/_section Guide (doubleres).png new file mode 100644 index 0000000000..a77e8ffefc Binary files /dev/null and b/Themes/HelloWorld/Graphics/_section Guide (doubleres).png differ diff --git a/Themes/HelloWorld/Graphics/_section Guide.png b/Themes/HelloWorld/Graphics/_section Guide.png deleted file mode 100644 index 071f4e83e9..0000000000 Binary files a/Themes/HelloWorld/Graphics/_section Guide.png and /dev/null differ diff --git a/Themes/HelloWorld/Graphics/_section Reference (doubleres).png b/Themes/HelloWorld/Graphics/_section Reference (doubleres).png new file mode 100644 index 0000000000..fb870063a6 Binary files /dev/null and b/Themes/HelloWorld/Graphics/_section Reference (doubleres).png differ diff --git a/Themes/HelloWorld/Graphics/_section Reference.png b/Themes/HelloWorld/Graphics/_section Reference.png deleted file mode 100644 index a5d7c0b2b2..0000000000 Binary files a/Themes/HelloWorld/Graphics/_section Reference.png and /dev/null differ diff --git a/Themes/HelloWorld/Graphics/_section Tutorial (doubleres).png b/Themes/HelloWorld/Graphics/_section Tutorial (doubleres).png new file mode 100644 index 0000000000..788ce5d67e Binary files /dev/null and b/Themes/HelloWorld/Graphics/_section Tutorial (doubleres).png differ diff --git a/Themes/HelloWorld/Graphics/_section Tutorial.png b/Themes/HelloWorld/Graphics/_section Tutorial.png deleted file mode 100644 index a0fc39758c..0000000000 Binary files a/Themes/HelloWorld/Graphics/_section Tutorial.png and /dev/null differ diff --git a/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua b/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua index ec623597bc..c8dfe98f84 100644 --- a/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua +++ b/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua @@ -59,7 +59,7 @@ local contrib = { "Petriform", -- default theme music "譯懃ぜ蟆城ｳｩ/Sakurana-Kobato (@sakuraponila)", -- custom scoring fixes "Samuel Kim (1a2a3a2a1a)", -- various beat mode fixes - "sy567", -- beginner helper fix + "hanubeki (@803832)", -- beginner helper fix, among various other things "v1toko", -- x-mode from StepNXA } diff --git a/Themes/_fallback/Languages/ja.ini b/Themes/_fallback/Languages/ja.ini index f76eec43f1..e81c5ef6c6 100644 --- a/Themes/_fallback/Languages/ja.ini +++ b/Themes/_fallback/Languages/ja.ini @@ -1,4 +1,4 @@ -ｻｿ;Stepmania 5.0邉ｻ譛ｬ菴鍋畑縲_fallback繝繝ｼ繝樊律譛ｬ隱槫喧繝輔ぃ繧､繝ｫVer 1.05ﾎｳ +ｻｿ;Stepmania 5.0邉ｻ譛ｬ菴鍋畑縲_fallback繝繝ｼ繝樊律譛ｬ隱槫喧繝輔ぃ繧､繝ｫVer 1.06-A [Common] WindowTitle=StepMania @@ -965,6 +965,7 @@ Min BPM=譛蟆(陦ｨ遉ｺ)BPM Mines=蝨ｰ髮ｷ Mirror Player 1 to 2=1P縺ｮ繝弱ｼ繝医ｒ2P縺ｫ繝溘Λ繝ｼ Mirror Player 2 to 1=2P縺ｮ繝弱ｼ繝医ｒ1P縺ｫ繝溘Λ繝ｼ +Modify Keysounds at current beat=繧ｪ繝悶ず繧ｧ縺ｫ繧ｭ繝ｼ髻ｳ繧偵い繧ｵ繧､繝ｳ縺吶ｋ MoveRandomToEnd=譛蠕後∪縺ｧ繝ｩ繝ｳ繝繝 More Options=隧ｳ邏ｰ繧ｪ繝励す繝ｧ繝ｳ MovieColorDepth=繝繝ｼ繝薙ｼ縺ｮ\n譛牙柑濶ｲ謨ｰ @@ -1112,6 +1113,8 @@ Shuffle=繧ｷ繝｣繝繝輔Ν GamePrefDefaultFail=譖ｲ縺ｮ邨ゆｺ # UserPrefScoringMode=繧ｹ繧ｳ繧｢縺ｮ險育ｮ玲婿蠑 + + [PaneDisplay] Steps=繧ｪ繝悶ず繧ｧ Holds=繝帙ｼ繝ｫ繝 @@ -1363,6 +1366,12 @@ Help=繝倥Ν繝 Info=諠蝣ｱ Routine Player=繝ｫ繝ｼ繝√Φ繝励Ξ繧､繝､繝ｼ +Track %d=(蟾ｦ縺九ｉ) %d繝ｬ繝ｼ繝ｳ逶ｮ縺ｮ繧｢繧ｵ繧､繝ｳ +None=辟｡縺 +New Sound=譁ｰ隕上↓繧｢繧ｵ繧､繝ｳ +Enter New Keysound File=繧ｭ繝ｼ髻ｳ繝輔ぃ繧､繝ｫ縺ｮ蜷榊燕繧貞･蜉帙＠縺ｦ縺上□縺輔＞縲\n迚ｹ縺ｫ髟ｷ縺繝輔ぃ繧､繝ｫ繝阪ｼ繝繧帝俣驕輔ｏ縺ｪ縺繧医≧縺ｫ縺励※縺上□縺輔＞縲 + + [ScreenEditMenu] HeaderText=隴憺擇縺ｮ邱ｨ髮 HeaderSubText=譖ｲ縺ｫ隴憺擇繧貞牡繧雁ｽ薙※縲∫ｷｨ髮縺ｧ縺阪∪縺吶 @@ -1719,11 +1728,11 @@ Setup=繧ｯ繧､繝繧ｯ繧ｻ繝繝医い繝繝 Error adding file '%s'.=縲%s縲阪ｮ霑ｽ蜉縺ｧ繧ｨ繝ｩ繝ｼ縺檎匱逕溘＠縺ｾ縺励◆縲 [SongManager] -Loading courses...=繧ｳ繝ｼ繧ｹ隱ｭ縺ｿ霎ｼ縺ｿ荳ｭ窶ｦ -Loading songs...=譖ｲ隱ｭ縺ｿ霎ｼ縺ｿ荳ｭ窶ｦ -Reloading...=繝ｪ繝ｭ繝ｼ繝我ｸｭ窶ｦ -Unloading songs...=繝ｭ繝ｼ繝芽ｧ｣髯､荳ｭ窶ｦ -Unloading courses...=繝ｭ繝ｼ繝芽ｧ｣髯､荳ｭ窶ｦ窶ｦ +Loading courses...=繧ｳ繝ｼ繧ｹ隱ｭ縺ｿ霎ｼ縺ｿ荳ｭ +Loading songs...=譖ｲ隱ｭ縺ｿ霎ｼ縺ｿ荳ｭ +Reloading...=繝ｪ繝ｭ繝ｼ繝我ｸｭ +Unloading songs...=繝ｭ繝ｼ繝芽ｧ｣髯､荳ｭ +Unloading courses...=繝ｭ繝ｼ繝芽ｧ｣髯､荳ｭ The folder "%s" appears to be a song folder. All song folders must reside in a group folder. For example, "Songs/Originals/My Song".=縲%s縲阪ｯ譖ｲ繝輔か繝ｫ繝縺ｧ縺吶よ峇繝輔か繝ｫ繝縺ｯ繧ｰ繝ｫ繝ｼ繝励ヵ繧ｩ繝ｫ繝縺ｮ荳ｭ縺ｫ驟咲ｽｮ縺励※縺上□縺輔＞縲 [SongUtil] diff --git a/Themes/_fallback/Sounds/MusicWheel collapse.redir b/Themes/_fallback/Sounds/MusicWheel collapse.redir new file mode 100644 index 0000000000..5272adb660 --- /dev/null +++ b/Themes/_fallback/Sounds/MusicWheel collapse.redir @@ -0,0 +1 @@ +Common invalid \ No newline at end of file diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 649d27c7c2..e95e4f8d90 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -2009,11 +2009,12 @@ OptionsListTimeout=0.25 # UsePlayerSelectMenu=false SelectMenuScreenName="ScreenPlayerOptions" -OptionsMenuAvailable=true +OptionsMenuAvailable=GAMESTATE:GetPlayMode() ~= "PlayMode_Oni" SelectMenuAvailable=false ModeMenuAvailable=true # ShowOptionsMessageSeconds=1.5 +PlaySoundOnEnteringOptionsMenu=true # ScreenModsCommand=setupmusicstagemods # @@ -2628,27 +2629,42 @@ Fallback="ScreenOptionsSimpleService" NextScreen=Branch.AfterInit() PrevScreen=Branch.AfterInit() -LineNames="SystemDirection,KeyConfig,GameType,6,8,Reload,Credits,MoreOptions" -# LineNames="SystemDirection,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9" -LineSystemDirection="gamecommand;screen,ScreenOptionsSystemDirection;name,System Direction" -LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings" +LineNames="Sync,GameType,KeyConfig,TestInput,Input,Reload,Arcade,Appearance,Theme,GraphicSound,Profiles,Network,UI,Advanced,Credits" +LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync" LineGameType="gamecommand;screen,ScreenSelectGame;name,Select Game" -Line6="gamecommand;screen,ScreenNetworkOptions;name,Network Options" -Line8="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles" +LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings" +LineTestInput="gamecommand;screen,ScreenTestInput;name,Test Input" +LineInput="gamecommand;screen,ScreenOptionsInput;name,Input Options" LineReload="gamecommand;screen,ScreenReloadSongs;name,Reload Songs" -LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits" +LineArcade="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options" +LineAppearance="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options" +LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options" +LineGraphicSound="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options" +LineProfiles="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles" +LineNetwork="gamecommand;screen,ScreenNetworkOptions;name,Network Options" +LineUI="gamecommand;screen,ScreenOptionsUI;name,UI Options" +LineAdvanced="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options" LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options" +LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits" + +# Old +#LineNames="SystemDirection,KeyConfig,GameType,6,8,Reload,Credits,MoreOptions" +# LineNames="SystemDirection,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9" # for ScreenOptionsExtended: -Line2="gamecommand;screen,ScreenTestInput;name,Test Input" -LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync" -Line3="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options" -Line10="gamecommand;screen,ScreenOptionsUI;name,UI Options" -Line11="gamecommand;screen,ScreenOptionsInput;name,Input Options" -Line4="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options" -Line12="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options" -Line5="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options" -LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options" +#LineSystemDirection="gamecommand;screen,ScreenOptionsSystemDirection;name,System Direction" +#Line2="gamecommand;screen,ScreenTestInput;name,Test Input" +#Line3="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options" +#Line4="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options" +#Line5="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options" +#Line6="gamecommand;screen,ScreenNetworkOptions;name,Network Options" +#Line8="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles" +#Line10="gamecommand;screen,ScreenOptionsUI;name,UI Options" +#Line11="gamecommand;screen,ScreenOptionsInput;name,Input Options" +#Line12="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options" +#LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options" +#LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options" +#LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits" [ScreenOptionsExtended] Fallback="ScreenOptionsService" @@ -2794,8 +2810,8 @@ ShowExitRow=true [ScreenTestInput] Class="ScreenTestInput" Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsExtended" -PrevScreen="ScreenOptionsExtended" +NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsService" [ScreenOptionsSystemDirection] Fallback="ScreenOptionsServiceChild" @@ -2828,8 +2844,8 @@ Line22="conf,EventMode" [ScreenOptionsGraphicsSound] Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsExtended" -PrevScreen="ScreenOptionsExtended" +NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsService" LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,20" Line1="conf,Windowed" Line2="conf,DisplayResolution" @@ -2854,8 +2870,8 @@ Line20="conf,VisualDelaySeconds" [ScreenOptionsAdvanced] Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsExtended" -PrevScreen="ScreenOptionsExtended" +NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsService" LineNames="Score,3,4,8,11,13,14,15,16,28,29,30" LineScore="lua,UserPrefScoringMode()" Line3="conf,TimingWindowScale" @@ -2881,8 +2897,8 @@ Line30="conf,FastLoad" [ScreenAppearanceOptions] Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsExtended" -PrevScreen="ScreenOptionsExtended" +NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsService" LineNames="1,2,3,4,5,14,15,17,18,19" Line1="conf,Language" Line2="conf,Announcer" @@ -2899,8 +2915,8 @@ Line19="conf,NumBackgrounds" # user interface options that aren't related to themes, etc. # (some don't get used/modified too often) Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsExtended" -PrevScreen="ScreenOptionsExtended" +NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsService" LineNames="1,3,4,6,7,9,10,11,12,14" Line1="conf,Center1Player" Line3="conf,DancePointsForOni" @@ -2920,8 +2936,8 @@ Line14="conf,ShowSongOptions" [ScreenOptionsInput] Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsExtended" -PrevScreen="ScreenOptionsExtended" +NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsService" LineNames="1,2,3,4,5" Line1="conf,AutoMapOnJoyChange" Line2="conf,OnlyDedicatedMenuButtons" @@ -2931,8 +2947,8 @@ Line5="conf,MusicWheelSwitchSpeed" [ScreenOptionsArcade] Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsExtended" -PrevScreen="ScreenOptionsExtended" +NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsService" # stuff tied to arcade features LineNames="1,2,3,4,5,6" Line1="conf,GetRankingName" @@ -4043,8 +4059,8 @@ OptionRowNormalMetricsGroup="OptionRowCourseOverview" [ScreenGameplaySyncMachine] Class="ScreenGameplaySyncMachine" Fallback="ScreenGameplay" -PrevScreen="ScreenOptionsExtended" -NextScreen="ScreenOptionsExtended" +PrevScreen="ScreenOptionsService" +NextScreen="ScreenOptionsService" PlayerType="PlayerSyncMachine" #AllowCenter1Player=false diff --git a/Themes/default/BGAnimations/ScreenCredits overlay.lua b/Themes/default/BGAnimations/ScreenCredits overlay.lua index c91c5781c7..36bd1b63bf 100644 --- a/Themes/default/BGAnimations/ScreenCredits overlay.lua +++ b/Themes/default/BGAnimations/ScreenCredits overlay.lua @@ -59,7 +59,7 @@ local contrib = { "Petriform", -- default theme music "譯懃ぜ蟆城ｳｩ/Sakurana-Kobato (@sakuraponila)", -- custom scoring fixes "Samuel Kim (1a2a3a2a1a)", -- various beat mode fixes - "sy567", -- beginner helper fix + "hanubeki (@803832)", -- beginner helper fix, among various other things "v1toko", -- x-mode from StepNXA } diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 07eb50c58c..08d00c0262 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -1290,8 +1290,8 @@ LineRollCombo="lua,ThemePrefRow('ComboOnRolls')" [ScreenOptionsTheme] Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsExtended" -PrevScreen="ScreenOptionsExtended" +NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsService" LineNames="gNotePos,gAuto,gScore,gSDisp,TimingDisplay,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter,FancyUIBG" LinegNotePos="lua,ThemePrefRow('NotePosition')" LinegScore="lua,ThemePrefRow('GameplayShowScore')" diff --git a/Themes/test/metrics.ini b/Themes/test/metrics.ini index f8ca408206..c114dabdfa 100644 --- a/Themes/test/metrics.ini +++ b/Themes/test/metrics.ini @@ -1,6 +1,17 @@ [Global] FallbackTheme=default [ScreenTitleMenu] +# new scroll for wrapping +ScrollerTransform=function(self,offset,itemIndex,numItems) \ + self:y((28)*(itemIndex-(numItems-1)/2)); \ + self:x(math.floor(itemIndex/5) * 128); \ +end; +# more choices for debug stuff +DefaultChoice="GameStart" +# new stuff +ChoiceNames="GameStart,Options,Edit,Jukebox,TestClearChildren,Exit" +# new tests +ChoiceTestClearChildren="screen,ScreenTestClearChildren;text,Test: Clear Children" [ScreenGameplay] # LifeP1OnCommand=visible,false # LifeP2OnCommand=visible,false diff --git a/src/GameState.cpp b/src/GameState.cpp index e985c0cb56..566ae1f0b8 100644 --- a/src/GameState.cpp +++ b/src/GameState.cpp @@ -103,7 +103,7 @@ static const ThemeMetric GRADE_TIER_FOR_EXTRA_2 ("GameState","GradeTierFo static ThemeMetric ARE_STAGE_PLAYER_MODS_FORCED ("GameState","AreStagePlayerModsForced"); static ThemeMetric ARE_STAGE_SONG_MODS_FORCED ("GameState","AreStageSongModsForced"); -static Preference g_Premium( "Premium", Premium_Off ); +static Preference g_Premium( "Premium", Premium_DoubleFor1Credit ); Preference GameState::m_bAutoJoin( "AutoJoin", false ); GameState::GameState() : diff --git a/src/MemoryCardManager.cpp b/src/MemoryCardManager.cpp index b3ddb9e87e..6c30e7be0b 100644 --- a/src/MemoryCardManager.cpp +++ b/src/MemoryCardManager.cpp @@ -39,7 +39,7 @@ static void MemoryCardUsbLevelInit( size_t /*PlayerNumber*/ i, RString &sNameOut defaultValueOut = -1; } -static Preference g_bMemoryCards( "MemoryCards", true ); +static Preference g_bMemoryCards( "MemoryCards", false ); static Preference g_bMemoryCardProfiles( "MemoryCardProfiles", true ); // if set, always use the device that mounts to this point diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp index 5b6af3280b..7adce9de96 100644 --- a/src/MusicWheel.cpp +++ b/src/MusicWheel.cpp @@ -109,6 +109,7 @@ void MusicWheel::Load( RString sType ) m_soundChangeSort.Load( THEME->GetPathS(sType,"sort") ); m_soundExpand.Load( THEME->GetPathS(sType,"expand"), true ); + m_soundCollapse.Load( THEME->GetPathS(sType,"collapse"), true ); // Update for SORT_MOST_PLAYED. SONGMAN->UpdatePopular(); diff --git a/src/PrefsManager.cpp b/src/PrefsManager.cpp index e113fa1ab9..f2dd86bc80 100644 --- a/src/PrefsManager.cpp +++ b/src/PrefsManager.cpp @@ -213,7 +213,7 @@ PrefsManager::PrefsManager() : m_iSongsPerPlay ( "SongsPerPlay", 3, ValidateSongsPerPlay ), m_bDelayedCreditsReconcile ( "DelayedCreditsReconcile", false ), m_ShowSongOptions ( "ShowSongOptions", Maybe_YES ), - m_bDancePointsForOni ( "DancePointsForOni", false ), + m_bDancePointsForOni ( "DancePointsForOni", true ), m_bPercentageScoring ( "PercentageScoring", false ), m_fMinPercentageForMachineSongHighScore ( "MinPercentageForMachineSongHighScore", 0.0001f ), // This is for home, who cares how bad you do? m_fMinPercentageForMachineCourseHighScore ( "MinPercentageForMachineCourseHighScore", 0.0001f ), // don't save course scores with 0 percentage diff --git a/src/ScreenDebugOverlay.cpp b/src/ScreenDebugOverlay.cpp index 1ca2b3c179..e992da578a 100644 --- a/src/ScreenDebugOverlay.cpp +++ b/src/ScreenDebugOverlay.cpp @@ -262,13 +262,10 @@ void ScreenDebugOverlay::Init() BitmapText *p = new BitmapText; p->SetName( "PageText" ); p->LoadFromFont( THEME->GetPathF("ScreenDebugOverlay", "page") ); - LOAD_ALL_COMMANDS( p ); - // xxx: I shouldn't have to do this: - ON_COMMAND( p ); + LOAD_ALL_COMMANDS_AND_ON_COMMAND( p ); // todo: Y value is still hardcoded. -aj p->SetXY( PAGE_START_X+iPage*PAGE_SPACING_X, SCREEN_TOP+20 ); p->SetText( *s + " (" + sButton + ")" ); - //p->SetShadowLength( 1 ); m_vptextPages.push_back( p ); this->AddChild( p ); } @@ -281,10 +278,7 @@ void ScreenDebugOverlay::Init() bt->LoadFromFont( THEME->GetPathF("ScreenDebugOverlay", "line") ); bt->SetHorizAlign( align_right ); bt->SetText( "blah" ); - //p->SetShadowLength( 2 ); - LOAD_ALL_COMMANDS( *bt ); - // xxx: I shouldn't have to do this: - ON_COMMAND( bt ); + LOAD_ALL_COMMANDS_AND_ON_COMMAND( *bt ); m_vptextButton.push_back( bt ); this->AddChild( bt ); } @@ -294,10 +288,7 @@ void ScreenDebugOverlay::Init() bt->LoadFromFont( THEME->GetPathF("ScreenDebugOverlay", "line") ); bt->SetHorizAlign( align_left ); bt->SetText( "blah" ); - //p->SetShadowLength( 2 ); - LOAD_ALL_COMMANDS( *bt ); - // xxx: I shouldn't have to do this: - ON_COMMAND( bt ); + LOAD_ALL_COMMANDS_AND_ON_COMMAND( *bt ); m_vptextFunction.push_back( bt ); this->AddChild( bt ); } @@ -366,7 +357,6 @@ void ScreenDebugOverlay::UpdateText() int i = p-g_pvpSubscribers->begin(); - //float fY = SCREEN_TOP+50 + iOffset * 16; float fY = LINE_START_Y + iOffset * LINE_SPACING; BitmapText &txt1 = *m_vptextButton[i]; diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index 76e22808d7..ca13e7acfc 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -94,6 +94,7 @@ void ScreenSelectMusic::Init() TWO_PART_TIMER_SECONDS.Load( m_sName, "TwoPartTimerSeconds" ); WRAP_CHANGE_STEPS.Load( m_sName, "WrapChangeSteps" ); NULL_SCORE_STRING.Load( m_sName, "NullScoreString" ); + PLAY_SOUND_ON_ENTERING_OPTIONS_MENU.Load( m_sName, "PlaySoundOnEnteringOptionsMenu" ); // To allow changing steps with gamebuttons -DaisuMaster CHANGE_STEPS_WITH_GAME_BUTTONS.Load( m_sName, "ChangeStepsWithGameButtons" ); CHANGE_GROUPS_WITH_GAME_BUTTONS.Load( m_sName, "ChangeGroupsWithGameButtons" ); @@ -437,7 +438,8 @@ void ScreenSelectMusic::Input( const InputEventPlus &input ) } m_bGoToOptions = true; - m_soundStart.Play(); + if( PLAY_SOUND_ON_ENTERING_OPTIONS_MENU ) + m_soundStart.Play(); this->PlayCommand( "ShowEnteringOptions" ); // Re-queue SM_BeginFadingOut, since ShowEnteringOptions may have diff --git a/src/ScreenSelectMusic.h b/src/ScreenSelectMusic.h index 3f64ecc505..aa2e9465d6 100644 --- a/src/ScreenSelectMusic.h +++ b/src/ScreenSelectMusic.h @@ -97,6 +97,7 @@ protected: ThemeMetric CHANGE_STEPS_WITH_GAME_BUTTONS; ThemeMetric CHANGE_GROUPS_WITH_GAME_BUTTONS; ThemeMetric NULL_SCORE_STRING; + ThemeMetric PLAY_SOUND_ON_ENTERING_OPTIONS_MENU; bool CanChangeSong() const { return m_SelectionState == SelectionState_SelectingSong; } bool CanChangeSteps() const { return TWO_PART_SELECTION ? m_SelectionState == SelectionState_SelectingSteps : m_SelectionState == SelectionState_SelectingSong; } diff --git a/src/WheelBase.cpp b/src/WheelBase.cpp index 797f422153..25753a1f45 100644 --- a/src/WheelBase.cpp +++ b/src/WheelBase.cpp @@ -283,11 +283,15 @@ bool WheelBase::Select() // return true if this selection can end the screen { RString sThisItemSectionName = m_CurWheelItemData[m_iSelection]->m_sText; if( m_sExpandedSectionName == sThisItemSectionName ) // already expanded + { SetOpenSection( "" ); // collapse it + m_soundCollapse.Play(); + } else // already collapsed + { SetOpenSection( sThisItemSectionName ); // expand it - - m_soundExpand.Play(); + m_soundExpand.Play(); + } } break; default: diff --git a/src/WheelBase.h b/src/WheelBase.h index 0a99704dc1..dbbb786385 100644 --- a/src/WheelBase.h +++ b/src/WheelBase.h @@ -99,6 +99,7 @@ protected: RageSound m_soundChangeMusic; RageSound m_soundExpand; + RageSound m_soundCollapse; RageSound m_soundLocked; // bool WheelItemIsVisible(int n);