summaryrefslogtreecommitdiff
path: root/src/heretic/p_pspr.c
diff options
context:
space:
mode:
authorSimon Howard2008-10-01 17:31:28 +0000
committerSimon Howard2008-10-01 17:31:28 +0000
commitbf5e84859e2aca7f543f88a4a93bb971332aa989 (patch)
tree377a3eac2ccbfdc6859f7b28ac83cc589d9a1c01 /src/heretic/p_pspr.c
parentfde2f7883fbd50ea4b56c0cc35f15161ff3ab649 (diff)
downloadchocolate-doom-bf5e84859e2aca7f543f88a4a93bb971332aa989.tar.gz
chocolate-doom-bf5e84859e2aca7f543f88a4a93bb971332aa989.tar.bz2
chocolate-doom-bf5e84859e2aca7f543f88a4a93bb971332aa989.zip
Merge Hexen fixed_t and angle definitions to common code, plus byte
swapping macros, bounding box checking, read/write file, screenshot and command line argument code. Update Heretic code to use ANG1_X rather than the new (correct) ANG1 definition. Subversion-branch: /branches/raven-branch Subversion-revision: 1311
Diffstat (limited to 'src/heretic/p_pspr.c')
-rw-r--r--src/heretic/p_pspr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/heretic/p_pspr.c b/src/heretic/p_pspr.c
index dc0b81ea..d3261093 100644
--- a/src/heretic/p_pspr.c
+++ b/src/heretic/p_pspr.c
@@ -1465,7 +1465,7 @@ void A_FireSkullRodPL2(player_t * player, pspdef_t * psp)
void A_SkullRodPL2Seek(mobj_t * actor)
{
- P_SeekerMissile(actor, ANG1 * 10, ANG1 * 30);
+ P_SeekerMissile(actor, ANG1_X * 10, ANG1_X * 30);
}
//----------------------------------------------------------------------------
@@ -1634,7 +1634,7 @@ void A_PhoenixPuff(mobj_t * actor)
mobj_t *puff;
angle_t angle;
- P_SeekerMissile(actor, ANG1 * 5, ANG1 * 10);
+ P_SeekerMissile(actor, ANG1_X * 5, ANG1_X * 10);
puff = P_SpawnMobj(actor->x, actor->y, actor->z, MT_PHOENIXPUFF);
angle = actor->angle + ANG90;
angle >>= ANGLETOFINESHIFT;