actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Character Icons for pop'n music support on music select screen (metric-command-hidden by default)

Browse Source
This commit is contained in:
Andrew Livy
2003-11-21 04:35:06 +00:00
parent 6f2705184f
commit 59cbb8a170
8 changed files with 113 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/TODO.andy
+5
View File
@@ -4,6 +4,11 @@ X denotes task complete or no longer required to do.
H denotes task on hold. 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 TODO As of: 13:41 03/06/02
* Finish Pump Theme * Finish Pump Theme
stepmania/Themes/default/metrics.ini
+9 -1
View File
@@ -1,4 +1,4 @@
// Possible NextScreen names: // Possible NextScreen names:
// - ScreenCaution // - ScreenCaution
// - ScreenEz2SelectPlayer // - ScreenEz2SelectPlayer
// - ScreenSelectMode // - ScreenSelectMode
@@ -579,6 +579,14 @@ CDTitleY=148
CDTitleOnCommand=addx,-400;bounceend,0.5;addx,400 CDTitleOnCommand=addx,-400;bounceend,0.5;addx,400
CDTitleOffCommand=bouncebegin,0.5;addx,-400 CDTitleOffCommand=bouncebegin,0.5;addx,-400
CDTitleSpinSeconds=4 CDTitleSpinSeconds=4
CharacterIconP1Y=999
CharacterIconP1X=999
CharacterIconP2Y=999
CharacterIconP2X=999
CharacterIconP1OnCommand=
CharacterIconP2OnCommand=
CharacterIconP1OffCommand=
CharacterIconP2OffCommand=
DifficultyFrameP1X=60 DifficultyFrameP1X=60
DifficultyFrameP1Y=248 DifficultyFrameP1Y=248
DifficultyFrameP1OnCommand=diffusealpha,0;linear,0.5;diffusealpha,1 DifficultyFrameP1OnCommand=diffusealpha,0;linear,0.5;diffusealpha,1
stepmania/src/Character.cpp
+26
View File
@@ -77,6 +77,32 @@ CString Character::GetTakingABreakPath() const
return as[0]; 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 CString Character::GetCardPath() const
{ {
CStringArray as; CStringArray as;
stepmania/src/Character.h
+1
View File
@@ -29,6 +29,7 @@ public:
CString GetRestAnimationPath() const; CString GetRestAnimationPath() const;
CString GetWarmUpAnimationPath() const; CString GetWarmUpAnimationPath() const;
CString GetDanceAnimationPath() const; CString GetDanceAnimationPath() const;
CString GetSongSelectIconPath() const;
CString m_sCharDir; CString m_sCharDir;
CString m_sName; CString m_sName;
stepmania/src/ScreenCredits.cpp
+3
View File
@@ -137,6 +137,9 @@ const CreditLine CREDIT_LINES[] =
{0,"DDRLlama"}, {0,"DDRLlama"},
{0,"DDRManiaX"}, // boards and all round support {0,"DDRManiaX"}, // boards and all round support
{0,"NMR"}, {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,"Random Hajile"}, // sent me 3DDX stuff - friez
{0,"Chocobo Ghost"}, // sent me ez2 stuff - friez {0,"Chocobo Ghost"}, // sent me ez2 stuff - friez
{0,"Tyma"}, // sent me popnmusic stuff - friez {0,"Tyma"}, // sent me popnmusic stuff - friez
stepmania/src/ScreenSelectMusic.cpp
+14
View File
@@ -101,6 +101,15 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName
m_Menu.Load( "ScreenSelectMusic" ); m_Menu.Load( "ScreenSelectMusic" );
this->AddChild( &m_Menu ); this->AddChild( &m_Menu );
for( p=0; p<NUM_PLAYERS; p++ )
{
Character* pChar = GAMESTATE->m_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.Load( THEME->GetPathToG("ScreenSelectMusic wheel under") );
m_MusicWheelUnder->SetName( "WheelUnder" ); m_MusicWheelUnder->SetName( "WheelUnder" );
SET_XY( m_MusicWheelUnder ); SET_XY( m_MusicWheelUnder );
@@ -253,6 +262,9 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName
SET_XY_AND_ON_COMMAND( m_DifficultyMeter[p] ); SET_XY_AND_ON_COMMAND( m_DifficultyMeter[p] );
this->AddChild( &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].SetName( ssprintf("ScoreFrameP%d",p+1) );
m_sprHighScoreFrame[p].Load( THEME->GetPathToG(ssprintf("ScreenSelectMusic score frame p%d",p+1)) ); m_sprHighScoreFrame[p].Load( THEME->GetPathToG(ssprintf("ScreenSelectMusic score frame p%d",p+1)) );
SET_XY( m_sprHighScoreFrame[p] ); SET_XY( m_sprHighScoreFrame[p] );
@@ -474,6 +486,7 @@ void ScreenSelectMusic::TweenOnScreen()
if( !GAMESTATE->IsHumanPlayer(p) ) if( !GAMESTATE->IsHumanPlayer(p) )
continue; // skip continue; // skip
ON_COMMAND( m_sprCharacterIcon[p] );
ON_COMMAND( m_OptionIconRow[p] ); ON_COMMAND( m_OptionIconRow[p] );
ON_COMMAND( m_sprHighScoreFrame[p] ); ON_COMMAND( m_sprHighScoreFrame[p] );
ON_COMMAND( m_textHighScore[p] ); ON_COMMAND( m_textHighScore[p] );
@@ -525,6 +538,7 @@ void ScreenSelectMusic::TweenOffScreen()
if( !GAMESTATE->IsHumanPlayer(p) ) if( !GAMESTATE->IsHumanPlayer(p) )
continue; // skip continue; // skip
OFF_COMMAND(m_sprCharacterIcon[p]);
OFF_COMMAND( m_OptionIconRow[p] ); OFF_COMMAND( m_OptionIconRow[p] );
OFF_COMMAND( m_sprHighScoreFrame[p] ); OFF_COMMAND( m_sprHighScoreFrame[p] );
OFF_COMMAND( m_textHighScore[p] ); OFF_COMMAND( m_textHighScore[p] );
stepmania/src/ScreenSelectMusic.h
+2 -1
View File
@@ -28,7 +28,7 @@
#include "CourseContentsList.h" #include "CourseContentsList.h"
#include "HelpDisplay.h" #include "HelpDisplay.h"
#include "PaneDisplay.h" #include "PaneDisplay.h"
#include "Character.h"
class ScreenSelectMusic : public Screen class ScreenSelectMusic : public Screen
{ {
@@ -74,6 +74,7 @@ protected:
MenuElements m_Menu; MenuElements m_Menu;
Sprite m_sprCharacterIcon[NUM_PLAYERS];
Sprite m_sprBannerMask; Sprite m_sprBannerMask;
FadingBanner m_Banner; FadingBanner m_Banner;
AutoActor m_sprBannerFrame; AutoActor m_sprBannerFrame;
stepmania/src/StepMania.dsp
+47 -36
View File
@@ -1,5 +1,5 @@
# Microsoft Developer Studio Project File - Name="StepMania" - Package Owner=<4> # 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 ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101 # TARGTYPE "Win32 (x86) Application" 0x0101
@@ -62,7 +62,7 @@ LINK32=link.exe
# SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
# Begin Special Build Tool # Begin Special Build Tool
IntDir=.\../Debug6 IntDir=.\../Debug6
TargetDir=\stepmania\itg TargetDir=\Stepmania\itg
TargetName=StepMania-debug TargetName=StepMania-debug
SOURCE="$(InputPath)" 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)\
@@ -82,26 +82,22 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania
# PROP Intermediate_Dir "Debug" # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # 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 XBCP=xbecopy.exe
# ADD BASE XBCP /NOLOGO # ADD BASE XBCP /NOLOGO
# ADD 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 # Begin Special Build Tool
IntDir=.\Debug
TargetDir=\stepmania\stepmania
TargetName=default
SOURCE="$(InputPath)"
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \ PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \
/Fo$(IntDir)\ /Fo$(IntDir)\
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
@@ -140,7 +136,7 @@ LINK32=link.exe
# SUBTRACT LINK32 /verbose /pdb:none # SUBTRACT LINK32 /verbose /pdb:none
# Begin Special Build Tool # Begin Special Build Tool
IntDir=.\../Release6 IntDir=.\../Release6
TargetDir=\stepmania\itg TargetDir=\Stepmania\itg
TargetName=StepMania TargetName=StepMania
SOURCE="$(InputPath)" 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)\
@@ -161,29 +157,25 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania
# PROP Intermediate_Dir "StepMania___Xbox_Release" # PROP Intermediate_Dir "StepMania___Xbox_Release"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
CPP=cl.exe XBCP=xbecopy.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 BASE XBCP /NOLOGO
# 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 # ADD XBCP /NOLOGO
# SUBTRACT CPP /Fr XBE=imagebld.exe
BSC32=bscmake.exe # ADD BASE XBE /nologo /stack:0x10000 /debug
# ADD BASE BSC32 /nologo # ADD XBE /nologo /testid:"123456" /stack:0x10000 /debug /out:"../default.xbe"
# ADD BSC32 /nologo
LINK32=link.exe 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" # 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 # 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 # 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 # SUBTRACT LINK32 /pdb:none /map /debug
XBE=imagebld.exe BSC32=bscmake.exe
# ADD BASE XBE /nologo /stack:0x10000 /debug # ADD BASE BSC32 /nologo
# ADD XBE /nologo /testid:"123456" /stack:0x10000 /debug /out:"../default.xbe" # ADD BSC32 /nologo
XBCP=xbecopy.exe CPP=cl.exe
# ADD BASE XBCP /NOLOGO # 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 XBCP /NOLOGO # 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 # 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 \ PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp \
/Fo$(IntDir)\ /Fo$(IntDir)\
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
@@ -5566,6 +5558,25 @@ SOURCE=.\error2.bmp
# End Source File # End Source File
# Begin 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 SOURCE=.\loading.bmp
# End Source File # End Source File
# Begin Source File # Begin Source File