From b4a16fc2461955c45121ac3fa8025fc364a671c7 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 12 Nov 2002 00:59:19 +0000 Subject: [PATCH] Fixed little compile error in RageDisplay and fixed error in README --- stepmania/README-FIRST.TXT | 10 +++++++--- stepmania/TODO.chris | 2 ++ stepmania/src/RageDisplay.cpp | 3 ++- stepmania/src/StepMania.dsp | 12 ++++-------- stepmania/src/TransitionFade.cpp | 8 -------- 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/stepmania/README-FIRST.TXT b/stepmania/README-FIRST.TXT index fc2b7a570e..6252482354 100644 --- a/stepmania/README-FIRST.TXT +++ b/stepmania/README-FIRST.TXT @@ -431,13 +431,17 @@ and can load sounds in ogg, mp3, or wav format.) by separating them with commas. e.g. "60=2.23,80=1.12". #BGCHANGE:...; - A value of the format "beat=bg name". Indicates that at 'beat', the background should begin playing a new background named 'bg name'. - 'beat' is a fractional value value and 'anim name' is a string. Different - animation change are separated by commas. e.g. "60=falling,80=flower". + 'beat' is a fractional value value and 'bg name' is a string. Different + bg changes are separated by commas. e.g. "60=falling,80=flower". When StepMania looks for a backgound, it searches in this order: - - Looks for a movie with file name "bg name" in the song folder + - Looks for a movie with file name = "bg name" in the song folder. + You must include the file extension in "bg name". e.g. + "60=falling.avi,80=flower.mpg". - Looks for a BGAnimation folder with the name "bg name" in the song folder. - Looks for a movie with file name "bg name" in the RandomMovies folder. + You must include the file extension in "bg name". e.g. + "60=falling.avi,80=flower.mpg". - Looks for a BGAnimation with file name "bg name" in the BGAnimations folder. - Looks for a Visualization with the file name "bg name" in the diff --git a/stepmania/TODO.chris b/stepmania/TODO.chris index 1fb2da7f3c..352d8b4edd 100644 --- a/stepmania/TODO.chris +++ b/stepmania/TODO.chris @@ -2,6 +2,8 @@ Fix ///////////////////////// +rename Notes to Pattern + You'll notice that if you add up the Perfects and Greats, they are far less than the max combo. Where did they go? Apparently Jumps count for 2 steps during normal game play, but ONLY for max combo. test BGChange grabbing from random movies diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp index ddfc4cf67d..9d886dd70d 100644 --- a/stepmania/src/RageDisplay.cpp +++ b/stepmania/src/RageDisplay.cpp @@ -134,7 +134,8 @@ void RageDisplay::SetVideoMode( bool windowed, int width, int height, int bpp, R if(!g_screen) throw RageException("Failed to open screen!"); - g_glVersion = int(roundf(atof((const char *) glGetString(GL_VERSION)) * 10)); + float fGLVersion = atof( (const char *) glGetString(GL_VERSION) ); + g_glVersion = int(roundf(fGLVersion) * 10); LOG->Trace( "OpenGL version %.1f", g_glVersion / 10.); GetGLExtensions(g_glExts); if(g_glExts.find("GL_EXT_texture_env_combine") != g_glExts.end()) diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index 3a88f463de..f0385d9f42 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -57,10 +57,10 @@ LINK32=link.exe # SUBTRACT LINK32 /pdb:none # Begin Special Build Tool IntDir=.\../Release6 -TargetDir=\temp\stepmania +TargetDir=\stepmania\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 /profile /pdb:none /incremental:no /nodefaultlib # Begin Special Build Tool IntDir=.\../Debug6 -TargetDir=\temp\stepmania +TargetDir=\stepmania\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 @@ -652,10 +652,6 @@ SOURCE=.\BitmapText.h # End Source File # Begin Source File -SOURCE=.\Quad.cpp -# End Source File -# Begin Source File - SOURCE=.\Quad.h # End Source File # Begin Source File diff --git a/stepmania/src/TransitionFade.cpp b/stepmania/src/TransitionFade.cpp index c72cae1f4a..2b3c7d5ba1 100644 --- a/stepmania/src/TransitionFade.cpp +++ b/stepmania/src/TransitionFade.cpp @@ -39,14 +39,6 @@ void TransitionFade::DrawPrimitives() colorTemp.a = fPercentageOpaque; m_rect.SetDiffuse( colorTemp ); m_rect.Draw(); - -// SUPER HACK! For some reason, this does not draw in release mode. I've looked for -// hours and can't figure out why. It appears though if you draw it twice, so that's -// what we'll do for now. Aye... -//#ifndef _DEBUG -// m_rect.SetDiffuse( colorTemp ); -// m_rect.Draw(); -//#endif }