OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Changed: HIRESTEX 'define' textures now replace existing textures

Browse source 
of type MiscPatch with the same name.
- Added UDMF line trigger types MonsterUse and MonsterPush.
- Separated skill and class filter bits from FMapThing::flags so that
  UDMF can define up to 16 of each. Also separated easy/baby and
  hard/nightmare and changed default MAPINFO definitions.
- Changed: Crosshair drawing uses the current player class's default health instead
  of 100 to calculate the color for the crosshair.
- Added SECF_NOFALLINGDAMAGE flag plus Sector_ChangeFlags to set it. Also separated
  all user settable flags from MoreFlags into their own Flags variable.


SVN r964 (trunk)
This commit is contained in:
Christoph Oelckers 2008-05-11 21:16:32 +00:00
commit 6c21616c85
31 changed files with 1336 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/decallib.cpp
View file

@ -405,7 +405,7 @@ void FDecalLib::ReadDecals(FScanner &sc)
}
}
BYTE FDecalLib::GetDecalID (FScanner &sc)
WORD FDecalLib::GetDecalID (FScanner &sc)
{
sc.MustGetString ();
if (!IsNum (sc.String))
@ -416,18 +416,18 @@ BYTE FDecalLib::GetDecalID (FScanner &sc)
else
{
unsigned long num = strtoul (sc.String, NULL, 10);
if (num < 1 || num > 255)
if (num < 1 || num > 65535)
{
sc.MustGetStringName ("Decal ID must be between 1 and 255");
sc.MustGetStringName ("Decal ID must be between 1 and 65535");
}
return (BYTE)num;
return (WORD)num;
}
}
void FDecalLib::ParseDecal (FScanner &sc)
{
FString decalName;
BYTE decalNum;
WORD decalNum;
FDecalTemplate newdecal;
int code, picnum;
@ -544,7 +544,7 @@ void FDecalLib::ParseDecal (FScanner &sc)
void FDecalLib::ParseDecalGroup (FScanner &sc)
{
FString groupName;
BYTE decalNum;
WORD decalNum;
FDecalBase *targetDecal;
FDecalGroup *group;
@ -839,7 +839,7 @@ void FDecalLib::ReplaceDecalRef (FDecalBase *from, FDecalBase *to, FDecalBase *r
root->ReplaceDecalRef (from, to);
}
void FDecalLib::AddDecal (const char *name, BYTE num, const FDecalTemplate &decal)
void FDecalLib::AddDecal (const char *name, WORD num, const FDecalTemplate &decal)
{
FDecalTemplate *newDecal = new FDecalTemplate;
@ -912,7 +912,7 @@ void FDecalLib::AddDecal (FDecalBase *decal)
}
}
const FDecalTemplate *FDecalLib::GetDecalByNum (BYTE num) const
const FDecalTemplate *FDecalLib::GetDecalByNum (WORD num) const
{
if (num == 0)
{
@ -940,7 +940,7 @@ const FDecalTemplate *FDecalLib::GetDecalByName (const char *name) const
return NULL;
}
FDecalBase *FDecalLib::ScanTreeForNum (const BYTE num, FDecalBase *root)
FDecalBase *FDecalLib::ScanTreeForNum (const WORD num, FDecalBase *root)
{
while (root != NULL)
{