summaryrefslogtreecommitdiff
path: root/src/strife/p_pspr.c
diff options
context:
space:
mode:
authorSamuel Villareal2010-09-12 00:27:22 +0000
committerSamuel Villareal2010-09-12 00:27:22 +0000
commitbc7f01df39827dee7e24fb461b4d48510e0e3582 (patch)
treea475d8c7dfe9fb4501b36716017f3ad9fe2e7719 /src/strife/p_pspr.c
parentfd1f146713bfa70136284a33214be42467611af5 (diff)
downloadchocolate-doom-bc7f01df39827dee7e24fb461b4d48510e0e3582.tar.gz
chocolate-doom-bc7f01df39827dee7e24fb461b4d48510e0e3582.tar.bz2
chocolate-doom-bc7f01df39827dee7e24fb461b4d48510e0e3582.zip
+ Items can be picked up now
+ Fixed targeter x/y offsets + Pickup Armor/Health/Ammo/Weapon updates Subversion-branch: /branches/strife-branch Subversion-revision: 2067
Diffstat (limited to 'src/strife/p_pspr.c')
-rw-r--r--src/strife/p_pspr.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/strife/p_pspr.c b/src/strife/p_pspr.c
index 99981739..b4e7c1c2 100644
--- a/src/strife/p_pspr.c
+++ b/src/strife/p_pspr.c
@@ -966,8 +966,11 @@ void P_MovePsprites (player_t* player)
player->psprites[ps_flash].sy = player->psprites[ps_weapon].sy;
// villsa [STRIFE] extra stuff for targeter
- player->psprites[ps_targleft].sx = (100 - player->accuracy) - (160*FRACUNIT);
- player->psprites[ps_targright].sx = (100 - player->accuracy) + (160*FRACUNIT);
+ player->psprites[ps_targleft].sx =
+ (160*FRACUNIT) - ((100 - player->accuracy) << FRACBITS);
+
+ player->psprites[ps_targright].sx =
+ ((100 - player->accuracy) << FRACBITS) + (160*FRACUNIT);
}