OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Ensure that only actor with positive SpawnIDs get added to the SpawnableThings map, so there will

Browse source 
be no conflicts with recently-added named arguments for spawnable things on UDMF maps.
- Change the SpawnableThings array into a map, so there is no longer any particular upper limit on an actor's SpawnID. Also fixes a possible exploit, since an actor's SpawnID was never checked to make sure it was within range.

SVN r3959 (trunk)
This commit is contained in:
Randy Heit 2012-11-09 23:53:58 +00:00
commit 955d929d5e
5 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/p_things.cpp
View file

@ -46,8 +46,8 @@
#include "templates.h"
#include "g_level.h"
// List of spawnable things for the Thing_Spawn and Thing_Projectile specials.
const PClass *SpawnableThings[MAX_SPAWNABLES];
// Set of spawnable things for the Thing_Spawn and Thing_Projectile specials.
TMap<int, const PClass *> SpawnableThings;
static FRandom pr_leadtarget ("LeadTarget");
@ -494,23 +494,43 @@ const PClass *P_GetSpawnableType(int spawnnum)
return PClass::FindClass(spawnname);
}
}
else if (spawnnum < countof(SpawnableThings))
else
{ // A numbered arg from a Hexen or UDMF map
return SpawnableThings[spawnnum];
const PClass **type = SpawnableThings.CheckKey(spawnnum);
if (type != NULL)
{
return *type;
}
}
return NULL;
}
CCMD (dumpspawnables)
{
int i;
typedef TMap<int, const PClass *>::Pair SpawnablePair;
for (i = 0; i < MAX_SPAWNABLES; i++)
static int STACK_ARGS SpawnableSort(const void *a, const void *b)
{
return (*((SpawnablePair **)a))->Key - (*((SpawnablePair **)b))->Key;
}
CCMD (dumpspawnables)
{
TMapIterator<int, const PClass *> it(SpawnableThings);
SpawnablePair *pair, **allpairs;
int i = 0;
// Sort into numerical order, since their arrangement in the map can
// be in an unspecified order.
allpairs = new TMap<int, const PClass *>::Pair *[SpawnableThings.CountUsed()];
while (it.NextPair(pair))
{
if (SpawnableThings[i] != NULL)
{
Printf ("%d %s\n", i, SpawnableThings[i]->TypeName.GetChars());
}
allpairs[i++] = pair;
}
qsort(allpairs, i, sizeof(*allpairs), SpawnableSort);
for (int j = 0; j < i; ++j)
{
pair = allpairs[j];
Printf ("%d %s\n", pair->Key, pair->Value->TypeName.GetChars());
}
delete[] allpairs;
}