From 958299c734c3b98e5baf6d585aeb1af0b94bccc6 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 14 Feb 2006 11:10:03 +0000 Subject: [PATCH] spacing --- stepmania/src/BannerCache.cpp | 2 +- stepmania/src/DateTime.h | 12 ++++++------ stepmania/src/Grade.h | 11 +++++------ stepmania/src/RadarValues.h | 4 ++-- stepmania/src/ScoreKeeperNormal.cpp | 10 +++++----- stepmania/src/ScreenSelectMusic.h | 22 +++++++++++----------- stepmania/src/global.cpp | 2 +- 7 files changed, 31 insertions(+), 32 deletions(-) diff --git a/stepmania/src/BannerCache.cpp b/stepmania/src/BannerCache.cpp index 39a2e03053..3b27ab8cf9 100644 --- a/stepmania/src/BannerCache.cpp +++ b/stepmania/src/BannerCache.cpp @@ -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 ) diff --git a/stepmania/src/DateTime.h b/stepmania/src/DateTime.h index 9c97e22fad..73bbb13532 100644 --- a/stepmania/src/DateTime.h +++ b/stepmania/src/DateTime.h @@ -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(); diff --git a/stepmania/src/Grade.h b/stepmania/src/Grade.h index 7d4919b010..66effb59ba 100644 --- a/stepmania/src/Grade.h +++ b/stepmania/src/Grade.h @@ -40,12 +40,11 @@ static inline RString GradeToString( Grade g ) ASSERT_M( (g >= 0 && gm_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 ); } diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index ece352cb8b..dc2cdc7c4d 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -73,9 +73,9 @@ protected: void CheckBackgroundRequests(); - vector m_vpSteps; - vector m_vpTrails; - int m_iSelection[NUM_PLAYERS]; + vector m_vpSteps; + vector m_vpTrails; + int m_iSelection[NUM_PLAYERS]; ThemeMetric BANNER_WIDTH; ThemeMetric 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 diff --git a/stepmania/src/global.cpp b/stepmania/src/global.cpp index 0981c3327f..be44bc4ce7 100644 --- a/stepmania/src/global.cpp +++ b/stepmania/src/global.cpp @@ -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 );