- fixed last commit.
- added more spawn filters. SVN r1192 (trunk)
This commit is contained in:
parent
9df27c7afd
commit
f84ededfba
4 changed files with 9 additions and 4 deletions
|
|
@ -255,7 +255,7 @@ void FActorInfo::RegisterIDs ()
|
|||
if (gameinfo.gametype == GAME_Chex && DoomEdMap.FindType(DoomEdNum) == NULL &&
|
||||
(GameFilter & GAME_Doom))
|
||||
{
|
||||
DoomEdMap.AddType (DoomEdNum, Class);
|
||||
DoomEdMap.AddType (DoomEdNum, Class, true);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -554,7 +554,7 @@ FDoomEdMap::~FDoomEdMap()
|
|||
Empty();
|
||||
}
|
||||
|
||||
void FDoomEdMap::AddType (int doomednum, const PClass *type)
|
||||
void FDoomEdMap::AddType (int doomednum, const PClass *type, bool temporary)
|
||||
{
|
||||
unsigned int hash = (unsigned int)doomednum % DOOMED_HASHSIZE;
|
||||
FDoomEdEntry *entry = DoomEdHash[hash];
|
||||
|
|
@ -569,11 +569,12 @@ void FDoomEdMap::AddType (int doomednum, const PClass *type)
|
|||
entry->DoomEdNum = doomednum;
|
||||
DoomEdHash[hash] = entry;
|
||||
}
|
||||
else
|
||||
else if (!entry->temp)
|
||||
{
|
||||
Printf (PRINT_BOLD, "Warning: %s and %s both have doomednum %d.\n",
|
||||
type->TypeName.GetChars(), entry->Type->TypeName.GetChars(), doomednum);
|
||||
}
|
||||
entry->temp = temporary;
|
||||
entry->Type = type;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue