diff options
| author | James Haley | 2010-01-26 00:59:02 +0000 |
|---|---|---|
| committer | James Haley | 2010-01-26 00:59:02 +0000 |
| commit | b80409202d07732ec201c9816887262b505b81d4 (patch) | |
| tree | 364dcb86f2c22411a720447bfa21c4de9191ff6f /src/heretic/p_enemy.c | |
| parent | 66e8dc63bd0b384c99f0d0ff60b3d75c42d441b1 (diff) | |
| parent | 8f6edc1f7402215c5e38d1f03939ce6b5ff5e3ae (diff) | |
| download | chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.tar.gz chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.tar.bz2 chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.zip | |
Merge from raven-branch
Subversion-branch: /branches/strife-branch
Subversion-revision: 1825
Diffstat (limited to 'src/heretic/p_enemy.c')
| -rw-r--r-- | src/heretic/p_enemy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/heretic/p_enemy.c b/src/heretic/p_enemy.c index 05566a07..6ad8cff0 100644 --- a/src/heretic/p_enemy.c +++ b/src/heretic/p_enemy.c @@ -1917,7 +1917,7 @@ void A_HeadIceImpact(mobj_t * ice) angle >>= ANGLETOFINESHIFT; shard->momx = FixedMul(shard->info->speed, finecosine[angle]); shard->momy = FixedMul(shard->info->speed, finesine[angle]); - shard->momz = -.6 * FRACUNIT; + shard->momz = (fixed_t)(-.6 * FRACUNIT); P_CheckMissileSpawn(shard); } } @@ -2507,7 +2507,7 @@ void A_VolcanoBlast(mobj_t * volcano) angle >>= ANGLETOFINESHIFT; blast->momx = FixedMul(1 * FRACUNIT, finecosine[angle]); blast->momy = FixedMul(1 * FRACUNIT, finesine[angle]); - blast->momz = (2.5 * FRACUNIT) + (P_Random() << 10); + blast->momz = (fixed_t)(2.5 * FRACUNIT) + (P_Random() << 10); S_StartSound(blast, sfx_volsht); P_CheckMissileSpawn(blast); } @@ -2540,8 +2540,8 @@ void A_VolcBallImpact(mobj_t * ball) angle = i * ANG90; tiny->angle = angle; angle >>= ANGLETOFINESHIFT; - tiny->momx = FixedMul(FRACUNIT * .7, finecosine[angle]); - tiny->momy = FixedMul(FRACUNIT * .7, finesine[angle]); + tiny->momx = FixedMul((fixed_t)(FRACUNIT * .7), finecosine[angle]); + tiny->momy = FixedMul((fixed_t)(FRACUNIT * .7), finesine[angle]); tiny->momz = FRACUNIT + (P_Random() << 9); P_CheckMissileSpawn(tiny); } |