Merge pull request #119 from sigatrev/fix-spaces

spaces to tabs
This commit is contained in:
Colby Klein
2014-04-15 15:50:28 -07:00
2 changed files with 30 additions and 30 deletions
+26 -26
View File
@@ -2471,14 +2471,14 @@ public:
LuaHelpers::CreateTableFromArray( vHP, L );
return 1;
}
static int GetEnabledPlayers(T* , lua_State *L )
{
vector<PlayerNumber> vEP;
FOREACH_EnabledPlayer( pn )
vEP.push_back( pn );
LuaHelpers::CreateTableFromArray( vEP, L );
return 1;
}
static int GetEnabledPlayers(T* , lua_State *L )
{
vector<PlayerNumber> vEP;
FOREACH_EnabledPlayer( pn )
vEP.push_back( pn );
LuaHelpers::CreateTableFromArray( vEP, L );
return 1;
}
static int GetCurrentStyle( T* p, lua_State *L )
{
Style *pStyle = const_cast<Style *> (p->GetCurrentStyle());
@@ -2556,24 +2556,24 @@ public:
return 1;
}
static int LoadProfiles( T* p, lua_State *L )
{
bool LoadEdits = true;
if(lua_isboolean(L, 1))
{
LoadEdits = BArg(1);
}
p->LoadProfiles( LoadEdits );
SCREENMAN->ZeroNextUpdate();
return 0;
}
static int SaveProfiles( T* p, lua_State *L )
{
p->SavePlayerProfiles();
SCREENMAN->ZeroNextUpdate();
return 0;
}
static int LoadProfiles( T* p, lua_State *L )
{
bool LoadEdits = true;
if(lua_isboolean(L, 1))
{
LoadEdits = BArg(1);
}
p->LoadProfiles( LoadEdits );
SCREENMAN->ZeroNextUpdate();
return 0;
}
static int SaveProfiles( T* p, lua_State *L )
{
p->SavePlayerProfiles();
SCREENMAN->ZeroNextUpdate();
return 0;
}
DEFINE_METHOD( HaveProfileToLoad, HaveProfileToLoad() )
DEFINE_METHOD( HaveProfileToSave, HaveProfileToSave() )
+4 -4
View File
@@ -384,13 +384,13 @@ public:
return 0;
}
static int StartTransitioningScreen( T* p, lua_State *L )
{
static int StartTransitioningScreen( T* p, lua_State *L )
{
RString sMessage = SArg(1);
ScreenMessage SM = ScreenMessageHelpers::ToScreenMessage( sMessage );
p->StartTransitioningScreen( SM );
p->StartTransitioningScreen( SM );
return 0;
}
}
LunaScreenWithMenuElements()
{