diff --git a/stepmania/src/DateTime.cpp b/stepmania/src/DateTime.cpp index 32f4e8aecf..4e6034b9e6 100644 --- a/stepmania/src/DateTime.cpp +++ b/stepmania/src/DateTime.cpp @@ -5,6 +5,7 @@ #if !defined(SMPACKAGE) #include "ThemeMetric.h" #endif +#include "LuaFunctions.h" DateTime::DateTime() { @@ -306,6 +307,19 @@ tm GetDayInYearAndYear( int iDayInYearIndex, int iYear ) return when; } +LuaFunction( MonthToString, MonthToString( (Month)IArg(1) ) ); +#if !defined(SMPACKAGE) +LuaFunction( MonthToThemedString, MonthToThemedString( (Month)IArg(1) ) ); +#endif +LuaFunction( MonthOfYear, GetLocalTime().tm_mon ); +LuaFunction( DayOfMonth, GetLocalTime().tm_mday ); +LuaFunction( Hour, GetLocalTime().tm_hour ); +LuaFunction( Minute, GetLocalTime().tm_min ); +LuaFunction( Second, GetLocalTime().tm_sec ); +LuaFunction( Year, GetLocalTime().tm_year+1900 ); +LuaFunction( Weekday, GetLocalTime().tm_wday ); +LuaFunction( DayOfYear, GetLocalTime().tm_yday ); + /* * (c) 2001-2004 Chris Danford * All rights reserved. diff --git a/stepmania/src/DateTimeLua.cpp b/stepmania/src/DateTimeLua.cpp deleted file mode 100644 index 5c4567e86c..0000000000 --- a/stepmania/src/DateTimeLua.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include "global.h" -#include "DateTime.h" -#include "LuaFunctions.h" -#include "RageUtil.h" - -LuaFunction( MonthToString, MonthToString( (Month)IArg(1) ) ); -LuaFunction( MonthToThemedString, MonthToThemedString( (Month)IArg(1) ) ); -LuaFunction( MonthOfYear, GetLocalTime().tm_mon ); -LuaFunction( DayOfMonth, GetLocalTime().tm_mday ); -LuaFunction( Hour, GetLocalTime().tm_hour ); -LuaFunction( Minute, GetLocalTime().tm_min ); -LuaFunction( Second, GetLocalTime().tm_sec ); -LuaFunction( Year, GetLocalTime().tm_year+1900 ); -LuaFunction( Weekday, GetLocalTime().tm_wday ); -LuaFunction( DayOfYear, GetLocalTime().tm_yday ); - -/* - * (c) 2001-2004 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. - */ diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj index bdadfe0fc7..58d8f378ef 100644 --- a/stepmania/src/StepMania-net2003.vcproj +++ b/stepmania/src/StepMania-net2003.vcproj @@ -815,9 +815,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - -