From e91a806b37e48b92ec6296347d59b34f0e782cb0 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 29 Sep 2006 09:54:50 +0000 Subject: [PATCH] remove LuaFunctions.h --- stepmania/src/CommonMetrics.cpp | 2 +- stepmania/src/Course.cpp | 2 +- stepmania/src/DateTime.cpp | 2 +- stepmania/src/Difficulty.cpp | 1 - stepmania/src/GameConstantsAndTypes.cpp | 3 +- stepmania/src/Grade.cpp | 1 - stepmania/src/LuaFunctions.h | 31 --------------------- stepmania/src/LuaManager.cpp | 1 - stepmania/src/Makefile.am | 1 - stepmania/src/NetworkSyncManager.cpp | 1 - stepmania/src/NoteTypes.cpp | 1 - stepmania/src/PercentageDisplay.cpp | 2 +- stepmania/src/PlayerNumber.cpp | 1 - stepmania/src/PlayerStageStats.cpp | 1 - stepmania/src/Preference.cpp | 1 - stepmania/src/RageUtil.cpp | 2 +- stepmania/src/ScreenDimensions.cpp | 1 - stepmania/src/ScreenOptionsEditPlaylist.cpp | 2 +- stepmania/src/ScreenOptionsMasterPrefs.cpp | 2 +- stepmania/src/ScreenUnlockCelebrate.cpp | 2 +- stepmania/src/StepMania-net2003.vcproj | 3 -- stepmania/src/UnlockManager.cpp | 1 - stepmania/src/Workout.cpp | 1 - 23 files changed, 9 insertions(+), 56 deletions(-) delete mode 100644 stepmania/src/LuaFunctions.h diff --git a/stepmania/src/CommonMetrics.cpp b/stepmania/src/CommonMetrics.cpp index c970ee222b..c723a22692 100644 --- a/stepmania/src/CommonMetrics.cpp +++ b/stepmania/src/CommonMetrics.cpp @@ -6,7 +6,7 @@ #include "RageLog.h" #include "GameState.h" #include "ProductInfo.h" -#include "LuaFunctions.h" +#include "LuaManager.h" static RString PLAYER_COLOR_NAME( size_t p ) { return ssprintf("ColorP%dCommand",int(p+1)); } diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index cae3a04d1e..2749000fef 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -12,7 +12,7 @@ #include "Foreach.h" #include "UnlockManager.h" #include "CourseLoaderCRS.h" -#include "LuaFunctions.h" +#include "LuaManager.h" #include "LocalizedString.h" #include "Preference.h" #include diff --git a/stepmania/src/DateTime.cpp b/stepmania/src/DateTime.cpp index 3f52e90e7b..98ad96bf85 100644 --- a/stepmania/src/DateTime.cpp +++ b/stepmania/src/DateTime.cpp @@ -2,7 +2,7 @@ #include "DateTime.h" #include "RageUtil.h" #include "EnumHelper.h" -#include "LuaFunctions.h" +#include "LuaManager.h" #include "LocalizedString.h" DateTime::DateTime() diff --git a/stepmania/src/Difficulty.cpp b/stepmania/src/Difficulty.cpp index 3a1c212b04..7b0d4818d8 100644 --- a/stepmania/src/Difficulty.cpp +++ b/stepmania/src/Difficulty.cpp @@ -3,7 +3,6 @@ #include "GameState.h" #include "ThemeMetric.h" #include "LuaManager.h" -#include "LuaFunctions.h" #include "LocalizedString.h" diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp index 08cebb6ccd..28cd5ec721 100644 --- a/stepmania/src/GameConstantsAndTypes.cpp +++ b/stepmania/src/GameConstantsAndTypes.cpp @@ -7,10 +7,9 @@ #include "Foreach.h" #include "LuaManager.h" #include "GameManager.h" +#include "LocalizedString.h" #include -#include "LuaFunctions.h" -#include "LocalizedString.h" const RString RANKING_TO_FILL_IN_MARKER[NUM_PLAYERS] = {"#P1#","#P2#"}; diff --git a/stepmania/src/Grade.cpp b/stepmania/src/Grade.cpp index c756834364..70f1d428b1 100644 --- a/stepmania/src/Grade.cpp +++ b/stepmania/src/Grade.cpp @@ -5,7 +5,6 @@ #include "RageLog.h" #include "EnumHelper.h" #include "LuaManager.h" -#include "LuaFunctions.h" LuaXType( Grade ); diff --git a/stepmania/src/LuaFunctions.h b/stepmania/src/LuaFunctions.h deleted file mode 100644 index 2936c04260..0000000000 --- a/stepmania/src/LuaFunctions.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef LUA_FUNCTIONS_H -#define LUA_FUNCTIONS_H - -#include "LuaManager.h" - -#endif - -/* - * (c) 2004 Glenn Maynard - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons to - * whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT - * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/stepmania/src/LuaManager.cpp b/stepmania/src/LuaManager.cpp index 1a1220165e..5165b0ebc0 100644 --- a/stepmania/src/LuaManager.cpp +++ b/stepmania/src/LuaManager.cpp @@ -1,6 +1,5 @@ #include "global.h" #include "LuaManager.h" -#include "LuaFunctions.h" #include "LuaReference.h" #include "RageUtil.h" #include "RageLog.h" diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index d4d10856f4..60c7680969 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -105,7 +105,6 @@ HighScore.cpp HighScore.h \ InputEventPlus.h \ Inventory.cpp Inventory.h \ LocalizedString.cpp LocalizedString.h \ -LuaFunctions.h \ LuaReference.cpp LuaReference.h \ LuaExpressionTransform.cpp LuaExpressionTransform.h \ LyricsLoader.cpp LyricsLoader.h \ diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index 968b5410a9..8e6ba67d1b 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -2,7 +2,6 @@ #include "NetworkSyncManager.h" #include "NetworkSyncServer.h" #include "LuaManager.h" -#include "LuaFunctions.h" #include "crypto/CryptMD5.h" #include "LocalizedString.h" diff --git a/stepmania/src/NoteTypes.cpp b/stepmania/src/NoteTypes.cpp index 175957e240..3cb10e2dcb 100644 --- a/stepmania/src/NoteTypes.cpp +++ b/stepmania/src/NoteTypes.cpp @@ -2,7 +2,6 @@ #include "NoteTypes.h" #include "RageUtil.h" #include "LuaManager.h" -#include "LuaFunctions.h" #include "XmlFile.h" #include "LocalizedString.h" diff --git a/stepmania/src/PercentageDisplay.cpp b/stepmania/src/PercentageDisplay.cpp index c075545a9f..ac0568404c 100644 --- a/stepmania/src/PercentageDisplay.cpp +++ b/stepmania/src/PercentageDisplay.cpp @@ -197,7 +197,7 @@ RString PercentageDisplay::FormatPercentScore( float fPercentDancePoints ) } // lua start -#include "LuaFunctions.h" +#include "LuaManager.h" LuaFunction( FormatPercentScore, PercentageDisplay::FormatPercentScore( FArg(1) ) ) diff --git a/stepmania/src/PlayerNumber.cpp b/stepmania/src/PlayerNumber.cpp index 4b94bf3f85..8533e00955 100644 --- a/stepmania/src/PlayerNumber.cpp +++ b/stepmania/src/PlayerNumber.cpp @@ -3,7 +3,6 @@ #include "GameState.h" #include "LuaManager.h" #include "LocalizedString.h" -#include "LuaFunctions.h" static const char *PlayerNumberNames[] = { "P1", diff --git a/stepmania/src/PlayerStageStats.cpp b/stepmania/src/PlayerStageStats.cpp index 2e20a61a4f..fffcd8ab37 100644 --- a/stepmania/src/PlayerStageStats.cpp +++ b/stepmania/src/PlayerStageStats.cpp @@ -3,7 +3,6 @@ #include "RageLog.h" #include "ThemeManager.h" #include "Foreach.h" -#include "LuaFunctions.h" #include "LuaManager.h" #include #include "GameState.h" diff --git a/stepmania/src/Preference.cpp b/stepmania/src/Preference.cpp index 088156498b..989dd7a19a 100644 --- a/stepmania/src/Preference.cpp +++ b/stepmania/src/Preference.cpp @@ -2,7 +2,6 @@ #include "Preference.h" #include "XmlFile.h" #include "RageLog.h" -#include "LuaFunctions.h" #include "LuaManager.h" #include "MessageManager.h" #include "SubscriptionManager.h" diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index e234f49bfd..28de52e2dd 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -5,7 +5,7 @@ #include "RageFile.h" #include "Foreach.h" #include "LocalizedString.h" -#include "LuaFunctions.h" +#include "LuaManager.h" #include #include diff --git a/stepmania/src/ScreenDimensions.cpp b/stepmania/src/ScreenDimensions.cpp index feebdcc035..5d6297aae1 100644 --- a/stepmania/src/ScreenDimensions.cpp +++ b/stepmania/src/ScreenDimensions.cpp @@ -3,7 +3,6 @@ #include "PrefsManager.h" #include "Preference.h" #include "LuaManager.h" -#include "LuaFunctions.h" #include "ThemeMetric.h" static ThemeMetric THEME_SCREEN_WIDTH("Common","ScreenWidth"); diff --git a/stepmania/src/ScreenOptionsEditPlaylist.cpp b/stepmania/src/ScreenOptionsEditPlaylist.cpp index ca9c8df0fc..8286e2cad9 100644 --- a/stepmania/src/ScreenOptionsEditPlaylist.cpp +++ b/stepmania/src/ScreenOptionsEditPlaylist.cpp @@ -177,7 +177,7 @@ RString GetEditPlaylistSelectedSongGenreText( int iColumnIndex ) return join("\n", vs); } -#include "LuaFunctions.h" +#include "LuaManager.h" LuaFunction( GetEditPlaylistSelectedSongGenre, g_sSongGenre ); LuaFunction( GetEditPlaylistSelectedSongGenreText, GetEditPlaylistSelectedSongGenreText(IArg(1)) ); diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index dec9e23b5e..f046ca2f01 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -419,7 +419,7 @@ static int GetLifeDifficulty() iLifeDifficulty++; // LifeDifficulty returns an index return iLifeDifficulty; } -#include "LuaFunctions.h" +#include "LuaManager.h" LuaFunction( GetLifeDifficulty, GetLifeDifficulty() ); static void ShowSongOptions( int &sel, bool ToSel, const ConfOption *pConfOption ) diff --git a/stepmania/src/ScreenUnlockCelebrate.cpp b/stepmania/src/ScreenUnlockCelebrate.cpp index 3c36db0467..6598299ee7 100644 --- a/stepmania/src/ScreenUnlockCelebrate.cpp +++ b/stepmania/src/ScreenUnlockCelebrate.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "ScreenUnlockCelebrate.h" #include "UnlockManager.h" -#include "LuaFunctions.h" +#include "LuaManager.h" #include "GameState.h" diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj index 2b28751823..0cb3087f9a 100644 --- a/stepmania/src/StepMania-net2003.vcproj +++ b/stepmania/src/StepMania-net2003.vcproj @@ -934,9 +934,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - - diff --git a/stepmania/src/UnlockManager.cpp b/stepmania/src/UnlockManager.cpp index 84efecdcd2..0b39534040 100644 --- a/stepmania/src/UnlockManager.cpp +++ b/stepmania/src/UnlockManager.cpp @@ -14,7 +14,6 @@ #include "Steps.h" #include #include "CommonMetrics.h" -#include "LuaFunctions.h" #include "LuaManager.h" UnlockManager* UNLOCKMAN = NULL; // global and accessable from anywhere in our program diff --git a/stepmania/src/Workout.cpp b/stepmania/src/Workout.cpp index 856d440f26..d6a80ca8e0 100644 --- a/stepmania/src/Workout.cpp +++ b/stepmania/src/Workout.cpp @@ -4,7 +4,6 @@ #include "LocalizedString.h" #include "RageUtil.h" #include "LuaManager.h" -#include "LuaFunctions.h" #include "XmlFile.h" #include "XmlFileUtil.h" #include "Course.h"