merge

stepmania/src/LocalizedString.cpp

@@ -1,6 +1,8 @@
 #include "global.h"
 #include "LocalizedString.h"
 #include "Foreach.h"
+#include "LuaFunctions.h"
+#include "LuaManager.h"
 
 static RString DefaultLocalizer( const RString &sSection, const RString &sName )
 {
@@ -61,6 +63,7 @@ void LocalizedString::Refresh()
 	m_sValue = LocalizeString( m_sSection, m_sName );
 }
 
+LuaFunction( LocalizeString, LocalizedString::LocalizeString( SArg(1), SArg(2) ) )
 
 /*
  * Copyright (c) 2001-2005 Chris Danford

stepmania/src/LocalizedStringLua.cpp

@@ -1,31 +0,0 @@
-#include "global.h"
-#include "LocalizedString.h"
-#include "LuaFunctions.h"
-#include "LuaManager.h"
-
-LuaFunction( LocalizeString, LocalizedString::LocalizeString( SArg(1), SArg(2) ) )
-
-/*
- * Copyright (c) 2001-2005 Chris Danford
- * 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.
- */