Merge branch 'cybrak_flamedmg' into 'next'

Fix damagetype for Cybrak flamethrower. See merge request STJr/SRB2!731
2020-01-31 02:34:05 -05:00 · 2020-01-31 02:34:05 -05:00 · d7fcd3384a
parent 56839f428d f90c70ebe2
commit d7fcd3384a
1 changed files with 2 additions and 2 deletions
--- a/src/info.c
+++ b/src/info.c
@ -6487,10 +6487,10 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		24*FRACUNIT,    // radius
 		24*FRACUNIT,    // height
 		0,              // display offset
-		0,              // mass
+		DMG_FIRE,       // mass
 		1,              // damage
 		sfx_None,       // activesound
-		MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
+		MF_NOBLOCKMAP|MF_MISSILE|MF_PAIN|MF_NOGRAVITY, // flags
 		S_NULL          // raisestate
 	},