mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-28 12:30:46 +00:00
- Rename DeferedStartGame()
to DeferredStartGame()
.
This commit is contained in:
parent
4ac1376b9f
commit
77630dcbc7
6 changed files with 11 additions and 11 deletions
|
@ -264,7 +264,7 @@ void ChangeLevel(MapRecord* map, int skill)
|
||||||
//
|
//
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
|
|
||||||
void DeferedStartGame(MapRecord* map, int skill, bool nostopsound)
|
void DeferredStartGame(MapRecord* map, int skill, bool nostopsound)
|
||||||
{
|
{
|
||||||
g_nextmap = map;
|
g_nextmap = map;
|
||||||
g_nextskill = skill;
|
g_nextskill = skill;
|
||||||
|
@ -355,7 +355,7 @@ CCMD(levelstart)
|
||||||
auto map = levelwarp_common(argv, "start game", "start new game at");
|
auto map = levelwarp_common(argv, "start game", "start new game at");
|
||||||
if (map)
|
if (map)
|
||||||
{
|
{
|
||||||
DeferedStartGame(map, -1);
|
DeferredStartGame(map, -1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -445,7 +445,7 @@ CCMD(map)
|
||||||
Printf(PRINT_BOLD, "%s: map file not found\n", map->fileName.GetChars());
|
Printf(PRINT_BOLD, "%s: map file not found\n", map->fileName.GetChars());
|
||||||
}
|
}
|
||||||
|
|
||||||
DeferedStartGame(map, -1);
|
DeferredStartGame(map, -1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ int GetAutomapZoom(int gZoom);
|
||||||
|
|
||||||
void DrawCrosshair(int deftile, int health, double xdelta, double ydelta, double scale, PalEntry color = 0xffffffff);
|
void DrawCrosshair(int deftile, int health, double xdelta, double ydelta, double scale, PalEntry color = 0xffffffff);
|
||||||
void updatePauseStatus();
|
void updatePauseStatus();
|
||||||
void DeferedStartGame(MapRecord* map, int skill, bool nostopsound = false);
|
void DeferredStartGame(MapRecord* map, int skill, bool nostopsound = false);
|
||||||
void ChangeLevel(MapRecord* map, int skill);
|
void ChangeLevel(MapRecord* map, int skill);
|
||||||
void CompleteLevel(MapRecord* map);
|
void CompleteLevel(MapRecord* map);
|
||||||
|
|
||||||
|
|
|
@ -688,7 +688,7 @@ void MainLoop ()
|
||||||
userConfig.CommandMap = "";
|
userConfig.CommandMap = "";
|
||||||
if (maprecord)
|
if (maprecord)
|
||||||
{
|
{
|
||||||
DeferedStartGame(maprecord, -1);
|
DeferredStartGame(maprecord, -1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -105,7 +105,7 @@ static bool DoStartGame(FNewGameStartup& gs)
|
||||||
|
|
||||||
gi->StartGame(gs); // play game specific effects (like Duke/RR/SW's voice lines when starting a game.)
|
gi->StartGame(gs); // play game specific effects (like Duke/RR/SW's voice lines when starting a game.)
|
||||||
|
|
||||||
DeferedStartGame(map, gs.Skill);
|
DeferredStartGame(map, gs.Skill);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -421,7 +421,7 @@ static bool cheatMario(cheatseq_t* c)
|
||||||
if (parseArgs((char*)c->Args, &nEpisode, &nLevel) == 2)
|
if (parseArgs((char*)c->Args, &nEpisode, &nLevel) == 2)
|
||||||
{
|
{
|
||||||
auto map = FindMapByIndex(nEpisode, nLevel);
|
auto map = FindMapByIndex(nEpisode, nLevel);
|
||||||
if (map) DeferedStartGame(map, -1);
|
if (map) DeferredStartGame(map, -1);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -102,7 +102,7 @@ const char *GameInterface::GenericCheat(int player, int cheat)
|
||||||
bool RestartCheat(cheatseq_t* c)
|
bool RestartCheat(cheatseq_t* c)
|
||||||
{
|
{
|
||||||
if (!checkCheat(c)) return false;
|
if (!checkCheat(c)) return false;
|
||||||
DeferedStartGame(currentLevel, -1);
|
DeferredStartGame(currentLevel, -1);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -117,7 +117,7 @@ bool NextCheat(cheatseq_t* c)
|
||||||
if (!checkCheat(c)) return false;
|
if (!checkCheat(c)) return false;
|
||||||
if (!currentLevel) return true;
|
if (!currentLevel) return true;
|
||||||
auto map = FindNextMap(currentLevel);
|
auto map = FindNextMap(currentLevel);
|
||||||
if (map) DeferedStartGame(map, -1);
|
if (map) DeferredStartGame(map, -1);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ bool PrevCheat(cheatseq_t* c)
|
||||||
if (!checkCheat(c)) return false;
|
if (!checkCheat(c)) return false;
|
||||||
if (!currentLevel) return true;
|
if (!currentLevel) return true;
|
||||||
auto map = FindMapByLevelNum(currentLevel->levelNumber - 1);
|
auto map = FindMapByLevelNum(currentLevel->levelNumber - 1);
|
||||||
if (map) DeferedStartGame(map, -1);
|
if (map) DeferredStartGame(map, -1);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -160,7 +160,7 @@ bool WarpCheat(cheatseq_t* c)
|
||||||
if (TEST(pp->Flags, PF_DEAD))
|
if (TEST(pp->Flags, PF_DEAD))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
DeferedStartGame(maprec, -1);
|
DeferredStartGame(maprec, -1);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue