diff options
| author | Simon Howard | 2008-10-01 17:31:28 +0000 |
|---|---|---|
| committer | Simon Howard | 2008-10-01 17:31:28 +0000 |
| commit | bf5e84859e2aca7f543f88a4a93bb971332aa989 (patch) | |
| tree | 377a3eac2ccbfdc6859f7b28ac83cc589d9a1c01 /src/heretic | |
| parent | fde2f7883fbd50ea4b56c0cc35f15161ff3ab649 (diff) | |
| download | chocolate-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')
| -rw-r--r-- | src/heretic/p_enemy.c | 8 | ||||
| -rw-r--r-- | src/heretic/p_pspr.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/heretic/p_enemy.c b/src/heretic/p_enemy.c index 3f752195..376704fe 100644 --- a/src/heretic/p_enemy.c +++ b/src/heretic/p_enemy.c @@ -1245,7 +1245,7 @@ void A_MummyAttack2(mobj_t * actor) void A_MummyFX1Seek(mobj_t * actor) { - P_SeekerMissile(actor, ANG1 * 10, ANG1 * 20); + P_SeekerMissile(actor, ANG1_X * 10, ANG1_X * 20); } //---------------------------------------------------------------------------- @@ -1326,8 +1326,8 @@ void A_Srcr1Attack(mobj_t * actor) { momz = mo->momz; angle = mo->angle; - P_SpawnMissileAngle(actor, MT_SRCRFX1, angle - ANG1 * 3, momz); - P_SpawnMissileAngle(actor, MT_SRCRFX1, angle + ANG1 * 3, momz); + P_SpawnMissileAngle(actor, MT_SRCRFX1, angle - ANG1_X * 3, momz); + P_SpawnMissileAngle(actor, MT_SRCRFX1, angle + ANG1_X * 3, momz); } if (actor->health < actor->info->spawnhealth / 3) { // Maybe attack again @@ -1892,7 +1892,7 @@ void A_WhirlwindSeek(mobj_t * actor) { return; } - P_SeekerMissile(actor, ANG1 * 10, ANG1 * 30); + P_SeekerMissile(actor, ANG1_X * 10, ANG1_X * 30); } //---------------------------------------------------------------------------- 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; |