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

War on -Werror, part 13: hodgehodge.

Browse Source
This commit is contained in:
Jason Felds
2012-12-27 12:07:02 -05:00
parent 1fc16698ba
commit 52df8ea981
14 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ProfileManager.cpp
+9 -3
View File
@@ -580,8 +580,10 @@ const RString& ProfileManager::GetProfileDir( ProfileSlot slot ) const
case ProfileSlot_Machine:
return MACHINE_PROFILE_DIR;
default:
ASSERT(0);
break;
}
// it should never hit here.
FAIL_M("Invalid profile slot chosen: unable to get the directory!");
}
RString ProfileManager::GetProfileDirImportedFrom( ProfileSlot slot ) const
@@ -596,6 +598,8 @@ RString ProfileManager::GetProfileDirImportedFrom( ProfileSlot slot ) const
default:
ASSERT(0);
}
// it should never hit here.
return RString();
}
const Profile* ProfileManager::GetProfile( ProfileSlot slot ) const
@@ -610,6 +614,8 @@ const Profile* ProfileManager::GetProfile( ProfileSlot slot ) const
default:
ASSERT(0);
}
// it should never hit here.
return NULL;
}
//
@@ -822,7 +828,7 @@ public:
static int IsPersistentProfile( T* p, lua_State *L ) { lua_pushboolean(L, p->IsPersistentProfile(Enum::Check<PlayerNumber>(L, 1)) ); return 1; }
static int GetProfile( T* p, lua_State *L ) { PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1); Profile* pP = p->GetProfile(pn); ASSERT(pP != NULL); pP->PushSelf(L); return 1; }
static int GetMachineProfile( T* p, lua_State *L ) { p->GetMachineProfile()->PushSelf(L); return 1; }
static int SaveMachineProfile( T* p, lua_State *L ) { p->SaveMachineProfile(); return 0; }
static int SaveMachineProfile( T* p, lua_State * ) { p->SaveMachineProfile(); return 0; }
static int GetLocalProfile( T* p, lua_State *L )
{
Profile *pProfile = p->GetLocalProfile(SArg(1));
@@ -842,7 +848,7 @@ public:
static int LastLoadWasTamperedOrCorrupt( T* p, lua_State *L ) { lua_pushboolean(L, p->LastLoadWasTamperedOrCorrupt(Enum::Check<PlayerNumber>(L, 1)) ); return 1; }
static int GetPlayerName( T* p, lua_State *L ) { PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1); lua_pushstring(L, p->GetPlayerName(pn)); return 1; }
static int LocalProfileIDToDir( T* p, lua_State *L )
static int LocalProfileIDToDir( T* , lua_State *L )
{
RString dir = USER_PROFILES_DIR + SArg(1) + "/";
lua_pushstring( L, dir );