zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-18 15:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Randy Heit 2013-10-08 21:51:51 -05:00
commit 242f2ab7b0
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_main.cpp
View file

@ -2270,8 +2270,6 @@ void D_DoomMain (void)
execFiles = Args->GatherFiles ("-exec"); execFiles = Args->GatherFiles ("-exec");
D_MultiExec (execFiles, true); D_MultiExec (execFiles, true);
C_ExecCmdLineParams (); // [RH] do all +set commands on the command line
CopyFiles(allwads, pwads); CopyFiles(allwads, pwads);
// Since this function will never leave we must delete this array here manually. // Since this function will never leave we must delete this array here manually.
@ -2287,6 +2285,8 @@ void D_DoomMain (void)
// Now that wads are loaded, define mod-specific cvars. // Now that wads are loaded, define mod-specific cvars.
ParseCVarInfo(); ParseCVarInfo();
C_ExecCmdLineParams (); // [RH] do all +set commands on the command line
// [RH] Initialize localizable strings. // [RH] Initialize localizable strings.
GStrings.LoadStrings (false); GStrings.LoadStrings (false);

9
src/dthinker.cpp
View file

@ -357,12 +357,10 @@ void DThinker::DestroyThinkersInList (FThinkerList &list)
{ {
if (list.Sentinel != NULL) if (list.Sentinel != NULL)
{ {
DThinker *node = list.Sentinel->NextThinker; for (DThinker *node = list.Sentinel->NextThinker; node != list.Sentinel; node = list.Sentinel->NextThinker)
while (node != list.Sentinel)
{ {
DThinker *next = node->NextThinker; assert(node != NULL);
node->Destroy(); node->Destroy();
node = next;
} }
list.Sentinel->Destroy(); list.Sentinel->Destroy();
list.Sentinel = NULL; list.Sentinel = NULL;
@ -380,9 +378,8 @@ void DThinker::DestroyMostThinkersInList (FThinkerList &list, int stat)
// it from the list. G_FinishTravel() will find it later from // it from the list. G_FinishTravel() will find it later from
// a players[].mo link and destroy it then, after copying various // a players[].mo link and destroy it then, after copying various
// information to a new player. // information to a new player.
for (DThinker *probe = list.Sentinel->NextThinker, *next; probe != list.Sentinel; probe = next) for (DThinker *probe = list.Sentinel->NextThinker; probe != list.Sentinel; probe = list.Sentinel->NextThinker)
{ {
next = probe->NextThinker;
if (!probe->IsKindOf(RUNTIME_CLASS(APlayerPawn)) || // <- should not happen if (!probe->IsKindOf(RUNTIME_CLASS(APlayerPawn)) || // <- should not happen
static_cast<AActor *>(probe)->player == NULL || static_cast<AActor *>(probe)->player == NULL ||
static_cast<AActor *>(probe)->player->mo != probe) static_cast<AActor *>(probe)->player->mo != probe)

5
src/g_shared/a_pickups.cpp
View file

@ -1792,7 +1792,10 @@ bool ABackpackItem::HandlePickup (AInventory *item)
AInventory *ABackpackItem::CreateTossable () AInventory *ABackpackItem::CreateTossable ()
{ {
ABackpackItem *pack = static_cast<ABackpackItem *>(Super::CreateTossable()); ABackpackItem *pack = static_cast<ABackpackItem *>(Super::CreateTossable());
pack->bDepleted = true; if (pack != NULL)
{
pack->bDepleted = true;
}
return pack; return pack;
} }