diff --git a/source/games/duke/src/hudweapon_d.cpp b/source/games/duke/src/hudweapon_d.cpp index 15a6c0ce0..c7a3a0db8 100644 --- a/source/games/duke/src/hudweapon_d.cpp +++ b/source/games/duke/src/hudweapon_d.cpp @@ -38,9 +38,9 @@ source as it is released. BEGIN_DUKE_NS -int getavel(int snum) +double getavel(int snum) { - return PlayerInputAngVel(screenpeek) >> FRACBITS; + return PlayerInputAngVel(screenpeek) / (double)(FRACUNIT); } //--------------------------------------------------------------------------- @@ -87,14 +87,15 @@ void displayloogie(short snum) int animatefist(int gs, int snum) { - short looking_arc, fisti, fistpal; - int fistzoom, fistz; + short fisti, fistpal; + int fistzoom; + double looking_arc, fistz; fisti = ps[snum].fist_incs; if (fisti > 32) fisti = 32; if (fisti <= 0) return 0; - looking_arc = abs(ps[snum].getlookang()) / 9; + looking_arc = fabs(ps[snum].q16look_ang / (double)(FRACUNIT)) / 9.; fistzoom = 65536L - (sintable[(512 + (fisti << 6)) & 2047] << 2); if (fistzoom > 90612L) @@ -109,7 +110,7 @@ int animatefist(int gs, int snum) fistpal = sector[ps[snum].cursectnum].floorpal; hud_drawsprite( - (-fisti + 222 + (getavel(snum) >> 4)), + (-fisti + 222 + (getavel(snum) / 16.)), (looking_arc + fistz), fistzoom, 0, FIST, gs, fistpal, 2); @@ -125,11 +126,12 @@ int animatefist(int gs, int snum) int animateknee(int gs, int snum) { static const short knee_y[] = { 0,-8,-16,-32,-64,-84,-108,-108,-108,-72,-32,-8 }; - short looking_arc, pal; + short pal; + double looking_arc; if (ps[snum].knee_incs > 11 || ps[snum].knee_incs == 0 || sprite[ps[snum].i].extra <= 0) return 0; - looking_arc = knee_y[ps[snum].knee_incs] + abs(ps[snum].getlookang()) / 9; + looking_arc = knee_y[ps[snum].knee_incs] + (fabs(ps[snum].q16look_ang / (double)(FRACUNIT)) / 9.); looking_arc -= (ps[snum].hard_landing << 3); @@ -142,7 +144,7 @@ int animateknee(int gs, int snum) pal = ps[snum].palookup; } - hud_drawpal(105 + (getavel(snum) >> 4) - (ps[snum].getlookang() >> 1) + (knee_y[ps[snum].knee_incs] >> 2), looking_arc + 280 - ((ps[snum].gethoriz() - ps[snum].gethorizof()) >> 4), KNEE, gs, 4, pal); + hud_drawpal(105 + (getavel(snum) / 16.) - (ps[snum].q16look_ang / (2. * FRACUNIT)) + (knee_y[ps[snum].knee_incs] >> 2), looking_arc + 280 - ((ps[snum].q16horiz - ps[snum].q16horizoff) / (16. * FRACUNIT)), KNEE, gs, 4, pal); return 1; } @@ -156,13 +158,14 @@ int animateknee(int gs, int snum) int animateknuckles(int gs, int snum) { static const short knuckle_frames[] = { 0,1,2,2,3,3,3,2,2,1,0 }; - short looking_arc, pal; + short pal; + double looking_arc; if (isWW2GI()) return 0; if (ps[snum].knuckle_incs == 0 || sprite[ps[snum].i].extra <= 0) return 0; - looking_arc = abs(ps[snum].getlookang()) / 9; + looking_arc = fabs(ps[snum].q16look_ang / (double)(FRACUNIT)) / 9.; looking_arc -= (ps[snum].hard_landing << 3); @@ -172,7 +175,7 @@ int animateknuckles(int gs, int snum) pal = sector[ps[snum].cursectnum].floorpal; auto pic = isWorldTour() ? CRACKKNUCKLESWIDE : CRACKKNUCKLES; - hud_drawpal(160 + (getavel(snum) >> 4) - (ps[snum].getlookang() >> 1), looking_arc + 180 - ((ps[snum].gethoriz() - ps[snum].gethorizof()) >> 4), pic + knuckle_frames[ps[snum].knuckle_incs >> 1], gs, 4, pal); + hud_drawpal(160 + (getavel(snum) / 16.) - (ps[snum].q16look_ang / (2. * FRACUNIT)), looking_arc + 180 - ((ps[snum].q16horiz - ps[snum].q16horizoff) / (16. * FRACUNIT)), pic + knuckle_frames[ps[snum].knuckle_incs >> 1], gs, 4, pal); return 1; } @@ -208,12 +211,13 @@ void displaymasks_d(int snum) static int animatetip(int gs, int snum) { - int p, looking_arc; + int p; + double looking_arc; static const short tip_y[] = { 0,-8,-16,-32,-64,-84,-108,-108,-108,-108,-108,-108,-108,-108,-108,-108,-96,-72,-64,-32,-16 }; if (ps[snum].tipincs == 0) return 0; - looking_arc = abs(ps[snum].getlookang()) / 9; + looking_arc = fabs(ps[snum].q16look_ang / (double)(FRACUNIT)) / 9.; looking_arc -= (ps[snum].hard_landing << 3); if (sprite[ps[snum].i].pal == 1) @@ -226,8 +230,8 @@ static int animatetip(int gs, int snum) else p = wall[ps[snum].access_wallnum].pal; */ - hud_drawpal(170 + (getavel(snum) >> 4) - (ps[snum].getlookang() >> 1), - (tip_y[ps[snum].tipincs] >> 1) + looking_arc + 240 - ((ps[snum].gethoriz() - ps[snum].gethorizof()) >> 4), TIP + ((26 - ps[snum].tipincs) >> 4), gs, 0, p); + hud_drawpal(170 + (getavel(snum) / 16.) - (ps[snum].q16look_ang / (2. * FRACUNIT)), + (tip_y[ps[snum].tipincs] >> 1) + looking_arc + 240 - ((ps[snum].q16horiz - ps[snum].q16horizoff) / (16. * FRACUNIT)), TIP + ((26 - ps[snum].tipincs) >> 4), gs, 0, p); return 1; } @@ -241,12 +245,12 @@ static int animatetip(int gs, int snum) int animateaccess(int gs,int snum) { static const short access_y[] = {0,-8,-16,-32,-64,-84,-108,-108,-108,-108,-108,-108,-108,-108,-108,-108,-96,-72,-64,-32,-16}; - short looking_arc; + double looking_arc; char p; if(ps[snum].access_incs == 0 || sprite[ps[snum].i].extra <= 0) return 0; - looking_arc = access_y[ps[snum].access_incs] + abs(ps[snum].getlookang())/9; + looking_arc = access_y[ps[snum].access_incs] + (fabs(ps[snum].q16look_ang / (double)(FRACUNIT)) / 9.); looking_arc -= (ps[snum].hard_landing<<3); if(ps[snum].access_spritenum >= 0) @@ -256,9 +260,9 @@ int animateaccess(int gs,int snum) // p = wall[ps[snum].access_wallnum].pal; if((ps[snum].access_incs-3) > 0 && (ps[snum].access_incs-3)>>3) - hud_drawpal(170+(getavel(snum)>>4)-(ps[snum].getlookang()>>1)+(access_y[ps[snum].access_incs]>>2),looking_arc+266-((ps[snum].gethoriz()-ps[snum].gethorizof())>>4),HANDHOLDINGLASER+(ps[snum].access_incs>>3),gs,0,p); + hud_drawpal(170+(getavel(snum)/16.)-(ps[snum].q16look_ang / (2. * FRACUNIT))+(access_y[ps[snum].access_incs]>>2),looking_arc+266-((ps[snum].q16horiz - ps[snum].q16horizoff) / (16. * FRACUNIT)),HANDHOLDINGLASER+(ps[snum].access_incs>>3),gs,0,p); else - hud_drawpal(170+(getavel(snum)>>4)-(ps[snum].getlookang()>>1)+(access_y[ps[snum].access_incs]>>2),looking_arc+266-((ps[snum].gethoriz()-ps[snum].gethorizof())>>4),HANDHOLDINGACCESS,gs,4,p); + hud_drawpal(170+(getavel(snum)/16.)-(ps[snum].q16look_ang / (2. * FRACUNIT))+(access_y[ps[snum].access_incs]>>2),looking_arc+266-((ps[snum].q16horiz - ps[snum].q16horizoff) / (16. * FRACUNIT)),HANDHOLDINGACCESS,gs,4,p); return 1; } @@ -271,10 +275,10 @@ int animateaccess(int gs,int snum) void displayweapon_d(int snum, double smoothratio) { - int looking_arc, cw; + int cw; int i, j; int o,pal; - double weapon_sway, weapon_xoffset, gun_pos; + double weapon_sway, weapon_xoffset, gun_pos, looking_arc; signed char gs; struct player_struct *p; @@ -284,7 +288,7 @@ void displayweapon_d(int snum, double smoothratio) o = 0; - looking_arc = abs(p->getlookang())/9; + looking_arc = fabs(p->q16look_ang / (double)(FRACUNIT)) / 9.; weapon_sway = p->oweapon_sway + (((p->weapon_sway - p->oweapon_sway) * smoothratio) / MaxSmoothRatio); gs = sprite[p->i].shade; @@ -343,11 +347,11 @@ void displayweapon_d(int snum, double smoothratio) if (j < 5 || j > 9) { - hud_drawpal(weapon_xoffset + 80 - (p->getlookang() >> 1), looking_arc + 250 - gun_pos, KNEE, gs, o | 4, pal); + hud_drawpal(weapon_xoffset + 80 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 250 - gun_pos, KNEE, gs, o | 4, pal); } else { - hud_drawpal(weapon_xoffset + 160 - 16 - (p->getlookang() >> 1), looking_arc + 214 - gun_pos, KNEE + 1, gs, o | 4, pal); + hud_drawpal(weapon_xoffset + 160 - 16 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 214 - gun_pos, KNEE + 1, gs, o | 4, pal); } } @@ -363,12 +367,12 @@ void displayweapon_d(int snum, double smoothratio) } cw = weapon_xoffset; weapon_xoffset += sintable[(fistsign) & 2047] >> 10; - hud_draw(weapon_xoffset + 250 - (p->getlookang() >> 1), + hud_draw(weapon_xoffset + 250 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 258 - (abs(sintable[(fistsign) & 2047] >> 8)), FIST, gs, o); weapon_xoffset = cw; weapon_xoffset -= sintable[(fistsign) & 2047] >> 10; - hud_draw(weapon_xoffset + 40 - (p->getlookang() >> 1), + hud_draw(weapon_xoffset + 40 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 200 + (abs(sintable[(fistsign) & 2047] >> 8)), FIST, gs, o | 4); } @@ -396,12 +400,12 @@ void displayweapon_d(int snum, double smoothratio) if (p->kickback_pic < 5 || p->kickback_pic > 9) { - hud_drawpal(weapon_xoffset + 220 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 220 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 250 - gun_pos, KNEE, gs, o, pal); } else { - hud_drawpal(weapon_xoffset + 160 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 160 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 214 - gun_pos, KNEE + 1, gs, o, pal); } } @@ -427,13 +431,13 @@ void displayweapon_d(int snum, double smoothratio) if (p->kickback_pic > 6) looking_arc += (p->kickback_pic << 3); else if (p->kickback_pic < 4) - hud_drawpal(weapon_xoffset + 142 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 142 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 234 - gun_pos, HANDHOLDINGLASER + 3, gs, o, pal); - hud_drawpal(weapon_xoffset + 130 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 130 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 249 - gun_pos, HANDHOLDINGLASER + (p->kickback_pic >> 2), gs, o, pal); - hud_drawpal(weapon_xoffset + 152 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 152 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 249 - gun_pos, HANDHOLDINGLASER + (p->kickback_pic >> 2), gs, o | 4, pal); }; @@ -460,7 +464,7 @@ void displayweapon_d(int snum, double smoothratio) { if (*kb < (isWW2GI() ? aplWeaponTotalTime[RPG_WEAPON][snum] : 8)) { - hud_drawpal(weapon_xoffset + 164, (looking_arc << 1) + 176 - gun_pos, + hud_drawpal(weapon_xoffset + 164, (looking_arc * 2.) + 176 - gun_pos, rpgpic + (p->kickback_pic >> 1), gs, o | pin, pal); } else if (isWW2GI()) @@ -486,7 +490,7 @@ void displayweapon_d(int snum, double smoothratio) } } - hud_drawpal(weapon_xoffset + 164, (looking_arc << 1) + 176 - gun_pos, rpgpic, gs, o | pin, pal); + hud_drawpal(weapon_xoffset + 164, (looking_arc * 2.) + 176 - gun_pos, rpgpic, gs, o | pin, pal); }; //--------------------------------------------------------------------------- @@ -517,12 +521,12 @@ void displayweapon_d(int snum, double smoothratio) if (*kb == 0) { - hud_drawpal(weapon_xoffset + 146 - (p->getlookang() >> 1), looking_arc + 202 - gun_pos, + hud_drawpal(weapon_xoffset + 146 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 202 - gun_pos, SHOTGUN, gs, o, pal); } else if (*kb <= aplWeaponTotalTime[SHOTGUN_WEAPON][snum]) { - hud_drawpal(weapon_xoffset + 146 - (p->getlookang() >> 1), looking_arc + 202 - gun_pos, + hud_drawpal(weapon_xoffset + 146 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 202 - gun_pos, SHOTGUN + 1, gs, o, pal); } // else we are in 'reload time' @@ -536,7 +540,7 @@ void displayweapon_d(int snum, double smoothratio) // down gun_pos -= 10 * (p->kickback_pic - aplWeaponTotalTime[p->curr_weapon][snum]); //D // weapon_xoffset+=80*(*kb-aplWeaponTotalTime[cw][snum]); - hud_drawpal(weapon_xoffset + 146 - (p->getlookang() >> 1), looking_arc + 202 - gun_pos, + hud_drawpal(weapon_xoffset + 146 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 202 - gun_pos, SHOTGUN, gs, o, pal); } else @@ -546,7 +550,7 @@ void displayweapon_d(int snum, double smoothratio) // up and left gun_pos -= 10 * (aplWeaponReload[p->curr_weapon][snum] - p->kickback_pic); //U // weapon_xoffset+=80*(*kb-aplWeaponTotalTime[cw][snum]); - hud_drawpal(weapon_xoffset + 146 - (p->getlookang() >> 1), looking_arc + 202 - gun_pos, + hud_drawpal(weapon_xoffset + 146 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 202 - gun_pos, SHOTGUN, gs, o, pal); } }; @@ -571,13 +575,13 @@ void displayweapon_d(int snum, double smoothratio) { case 1: case 2: - hud_drawpal(weapon_xoffset + 168 - (p->getlookang() >> 1),looking_arc + 201 - gun_pos, + hud_drawpal(weapon_xoffset + 168 - (p->q16look_ang / (2. * FRACUNIT)),looking_arc + 201 - gun_pos, SHOTGUN + 2,-128,o,pal); case 0: case 6: case 7: case 8: - hud_drawpal(weapon_xoffset + 146 - (p->getlookang() >> 1),looking_arc + 202 - gun_pos, + hud_drawpal(weapon_xoffset + 146 - (p->q16look_ang / (2. * FRACUNIT)),looking_arc + 202 - gun_pos, SHOTGUN,gs,o,pal); break; case 3: @@ -592,45 +596,45 @@ void displayweapon_d(int snum, double smoothratio) gun_pos -= 40; weapon_xoffset += 20; - hud_drawpal(weapon_xoffset + 178 - (p->getlookang() >> 1),looking_arc + 194 - gun_pos, + hud_drawpal(weapon_xoffset + 178 - (p->q16look_ang / (2. * FRACUNIT)),looking_arc + 194 - gun_pos, SHOTGUN + 1 + ((*(kb)-1) >> 1),-128,o,pal); } - hud_drawpal(weapon_xoffset + 158 - (p->getlookang() >> 1),looking_arc + 220 - gun_pos, + hud_drawpal(weapon_xoffset + 158 - (p->q16look_ang / (2. * FRACUNIT)),looking_arc + 220 - gun_pos, SHOTGUN + 3,gs,o,pal); break; case 13: case 14: case 15: - hud_drawpal(32 + weapon_xoffset + 166 - (p->getlookang() >> 1),looking_arc + 210 - gun_pos, + hud_drawpal(32 + weapon_xoffset + 166 - (p->q16look_ang / (2. * FRACUNIT)),looking_arc + 210 - gun_pos, SHOTGUN + 4,gs,o,pal); break; case 16: case 17: case 18: case 19: - hud_drawpal(64 + weapon_xoffset + 170 - (p->getlookang() >> 1),looking_arc + 196 - gun_pos, + hud_drawpal(64 + weapon_xoffset + 170 - (p->q16look_ang / (2. * FRACUNIT)),looking_arc + 196 - gun_pos, SHOTGUN + 5,gs,o,pal); break; case 20: case 21: case 22: case 23: - hud_drawpal(64 + weapon_xoffset + 176 - (p->getlookang() >> 1),looking_arc + 196 - gun_pos, + hud_drawpal(64 + weapon_xoffset + 176 - (p->q16look_ang / (2. * FRACUNIT)),looking_arc + 196 - gun_pos, SHOTGUN + 6,gs,o,pal); break; case 24: case 25: case 26: case 27: - hud_drawpal(64 + weapon_xoffset + 170 - (p->getlookang() >> 1),looking_arc + 196 - gun_pos, + hud_drawpal(64 + weapon_xoffset + 170 - (p->q16look_ang / (2. * FRACUNIT)),looking_arc + 196 - gun_pos, SHOTGUN + 5,gs,o,pal); break; case 28: case 29: case 30: - hud_drawpal(32 + weapon_xoffset + 156 - (p->getlookang() >> 1),looking_arc + 206 - gun_pos, + hud_drawpal(32 + weapon_xoffset + 156 - (p->q16look_ang / (2. * FRACUNIT)),looking_arc + 206 - gun_pos, SHOTGUN + 4,gs,o,pal); break; } @@ -656,14 +660,14 @@ void displayweapon_d(int snum, double smoothratio) if (*kb == 0) { - // hud_drawpal(weapon_xoffset+168-(p->getlookang()>>1),looking_arc+260-gun_pos, + // hud_drawpal(weapon_xoffset+168-(p->q16look_ang/(2. * FRACUNIT)),looking_arc+260-gun_pos, // CHAINGUN,gs,o,pal); - hud_drawpal(weapon_xoffset + 178 - (p->getlookang() >> 1), looking_arc + 233 - gun_pos, + hud_drawpal(weapon_xoffset + 178 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 233 - gun_pos, CHAINGUN + 1, gs, o, pal); } else if (*kb <= aplWeaponTotalTime[CHAINGUN_WEAPON][snum]) { - hud_drawpal(weapon_xoffset + 188 - (p->getlookang() >> 1), looking_arc + 243 - gun_pos, + hud_drawpal(weapon_xoffset + 188 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 243 - gun_pos, CHAINGUN + 2, gs, o, pal); } // else we are in 'reload time' @@ -693,7 +697,7 @@ void displayweapon_d(int snum, double smoothratio) + iFifths - p->kickback_pic)); weapon_xoffset += 80 - (10 * (aplWeaponTotalTime[p->curr_weapon][snum] + iFifths - p->kickback_pic)); - hud_drawpal(weapon_xoffset + 168 - (p->getlookang() >> 1), looking_arc + 260 - gun_pos, + hud_drawpal(weapon_xoffset + 168 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 260 - gun_pos, 2519, gs, o, pal); } else if (p->kickback_pic < @@ -706,7 +710,7 @@ void displayweapon_d(int snum, double smoothratio) // down gun_pos += 80; //5*(iFifthsp->kickback_pic-aplWeaponTotalTime[p->curr_weapon][snum]); //D weapon_xoffset += 80; //80*(*kb-aplWeaponTotalTime[p->curr_weapon][snum]); - hud_drawpal(weapon_xoffset + 168 - (p->getlookang() >> 1), looking_arc + 260 - gun_pos, + hud_drawpal(weapon_xoffset + 168 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 260 - gun_pos, 2518, gs, o, pal); } else if (p->kickback_pic < @@ -719,7 +723,7 @@ void displayweapon_d(int snum, double smoothratio) // up gun_pos += 80;//5*(iFifths*2); weapon_xoffset += 80; //80*(*kb-aplWeaponTotalTime[p->curr_weapon][snum]); - hud_drawpal(weapon_xoffset + 168 - (p->getlookang() >> 1), looking_arc + 260 - gun_pos, + hud_drawpal(weapon_xoffset + 168 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 260 - gun_pos, 2517, gs, o, pal); } else if (p->kickback_pic < @@ -732,7 +736,7 @@ void displayweapon_d(int snum, double smoothratio) // down gun_pos += 80; //5*(aplWeaponTotalTime[p->curr_weapon][snum]- p->kickback_pic); //D weapon_xoffset += 80; //80*(*kb-aplWeaponTotalTime[p->curr_weapon][snum]); - hud_drawpal(weapon_xoffset + 168 - (p->getlookang() >> 1), looking_arc + 260 - gun_pos, 2518, gs, o, pal); + hud_drawpal(weapon_xoffset + 168 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 260 - gun_pos, 2518, gs, o, pal); } else { @@ -743,7 +747,7 @@ void displayweapon_d(int snum, double smoothratio) //5*(aplWeaponReload[p->curr_weapon][snum]- p->kickback_pic); //U weapon_xoffset += 10 * (aplWeaponReload[p->curr_weapon][snum] - p->kickback_pic); //80*(*kb-aplWeaponTotalTime[cw][snum]); - hud_drawpal(weapon_xoffset + 168 - (p->getlookang() >> 1), looking_arc + 260 - gun_pos, 2519, gs, o, pal); + hud_drawpal(weapon_xoffset + 168 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 260 - gun_pos, 2519, gs, o, pal); } } @@ -767,28 +771,28 @@ void displayweapon_d(int snum, double smoothratio) if (*kb > 0 && sprite[p->i].pal != 1) weapon_xoffset += 1 - (rand() & 3); - hud_drawpal(weapon_xoffset + 168 - (p->getlookang() >> 1), looking_arc + 260 - gun_pos, CHAINGUN, gs, o, pal); + hud_drawpal(weapon_xoffset + 168 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 260 - gun_pos, CHAINGUN, gs, o, pal); switch(p->kickback_pic) { case 0: - hud_drawpal(weapon_xoffset + 178 - (p->getlookang() >> 1),looking_arc + 233 - gun_pos, CHAINGUN + 1,gs,o,pal); + hud_drawpal(weapon_xoffset + 178 - (p->q16look_ang / (2. * FRACUNIT)),looking_arc + 233 - gun_pos, CHAINGUN + 1,gs,o,pal); break; default: if (*kb > 4 && *kb < 12) { i = 0; if (sprite[p->i].pal != 1) i = rand() & 7; - hud_drawpal(i + weapon_xoffset - 4 + 140 - (p->getlookang() >> 1),i + looking_arc - (p->kickback_pic >> 1) + 208 - gun_pos, CHAINGUN + 5 + ((*kb - 4) / 5),gs,o,pal); + hud_drawpal(i + weapon_xoffset - 4 + 140 - (p->q16look_ang / (2. * FRACUNIT)),i + looking_arc - (p->kickback_pic >> 1) + 208 - gun_pos, CHAINGUN + 5 + ((*kb - 4) / 5),gs,o,pal); if (sprite[p->i].pal != 1) i = rand() & 7; - hud_drawpal(i + weapon_xoffset - 4 + 184 - (p->getlookang() >> 1),i + looking_arc - (p->kickback_pic >> 1) + 208 - gun_pos, CHAINGUN + 5 + ((*kb - 4) / 5),gs,o,pal); + hud_drawpal(i + weapon_xoffset - 4 + 184 - (p->q16look_ang / (2. * FRACUNIT)),i + looking_arc - (p->kickback_pic >> 1) + 208 - gun_pos, CHAINGUN + 5 + ((*kb - 4) / 5),gs,o,pal); } if (*kb < 8) { i = rand() & 7; - hud_drawpal(i + weapon_xoffset - 4 + 162 - (p->getlookang() >> 1),i + looking_arc - (p->kickback_pic >> 1) + 208 - gun_pos, CHAINGUN + 5 + ((*kb - 2) / 5),gs,o,pal); - hud_drawpal(weapon_xoffset + 178 - (p->getlookang() >> 1),looking_arc + 233 - gun_pos, CHAINGUN + 1 + (p->kickback_pic >> 1),gs,o,pal); + hud_drawpal(i + weapon_xoffset - 4 + 162 - (p->q16look_ang / (2. * FRACUNIT)),i + looking_arc - (p->kickback_pic >> 1) + 208 - gun_pos, CHAINGUN + 5 + ((*kb - 2) / 5),gs,o,pal); + hud_drawpal(weapon_xoffset + 178 - (p->q16look_ang / (2. * FRACUNIT)),looking_arc + 233 - gun_pos, CHAINGUN + 1 + (p->kickback_pic >> 1),gs,o,pal); } - else hud_drawpal(weapon_xoffset + 178 - (p->getlookang() >> 1),looking_arc + 233 - gun_pos, CHAINGUN + 1,gs,o,pal); + else hud_drawpal(weapon_xoffset + 178 - (p->q16look_ang / (2. * FRACUNIT)),looking_arc + 233 - gun_pos, CHAINGUN + 1,gs,o,pal); break; } }; @@ -819,7 +823,7 @@ void displayweapon_d(int snum, double smoothratio) short tilenum; signed char shade; char orientation; - x = (l - (p->getlookang() >> 1)); + x = (l - (p->q16look_ang / (2. * FRACUNIT))); y = (looking_arc + 244 - gun_pos); tilenum = FIRSTGUN + kb_frames[*kb]; shade = gs; @@ -841,41 +845,41 @@ void displayweapon_d(int snum, double smoothratio) const int WEAPON2_RELOAD_TIME = 50; auto reload_time = isWW2GI() ? aplWeaponReload[PISTOL_WEAPON][snum] : WEAPON2_RELOAD_TIME; if (p->kickback_pic < 10) - hud_drawpal(194 - (p->getlookang() >> 1), looking_arc + 230 - gun_pos, pic + 4, gs, o|pin, pal); + hud_drawpal(194 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 230 - gun_pos, pic + 4, gs, o|pin, pal); else if (p->kickback_pic < 15) { - hud_drawpal(244 - (p->kickback_pic << 3) - (p->getlookang() >> 1), looking_arc + 130 - gun_pos + (p->kickback_pic << 4), pic + 6, gs, o | pin, pal); - hud_drawpal(224 - (p->getlookang() >> 1), looking_arc + 220 - gun_pos, pic + 5, gs, o | pin, pal); + hud_drawpal(244 - (p->kickback_pic << 3) - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 130 - gun_pos + (p->kickback_pic << 4), pic + 6, gs, o | pin, pal); + hud_drawpal(224 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 220 - gun_pos, pic + 5, gs, o | pin, pal); } else if (p->kickback_pic < 20) { - hud_drawpal(124 + (p->kickback_pic << 1) - (p->getlookang() >> 1), looking_arc + 430 - gun_pos - (p->kickback_pic << 3), pic + 6, gs, o | pin, pal); - hud_drawpal(224 - (p->getlookang() >> 1), looking_arc + 220 - gun_pos, pic + 5, gs, o | pin, pal); + hud_drawpal(124 + (p->kickback_pic << 1) - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 430 - gun_pos - (p->kickback_pic << 3), pic + 6, gs, o | pin, pal); + hud_drawpal(224 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 220 - gun_pos, pic + 5, gs, o | pin, pal); } else if (p->kickback_pic < (reload_time - 12)) { - hud_drawpal(184 - (p->getlookang() >> 1), looking_arc + 235 - gun_pos, pic + 8, gs, o | pin, pal); - hud_drawpal(224 - (p->getlookang() >> 1), looking_arc + 210 - gun_pos, pic + 5, gs, o | pin, pal); + hud_drawpal(184 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 235 - gun_pos, pic + 8, gs, o | pin, pal); + hud_drawpal(224 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 210 - gun_pos, pic + 5, gs, o | pin, pal); } else if (p->kickback_pic < (reload_time - 6)) { - hud_drawpal(164 - (p->getlookang() >> 1), looking_arc + 245 - gun_pos, pic + 8, gs, o | pin, pal); - hud_drawpal(224 - (p->getlookang() >> 1), looking_arc + 220 - gun_pos, pic + 5, gs, o | pin, pal); + hud_drawpal(164 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 245 - gun_pos, pic + 8, gs, o | pin, pal); + hud_drawpal(224 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 220 - gun_pos, pic + 5, gs, o | pin, pal); } else if (p->kickback_pic < (reload_time)) - hud_drawpal(194 - (p->getlookang() >> 1), looking_arc + 235 - gun_pos, pic + 5, gs, o, pal); + hud_drawpal(194 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 235 - gun_pos, pic + 5, gs, o, pal); else if (p->kickback_pic < 23) { - hud_drawpal(184 - (p->getlookang() >> 1), looking_arc + 235 - gun_pos, pic + 8, gs, o | pin, pal); - hud_drawpal(224 - (p->getlookang() >> 1), looking_arc + 210 - gun_pos, pic + 5, gs, o | pin, pal); + hud_drawpal(184 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 235 - gun_pos, pic + 8, gs, o | pin, pal); + hud_drawpal(224 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 210 - gun_pos, pic + 5, gs, o | pin, pal); } else if (p->kickback_pic < 25) { - hud_drawpal(164 - (p->getlookang() >> 1), looking_arc + 245 - gun_pos, pic + 8, gs, o | pin, pal); - hud_drawpal(224 - (p->getlookang() >> 1), looking_arc + 220 - gun_pos, pic + 5, gs, o | pin, pal); + hud_drawpal(164 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 245 - gun_pos, pic + 8, gs, o | pin, pal); + hud_drawpal(224 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 220 - gun_pos, pic + 5, gs, o | pin, pal); } else if (p->kickback_pic < 27) - hud_drawpal(194 - (p->getlookang() >> 1), looking_arc + 235 - gun_pos, pic + 5, gs, o | pin, pal); + hud_drawpal(194 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 235 - gun_pos, pic + 5, gs, o | pin, pal); } }; @@ -932,10 +936,10 @@ void displayweapon_d(int snum, double smoothratio) else if (p->kickback_pic < 20) gun_pos -= 9 * (p->kickback_pic - 14); //D } - hud_drawpal(weapon_xoffset + 190 - (p->getlookang() >> 1), looking_arc + 250 - gun_pos, HANDTHROW + throw_frames[p->kickback_pic], gs, o, pal); + hud_drawpal(weapon_xoffset + 190 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 250 - gun_pos, HANDTHROW + throw_frames[p->kickback_pic], gs, o, pal); } else - hud_drawpal(weapon_xoffset + 190 - (p->getlookang() >> 1), looking_arc + 260 - gun_pos, HANDTHROW, gs, o, pal); + hud_drawpal(weapon_xoffset + 190 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 260 - gun_pos, HANDTHROW, gs, o, pal); }; //--------------------------------------------------------------------------- @@ -955,9 +959,9 @@ void displayweapon_d(int snum, double smoothratio) weapon_xoffset = -48; if (p->kickback_pic) - hud_drawpal(weapon_xoffset + 150 - (p->getlookang() >> 1), looking_arc + 258 - gun_pos, HANDREMOTE + remote_frames[p->kickback_pic], gs, o, pal); + hud_drawpal(weapon_xoffset + 150 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 258 - gun_pos, HANDREMOTE + remote_frames[p->kickback_pic], gs, o, pal); else - hud_drawpal(weapon_xoffset + 150 - (p->getlookang() >> 1), looking_arc + 258 - gun_pos, HANDREMOTE, gs, o, pal); + hud_drawpal(weapon_xoffset + 150 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 258 - gun_pos, HANDREMOTE, gs, o, pal); }; //--------------------------------------------------------------------------- @@ -980,13 +984,13 @@ void displayweapon_d(int snum, double smoothratio) i = sgn(p->kickback_pic >> 2); if (p->ammo_amount[p->curr_weapon] & 1) { - hud_drawpal(weapon_xoffset + 30 - (p->getlookang() >> 1), looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal); - hud_drawpal(weapon_xoffset + 268 - (p->getlookang() >> 1), looking_arc + 238 - gun_pos, DEVISTATOR + i, -32, o, pal); + hud_drawpal(weapon_xoffset + 30 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal); + hud_drawpal(weapon_xoffset + 268 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 238 - gun_pos, DEVISTATOR + i, -32, o, pal); } else { - hud_drawpal(weapon_xoffset + 30 - (p->getlookang() >> 1), looking_arc + 240 - gun_pos, DEVISTATOR + i, -32, o | 4, pal); - hud_drawpal(weapon_xoffset + 268 - (p->getlookang() >> 1), looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal); + hud_drawpal(weapon_xoffset + 30 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, DEVISTATOR + i, -32, o | 4, pal); + hud_drawpal(weapon_xoffset + 268 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal); } } // else we are in 'reload time' @@ -1000,8 +1004,8 @@ void displayweapon_d(int snum, double smoothratio) // down gun_pos -= 10 * (p->kickback_pic - aplWeaponTotalTime[p->curr_weapon][snum]); //D // weapon_xoffset+=80*(*kb-aplWeaponTotalTime[cw][snum]); - hud_drawpal(weapon_xoffset + 268 - (p->getlookang() >> 1), looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal); - hud_drawpal(weapon_xoffset + 30 - (p->getlookang() >> 1), looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal); + hud_drawpal(weapon_xoffset + 268 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal); + hud_drawpal(weapon_xoffset + 30 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal); } else { @@ -1010,14 +1014,14 @@ void displayweapon_d(int snum, double smoothratio) // up and left gun_pos -= 10 * (aplWeaponReload[p->curr_weapon][snum] - p->kickback_pic); //U // weapon_xoffset+=80*(*kb-aplWeaponTotalTime[cw][snum]); - hud_drawpal(weapon_xoffset + 268 - (p->getlookang() >> 1), looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal); - hud_drawpal(weapon_xoffset + 30 - (p->getlookang() >> 1), looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal); + hud_drawpal(weapon_xoffset + 268 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal); + hud_drawpal(weapon_xoffset + 30 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal); } } else { - hud_drawpal(weapon_xoffset + 268 - (p->getlookang() >> 1), looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal); - hud_drawpal(weapon_xoffset + 30 - (p->getlookang() >> 1), looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal); + hud_drawpal(weapon_xoffset + 268 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal); + hud_drawpal(weapon_xoffset + 30 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal); } }; @@ -1042,19 +1046,19 @@ void displayweapon_d(int snum, double smoothratio) if (p->hbomb_hold_delay) { - hud_drawpal((cycloidy[*kb] >> 1) + weapon_xoffset + 268 - (p->getlookang() >> 1), cycloidy[*kb] + looking_arc + 238 - gun_pos, DEVISTATOR + i, -32, o, pal); - hud_drawpal(weapon_xoffset + 30 - (p->getlookang() >> 1), looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal); + hud_drawpal((cycloidy[*kb] >> 1) + weapon_xoffset + 268 - (p->q16look_ang / (2. * FRACUNIT)), cycloidy[*kb] + looking_arc + 238 - gun_pos, DEVISTATOR + i, -32, o, pal); + hud_drawpal(weapon_xoffset + 30 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal); } else { - hud_drawpal(-(cycloidy[*kb] >> 1) + weapon_xoffset + 30 - (p->getlookang() >> 1), cycloidy[*kb] + looking_arc + 240 - gun_pos, DEVISTATOR + i, -32, o | 4, pal); - hud_drawpal(weapon_xoffset + 268 - (p->getlookang() >> 1), looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal); + hud_drawpal(-(cycloidy[*kb] >> 1) + weapon_xoffset + 30 - (p->q16look_ang / (2. * FRACUNIT)), cycloidy[*kb] + looking_arc + 240 - gun_pos, DEVISTATOR + i, -32, o | 4, pal); + hud_drawpal(weapon_xoffset + 268 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal); } } else { - hud_drawpal(weapon_xoffset + 268 - (p->getlookang() >> 1), looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal); - hud_drawpal(weapon_xoffset + 30 - (p->getlookang() >> 1), looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal); + hud_drawpal(weapon_xoffset + 268 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal); + hud_drawpal(weapon_xoffset + 30 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal); } }; @@ -1084,10 +1088,10 @@ void displayweapon_d(int snum, double smoothratio) looking_arc += rand() & 3; } gun_pos -= 16; - hud_drawpal(weapon_xoffset + 210 - (p->getlookang() >> 1), looking_arc + 261 - gun_pos, pic + 2, -32, o|pin, pal); - hud_drawpal(weapon_xoffset + 210 - (p->getlookang() >> 1), looking_arc + 235 - gun_pos, pic + 3 + cat_frames[*kb % 6], -32, o | pin, pal); + hud_drawpal(weapon_xoffset + 210 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 261 - gun_pos, pic + 2, -32, o|pin, pal); + hud_drawpal(weapon_xoffset + 210 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 235 - gun_pos, pic + 3 + cat_frames[*kb % 6], -32, o | pin, pal); } - else hud_drawpal(weapon_xoffset + 210 - (p->getlookang() >> 1), looking_arc + 261 - gun_pos, pic, gs, o | pin, pal); + else hud_drawpal(weapon_xoffset + 210 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 261 - gun_pos, pic, gs, o | pin, pal); }; //--------------------------------------------------------------------------- @@ -1109,22 +1113,22 @@ void displayweapon_d(int snum, double smoothratio) // the 'at rest' display if (ps[snum].ammo_amount[cw] <= 0) //p->last_weapon >= 0) { - hud_drawpal(weapon_xoffset + 184 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 184 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER + 3 + (p->kickback_pic & 3), -32, o, 0); - hud_drawpal(weapon_xoffset + 188 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 188 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER + 1, gs, o, pal); } else { - hud_drawpal(weapon_xoffset + 184 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 184 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER + 2, 16 - (sintable[p->random_club_frame & 2047] >> 10), o, 0); - hud_drawpal(weapon_xoffset + 188 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 188 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER, gs, o, pal); } } @@ -1173,11 +1177,11 @@ void displayweapon_d(int snum, double smoothratio) // draw weapon { - hud_drawpal(weapon_xoffset + 184 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 184 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER + 3 + (p->kickback_pic & 3), -32, o, 0); - hud_drawpal(weapon_xoffset + 188 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 188 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER + 1, gs, o, pal); } } @@ -1200,7 +1204,7 @@ void displayweapon_d(int snum, double smoothratio) if (p->kickback_pic == 0) { { - hud_drawpal(weapon_xoffset + 188 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 188 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER - 2, gs, o, pal); } } @@ -1247,11 +1251,11 @@ void displayweapon_d(int snum, double smoothratio) // display weapon { - hud_drawpal(weapon_xoffset + 184 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 184 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER + 3 + (p->kickback_pic & 3), -32, o, 2); - hud_drawpal(weapon_xoffset + 188 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 188 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER - 1, gs, o, pal); } @@ -1276,22 +1280,22 @@ void displayweapon_d(int snum, double smoothratio) { if (cw == GROW_WEAPON) { - hud_drawpal(weapon_xoffset + 184 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 184 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER + 2, 16 - (sintable[p->random_club_frame & 2047] >> 10), o, 2); - hud_drawpal(weapon_xoffset + 188 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 188 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER - 2, gs, o, pal); } else { - hud_drawpal(weapon_xoffset + 184 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 184 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER + 2, 16 - (sintable[p->random_club_frame & 2047] >> 10), o, 0); - hud_drawpal(weapon_xoffset + 188 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 188 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER, gs, o, pal); } } @@ -1305,21 +1309,21 @@ void displayweapon_d(int snum, double smoothratio) if (cw == GROW_WEAPON) { - hud_drawpal(weapon_xoffset + 184 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 184 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER + 3 + (p->kickback_pic & 3), -32, o, 2); - hud_drawpal(weapon_xoffset + 188 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 188 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER - 1, gs, o, pal); } else { - hud_drawpal(weapon_xoffset + 184 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 184 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER + 3 + (p->kickback_pic & 3), -32, o, 0); - hud_drawpal(weapon_xoffset + 188 - (p->getlookang() >> 1), + hud_drawpal(weapon_xoffset + 188 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 240 - gun_pos, SHRINKER + 1, gs, o, pal); } } @@ -1345,8 +1349,8 @@ void displayweapon_d(int snum, double smoothratio) if (*kb < 1 || sector[p->cursectnum].lotag == 2) { - hud_drawpal(weapon_xoffset + 210 - (p->getlookang() >> 1), looking_arc + 261 - gun_pos, FLAMETHROWER, gs, o, pal); - hud_drawpal(weapon_xoffset + 210 - (p->getlookang() >> 1), looking_arc + 261 - gun_pos, FLAMETHROWERPILOT, gs, o, pal); + hud_drawpal(weapon_xoffset + 210 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 261 - gun_pos, FLAMETHROWER, gs, o, pal); + hud_drawpal(weapon_xoffset + 210 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 261 - gun_pos, FLAMETHROWERPILOT, gs, o, pal); } else { @@ -1357,8 +1361,8 @@ void displayweapon_d(int snum, double smoothratio) looking_arc += krand() & 1; } gun_pos -= 16; - hud_drawpal(weapon_xoffset + 210 - (p->getlookang() >> 1), looking_arc + 261 - gun_pos, FLAMETHROWER + 1, 32, o, pal); - hud_drawpal(weapon_xoffset + 210 - (p->getlookang() >> 1), looking_arc + 235 - gun_pos, FLAMETHROWER + 2 + cat_frames[*kb % 6], -32, o, pal); + hud_drawpal(weapon_xoffset + 210 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 261 - gun_pos, FLAMETHROWER + 1, 32, o, pal); + hud_drawpal(weapon_xoffset + 210 - (p->q16look_ang / (2. * FRACUNIT)), looking_arc + 235 - gun_pos, FLAMETHROWER + 2 + cat_frames[*kb % 6], -32, o, pal); } };