This commit is contained in:
Glenn Maynard
2006-02-14 11:10:03 +00:00
parent 1662ac4637
commit 958299c734
7 changed files with 31 additions and 32 deletions
+1 -1
View File
@@ -396,7 +396,7 @@ void BannerCache::CacheBannerInternal( RString BannerPath )
RageSurfaceUtils::ConvertSurface(img, img->w, img->h, 32, 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000);
RageSurface *dst = CreateSurface(
256, 64, img->format->BitsPerPixel,
256, 64, img->format->BitsPerPixel,
img->format->Rmask, img->format->Gmask, img->format->Bmask, img->format->Amask );
if( img->format->BitsPerPixel == 8 )
+6 -6
View File
@@ -32,12 +32,12 @@ tm GetDayInYearAndYear( int iDayInYearIndex, int iYear );
struct DateTime
{
int tm_sec; /* seconds after the minute - [0,59] */
int tm_min; /* minutes after the hour - [0,59] */
int tm_hour; /* hours since midnight - [0,23] */
int tm_mday; /* day of the month - [1,31] */
int tm_mon; /* months since January - [0,11] */
int tm_year; /* years since 1900 */
int tm_sec; /* seconds after the minute - [0,59] */
int tm_min; /* minutes after the hour - [0,59] */
int tm_hour; /* hours since midnight - [0,23] */
int tm_mday; /* day of the month - [1,31] */
int tm_mon; /* months since January - [0,11] */
int tm_year; /* years since 1900 */
DateTime();
void Init();
+5 -6
View File
@@ -40,12 +40,11 @@ static inline RString GradeToString( Grade g )
ASSERT_M( (g >= 0 && g<NUM_Grade) || g == Grade_NoData, ssprintf("grade = %d",g) );
switch( g )
{
case Grade_NoData: return "NoData";
case Grade_Failed: return "Failed";
default:
return ssprintf("Tier%02d",g+1);
}
{
case Grade_NoData: return "NoData";
case Grade_Failed: return "Failed";
default: return ssprintf("Tier%02d",g+1);
}
}
RString GradeToOldString( Grade g ); // "AAA", "B", etc for backward compatibility. Used in announcer
+2 -2
View File
@@ -30,8 +30,8 @@ struct RadarValues
float f[NUM_RadarCategory];
} m_Values;
operator const float* () const { return m_Values.f; };
operator float* () { return m_Values.f; };
operator const float* () const { return m_Values.f; };
operator float* () { return m_Values.f; };
RadarValues();
void MakeUnknown();
+5 -5
View File
@@ -406,9 +406,9 @@ void ScoreKeeperNormal::HandleTapRowScore( TapNoteScore scoreOfLastTap, int iNum
// TODO: Remove indexing with PlayerNumber
PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
NSMAN->ReportScore(pn, scoreOfLastTap,
m_pPlayerStageStats->iScore,
m_pPlayerStageStats->iCurCombo);
NSMAN->ReportScore( pn, scoreOfLastTap,
m_pPlayerStageStats->iScore,
m_pPlayerStageStats->iCurCombo );
}
@@ -434,8 +434,8 @@ void ScoreKeeperNormal::HandleHoldScore( HoldNoteScore holdScore, TapNoteScore t
NSMAN->ReportScore(
pn,
holdScore+TNS_W1,
m_pPlayerStageStats->iScore,
m_pPlayerStageStats->iCurCombo );
m_pPlayerStageStats->iScore,
m_pPlayerStageStats->iCurCombo );
}
+11 -11
View File
@@ -73,9 +73,9 @@ protected:
void CheckBackgroundRequests();
vector<Steps*> m_vpSteps;
vector<Trail*> m_vpTrails;
int m_iSelection[NUM_PLAYERS];
vector<Steps*> m_vpSteps;
vector<Trail*> m_vpTrails;
int m_iSelection[NUM_PLAYERS];
ThemeMetric<float> BANNER_WIDTH;
ThemeMetric<float> BANNER_HEIGHT;
@@ -100,14 +100,14 @@ protected:
RString m_sFallbackCDTitlePath;
Sprite m_sprBannerMask;
FadingBanner m_Banner;
FadingBanner m_Banner;
AutoActor m_sprBannerFrame;
BPMDisplay m_BPMDisplay;
Sprite m_sprCDTitleFront, m_sprCDTitleBack;
Sprite m_sprDifficultyFrame[NUM_PLAYERS];
DifficultyIcon m_DifficultyIcon[NUM_PLAYERS];
DifficultyIcon m_DifficultyIcon[NUM_PLAYERS];
Sprite m_AutoGenIcon[NUM_PLAYERS];
GrooveRadar m_GrooveRadar;
GrooveRadar m_GrooveRadar;
BitmapText m_textSongOptions;
BitmapText m_textNumSongs;
BitmapText m_textTotalTime;
@@ -120,9 +120,9 @@ protected:
AutoActor m_sprLongBalloon;
AutoActor m_sprMarathonBalloon;
AutoActor m_sprCourseHasMods;
DifficultyDisplay m_DifficultyDisplay;
DifficultyList m_DifficultyList;
CourseContentsList m_CourseContents;
DifficultyDisplay m_DifficultyDisplay;
DifficultyList m_DifficultyList;
CourseContentsList m_CourseContents;
HelpDisplay m_Artist;
BitmapText m_MachineRank;
PaneDisplay m_PaneDisplay[NUM_PLAYERS];
@@ -141,8 +141,8 @@ protected:
RageSound m_soundLocked;
RageSound m_soundSelectPressed;
BackgroundLoader m_BackgroundLoader;
RageTexturePreloader m_TexturePreload;
BackgroundLoader m_BackgroundLoader;
RageTexturePreloader m_TexturePreload;
};
#endif
+1 -1
View File
@@ -42,7 +42,7 @@ void NORETURN sm_crash( const char *reason )
#if defined(_MSC_VER)
_asm nop;
#elif defined(__GNUC__) // MinGW or similar
asm("nop");
asm("nop");
#endif
#else
_exit( 1 );