moved PlayerNumber into a separate header to reduce dependences on GameConstantsAndTypes.h
default mappings for menu buttons items in battle now have a duration fix VC6 compile errors
This commit is contained in:
@@ -11,10 +11,7 @@
|
||||
*/
|
||||
|
||||
#include "GameConstantsAndTypes.h"
|
||||
#include "ThemeManager.h"
|
||||
|
||||
#define COLOR_P1 THEME->GetMetricC("Common","ColorP1")
|
||||
#define COLOR_P2 THEME->GetMetricC("Common","ColorP2")
|
||||
|
||||
|
||||
CString DifficultyToString( Difficulty dc )
|
||||
@@ -75,21 +72,6 @@ PlayMode StringToPlayMode( CString s )
|
||||
}
|
||||
|
||||
|
||||
RageColor PlayerToColor( PlayerNumber pn )
|
||||
{
|
||||
switch( pn )
|
||||
{
|
||||
case PLAYER_1: return COLOR_P1;
|
||||
case PLAYER_2: return COLOR_P2;
|
||||
default: ASSERT(0); return RageColor(0.5f,0.5f,0.5f,1);
|
||||
}
|
||||
};
|
||||
|
||||
RageColor PlayerToColor( int p )
|
||||
{
|
||||
return PlayerToColor( (PlayerNumber)p );
|
||||
}
|
||||
|
||||
|
||||
RankingCategory AverageMeterToRankingCategory( float fAverageMeter )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user