thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-05 00:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fix native MF_PAIN sound extension being limited to UINT8 range, which only became evident when the new s1/2/cd/3db/kc sfx were added.

Browse source 
* Make the pain-causing cactodes have DMG_SPIKE.
This commit is contained in:
toaster 2019-09-18 17:48:41 +01:00
parent f5240ae43a
commit 68116b914c
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/info.c
View file

@ -11599,7 +11599,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
20*FRACUNIT, // radius 20*FRACUNIT, // radius
128*FRACUNIT, // height 128*FRACUNIT, // height
0, // display offset 0, // display offset
100, // mass DMG_SPIKE, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_SOLID|MF_SCENERY|MF_PAIN, // flags MF_SOLID|MF_SCENERY|MF_PAIN, // flags
@ -11624,9 +11624,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // deathsound sfx_None, // deathsound
0, // speed 0, // speed
24*FRACUNIT, // radius 24*FRACUNIT, // radius
224*FRACUNIT, // height 224*FRACUNIT, // height
0, // display offset 0, // display offset
100, // mass DMG_SPIKE, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_SOLID|MF_SCENERY|MF_PAIN, // flags MF_SOLID|MF_SCENERY|MF_PAIN, // flags
@ -11651,9 +11651,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // deathsound sfx_None, // deathsound
0, // speed 0, // speed
24*FRACUNIT, // radius 24*FRACUNIT, // radius
256*FRACUNIT, // height 256*FRACUNIT, // height
0, // display offset 0, // display offset
100, // mass DMG_SPIKE, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_SOLID|MF_SCENERY|MF_PAIN, // flags MF_SOLID|MF_SCENERY|MF_PAIN, // flags
@ -11680,7 +11680,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
48*FRACUNIT, // radius 48*FRACUNIT, // radius
96*FRACUNIT, // height 96*FRACUNIT, // height
0, // display offset 0, // display offset
100, // mass DMG_SPIKE, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_SOLID|MF_SCENERY|MF_PAIN, // flags MF_SOLID|MF_SCENERY|MF_PAIN, // flags
@ -11707,7 +11707,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius 16*FRACUNIT, // radius
64*FRACUNIT, // height 64*FRACUNIT, // height
0, // display offset 0, // display offset
100, // mass DMG_SPIKE, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_SOLID|MF_SCENERY|MF_PAIN, // flags MF_SOLID|MF_SCENERY|MF_PAIN, // flags
@ -11734,7 +11734,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius 16*FRACUNIT, // radius
32*FRACUNIT, // height 32*FRACUNIT, // height
0, // display offset 0, // display offset
100, // mass DMG_SPIKE, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_SOLID|MF_SCENERY|MF_PAIN, // flags MF_SOLID|MF_SCENERY|MF_PAIN, // flags

4
src/p_map.c
View file

@ -1019,7 +1019,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true; // underneath return true; // underneath
if (tmthing->flags & MF_SHOOTABLE && thing->health > 0) if (tmthing->flags & MF_SHOOTABLE && thing->health > 0)
{ {
UINT8 damagetype = (thing->info->mass & 0xFF); UINT32 damagetype = (thing->info->mass & 0xFF);
if (!damagetype && thing->flags & MF_FIRE) // BURN! if (!damagetype && thing->flags & MF_FIRE) // BURN!
damagetype = DMG_FIRE; damagetype = DMG_FIRE;
if (P_DamageMobj(tmthing, thing, thing, 1, damagetype) && (damagetype = (thing->info->mass>>8))) if (P_DamageMobj(tmthing, thing, thing, 1, damagetype) && (damagetype = (thing->info->mass>>8)))
@ -1036,7 +1036,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true; // underneath return true; // underneath
if (thing->flags & MF_SHOOTABLE && tmthing->health > 0) if (thing->flags & MF_SHOOTABLE && tmthing->health > 0)
{ {
UINT8 damagetype = (tmthing->info->mass & 0xFF); UINT32 damagetype = (tmthing->info->mass & 0xFF);
if (!damagetype && tmthing->flags & MF_FIRE) // BURN! if (!damagetype && tmthing->flags & MF_FIRE) // BURN!
damagetype = DMG_FIRE; damagetype = DMG_FIRE;
if (P_DamageMobj(thing, tmthing, tmthing, 1, damagetype) && (damagetype = (tmthing->info->mass>>8))) if (P_DamageMobj(thing, tmthing, tmthing, 1, damagetype) && (damagetype = (tmthing->info->mass>>8)))