From f5dc5d75f32c832297ff88d2cb504941b522fc0f Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 29 May 2005 02:21:24 +0000 Subject: [PATCH] simplify --- stepmania/src/Difficulty.cpp | 4 ++-- stepmania/src/GameConstantsAndTypes.cpp | 2 +- stepmania/src/Grade.cpp | 2 +- stepmania/src/LuaManager.cpp | 2 +- stepmania/src/NetworkSyncManager.cpp | 2 +- stepmania/src/PercentageDisplay.cpp | 2 +- stepmania/src/PlayerStageStats.cpp | 2 +- stepmania/src/RageUtil.cpp | 2 +- stepmania/src/StatsManager.cpp | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/stepmania/src/Difficulty.cpp b/stepmania/src/Difficulty.cpp index b6d4bc5883..471a75d1a0 100644 --- a/stepmania/src/Difficulty.cpp +++ b/stepmania/src/Difficulty.cpp @@ -17,7 +17,7 @@ static const CString DifficultyNames[] = { XToString( Difficulty, NUM_DIFFICULTIES ); XToThemedString( Difficulty, NUM_DIFFICULTIES ); -LuaFunction_Int( DifficultyToThemedString, DifficultyToThemedString((Difficulty)a1) ); +LuaFunction( DifficultyToThemedString, DifficultyToThemedString((Difficulty) IArg(1)) ); /* We prefer the above names; recognize a number of others, too. (They'l * get normalized when written to SMs, etc.) */ @@ -73,7 +73,7 @@ XToString( CourseDifficulty, NUM_DIFFICULTIES ); XToThemedString( CourseDifficulty, NUM_DIFFICULTIES ); StringToX( CourseDifficulty ); -LuaFunction_Int( CourseDifficultyToThemedString, CourseDifficultyToThemedString((CourseDifficulty)a1) ); +LuaFunction( CourseDifficultyToThemedString, CourseDifficultyToThemedString((CourseDifficulty)IArg(1)) ); CourseDifficulty GetNextShownCourseDifficulty( CourseDifficulty cd ) { diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp index 9d4d2459dc..798ac13b82 100644 --- a/stepmania/src/GameConstantsAndTypes.cpp +++ b/stepmania/src/GameConstantsAndTypes.cpp @@ -253,7 +253,7 @@ StringToX( PeakComboAward ); #define LuaXToString(X) \ CString Lua##X##ToString( int n ) \ { return X##ToString( (X) n ); } \ -LuaFunction_Int( X##ToString, Lua##X##ToString(a1) ); /* register it */ +LuaFunction( X##ToString, Lua##X##ToString( IArg(1) ) ); #define LuaStringToX(X) \ X LuaStringTo##X( CString s ) \ diff --git a/stepmania/src/Grade.cpp b/stepmania/src/Grade.cpp index 5a1dcf5493..77cfd38af6 100644 --- a/stepmania/src/Grade.cpp +++ b/stepmania/src/Grade.cpp @@ -7,7 +7,7 @@ #include "LuaManager.h" #include "LuaFunctions.h" -LuaFunction_Int( GradeToString, GradeToString((Grade)a1) ) +LuaFunction( GradeToString, GradeToString((Grade)IArg(1)) ) CString GradeToThemedString( Grade g ) { diff --git a/stepmania/src/LuaManager.cpp b/stepmania/src/LuaManager.cpp index 98e9ff5b3c..82ce6707ee 100644 --- a/stepmania/src/LuaManager.cpp +++ b/stepmania/src/LuaManager.cpp @@ -415,7 +415,7 @@ static bool Trace( const CString &sString ) return true; } -LuaFunction_Str( Trace, Trace(str) ); +LuaFunction( Trace, Trace(SArg(1)) ); /* * (c) 2004 Glenn Maynard diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index 86f338096f..5e82424aec 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -872,7 +872,7 @@ LuaFunction_NoArgs( IsNetConnected, NSMAN->useSMserver ) LuaFunction_NoArgs( IsNetSMOnline, NSMAN->isSMOnline ) static bool ReportStyle() { NSMAN->ReportStyle(); return true; } LuaFunction_NoArgs( ReportStyle, ReportStyle() ) -LuaFunction_Int( IsSMOnlineLoggedIn, NSMAN->isSMOLoggedIn[a1] ) +LuaFunction( IsSMOnlineLoggedIn, NSMAN->isSMOLoggedIn[IArg(1)] ) /* * (c) 2003-2004 Charles Lohr, Joshua Allen diff --git a/stepmania/src/PercentageDisplay.cpp b/stepmania/src/PercentageDisplay.cpp index ec657fdd6a..7870c51521 100644 --- a/stepmania/src/PercentageDisplay.cpp +++ b/stepmania/src/PercentageDisplay.cpp @@ -148,7 +148,7 @@ CString PercentageDisplay::FormatPercentScore( float fPercentDancePoints ) return s; } -LuaFunction_Float( FormatPercentScore, PercentageDisplay::FormatPercentScore(a1) ) +LuaFunction( FormatPercentScore, PercentageDisplay::FormatPercentScore( FArg(1) ) ) /* diff --git a/stepmania/src/PlayerStageStats.cpp b/stepmania/src/PlayerStageStats.cpp index cce575003c..32b2938aaf 100644 --- a/stepmania/src/PlayerStageStats.cpp +++ b/stepmania/src/PlayerStageStats.cpp @@ -438,7 +438,7 @@ float PlayerStageStats::GetPercentageOfTaps( TapNoteScore tns ) const } -LuaFunction_Float( GetGradeFromPercent, PlayerStageStats::GetGradeFromPercent(a1) ) +LuaFunction( GetGradeFromPercent, PlayerStageStats::GetGradeFromPercent( FArg(1) ) ) // lua start diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index c423671227..728e9b8806 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -149,7 +149,7 @@ CString SecondsToMSSMsMs( float fSecs ) #include "LuaFunctions.h" #include "LuaManager.h" -LuaFunction_Float( SecondsToMSSMsMs, SecondsToMSSMsMs(a1) ) +LuaFunction( SecondsToMSSMsMs, SecondsToMSSMsMs( FArg(1) ) ) CString SecondsToMMSSMsMsMs( float fSecs ) { diff --git a/stepmania/src/StatsManager.cpp b/stepmania/src/StatsManager.cpp index 5eab342d72..e71c7ba299 100644 --- a/stepmania/src/StatsManager.cpp +++ b/stepmania/src/StatsManager.cpp @@ -271,7 +271,7 @@ LuaFunction_NoArgs( GetBestGrade, GetBestGrade() ); LuaFunction_NoArgs( GetWorstGrade, GetWorstGrade() ); LuaFunction_NoArgs( OnePassed, STATSMAN->m_CurStageStats.OnePassed() ); LuaFunction_NoArgs( AllFailed, STATSMAN->m_CurStageStats.AllFailed() ); -LuaFunction_Str( Grade, StringToGrade(str) ); +LuaFunction( Grade, StringToGrade( SArg(1) ) ); const StageStats *GetStageStatsN( int n ) {