summaryrefslogtreecommitdiff
path: root/src/heretic/p_mobj.c
diff options
context:
space:
mode:
authorSimon Howard2009-10-16 18:35:19 +0000
committerSimon Howard2009-10-16 18:35:19 +0000
commit35f753d9e4b9d85cc712262a751729688e32aad6 (patch)
tree8bdecfaf3984c6ea1fee2a98526400ff648961dc /src/heretic/p_mobj.c
parent4c0dc104d7582d709d8cc665a1c46ed1d49cdd65 (diff)
downloadchocolate-doom-35f753d9e4b9d85cc712262a751729688e32aad6.tar.gz
chocolate-doom-35f753d9e4b9d85cc712262a751729688e32aad6.tar.bz2
chocolate-doom-35f753d9e4b9d85cc712262a751729688e32aad6.zip
Fix compile under MSVC (thanks entryway).
Subversion-branch: /branches/raven-branch Subversion-revision: 1718
Diffstat (limited to 'src/heretic/p_mobj.c')
-rw-r--r--src/heretic/p_mobj.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/heretic/p_mobj.c b/src/heretic/p_mobj.c
index b5366501..e07ecf45 100644
--- a/src/heretic/p_mobj.c
+++ b/src/heretic/p_mobj.c
@@ -70,7 +70,7 @@ boolean P_SetMobjState(mobj_t * mobj, statenum_t state)
if (state == S_NULL)
{ // Remove mobj
- mobj->state = S_NULL;
+ mobj->state = (state_t *) S_NULL;
P_RemoveMobj(mobj);
return (false);
}
@@ -100,7 +100,7 @@ boolean P_SetMobjStateNF(mobj_t * mobj, statenum_t state)
if (state == S_NULL)
{ // Remove mobj
- mobj->state = S_NULL;
+ mobj->state = (state_t *) S_NULL;
P_RemoveMobj(mobj);
return (false);
}
@@ -1214,7 +1214,7 @@ void P_SpawnPuff(fixed_t x, fixed_t y, fixed_t z)
break;
case MT_GAUNTLETPUFF1:
case MT_GAUNTLETPUFF2:
- puff->momz = .8 * FRACUNIT;
+ puff->momz = (fixed_t)(.8 * FRACUNIT);
default:
break;
}