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

- fixed last commit.

Browse source 
- added more spawn filters.


SVN r1192 (trunk)
This commit is contained in:
Christoph Oelckers 2008-09-01 19:56:32 +00:00
parent 9df27c7afd
commit f84ededfba
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/info.cpp
View file

@ -255,7 +255,7 @@ void FActorInfo::RegisterIDs ()
if (gameinfo.gametype == GAME_Chex && DoomEdMap.FindType(DoomEdNum) == NULL && if (gameinfo.gametype == GAME_Chex && DoomEdMap.FindType(DoomEdNum) == NULL &&
(GameFilter & GAME_Doom)) (GameFilter & GAME_Doom))
{ {
DoomEdMap.AddType (DoomEdNum, Class); DoomEdMap.AddType (DoomEdNum, Class, true);
} }
} }
@ -554,7 +554,7 @@ FDoomEdMap::~FDoomEdMap()
Empty(); 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; unsigned int hash = (unsigned int)doomednum % DOOMED_HASHSIZE;
FDoomEdEntry *entry = DoomEdHash[hash]; FDoomEdEntry *entry = DoomEdHash[hash];
@ -569,11 +569,12 @@ void FDoomEdMap::AddType (int doomednum, const PClass *type)
entry->DoomEdNum = doomednum; entry->DoomEdNum = doomednum;
DoomEdHash[hash] = entry; DoomEdHash[hash] = entry;
} }
else else if (!entry->temp)
{ {
Printf (PRINT_BOLD, "Warning: %s and %s both have doomednum %d.\n", Printf (PRINT_BOLD, "Warning: %s and %s both have doomednum %d.\n",
type->TypeName.GetChars(), entry->Type->TypeName.GetChars(), doomednum); type->TypeName.GetChars(), entry->Type->TypeName.GetChars(), doomednum);
} }
entry->temp = temporary;
entry->Type = type; entry->Type = type;
} }

3
src/info.h
View file

@ -232,7 +232,7 @@ public:
~FDoomEdMap(); ~FDoomEdMap();
const PClass *FindType (int doomednum) const; const PClass *FindType (int doomednum) const;
void AddType (int doomednum, const PClass *type); void AddType (int doomednum, const PClass *type, bool temporary = false);
void DelType (int doomednum); void DelType (int doomednum);
void Empty (); void Empty ();
@ -246,6 +246,7 @@ private:
FDoomEdEntry *HashNext; FDoomEdEntry *HashNext;
const PClass *Type; const PClass *Type;
int DoomEdNum; int DoomEdNum;
bool temp;
}; };
static FDoomEdEntry *DoomEdHash[DOOMED_HASHSIZE]; static FDoomEdEntry *DoomEdHash[DOOMED_HASHSIZE];

2
wadsrc/static/actors/hexen/fog.txt
View file

@ -46,6 +46,7 @@ ACTOR FogPatchSmall 10001
ACTOR FogPatchMedium : FogPatchSmall 10002 ACTOR FogPatchMedium : FogPatchSmall 10002
{ {
Game Hexen
States States
{ {
Spawn: Spawn:
@ -61,6 +62,7 @@ ACTOR FogPatchMedium : FogPatchSmall 10002
ACTOR FogPatchLarge : FogPatchMedium 10003 ACTOR FogPatchLarge : FogPatchMedium 10003
{ {
Game Hexen
States States
{ {
Spawn: Spawn:

1
wadsrc/static/actors/hexen/heresiarch.txt
View file

@ -3,6 +3,7 @@
ACTOR Heresiarch 10080 native ACTOR Heresiarch 10080 native
{ {
Game Hexen
Health 5000 Health 5000
Painchance 10 Painchance 10
Speed 16 Speed 16