actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compile

Browse Source
This commit is contained in:
Chris Danford
2005-12-27 17:39:27 +00:00
parent f99b179a5b
commit fb259c7237
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/DateTime.cpp
-1
View File
@@ -179,7 +179,6 @@ CString HourInDayToString( int iHourInDayIndex )
return ssprintf("Hour%02d", iHourInDayIndex);
}
enum Month {};
static const CString MonthNames[] =
{
"January",
stepmania/src/DateTime.h
+3 -3
View File
@@ -8,7 +8,7 @@ const int NUM_LAST_WEEKS = 52;
const int DAYS_IN_YEAR = 366; // maximum (leap years)
const int HOURS_IN_DAY = 24;
const int DAYS_IN_WEEK = 7;
const int MONTHS_IN_YEAR = 12;
enum Month { MONTHS_IN_YEAR = 12 };
CString DayInYearToString( int iDayInYearIndex );
CString LastDayToString( int iLastDayIndex );
@@ -17,8 +17,8 @@ CString DayOfWeekToString( int iDayOfWeekIndex );
CString DayOfWeekToThemedString( int iDayOfWeekIndex );
CString HourInDayToString( int iHourIndex );
CString HourInDayToThemedString( int iHourIndex );
CString MonthToString( int iMonthIndex );
CString MonthToThemedString( int iMonthIndex );
const CString &MonthToString( Month month );
const CString &MonthToThemedString( Month month );
CString LastWeekToString( int iLastWeekIndex );
CString LastWeekToThemedString( int iLastWeekIndex );
stepmania/src/DateTimeLua.cpp
+2 -2
View File
@@ -3,8 +3,8 @@
#include "LuaFunctions.h"
#include "RageUtil.h"
LuaFunction( MonthToString, MonthToString( IArg(1) ) );
LuaFunction( MonthToThemedString, MonthToThemedString( IArg(1) ) );
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 );
stepmania/src/ScreenBookkeeping.cpp
+2 -2
View File
@@ -139,7 +139,7 @@ void ScreenBookkeeping::ChangeView( View newView )
iTotalLast += coins[i];
}
sTitle += ALL_TIME.GetString()+"\n";
sTitle += ALL_TIME.GetValue()+"\n";
sData += ssprintf("%i\n", iTotalLast);
m_textData[0].SetText( "" );
@@ -152,7 +152,7 @@ void ScreenBookkeeping::ChangeView( View newView )
break;
case VIEW_LAST_WEEKS:
{
m_textTitle.SetText( ssprintf(LAST_WEEKS, NUM_LAST_WEEKS) );
m_textTitle.SetText( ssprintf(LAST_WEEKS.GetValue(), NUM_LAST_WEEKS) );
int coins[NUM_LAST_WEEKS];
BOOKKEEPER->GetCoinsLastWeeks( coins );
stepmania/src/ScreenSetTime.cpp
+6 -6
View File
@@ -99,12 +99,12 @@ void ScreenSetTime::Update( float fDelta )
iPrettyHour = 12;
CString sPrettyHour = ssprintf( "%d %s", iPrettyHour, now.tm_hour>=12 ? "pm" : "am" );
m_textValue[hour].SetText( sPrettyHour );
m_textValue[minute].SetText( ssprintf("%02d",now.tm_min) );
m_textValue[second].SetText( ssprintf("%02d",now.tm_sec) );
m_textValue[year].SetText( ssprintf("%02d",now.tm_year+1900) );
m_textValue[month].SetText( MonthToString(now.tm_mon) );
m_textValue[day].SetText( ssprintf("%02d",now.tm_mday) );
m_textValue[hour] .SetText( sPrettyHour );
m_textValue[minute] .SetText( ssprintf("%02d",now.tm_min) );
m_textValue[second] .SetText( ssprintf("%02d",now.tm_sec) );
m_textValue[year] .SetText( ssprintf("%02d",now.tm_year+1900) );
m_textValue[month] .SetText( MonthToString((Month)now.tm_mon) );
m_textValue[day] .SetText( ssprintf("%02d",now.tm_mday) );
}
void ScreenSetTime::Input( const InputEventPlus &input )