diff options
author | Simon Howard | 2009-10-16 18:35:19 +0000 |
---|---|---|
committer | Simon Howard | 2009-10-16 18:35:19 +0000 |
commit | 35f753d9e4b9d85cc712262a751729688e32aad6 (patch) | |
tree | 8bdecfaf3984c6ea1fee2a98526400ff648961dc /src/heretic/p_pspr.c | |
parent | 4c0dc104d7582d709d8cc665a1c46ed1d49cdd65 (diff) | |
download | chocolate-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_pspr.c')
-rw-r--r-- | src/heretic/p_pspr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/heretic/p_pspr.c b/src/heretic/p_pspr.c index 07a04ac7..7f9660ac 100644 --- a/src/heretic/p_pspr.c +++ b/src/heretic/p_pspr.c @@ -1639,14 +1639,14 @@ void A_PhoenixPuff(mobj_t * actor) puff = P_SpawnMobj(actor->x, actor->y, actor->z, MT_PHOENIXPUFF); angle = actor->angle + ANG90; angle >>= ANGLETOFINESHIFT; - puff->momx = FixedMul(FRACUNIT * 1.3, finecosine[angle]); - puff->momy = FixedMul(FRACUNIT * 1.3, finesine[angle]); + puff->momx = FixedMul((fixed_t)(FRACUNIT * 1.3), finecosine[angle]); + puff->momy = FixedMul((fixed_t)(FRACUNIT * 1.3), finesine[angle]); puff->momz = 0; puff = P_SpawnMobj(actor->x, actor->y, actor->z, MT_PHOENIXPUFF); angle = actor->angle - ANG90; angle >>= ANGLETOFINESHIFT; - puff->momx = FixedMul(FRACUNIT * 1.3, finecosine[angle]); - puff->momy = FixedMul(FRACUNIT * 1.3, finesine[angle]); + puff->momx = FixedMul((fixed_t)(FRACUNIT * 1.3), finecosine[angle]); + puff->momy = FixedMul((fixed_t)(FRACUNIT * 1.3), finesine[angle]); puff->momz = 0; } @@ -1727,7 +1727,7 @@ void A_ShutdownPhoenixPL2(player_t * player, pspdef_t * psp) void A_FlameEnd(mobj_t * actor) { - actor->momz += 1.5 * FRACUNIT; + actor->momz += (fixed_t)(1.5 * FRACUNIT); } //---------------------------------------------------------------------------- @@ -1738,7 +1738,7 @@ void A_FlameEnd(mobj_t * actor) void A_FloatPuff(mobj_t * puff) { - puff->momz += 1.8 * FRACUNIT; + puff->momz += (fixed_t)(1.8 * FRACUNIT); } //--------------------------------------------------------------------------- |