remove LuaFunctions.h

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)); }

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 <limits.h>

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()

stepmania/src/Difficulty.cpp

@@ -3,7 +3,6 @@
 #include "GameState.h"
 #include "ThemeMetric.h"
 #include "LuaManager.h"
-#include "LuaFunctions.h"
 #include "LocalizedString.h"
 
 

stepmania/src/GameConstantsAndTypes.cpp

@@ -7,10 +7,9 @@
 #include "Foreach.h"
 #include "LuaManager.h"
 #include "GameManager.h"
+#include "LocalizedString.h"
 #include <float.h>
 
-#include "LuaFunctions.h"
-#include "LocalizedString.h"
 
 const RString RANKING_TO_FILL_IN_MARKER[NUM_PLAYERS] = {"#P1#","#P2#"};
 

stepmania/src/Grade.cpp

@@ -5,7 +5,6 @@
 #include "RageLog.h"
 #include "EnumHelper.h"
 #include "LuaManager.h"
-#include "LuaFunctions.h"
 
 LuaXType( Grade );
 

stepmania/src/LuaFunctions.h

@@ -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.
- */

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"

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 \

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"
 

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"
 

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) ) )
 

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",

stepmania/src/PlayerStageStats.cpp

@@ -3,7 +3,6 @@
 #include "RageLog.h"
 #include "ThemeManager.h"
 #include "Foreach.h"
-#include "LuaFunctions.h"
 #include "LuaManager.h"
 #include <float.h>
 #include "GameState.h"

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"

stepmania/src/RageUtil.cpp

@@ -5,7 +5,7 @@
 #include "RageFile.h"
 #include "Foreach.h"
 #include "LocalizedString.h"
-#include "LuaFunctions.h"
+#include "LuaManager.h"
 #include <float.h>
 
 #include <numeric>

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<float> THEME_SCREEN_WIDTH("Common","ScreenWidth");

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)) );
 

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 )

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"
 
 

stepmania/src/StepMania-net2003.vcproj

@@ -934,9 +934,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 			<File
 				RelativePath=".\LuaExpressionTransform.h">
 			</File>
-			<File
-				RelativePath="LuaFunctions.h">
-			</File>
 			<File
 				RelativePath="LuaReference.cpp">
 			</File>

stepmania/src/UnlockManager.cpp

@@ -14,7 +14,6 @@
 #include "Steps.h"
 #include <float.h>
 #include "CommonMetrics.h"
-#include "LuaFunctions.h"
 #include "LuaManager.h"
 
 UnlockManager*	UNLOCKMAN = NULL;	// global and accessable from anywhere in our program

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"