Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
49e6e7a8
Commit
49e6e7a8
authored
Nov 27, 2021
by
sphere
Browse files
Options
Downloads
Patches
Plain Diff
Fix retracting spikes dealing typeless damage instead of spike damage.
parent
1afb0c55
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!1660
A few damage type fixes
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/info.c
+2
-2
2 additions, 2 deletions
src/info.c
src/p_map.c
+1
-1
1 addition, 1 deletion
src/p_map.c
with
3 additions
and
3 deletions
src/info.c
+
2
−
2
View file @
49e6e7a8
...
...
@@ -7974,7 +7974,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8*FRACUNIT, // radius
32*FRACUNIT, // height
0, // display offset
4,
// mass
DMG_SPIKE,
// mass
0, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_SCENERY|MF_NOCLIPHEIGHT, // flags
...
...
@@ -8001,7 +8001,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius
14*FRACUNIT, // height
0, // display offset
4,
// mass
DMG_SPIKE,
// mass
0, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SCENERY|MF_NOCLIPHEIGHT|MF_PAPERCOLLISION, // flags
...
...
This diff is collapsed.
Click to expand it.
src/p_map.c
+
1
−
1
View file @
49e6e7a8
...
...
@@ -1156,7 +1156,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
else
thing
->
z
=
tmthing
->
z
+
tmthing
->
height
+
FixedMul
(
FRACUNIT
,
tmthing
->
scale
);
if
(
thing
->
flags
&
MF_SHOOTABLE
)
P_DamageMobj
(
thing
,
tmthing
,
tmthing
,
1
,
0
);
P_DamageMobj
(
thing
,
tmthing
,
tmthing
,
1
,
DMG_SPIKE
);
return
true
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment