OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- made sector_t::damageamount an int so that it can hold TELEFRAG_DAMAGE.

Browse source 
- marked all places where sector_t::special needs to be addressed for the damage overhaul.

NOTE: This commit will not compile!
This commit is contained in:
Christoph Oelckers 2016-01-06 12:56:35 +01:00
commit bd8513c063
13 changed files with 44 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_mobj.cpp
View file

@ -3452,7 +3452,7 @@ void AActor::Tick ()
if (player != NULL)
{
int scrolltype = sec->special & 0xff;
int scrolltype = sec->special;
if (scrolltype >= Scroll_North_Slow &&
scrolltype <= Scroll_SouthWest_Fast)
@ -4424,7 +4424,7 @@ APlayerPawn *P_SpawnPlayer (FPlayerStart *mthing, int playernum, int flags)
( gameaction != ga_worlddone ) &&
( p->mo != NULL ) &&
( !(p->mo->Sector->Flags & SECF_NORESPAWN) ) &&
( (p->mo->Sector->special & 255) != Damage_InstantDeath ))
( p->mo->Sector->damageamount < TELEFRAG_DAMAGE ))
{
spawn_x = p->mo->x;
spawn_y = p->mo->y;