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/hexen/p_user.c | |
| 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/hexen/p_user.c')
| -rw-r--r-- | src/hexen/p_user.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/hexen/p_user.c b/src/hexen/p_user.c index cc6ca8b2..2086bdd2 100644 --- a/src/hexen/p_user.c +++ b/src/hexen/p_user.c @@ -384,7 +384,7 @@ void P_DeathThink(player_t * player) if (player->attacker && player->attacker != player->mo) { // Watch killer dir = P_FaceMobj(player->mo, player->attacker, &delta); - if (delta < ANGLE_1 * 10) + if (delta < ANG1 * 10) { // Looking at killer, so fade damage and poison counters if (player->damagecount) { @@ -396,9 +396,9 @@ void P_DeathThink(player_t * player) } } delta = delta / 8; - if (delta > ANGLE_1 * 5) + if (delta > ANG1 * 5) { - delta = ANGLE_1 * 5; + delta = ANG1 * 5; } if (dir) { // Turn clockwise |