From 77630dcbc71b2146c24d87a595cbc89ffaa8f850 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Tue, 20 Jul 2021 18:41:39 +1000 Subject: [PATCH] - Rename `DeferedStartGame()` to `DeferredStartGame()`. --- source/core/cheats.cpp | 6 +++--- source/core/gamecontrol.h | 2 +- source/core/mainloop.cpp | 2 +- source/core/menu/razemenu.cpp | 2 +- source/games/blood/src/messages.cpp | 2 +- source/games/sw/src/cheats.cpp | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/core/cheats.cpp b/source/core/cheats.cpp index 8d6e84abf..455b6e04a 100644 --- a/source/core/cheats.cpp +++ b/source/core/cheats.cpp @@ -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_nextskill = skill; @@ -355,7 +355,7 @@ CCMD(levelstart) auto map = levelwarp_common(argv, "start game", "start new game at"); 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()); } - DeferedStartGame(map, -1); + DeferredStartGame(map, -1); } } diff --git a/source/core/gamecontrol.h b/source/core/gamecontrol.h index 1d9c9573c..5f3369a08 100644 --- a/source/core/gamecontrol.h +++ b/source/core/gamecontrol.h @@ -43,7 +43,7 @@ int GetAutomapZoom(int gZoom); void DrawCrosshair(int deftile, int health, double xdelta, double ydelta, double scale, PalEntry color = 0xffffffff); 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 CompleteLevel(MapRecord* map); diff --git a/source/core/mainloop.cpp b/source/core/mainloop.cpp index ce1ff3172..7ce5788de 100644 --- a/source/core/mainloop.cpp +++ b/source/core/mainloop.cpp @@ -688,7 +688,7 @@ void MainLoop () userConfig.CommandMap = ""; if (maprecord) { - DeferedStartGame(maprecord, -1); + DeferredStartGame(maprecord, -1); } } diff --git a/source/core/menu/razemenu.cpp b/source/core/menu/razemenu.cpp index 0584012fb..063ae0f00 100644 --- a/source/core/menu/razemenu.cpp +++ b/source/core/menu/razemenu.cpp @@ -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.) - DeferedStartGame(map, gs.Skill); + DeferredStartGame(map, gs.Skill); return true; } diff --git a/source/games/blood/src/messages.cpp b/source/games/blood/src/messages.cpp index d5dc6cab6..40d5307d8 100644 --- a/source/games/blood/src/messages.cpp +++ b/source/games/blood/src/messages.cpp @@ -421,7 +421,7 @@ static bool cheatMario(cheatseq_t* c) if (parseArgs((char*)c->Args, &nEpisode, &nLevel) == 2) { auto map = FindMapByIndex(nEpisode, nLevel); - if (map) DeferedStartGame(map, -1); + if (map) DeferredStartGame(map, -1); } return true; } diff --git a/source/games/sw/src/cheats.cpp b/source/games/sw/src/cheats.cpp index 37ec5947b..c2edfac6c 100644 --- a/source/games/sw/src/cheats.cpp +++ b/source/games/sw/src/cheats.cpp @@ -102,7 +102,7 @@ const char *GameInterface::GenericCheat(int player, int cheat) bool RestartCheat(cheatseq_t* c) { if (!checkCheat(c)) return false; - DeferedStartGame(currentLevel, -1); + DeferredStartGame(currentLevel, -1); return true; } @@ -117,7 +117,7 @@ bool NextCheat(cheatseq_t* c) if (!checkCheat(c)) return false; if (!currentLevel) return true; auto map = FindNextMap(currentLevel); - if (map) DeferedStartGame(map, -1); + if (map) DeferredStartGame(map, -1); return true; } @@ -126,7 +126,7 @@ bool PrevCheat(cheatseq_t* c) if (!checkCheat(c)) return false; if (!currentLevel) return true; auto map = FindMapByLevelNum(currentLevel->levelNumber - 1); - if (map) DeferedStartGame(map, -1); + if (map) DeferredStartGame(map, -1); return true; } @@ -160,7 +160,7 @@ bool WarpCheat(cheatseq_t* c) if (TEST(pp->Flags, PF_DEAD)) return true; - DeferedStartGame(maprec, -1); + DeferredStartGame(maprec, -1); return true; }