Skip to content
Snippets Groups Projects
Commit 16251734 authored by sphere's avatar sphere
Browse files

Merge branch 'hehballs' into 'next'

Fix Large Spike Balls not dealing spike damage

See merge request !1661
parents ec0345b0 a5e1167a
No related branches found
No related tags found
1 merge request!1661Fix Large Spike Balls not dealing spike damage
...@@ -11430,7 +11430,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = ...@@ -11430,7 +11430,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
17*FRACUNIT, // radius 17*FRACUNIT, // radius
34*FRACUNIT, // height 34*FRACUNIT, // height
1, // display offset 1, // display offset
0, // mass DMG_SPIKE, // mass
1, // damage 1, // damage
sfx_s3kc9s, //sfx_mswing, -- activesound sfx_s3kc9s, //sfx_mswing, -- activesound
MF_SCENERY|MF_PAIN|MF_NOGRAVITY, // flags MF_SCENERY|MF_PAIN|MF_NOGRAVITY, // flags
...@@ -11457,7 +11457,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = ...@@ -11457,7 +11457,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
34*FRACUNIT, // radius 34*FRACUNIT, // radius
68*FRACUNIT, // height 68*FRACUNIT, // height
1, // display offset 1, // display offset
0, // mass DMG_SPIKE, // mass
1, // damage 1, // damage
sfx_s3kc9s, //sfx_mswing, -- activesound sfx_s3kc9s, //sfx_mswing, -- activesound
MF_SCENERY|MF_PAIN|MF_NOGRAVITY, // flags MF_SCENERY|MF_PAIN|MF_NOGRAVITY, // flags
...@@ -20380,7 +20380,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = ...@@ -20380,7 +20380,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
18*FRACUNIT, // radius 18*FRACUNIT, // radius
28*FRACUNIT, // height 28*FRACUNIT, // height
0, // display offset 0, // display offset
0, // mass DMG_SPIKE, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_NOGRAVITY|MF_PAIN, // flags MF_NOGRAVITY|MF_PAIN, // flags
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment