From 59cbb8a170df91c94cd03ad571680fd5188a74cc Mon Sep 17 00:00:00 2001 From: Andrew Livy Date: Fri, 21 Nov 2003 04:35:06 +0000 Subject: [PATCH] Character Icons for pop'n music support on music select screen (metric-command-hidden by default) --- stepmania/TODO.andy | 5 ++ stepmania/Themes/default/metrics.ini | 10 ++- stepmania/src/Character.cpp | 26 ++++++++ stepmania/src/Character.h | 1 + stepmania/src/ScreenCredits.cpp | 3 + stepmania/src/ScreenSelectMusic.cpp | 14 ++++ stepmania/src/ScreenSelectMusic.h | 3 +- stepmania/src/StepMania.dsp | 95 ++++++++++++++++------------ 8 files changed, 113 insertions(+), 44 deletions(-) diff --git a/stepmania/TODO.andy b/stepmania/TODO.andy index 7213b7c88d..dbedb0a2d6 100644 --- a/stepmania/TODO.andy +++ b/stepmania/TODO.andy @@ -4,6 +4,11 @@ X denotes task complete or no longer required to do. H denotes task on hold. +TODO As of: 1:10 03/11/03 + +* Finish Ez2 Theme +* Finish PnM Theme + TODO As of: 13:41 03/06/02 * Finish Pump Theme diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 328fb9b061..d3b047445b 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1,4 +1,4 @@ -// Possible NextScreen names: +// Possible NextScreen names: // - ScreenCaution // - ScreenEz2SelectPlayer // - ScreenSelectMode @@ -579,6 +579,14 @@ CDTitleY=148 CDTitleOnCommand=addx,-400;bounceend,0.5;addx,400 CDTitleOffCommand=bouncebegin,0.5;addx,-400 CDTitleSpinSeconds=4 +CharacterIconP1Y=999 +CharacterIconP1X=999 +CharacterIconP2Y=999 +CharacterIconP2X=999 +CharacterIconP1OnCommand= +CharacterIconP2OnCommand= +CharacterIconP1OffCommand= +CharacterIconP2OffCommand= DifficultyFrameP1X=60 DifficultyFrameP1Y=248 DifficultyFrameP1OnCommand=diffusealpha,0;linear,0.5;diffusealpha,1 diff --git a/stepmania/src/Character.cpp b/stepmania/src/Character.cpp index 46771576a2..a6d1c9d368 100644 --- a/stepmania/src/Character.cpp +++ b/stepmania/src/Character.cpp @@ -77,6 +77,32 @@ CString Character::GetTakingABreakPath() const return as[0]; } +CString Character::GetSongSelectIconPath() const +{ + CStringArray as; + // first try and find an icon specific to the select music screen + // so you can have different icons for music select / char select + GetDirListing( m_sCharDir+"selectmusicicon.png", as, false, true ); + GetDirListing( m_sCharDir+"selectmusicicon.jpg", as, false, true ); + GetDirListing( m_sCharDir+"selectmusicicon.gif", as, false, true ); + GetDirListing( m_sCharDir+"selectmusicicon.bmp", as, false, true ); + + if( as.empty() ) + { + // if that failed, try using the regular icon + GetDirListing( m_sCharDir+"icon.png", as, false, true ); + GetDirListing( m_sCharDir+"icon.jpg", as, false, true ); + GetDirListing( m_sCharDir+"icon.gif", as, false, true ); + GetDirListing( m_sCharDir+"icon.bmp", as, false, true ); + if( as.empty() ) + return ""; + else + return as[0]; + } + else + return as[0]; +} + CString Character::GetCardPath() const { CStringArray as; diff --git a/stepmania/src/Character.h b/stepmania/src/Character.h index 956e6dfd4e..cb7de66da6 100644 --- a/stepmania/src/Character.h +++ b/stepmania/src/Character.h @@ -29,6 +29,7 @@ public: CString GetRestAnimationPath() const; CString GetWarmUpAnimationPath() const; CString GetDanceAnimationPath() const; + CString GetSongSelectIconPath() const; CString m_sCharDir; CString m_sName; diff --git a/stepmania/src/ScreenCredits.cpp b/stepmania/src/ScreenCredits.cpp index 262f2ebcec..dbb301f1b4 100644 --- a/stepmania/src/ScreenCredits.cpp +++ b/stepmania/src/ScreenCredits.cpp @@ -137,6 +137,9 @@ const CreditLine CREDIT_LINES[] = {0,"DDRLlama"}, {0,"DDRManiaX"}, // boards and all round support {0,"NMR"}, + {0,"DJ Paranoia"}, // pop'n stuff, general help - friez + {0,"DJ Yuz"}, // same as above + {0,"Reo"}, // pop'n stuff. {0,"Random Hajile"}, // sent me 3DDX stuff - friez {0,"Chocobo Ghost"}, // sent me ez2 stuff - friez {0,"Tyma"}, // sent me popnmusic stuff - friez diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 5bcd241d02..41be815757 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -101,6 +101,15 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName m_Menu.Load( "ScreenSelectMusic" ); this->AddChild( &m_Menu ); + for( p=0; pm_pCurCharacters[p]; + m_sprCharacterIcon[p].SetName( ssprintf("CharacterIconP%d",p+1) ); + m_sprCharacterIcon[p].Load( pChar->GetSongSelectIconPath() ); + SET_XY( m_sprCharacterIcon[p] ); + this->AddChild( &m_sprCharacterIcon[p] ); + } + m_MusicWheelUnder.Load( THEME->GetPathToG("ScreenSelectMusic wheel under") ); m_MusicWheelUnder->SetName( "WheelUnder" ); SET_XY( m_MusicWheelUnder ); @@ -253,6 +262,9 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName SET_XY_AND_ON_COMMAND( m_DifficultyMeter[p] ); this->AddChild( &m_DifficultyMeter[p] ); + // add an icon onto the song select to show what + // character they're using. + m_sprHighScoreFrame[p].SetName( ssprintf("ScoreFrameP%d",p+1) ); m_sprHighScoreFrame[p].Load( THEME->GetPathToG(ssprintf("ScreenSelectMusic score frame p%d",p+1)) ); SET_XY( m_sprHighScoreFrame[p] ); @@ -474,6 +486,7 @@ void ScreenSelectMusic::TweenOnScreen() if( !GAMESTATE->IsHumanPlayer(p) ) continue; // skip + ON_COMMAND( m_sprCharacterIcon[p] ); ON_COMMAND( m_OptionIconRow[p] ); ON_COMMAND( m_sprHighScoreFrame[p] ); ON_COMMAND( m_textHighScore[p] ); @@ -525,6 +538,7 @@ void ScreenSelectMusic::TweenOffScreen() if( !GAMESTATE->IsHumanPlayer(p) ) continue; // skip + OFF_COMMAND(m_sprCharacterIcon[p]); OFF_COMMAND( m_OptionIconRow[p] ); OFF_COMMAND( m_sprHighScoreFrame[p] ); OFF_COMMAND( m_textHighScore[p] ); diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index 87ae69c92c..18b76344ea 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -28,7 +28,7 @@ #include "CourseContentsList.h" #include "HelpDisplay.h" #include "PaneDisplay.h" - +#include "Character.h" class ScreenSelectMusic : public Screen { @@ -74,6 +74,7 @@ protected: MenuElements m_Menu; + Sprite m_sprCharacterIcon[NUM_PLAYERS]; Sprite m_sprBannerMask; FadingBanner m_Banner; AutoActor m_sprBannerFrame; diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index 57ca781960..e73631cf1f 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -1,5 +1,5 @@ # Microsoft Developer Studio Project File - Name="StepMania" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 60000 +# Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 @@ -62,10 +62,10 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib # Begin Special Build Tool IntDir=.\../Debug6 -TargetDir=\stepmania\itg +TargetDir=\Stepmania\itg 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 # End Special Build Tool @@ -82,28 +82,24 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -CPP=cl.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_XBOX" /D "_DEBUG" /YX /FD /G6 /Ztmp /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /D "OGG_ONLY" /YX /FD /G6 /Ztmp /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /subsystem:xbox /fixed:no /TMP -# ADD LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../StepManiaXbox-debug.exe" /subsystem:xbox /fixed:no /TMP -XBE=imagebld.exe -# ADD BASE XBE /nologo /stack:0x10000 /debug -# ADD XBE /nologo /stack:0x10000 /debug /out:"../default.xbe" XBCP=xbecopy.exe # ADD BASE XBCP /NOLOGO # ADD XBCP /NOLOGO +XBE=imagebld.exe +# ADD BASE XBE /nologo /stack:0x10000 /debug +# ADD XBE /nologo /stack:0x10000 /debug /out:"../default.xbe" +LINK32=link.exe +# ADD BASE LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /subsystem:xbox /fixed:no /TMP +# ADD LINK32 xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /incremental:no /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"../StepManiaXbox-debug.exe" /subsystem:xbox /fixed:no /TMP +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +CPP=cl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_XBOX" /D "_DEBUG" /YX /FD /G6 /Ztmp /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /D "OGG_ONLY" /YX /FD /G6 /Ztmp /c # Begin Special Build Tool -IntDir=.\Debug -TargetDir=\stepmania\stepmania -TargetName=default -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 @@ -140,10 +136,10 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /pdb:none # Begin Special Build Tool IntDir=.\../Release6 -TargetDir=\stepmania\itg +TargetDir=\Stepmania\itg 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 # End Special Build Tool @@ -161,31 +157,27 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania # PROP Intermediate_Dir "StepMania___Xbox_Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -CPP=cl.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fr /YX"global.h" /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "NDEBUG" /YX"global.h" /FD /c -# SUBTRACT CPP /Fr -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +XBCP=xbecopy.exe +# ADD BASE XBCP /NOLOGO +# ADD XBCP /NOLOGO +XBE=imagebld.exe +# ADD BASE XBE /nologo /stack:0x10000 /debug +# ADD XBE /nologo /testid:"123456" /stack:0x10000 /debug /out:"../default.xbe" LINK32=link.exe # ADD BASE LINK32 $(intdir)\verstub.obj xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /pdb:"../debug6/StepMania-debug.pdb" /map /debug /machine:IX86 /nodefaultlib:"libcmtd.lib" /out:"../StepMania-debug.exe" # SUBTRACT BASE LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib # ADD LINK32 $(intdir)\verstub.obj xapilib.lib d3d8.lib d3dx8.lib xgraphics.lib dsound.lib dmusic.lib xnet.lib xboxkrnl.lib libcmt.lib /nologo /incremental:no /pdb:"../release6xbox/StepMania.pdb" /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"../StepManiaXbox.exe" /subsystem:xbox /fixed:no /TMP /OPT:REF # SUBTRACT LINK32 /pdb:none /map /debug -XBE=imagebld.exe -# ADD BASE XBE /nologo /stack:0x10000 /debug -# ADD XBE /nologo /testid:"123456" /stack:0x10000 /debug /out:"../default.xbe" -XBCP=xbecopy.exe -# ADD BASE XBCP /NOLOGO -# ADD XBCP /NOLOGO +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +CPP=cl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fr /YX"global.h" /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /I "SDL_sound-1.0.0" /D "WIN32" /D "_XBOX" /D "NDEBUG" /YX"global.h" /FD /c +# SUBTRACT CPP /Fr # Begin Special Build Tool -IntDir=.\StepMania___Xbox_Release -TargetDir=\stepmania\stepmania -TargetName=default -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 @@ -5566,6 +5558,25 @@ SOURCE=.\error2.bmp # End Source File # Begin Source File +SOURCE=.\arch\Lights\LightsDriver_SystemMessage.cpp + +!IF "$(CFG)" == "StepMania - Win32 Debug" + +!ELSEIF "$(CFG)" == "StepMania - Xbox Debug" + +!ELSEIF "$(CFG)" == "StepMania - Win32 Release" + +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\arch\Lights\LightsDriver_SystemMessage.h +# End Source File +# Begin Source File + SOURCE=.\loading.bmp # End Source File # Begin Source File