Checked in files for ScreenSelectDifficultyEX

stepmania/TODO.miryokuteki

@@ -2,13 +2,20 @@
 // Miryokuteki's Todo/Done Record //
 ////////////////////////////////////
 
-// Last Updated February 19th, 2003
+// Last Updated February 20th, 2003
 
 Todo List:
   ** Find a way to get the length of a movie being played, so ScreenIntroMovie does not have to have a pre-determined length (I.e: exits when the movie is finished playing)
   ** Adding support for "BEGINNER HELP".. The thing that has a character showing where to step during the song, only on beginner mode. IE: Replaces the BG with this dynamic image sequence, showing what arrow to hit as it comes up on screen. You can see this in the BG of a DDRExtreme song if you pick "beginner" difficulty.
 
 
+Done as of 02/20/03:
+    NEW FEATURE** New screen added, for DDREx style difficulty selection. This is optional in the MACHINE OPTIONS menu
+
+
+
+
+
 Done as of 02/19/03:
     NEW FEATURE** Added screen to allow adjustment of Stepmania's internal volume, ScreenSoundOptions
 

stepmania/Themes/default/metrics.ini

@@ -131,7 +131,24 @@ CursorOffsetP2X=+40
 CursorOffsetP2Y=200
 CursorShadowLengthX=10
 CursorShadowLengthY=10
-InitialChoice=1
+InitialChoice=0
+HelpText=Use &LEFT; &RIGHT; to select, then press START
+TimerSeconds=40
+NextScreenArcade=ScreenSelectGroup
+NextScreenOni=ScreenInstructions
+
+[ScreenSelectDifficultyEX]
+DifficultyP1X=216
+DifficultyP1Y=180
+DifficultyP2X=440
+DifficultyP2Y=180
+CursorOffsetP1X=-40
+CursorOffsetP1Y=200
+CursorOffsetP2X=+40
+CursorOffsetP2Y=200
+CursorShadowLengthX=10
+CursorShadowLengthY=10
+InitialChoice=0
 HelpText=Use &LEFT; &RIGHT; to select, then press START
 TimerSeconds=40
 NextScreenArcade=ScreenSelectGroup
@@ -799,6 +816,7 @@ Caution=Toggle whether the Caution screen is shown.
 SongGroup=Toggle whether the Select Group screen is shown.
 WheelSections=ALWAYS means sections in group + ABC; NEVER means no sections;::ABC ONLY shows sections in just ABC sort
 Translations=Choose whether to displays song titles in their native::language (日本語), or to transliterate when possible
+DifficultySelect=
 
 [ScreenUnlock]
 SecondsToShow=10

stepmania/src/ScreenSelectStyle.cpp

@@ -40,7 +40,12 @@
 #define HELP_TEXT				THEME->GetMetric("ScreenSelectStyle","HelpText")
 #define TIMER_SECONDS			THEME->GetMetricI("ScreenSelectStyle","TimerSeconds")
 #define NEXT_SCREEN				PREFSMAN->m_bDDRExtremeDifficultySelect? THEME->GetMetric("ScreenSelectStyle","NextScreen") : "ScreenSelectDifficultyEX"
-
+/* I couldn't find a cleaner way to add this so that SM can show DDREX style,
+	if configured to, in place of the normal style select difficulty screen..
+	I know the screen after this one is supposed to be dynamic to whatever
+	is in the metrics file.. But logically, shouldn't select difficulty always
+	come after select style? -- Miryokuteki
+*/
 
 
 ScreenSelectStyle::ScreenSelectStyle()

stepmania/src/StepMania.dsp

@@ -57,10 +57,10 @@ LINK32=link.exe
 # SUBTRACT LINK32 /verbose /pdb:none
 # Begin Special Build Tool
 IntDir=.\../Release6
-TargetDir=\temp\stepmania
+TargetDir=\stepmania
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                                     	cl                                                                      /Zl                                                                      /nologo                                                                      /c                                                                      verstub.cpp                                                                      /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                                       	cl                                                                        /Zl                                                                        /nologo                                                                        /c                                                                        verstub.cpp                                                                        /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -92,10 +92,10 @@ LINK32=link.exe
 # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
 # Begin Special Build Tool
 IntDir=.\../Debug6
-TargetDir=\temp\stepmania
+TargetDir=\stepmania
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                                     	cl                                                                      /Zl                                                                      /nologo                                                                      /c                                                                      verstub.cpp                                                                      /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                                       	cl                                                                        /Zl                                                                        /nologo                                                                        /c                                                                        verstub.cpp                                                                        /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -609,6 +609,10 @@ SOURCE=.\arch\Sound\RageSoundDriver_DSound_Software.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\arch\Sound\RageSoundDriver_Null.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\arch\Sound\RageSoundDriver_Null.h
 # End Source File
 # Begin Source File
@@ -1733,6 +1737,14 @@ SOURCE=.\ScreenSelectDifficulty.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\ScreenSelectDifficultyEX.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ScreenSelectDifficultyEX.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\ScreenSelectGame.cpp
 # End Source File
 # Begin Source File