From 0006a92712fbd2d39ea0639363fb36bc08b14f86 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 22 Sep 2006 07:46:21 +0000 Subject: [PATCH] commands end with Command --- stepmania/Themes/default/metrics.ini | 16 ++++++++-------- stepmania/src/MenuTimer.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index d24b4c604b..7b0a09eb15 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -244,7 +244,7 @@ ScrollingListOffCommand=bouncebegin,0.5;zoomy,0 GuideOffCommand=bouncebegin,0.5;addy,400 ChoiceListHighlightOffCommand=linear,0.5;diffusealpha,0;glow,1,1,1,0 ChoiceListFrameOffCommand=linear,0.5;diffusealpha,0;glow,1,1,1,0 -UseModeSpecificBGAnims=0 +UseModeSpecificBGAnims=false EnableCharSelect=false Only2DChars=false CharacterIconP1Y=SCREEN_CENTER_Y+0 @@ -2333,13 +2333,13 @@ Text1OnCommand=stoptweening;shadowlength,0;zoomx,1;x,-13;y,2 Text1FormatFunction=function(fSeconds) fSeconds=math.min( 99, math.ceil(fSeconds) ); local digit = math.floor(fSeconds/10); return ""..digit end Text2OnCommand=stoptweening;shadowlength,0;zoomx,1;x,17;y,2 Text2FormatFunction=function(fSeconds) fSeconds=math.min( 99, math.ceil(fSeconds) ); local digit = math.mod(fSeconds,10); return ""..digit end -WarningCommand6=stoptweening;sleep,0.8;linear,0.2;zoomx,0 -WarningCommand5=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0;glowshift;effectperiod,0.15;effectcolor1,1,0,0,0;effectcolor2,1,0,0,1 -WarningCommand4=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0 -WarningCommand3=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0 -WarningCommand2=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0 -WarningCommand1=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0 -WarningCommand0=stoptweening;stopeffect;linear,0.2;zoomx,1 +Warning6Command=stoptweening;sleep,0.8;linear,0.2;zoomx,0 +Warning5Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0;glowshift;effectperiod,0.15;effectcolor1,1,0,0,0;effectcolor2,1,0,0,1 +Warning4Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0 +Warning3Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0 +Warning2Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0 +Warning1Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0 +Warning0Command=stoptweening;stopeffect;linear,0.2;zoomx,1 [ScreenOptions] Fallback="ScreenWithMenuElements" diff --git a/stepmania/src/MenuTimer.cpp b/stepmania/src/MenuTimer.cpp index fac0696924..839f628807 100644 --- a/stepmania/src/MenuTimer.cpp +++ b/stepmania/src/MenuTimer.cpp @@ -10,7 +10,7 @@ #include "ThemeMetric.h" #include "ActorUtil.h" -RString WARNING_COMMAND_NAME( size_t i ) { return ssprintf("WarningCommand%d",int(i)); } +RString WARNING_COMMAND_NAME( size_t i ) { return ssprintf("Warning%dCommand",int(i)); } static const ThemeMetric WARNING_START ("MenuTimer","WarningStart"); static const ThemeMetric WARNING_BEEP_START ("MenuTimer","WarningBeepStart");