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

"UserData" -> "UserTable" in Profile; more accurate name.

Browse Source
This commit is contained in:
Mark Cannon
2011-08-21 20:20:59 -04:00
parent acff1863f7
commit b5d8d67079
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Profile.cpp
+11 -11
View File
@@ -151,7 +151,7 @@ void Profile::InitGeneralData()
ZERO( m_iNumStagesPassedByPlayMode ); ZERO( m_iNumStagesPassedByPlayMode );
ZERO( m_iNumStagesPassedByGrade ); ZERO( m_iNumStagesPassedByGrade );
m_UserData.Unset(); m_UserTable.Unset();
} }
void Profile::InitSongScores() void Profile::InitSongScores()
@@ -1160,16 +1160,16 @@ XNode* Profile::SaveGeneralDataCreateNode() const
} }
} }
// Load Lua UserData from profile // Load Lua UserTable from profile
if( !IsMachine() && m_UserData.IsSet() ) if( !IsMachine() && m_UserTable.IsSet() )
{ {
Lua *L = LUA->Get(); Lua *L = LUA->Get();
m_UserData.PushSelf( L ); m_UserTable.PushSelf( L );
XNode* pUserTable = XmlFileUtil::XNodeFromTable( L ); XNode* pUserTable = XmlFileUtil::XNodeFromTable( L );
LUA->Release( L ); LUA->Release( L );
// XXX: XNodeFromTable returns a root node with the name "Layer". // XXX: XNodeFromTable returns a root node with the name "Layer".
pUserTable->m_sName = "UserData"; pUserTable->m_sName = "UserTable";
pGeneralDataNode->AppendChild( pUserTable ); pGeneralDataNode->AppendChild( pUserTable );
} }
@@ -1348,17 +1348,17 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode )
// Build the custom data table from the existing XNode. // Build the custom data table from the existing XNode.
if( !IsMachine() ) if( !IsMachine() )
{ {
const XNode *pUserData = pNode->GetChild( "UserData" ); const XNode *pUserTable = pNode->GetChild( "UserTable" );
Lua *L = LUA->Get(); Lua *L = LUA->Get();
// If we have custom data, load it. Otherwise, make a blank table. // If we have custom data, load it. Otherwise, make a blank table.
if( pUserData ) if( pUserTable )
LuaHelpers::CreateTableFromXNode( L, pUserData ); LuaHelpers::CreateTableFromXNode( L, pUserTable );
else else
lua_newtable( L ); lua_newtable( L );
m_UserData.SetFromStack( L ); m_UserTable.SetFromStack( L );
LUA->Release( L ); LUA->Release( L );
} }
@@ -2034,7 +2034,7 @@ public:
static int GetTotalMines( T* p, lua_State *L ) { lua_pushnumber(L, p->m_iTotalMines ); return 1; } static int GetTotalMines( T* p, lua_State *L ) { lua_pushnumber(L, p->m_iTotalMines ); return 1; }
static int GetTotalHands( T* p, lua_State *L ) { lua_pushnumber(L, p->m_iTotalHands ); return 1; } static int GetTotalHands( T* p, lua_State *L ) { lua_pushnumber(L, p->m_iTotalHands ); return 1; }
static int GetTotalLifts( T* p, lua_State *L ) { lua_pushnumber(L, p->m_iTotalLifts ); return 1; } static int GetTotalLifts( T* p, lua_State *L ) { lua_pushnumber(L, p->m_iTotalLifts ); return 1; }
static int GetUserData( T* p, lua_State *L ) { p->m_UserData.PushSelf(L); return 1; } static int GetUserTable( T* p, lua_State *L ) { p->m_UserTable.PushSelf(L); return 1; }
LunaProfile() LunaProfile()
{ {
@@ -2081,7 +2081,7 @@ public:
ADD_METHOD( GetTotalMines ); ADD_METHOD( GetTotalMines );
ADD_METHOD( GetTotalHands ); ADD_METHOD( GetTotalHands );
ADD_METHOD( GetTotalLifts ); ADD_METHOD( GetTotalLifts );
ADD_METHOD( GetUserData ); ADD_METHOD( GetUserTable );
} }
}; };
src/Profile.h
+5 -3
View File
@@ -88,7 +88,7 @@ public:
m_iTotalHands(0), m_iTotalLifts(0), m_bNewProfile(false), m_iTotalHands(0), m_iTotalLifts(0), m_bNewProfile(false),
m_UnlockedEntryIDs(), m_sLastPlayedMachineGuid(""), m_UnlockedEntryIDs(), m_sLastPlayedMachineGuid(""),
m_LastPlayedDate(),m_iNumSongsPlayedByStyle(), m_LastPlayedDate(),m_iNumSongsPlayedByStyle(),
m_iNumTotalSongsPlayed(0), m_UserData(), m_SongHighScores(), m_iNumTotalSongsPlayed(0), m_UserTable(), m_SongHighScores(),
m_CourseHighScores(), m_vScreenshots(), m_CourseHighScores(), m_vScreenshots(),
m_mapDayToCaloriesBurned() m_mapDayToCaloriesBurned()
{ {
@@ -106,7 +106,7 @@ public:
ZERO( m_iNumStagesPassedByPlayMode ); ZERO( m_iNumStagesPassedByPlayMode );
ZERO( m_iNumStagesPassedByGrade ); ZERO( m_iNumStagesPassedByGrade );
m_UserData.Unset(); m_UserTable.Unset();
FOREACH_ENUM( StepsType,st ) FOREACH_ENUM( StepsType,st )
FOREACH_ENUM( RankingCategory,rc ) FOREACH_ENUM( RankingCategory,rc )
@@ -207,7 +207,9 @@ public:
int m_iNumTotalSongsPlayed; int m_iNumTotalSongsPlayed;
int m_iNumStagesPassedByPlayMode[NUM_PlayMode]; int m_iNumStagesPassedByPlayMode[NUM_PlayMode];
int m_iNumStagesPassedByGrade[NUM_Grade]; int m_iNumStagesPassedByGrade[NUM_Grade];
LuaReference m_UserData;
/* store arbitrary data for the theme within a profile */
LuaTable m_UserTable;
// Song high scores // Song high scores
struct HighScoresForASteps struct HighScoresForASteps