zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 22:11:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- after realizing that changing the sector's MOD variable to an FNameNoInit doesn't do anything bad, I just went ahead and got rid of the last place in the engine that still used this data type for internal storage.

Browse source
This commit is contained in:
Christoph Oelckers 2016-01-05 16:10:04 +01:00
parent 5d388f8e63
commit 3e13e772ef
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_lnspec.cpp
View file

@ -2276,7 +2276,7 @@ FUNC(LS_Sector_SetDamage)
} }
} }
sectors[secnum].damageamount = (short)arg1; sectors[secnum].damageamount = (short)arg1;
sectors[secnum].damagemod = (short)arg2; sectors[secnum].damagetype = MODtoDamageType(arg2);
sectors[secnum].damageinterval = (short)arg3; sectors[secnum].damageinterval = (short)arg3;
sectors[secnum].leakydamage = (short)arg4; sectors[secnum].leakydamage = (short)arg4;
} }

9
src/p_saveg.cpp
View file

@ -369,15 +369,18 @@ void P_SerializeWorld (FArchive &arc)
<< sec->heightsec << sec->heightsec
<< sec->bottommap << sec->midmap << sec->topmap << sec->bottommap << sec->midmap << sec->topmap
<< sec->gravity << sec->gravity
<< sec->damageamount << sec->damageamount;
<< sec->damagemod;
if (SaveVersion >= 4528) if (SaveVersion >= 4528)
{ {
arc << sec->damageinterval arc << sec->damageinterval
<< sec->leakydamage; << sec->leakydamage
<< sec->damagetype;
} }
else else
{ {
short damagemod;
arc << damagemod;
sec->damagetype = MODtoDamageType(damagemod);
if (sec->damageamount < 20) if (sec->damageamount < 20)
{ {
sec->leakydamage = 0; sec->leakydamage = 0;

4
src/p_spec.cpp
View file

@ -570,7 +570,7 @@ void P_PlayerInSpecialSector (player_t *player, sector_t * sector)
{ {
if (level.time % sector->damageinterval == 0 && (ironfeet == NULL || pr_playerinspecialsector() < sector->leakydamage)) if (level.time % sector->damageinterval == 0 && (ironfeet == NULL || pr_playerinspecialsector() < sector->leakydamage))
{ {
P_DamageMobj (player->mo, NULL, NULL, sector->damageamount, MODtoDamageType (sector->damagemod)); P_DamageMobj (player->mo, NULL, NULL, sector->damageamount, sector->damagetype);
} }
} }
@ -1439,7 +1439,7 @@ void P_SpawnSpecials (void)
{ {
sector_t *sec = &sectors[s]; sector_t *sec = &sectors[s];
sec->damageamount = damage; sec->damageamount = damage;
sec->damagemod = 0;//MOD_UNKNOWN; sec->damagetype = NAME_None;
if (sec->damageamount < 20) if (sec->damageamount < 20)
{ {
sec->leakydamage = 0; sec->leakydamage = 0;

2
src/r_defs.h
View file

@ -710,8 +710,8 @@ struct sector_t
struct msecnode_t *touching_thinglist; // phares 3/14/98 struct msecnode_t *touching_thinglist; // phares 3/14/98
float gravity; // [RH] Sector gravity (1.0 is normal) float gravity; // [RH] Sector gravity (1.0 is normal)
FNameNoInit damagetype; // [RH] Means-of-death for applied damage
short damageamount; // [RH] Damage to do while standing on floor short damageamount; // [RH] Damage to do while standing on floor
short damagemod; // [RH] Means-of-death for applied damage
short damageinterval; // Interval for damage application short damageinterval; // Interval for damage application
short leakydamage; // chance of leaking through radiation suit short leakydamage; // chance of leaking through radiation suit