zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 07:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: RandomSpawner should observe the nomonsters flags when deciding what to spawn.

Browse source 
SVN r4153 (trunk)
This commit is contained in:
Randy Heit 2013-02-20 02:47:01 +00:00
parent 4fe9b6112a
commit 7d90117fb9
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/g_shared/a_randomspawner.cpp
View file

@ -31,6 +31,7 @@ class ARandomSpawner : public AActor
FDropItem *di; // di will be our drop item list iterator FDropItem *di; // di will be our drop item list iterator
FDropItem *drop; // while drop stays as the reference point. FDropItem *drop; // while drop stays as the reference point.
int n=0; int n=0;
bool nomonsters = (dmflags & DF_NO_MONSTERS) || (level.flags2 & LEVEL2_NOMONSTERS);
Super::BeginPlay(); Super::BeginPlay();
drop = di = GetDropItems(); drop = di = GetDropItems();
@ -39,12 +40,20 @@ class ARandomSpawner : public AActor
while (di != NULL) while (di != NULL)
{ {
if (di->Name != NAME_None) if (di->Name != NAME_None)
{
if (!nomonsters || !(GetDefaultByType(PClass::FindClass(di->Name))->flags3 & MF3_ISMONSTER))
{ {
if (di->amount < 0) di->amount = 1; // default value is -1, we need a positive value. if (di->amount < 0) di->amount = 1; // default value is -1, we need a positive value.
n += di->amount; // this is how we can weight the list. n += di->amount; // this is how we can weight the list.
}
di = di->Next; di = di->Next;
} }
} }
if (n == 0)
{ // Nothing left to spawn. They must have all been monsters, and monsters are disabled.
Destroy();
return;
}
// Then we reset the iterator to the start position... // Then we reset the iterator to the start position...
di = drop; di = drop;
// Take a random number... // Take a random number...
@ -53,16 +62,23 @@ class ARandomSpawner : public AActor
while (n > -1) while (n > -1)
{ {
if (di->Name != NAME_None) if (di->Name != NAME_None)
{
if (!nomonsters || !(GetDefaultByType(PClass::FindClass(di->Name))->flags3 & MF3_ISMONSTER))
{ {
n -= di->amount; n -= di->amount;
if ((di->Next != NULL) && (n > -1)) di = di->Next; else n = -1; if ((di->Next != NULL) && (n > -1))
di = di->Next;
else
n = -1;
}
} }
} }
// So now we can spawn the dropped item. // So now we can spawn the dropped item.
if (bouncecount >= MAX_RANDOMSPAWNERS_RECURSION) // Prevents infinite recursions if (bouncecount >= MAX_RANDOMSPAWNERS_RECURSION) // Prevents infinite recursions
{ {
Spawn("Unknown", x, y, z, NO_REPLACE); // Show that there's a problem. Spawn("Unknown", x, y, z, NO_REPLACE); // Show that there's a problem.
Destroy(); return; Destroy();
return;
} }
else if (pr_randomspawn() <= di->probability) // prob 255 = always spawn, prob 0 = never spawn. else if (pr_randomspawn() <= di->probability) // prob 255 = always spawn, prob 0 = never spawn.
{ {
@ -167,8 +183,10 @@ class ARandomSpawner : public AActor
if (rep && ((rep->flags4 & MF4_BOSSDEATH) || (rep->flags2 & MF2_BOSS))) if (rep && ((rep->flags4 & MF4_BOSSDEATH) || (rep->flags2 & MF2_BOSS)))
boss = true; boss = true;
} }
if (boss) this->tracer = newmobj; if (boss)
else Destroy(); // "else" because a boss-replacing spawner must wait until it can call A_BossDeath. this->tracer = newmobj;
else // "else" because a boss-replacing spawner must wait until it can call A_BossDeath.
Destroy();
} }
void Tick() // This function is needed for handling boss replacers void Tick() // This function is needed for handling boss replacers