zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-12-11 21:31:37 +00:00
Code Issues Projects Releases Packages Wiki Activity
raze/source/games/duke/src/hudweapon_d.cpp

1454 lines
40 KiB
C++
Raw Normal View History

hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
//-------------------------------------------------------------------------
/*
Copyright (C) 1996, 2003 - 3D Realms Entertainment
Copyright (C) 2000, 2003 - Matt Saettler (EDuke Enhancements)
- copyright
2020-06-28 07:03:31 +00:00
Copyright (C) 2020 - Christoph Oelckers
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
This file is part of Enhanced Duke Nukem 3D version 1.5 - Atomic Edition
Duke Nukem 3D is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
aint with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Original Source: 1996 - Todd Replogle
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
EDuke enhancements integrated: 04/13/2003 - Matt Saettler
Note: EDuke source was in transition. Changes are in-progress in the
source as it is released.
*/
//-------------------------------------------------------------------------
#include "ns.h"
#include "global.h"
- got rid of the dynamic tilemap. Most tile access is in game specific code, the remaining code only accesses 51 tiles
2020-07-03 21:56:14 +00:00
#include "names_d.h"
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
BEGIN_DUKE_NS
- make full use of Q16.16 resolution for player's angle and horizon values.
2020-08-02 04:51:53 +00:00
double getavel(int snum)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
return FixedToFloat(PlayerInputAngVel(screenpeek));
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- render the weapons with the DrawTexture interface and properly handle rotatesprite's alignment modes
2020-07-16 11:23:26 +00:00
inline static void hud_drawpal(double x, double y, int tilenum, int shade, int orientation, int p)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- disable rotation for hud_drawpal. This was just a Build crutch to do x-flipping, with that being handled in the backend now the rotation angle must be 0.
2020-07-25 07:02:47 +00:00
hud_drawsprite(x, y, 65536, 0, tilenum, shade, p, 2 | orientation);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void displayloogie(short snum)
{
- make full use of `sintablef[2048]`.
2020-08-02 04:09:54 +00:00
int i, a, y, z;
double x;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (ps[snum].loogcnt == 0) return;
y = (ps[snum].loogcnt << 2);
for (i = 0; i < ps[snum].numloogs; i++)
{
- consistency cleanup with a use of `calcSinTableView()` use within hudweapon_d.cpp.
2020-08-03 01:07:55 +00:00
a = abs(calcSinTableValue((ps[snum].loogcnt + i) << 5)) / 32;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
z = 4096 + ((ps[snum].loogcnt + i) << 9);
- remove bitwise & operations on calls to `calcSinTableValue()` since they're no longer necessary, and remove last use of `sintable[]` from hudweapon_d.cpp.
2020-08-02 23:19:14 +00:00
x = (-getavel(snum)) + (calcSinTableValue((ps[snum].loogcnt + i) << 6) / 1024.);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- draw all overlay elements on the game screen.
2020-07-06 13:52:09 +00:00
hud_drawsprite(
- render the weapons with the DrawTexture interface and properly handle rotatesprite's alignment modes
2020-07-16 11:23:26 +00:00
(ps[snum].loogiex[i] + x), (200 + ps[snum].loogiey[i] - y), z - (i << 8), 256 - a,
- draw all overlay elements on the game screen.
2020-07-06 13:52:09 +00:00
LOOGIE, 0, 0, 2);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
int animatefist(int gs, int snum, double look_anghalf)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- make full use of Q16.16 resolution for player's angle and horizon values.
2020-08-02 04:51:53 +00:00
short fisti, fistpal;
int fistzoom;
double looking_arc, fistz;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
fisti = ps[snum].fist_incs;
if (fisti > 32) fisti = 32;
if (fisti <= 0) return 0;
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
looking_arc = fabs(look_anghalf) / 4.5;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- remove bitwise & operations on calls to `calcSinTableValue()` since they're no longer necessary, and remove last use of `sintable[]` from hudweapon_d.cpp.
2020-08-02 23:19:14 +00:00
fistzoom = 65536L - (calcSinTableValue(512 + (fisti << 6)) * 4);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (fistzoom > 90612L)
fistzoom = 90612L;
if (fistzoom < 40920)
fistzoom = 40290;
- define new function `calcSinTableValue()` to calculate an equivalent `sintable[]` entry. * Returns a true double result. * Also supports fractional input for fractional input. That is, if `sintable[1]` = 50 and `sintable[2]` = 100, `calcSinTableValue(1.5)` = 75. * Increased precision of `BANG2RAD` define to use double and not float. * As such, revert addition of `sintablef[]`.
2020-08-02 12:08:35 +00:00
fistz = 194 + (calcSinTableValue(((6 + fisti) << 7) & 2047) / 512.);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (sprite[ps[snum].i].pal == 1)
fistpal = 1;
else
fistpal = sector[ps[snum].cursectnum].floorpal;
- draw all overlay elements on the game screen.
2020-07-06 13:52:09 +00:00
hud_drawsprite(
- make full use of Q16.16 resolution for player's angle and horizon values.
2020-08-02 04:51:53 +00:00
(-fisti + 222 + (getavel(snum) / 16.)),
- render the weapons with the DrawTexture interface and properly handle rotatesprite's alignment modes
2020-07-16 11:23:26 +00:00
(looking_arc + fistz),
- draw all overlay elements on the game screen.
2020-07-06 13:52:09 +00:00
fistzoom, 0, FIST, gs, fistpal, 2);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
return 1;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- apply same fix from c63564eb7a53b05c76b903c8cd491c0b2fbe299f for returning interpolated value for the player's `q16horiz - q16horizoff` if `cl_syncinput` is true. * Also changed `gethalflookang()` to camel case `getHalfLookAng()` for easier reading. * Also broke a very long if statement down into smaller chunks for readability.
2020-08-03 07:06:28 +00:00
int animateknee(int gs, int snum, double hard_landing, double look_anghalf, double horiz16th)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
static const short knee_y[] = { 0,-8,-16,-32,-64,-84,-108,-108,-108,-72,-32,-8 };
- make full use of Q16.16 resolution for player's angle and horizon values.
2020-08-02 04:51:53 +00:00
short pal;
double looking_arc;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (ps[snum].knee_incs > 11 || ps[snum].knee_incs == 0 || sprite[ps[snum].i].extra <= 0) return 0;
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
looking_arc = knee_y[ps[snum].knee_incs] + (fabs(look_anghalf) / 4.5);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- interpolate `p->hard_landing` for Duke 3D.
2020-08-03 04:41:15 +00:00
looking_arc -= hard_landing * 8.;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (sprite[ps[snum].i].pal == 1)
pal = 1;
else
{
pal = sector[ps[snum].cursectnum].floorpal;
if (pal == 0)
pal = ps[snum].palookup;
}
- apply same fix from c63564eb7a53b05c76b903c8cd491c0b2fbe299f for returning interpolated value for the player's `q16horiz - q16horizoff` if `cl_syncinput` is true. * Also changed `gethalflookang()` to camel case `getHalfLookAng()` for easier reading. * Also broke a very long if statement down into smaller chunks for readability.
2020-08-03 07:06:28 +00:00
hud_drawpal(105 + (getavel(snum) / 16.) - look_anghalf + (knee_y[ps[snum].knee_incs] >> 2), looking_arc + 280 - horiz16th, KNEE, gs, 4, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
return 1;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- apply same fix from c63564eb7a53b05c76b903c8cd491c0b2fbe299f for returning interpolated value for the player's `q16horiz - q16horizoff` if `cl_syncinput` is true. * Also changed `gethalflookang()` to camel case `getHalfLookAng()` for easier reading. * Also broke a very long if statement down into smaller chunks for readability.
2020-08-03 07:06:28 +00:00
int animateknuckles(int gs, int snum, double hard_landing, double look_anghalf, double horiz16th)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
static const short knuckle_frames[] = { 0,1,2,2,3,3,3,2,2,1,0 };
- make full use of Q16.16 resolution for player's angle and horizon values.
2020-08-02 04:51:53 +00:00
short pal;
double looking_arc;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (isWW2GI()) return 0;
if (ps[snum].knuckle_incs == 0 || sprite[ps[snum].i].extra <= 0) return 0;
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
looking_arc = fabs(look_anghalf) / 4.5;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- interpolate `p->hard_landing` for Duke 3D.
2020-08-03 04:41:15 +00:00
looking_arc -= hard_landing * 8.;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (sprite[ps[snum].i].pal == 1)
pal = 1;
else
pal = sector[ps[snum].cursectnum].floorpal;
- fixed World Tour weapon display and property parsing, resulting in incorrect ammo count for the flamethrower. Fixes #356
2020-09-06 22:45:11 +00:00
hud_drawpal(160 + (getavel(snum) / 16.) - look_anghalf, looking_arc + 180 - horiz16th, CRACKKNUCKLES + knuckle_frames[ps[snum].knuckle_incs >> 1], gs, 4, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
return 1;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- do proper interpolation of the snorkel in RR.
2020-08-31 17:06:53 +00:00
void displaymasks_d(int snum, double)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
int p;
if (sprite[ps[snum].i].pal == 1)
p = 1;
else
p = sector[ps[snum].cursectnum].floorpal;
if (ps[snum].scuba_on)
{
- removed the 8 pixel offset for the Scuba Gear in display modes with reduced viewport size. I have no idea why this was originally done, it makes no sense. Fixes #50
2020-07-27 16:59:05 +00:00
hud_drawsprite(44, (200 - tilesiz[SCUBAMASK].y), 65536, 0, SCUBAMASK, 0, p, 2 + 16);
hud_drawsprite((320 - 43), (200 - tilesiz[SCUBAMASK].y), 65536, 0, SCUBAMASK, 0, p, 2 + 4 + 16);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- apply same fix from c63564eb7a53b05c76b903c8cd491c0b2fbe299f for returning interpolated value for the player's `q16horiz - q16horizoff` if `cl_syncinput` is true. * Also changed `gethalflookang()` to camel case `getHalfLookAng()` for easier reading. * Also broke a very long if statement down into smaller chunks for readability.
2020-08-03 07:06:28 +00:00
static int animatetip(int gs, int snum, double hard_landing, double look_anghalf, double horiz16th)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- make full use of Q16.16 resolution for player's angle and horizon values.
2020-08-02 04:51:53 +00:00
int p;
double looking_arc;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
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;
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
looking_arc = fabs(look_anghalf) / 4.5;
- interpolate `p->hard_landing` for Duke 3D.
2020-08-03 04:41:15 +00:00
looking_arc -= hard_landing * 8.;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (sprite[ps[snum].i].pal == 1)
p = 1;
else
p = sector[ps[snum].cursectnum].floorpal;
/* if(ps[snum].access_spritenum >= 0)
p = sprite[ps[snum].access_spritenum].pal;
else
p = wall[ps[snum].access_wallnum].pal;
*/
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(170 + (getavel(snum) / 16.) - look_anghalf,
- apply same fix from c63564eb7a53b05c76b903c8cd491c0b2fbe299f for returning interpolated value for the player's `q16horiz - q16horizoff` if `cl_syncinput` is true. * Also changed `gethalflookang()` to camel case `getHalfLookAng()` for easier reading. * Also broke a very long if statement down into smaller chunks for readability.
2020-08-03 07:06:28 +00:00
(tip_y[ps[snum].tipincs] >> 1) + looking_arc + 240 - horiz16th, TIP + ((26 - ps[snum].tipincs) >> 4), gs, 0, p);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
return 1;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- apply same fix from c63564eb7a53b05c76b903c8cd491c0b2fbe299f for returning interpolated value for the player's `q16horiz - q16horizoff` if `cl_syncinput` is true. * Also changed `gethalflookang()` to camel case `getHalfLookAng()` for easier reading. * Also broke a very long if statement down into smaller chunks for readability.
2020-08-03 07:06:28 +00:00
int animateaccess(int gs,int snum,double hard_landing,double look_anghalf,double horiz16th)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
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};
- make full use of Q16.16 resolution for player's angle and horizon values.
2020-08-02 04:51:53 +00:00
double looking_arc;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
char p;
if(ps[snum].access_incs == 0 || sprite[ps[snum].i].extra <= 0) return 0;
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
looking_arc = access_y[ps[snum].access_incs] + (fabs(look_anghalf) / 4.5);
- interpolate `p->hard_landing` for Duke 3D.
2020-08-03 04:41:15 +00:00
looking_arc -= hard_landing * 8.;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if(ps[snum].access_spritenum >= 0)
p = sprite[ps[snum].access_spritenum].pal;
else p = 0;
// else
// p = wall[ps[snum].access_wallnum].pal;
if((ps[snum].access_incs-3) > 0 && (ps[snum].access_incs-3)>>3)
- apply same fix from c63564eb7a53b05c76b903c8cd491c0b2fbe299f for returning interpolated value for the player's `q16horiz - q16horizoff` if `cl_syncinput` is true. * Also changed `gethalflookang()` to camel case `getHalfLookAng()` for easier reading. * Also broke a very long if statement down into smaller chunks for readability.
2020-08-03 07:06:28 +00:00
hud_drawpal(170+(getavel(snum)/16.)-look_anghalf+(access_y[ps[snum].access_incs]>>2),looking_arc+266-horiz16th,HANDHOLDINGLASER+(ps[snum].access_incs>>3),gs,0,p);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
else
- apply same fix from c63564eb7a53b05c76b903c8cd491c0b2fbe299f for returning interpolated value for the player's `q16horiz - q16horizoff` if `cl_syncinput` is true. * Also changed `gethalflookang()` to camel case `getHalfLookAng()` for easier reading. * Also broke a very long if statement down into smaller chunks for readability.
2020-08-03 07:06:28 +00:00
hud_drawpal(170+(getavel(snum)/16.)-look_anghalf+(access_y[ps[snum].access_incs]>>2),looking_arc+266-horiz16th,HANDHOLDINGACCESS,gs,4,p);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
return 1;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- pass `smoothratio` through to `displayweapon()`.
2020-08-02 03:43:45 +00:00
void displayweapon_d(int snum, double smoothratio)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- make full use of Q16.16 resolution for player's angle and horizon values.
2020-08-02 04:51:53 +00:00
int cw;
- interpolate `p->weapon_sway`.
2020-08-02 04:54:17 +00:00
int i, j;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
int o,pal;
- apply same fix from c63564eb7a53b05c76b903c8cd491c0b2fbe299f for returning interpolated value for the player's `q16horiz - q16horizoff` if `cl_syncinput` is true. * Also changed `gethalflookang()` to camel case `getHalfLookAng()` for easier reading. * Also broke a very long if statement down into smaller chunks for readability.
2020-08-03 07:06:28 +00:00
double weapon_sway, weapon_xoffset, gun_pos, looking_arc, kickback_pic, random_club_frame, hard_landing, look_anghalf, horiz16th;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
signed char gs;
struct player_struct *p;
p = &ps[snum];
auto kb = &p->kickback_pic;
int pin = 0;
o = 0;
- apply same fix from c63564eb7a53b05c76b903c8cd491c0b2fbe299f for returning interpolated value for the player's `q16horiz - q16horizoff` if `cl_syncinput` is true. * Also changed `gethalflookang()` to camel case `getHalfLookAng()` for easier reading. * Also broke a very long if statement down into smaller chunks for readability.
2020-08-03 07:06:28 +00:00
horiz16th = get16thOfHoriz(snum, cl_syncinput, smoothratio);
look_anghalf = getHalfLookAng(snum, cl_syncinput, smoothratio);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
looking_arc = fabs(look_anghalf) / 4.5;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
weapon_sway = p->oweapon_sway + fmulscale16(p->weapon_sway - p->oweapon_sway, smoothratio);
kickback_pic = p->okickback_pic + fmulscale16(*kb - p->okickback_pic, smoothratio);
- interpolate `p->random_club_frame` for Duke 3D.
2020-08-03 04:32:31 +00:00
random_club_frame = p->orandom_club_frame + fmulscale16(p->random_club_frame - p->orandom_club_frame, smoothratio);
- interpolate `p->hard_landing` for Duke 3D.
2020-08-03 04:41:15 +00:00
hard_landing = p->ohard_landing + fmulscale16(p->hard_landing - p->ohard_landing, smoothratio);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
gs = sprite[p->i].shade;
if(gs > 24) gs = 24;
- apply same fix from c63564eb7a53b05c76b903c8cd491c0b2fbe299f for returning interpolated value for the player's `q16horiz - q16horizoff` if `cl_syncinput` is true. * Also changed `gethalflookang()` to camel case `getHalfLookAng()` for easier reading. * Also broke a very long if statement down into smaller chunks for readability.
2020-08-03 07:06:28 +00:00
bool playerVars = p->newowner >= 0 || ud.camerasprite >= 0 || p->over_shoulder_on > 0 || (sprite[p->i].pal != 1 && sprite[p->i].extra <= 0);
bool playerAnims = animatefist(gs,snum,look_anghalf) || animateknuckles(gs,snum,hard_landing,look_anghalf,horiz16th) ||
animatetip(gs,snum,hard_landing,look_anghalf,horiz16th) || animateaccess(gs,snum,hard_landing,look_anghalf,horiz16th);
if(playerVars || playerAnims)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
return;
- apply same fix from c63564eb7a53b05c76b903c8cd491c0b2fbe299f for returning interpolated value for the player's `q16horiz - q16horizoff` if `cl_syncinput` is true. * Also changed `gethalflookang()` to camel case `getHalfLookAng()` for easier reading. * Also broke a very long if statement down into smaller chunks for readability.
2020-08-03 07:06:28 +00:00
animateknee(gs,snum,hard_landing,look_anghalf,horiz16th);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- interpolate `p->weapon_pos` for smooth switching of weapons.
2020-08-02 13:00:53 +00:00
int opos = p->oweapon_pos * p->oweapon_pos;
int npos = p->weapon_pos * p->weapon_pos;
gun_pos = 80 - (opos + fmulscale16(npos - opos, smoothratio));
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
weapon_xoffset = (160)-90;
- simplified calcSinTableValue and inlined it. There's no need for all this magic voodoo - the sin function already returns the proper values all by itself.
2020-08-02 20:03:22 +00:00
weapon_xoffset -= calcSinTableValue((weapon_sway / 2.) + 512) / (1024. + 512.);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
weapon_xoffset -= 58 + p->weapon_ang;
if( sprite[p->i].xrepeat < 32 )
- simplified calcSinTableValue and inlined it. There's no need for all this magic voodoo - the sin function already returns the proper values all by itself.
2020-08-02 20:03:22 +00:00
gun_pos -= fabs(calcSinTableValue(weapon_sway * 4.) / 512.);
else gun_pos -= fabs(calcSinTableValue(weapon_sway / 2.) / 1024.);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- interpolate `p->hard_landing` for Duke 3D.
2020-08-03 04:41:15 +00:00
gun_pos -= hard_landing * 8.;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (isWW2GI())
{
if (p->last_weapon >= 0)
{
cw = aplWeaponWorksLike[p->last_weapon][snum];
}
else
{
cw = aplWeaponWorksLike[p->curr_weapon][snum];
}
}
else
{
if (p->last_weapon >= 0)
cw = p->last_weapon;
else cw = p->curr_weapon;
}
// onevent should go here..
// rest of code should be moved to CON..
j = 14-p->quick_kick;
- re-added EDuke32's last_quick_kick to remove flicker during the animation. Fixes #7.
2020-07-26 08:18:55 +00:00
if (j != 14 || p->last_quick_kick)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
if (sprite[p->i].pal == 1)
pal = 1;
else
{
pal = sector[p->cursectnum].floorpal;
if (pal == 0)
pal = p->palookup;
}
if (j < 5 || j > 9)
- re-added EDuke32's last_quick_kick to remove flicker during the animation. Fixes #7.
2020-07-26 08:18:55 +00:00
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 80 - look_anghalf, looking_arc + 250 - gun_pos, KNEE, gs, o | 4, pal);
- re-added EDuke32's last_quick_kick to remove flicker during the animation. Fixes #7.
2020-07-26 08:18:55 +00:00
}
else
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 160 - 16 - look_anghalf, looking_arc + 214 - gun_pos, KNEE + 1, gs, o | 4, pal);
- re-added EDuke32's last_quick_kick to remove flicker during the animation. Fixes #7.
2020-07-26 08:18:55 +00:00
}
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
if (sprite[p->i].xrepeat < 40)
{
static int fistsign;
//shrunken..
if (p->jetpack_on == 0)
{
i = sprite[p->i].xvel;
looking_arc += 32 - (i >> 1);
fistsign += i >> 1;
}
cw = weapon_xoffset;
- remove bitwise & operations on calls to `calcSinTableValue()` since they're no longer necessary, and remove last use of `sintable[]` from hudweapon_d.cpp.
2020-08-02 23:19:14 +00:00
weapon_xoffset += calcSinTableValue(fistsign) / 1024.;
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_draw(weapon_xoffset + 250 - look_anghalf,
- remove bitwise & operations on calls to `calcSinTableValue()` since they're no longer necessary, and remove last use of `sintable[]` from hudweapon_d.cpp.
2020-08-02 23:19:14 +00:00
looking_arc + 258 - (fabs(calcSinTableValue(fistsign) / 256.)),
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
FIST, gs, o);
weapon_xoffset = cw;
- remove bitwise & operations on calls to `calcSinTableValue()` since they're no longer necessary, and remove last use of `sintable[]` from hudweapon_d.cpp.
2020-08-02 23:19:14 +00:00
weapon_xoffset -= calcSinTableValue(fistsign) / 1024.;
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_draw(weapon_xoffset + 40 - look_anghalf,
- remove bitwise & operations on calls to `calcSinTableValue()` since they're no longer necessary, and remove last use of `sintable[]` from hudweapon_d.cpp.
2020-08-02 23:19:14 +00:00
looking_arc + 200 + (fabs(calcSinTableValue(fistsign) / 256.)),
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
FIST, gs, o | 4);
}
else
{
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayknee = [&]()
{
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb > 0)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
if (sprite[p->i].pal == 1)
pal = 1;
else
{
pal = sector[p->cursectnum].floorpal;
if (pal == 0)
pal = p->palookup;
}
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb < 5 || *kb > 9)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 220 - look_anghalf,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
looking_arc + 250 - gun_pos, KNEE, gs, o, pal);
}
else
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 160 - look_anghalf,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
looking_arc + 214 - gun_pos, KNEE + 1, gs, o, pal);
}
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displaytripbomb = [&]()
{
if (sprite[p->i].pal == 1)
pal = 1;
else
pal = sector[p->cursectnum].floorpal;
weapon_xoffset += 8;
gun_pos -= 10;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb > 6)
looking_arc += kickback_pic * 8.;
else if (*kb < 4)
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 142 - look_anghalf,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
looking_arc + 234 - gun_pos, HANDHOLDINGLASER + 3, gs, o, pal);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 130 - look_anghalf,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
looking_arc + 249 - gun_pos,
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
HANDHOLDINGLASER + (*kb >> 2), gs, o, pal);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 152 - look_anghalf,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
looking_arc + 249 - gun_pos,
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
HANDHOLDINGLASER + (*kb >> 2), gs, o | 4, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayrpg = [&]()
{
- fixing some HUD stuff.
2020-07-06 13:48:51 +00:00
pin = (isWorldTour() || (duke3d_globalflags & DUKE3D_NO_WIDESCREEN_PINNING)) ? 0 : RS_ALIGN_R;
auto rpgpic = isWorldTour() ? RPGGUNWIDE : RPGGUN;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (sprite[p->i].pal == 1)
pal = 1;
else pal = sector[p->cursectnum].floorpal;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
weapon_xoffset -= calcSinTableValue(768 + (kickback_pic * 128.)) / 2048.;
gun_pos += calcSinTableValue(768 + (kickback_pic * 128.)) / 2048.;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (*kb > 0)
{
if (*kb < (isWW2GI() ? aplWeaponTotalTime[RPG_WEAPON][snum] : 8))
{
- make full use of Q16.16 resolution for player's angle and horizon values.
2020-08-02 04:51:53 +00:00
hud_drawpal(weapon_xoffset + 164, (looking_arc * 2.) + 176 - gun_pos,
- fixed World Tour weapon display and property parsing, resulting in incorrect ammo count for the flamethrower. Fixes #356
2020-09-06 22:45:11 +00:00
RPGGUN + (*kb >> 1), gs, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else if (isWW2GI())
{
// else we are in 'reload time'
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb <
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
(
(aplWeaponReload[p->curr_weapon][snum] - aplWeaponTotalTime[p->curr_weapon][snum]) / 2
+ aplWeaponTotalTime[p->curr_weapon][snum]
)
)
{
// down
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= 10 * (kickback_pic - aplWeaponTotalTime[p->curr_weapon][snum]); //D
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else
{
// move back down
// up and left
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= 10 * (aplWeaponReload[p->curr_weapon][snum] - kickback_pic); //U
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
}
- make full use of Q16.16 resolution for player's angle and horizon values.
2020-08-02 04:51:53 +00:00
hud_drawpal(weapon_xoffset + 164, (looking_arc * 2.) + 176 - gun_pos, rpgpic, gs, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayshotgun_ww = [&]()
{
if (sprite[p->i].pal == 1)
pal = 1;
else
pal = sector[p->cursectnum].floorpal;
if (*kb > 0)
{
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= calcSinTableValue(kickback_pic * 128.) / 4096.;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
if (*kb > 0 && sprite[p->i].pal != 1)
{
weapon_xoffset += 1 - (rand() & 3);
}
weapon_xoffset -= 8;
if (*kb == 0)
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 146 - look_anghalf, looking_arc + 202 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
SHOTGUN, gs, o, pal);
}
else if (*kb <= aplWeaponTotalTime[SHOTGUN_WEAPON][snum])
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 146 - look_anghalf, looking_arc + 202 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
SHOTGUN + 1, gs, o, pal);
}
// else we are in 'reload time'
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb <
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
(
(aplWeaponReload[p->curr_weapon][snum] - aplWeaponTotalTime[p->curr_weapon][snum]) / 2
+ aplWeaponTotalTime[p->curr_weapon][snum]
)
)
{
// down
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= 10 * (kickback_pic - aplWeaponTotalTime[p->curr_weapon][snum]); //D
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
// weapon_xoffset+=80*(*kb-aplWeaponTotalTime[cw][snum]);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 146 - look_anghalf, looking_arc + 202 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
SHOTGUN, gs, o, pal);
}
else
{
// move back down
// up and left
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= 10 * (aplWeaponReload[p->curr_weapon][snum] - kickback_pic); //U
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
// weapon_xoffset+=80*(*kb-aplWeaponTotalTime[cw][snum]);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 146 - look_anghalf, looking_arc + 202 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
SHOTGUN, gs, o, pal);
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayshotgun = [&]()
{
if (sprite[p->i].pal == 1)
pal = 1;
else
pal = sector[p->cursectnum].floorpal;
weapon_xoffset -= 8;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
switch(*kb)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
case 1:
case 2:
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 168 - look_anghalf,looking_arc + 201 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
SHOTGUN + 2,-128,o,pal);
case 0:
case 6:
case 7:
case 8:
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 146 - look_anghalf,looking_arc + 202 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
SHOTGUN,gs,o,pal);
break;
case 3:
case 4:
case 5:
case 9:
case 10:
case 11:
case 12:
if (*kb > 1 && *kb < 5)
{
gun_pos -= 40;
weapon_xoffset += 20;
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 178 - look_anghalf,looking_arc + 194 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
SHOTGUN + 1 + ((*(kb)-1) >> 1),-128,o,pal);
}
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 158 - look_anghalf,looking_arc + 220 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
SHOTGUN + 3,gs,o,pal);
break;
case 13:
case 14:
case 15:
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(32 + weapon_xoffset + 166 - look_anghalf,looking_arc + 210 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
SHOTGUN + 4,gs,o,pal);
break;
case 16:
case 17:
case 18:
case 19:
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(64 + weapon_xoffset + 170 - look_anghalf,looking_arc + 196 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
SHOTGUN + 5,gs,o,pal);
break;
case 20:
case 21:
case 22:
case 23:
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(64 + weapon_xoffset + 176 - look_anghalf,looking_arc + 196 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
SHOTGUN + 6,gs,o,pal);
break;
case 24:
case 25:
case 26:
case 27:
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(64 + weapon_xoffset + 170 - look_anghalf,looking_arc + 196 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
SHOTGUN + 5,gs,o,pal);
break;
case 28:
case 29:
case 30:
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(32 + weapon_xoffset + 156 - look_anghalf,looking_arc + 206 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
SHOTGUN + 4,gs,o,pal);
break;
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displaychaingun_ww = [&]()
{
if (sprite[p->i].pal == 1)
pal = 1;
else
pal = sector[p->cursectnum].floorpal;
if (*kb > 0)
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= calcSinTableValue(kickback_pic * 128.) / 4096.;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (*kb > 0 && sprite[p->i].pal != 1) weapon_xoffset += 1 - (rand() & 3);
if (*kb == 0)
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
// hud_drawpal(weapon_xoffset+168-look_anghalf,looking_arc+260-gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
// CHAINGUN,gs,o,pal);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 178 - look_anghalf, looking_arc + 233 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
CHAINGUN + 1, gs, o, pal);
}
else if (*kb <= aplWeaponTotalTime[CHAINGUN_WEAPON][snum])
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 188 - look_anghalf, looking_arc + 243 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
CHAINGUN + 2, gs, o, pal);
}
// else we are in 'reload time'
// divide reload time into fifths.
// 1) move weapon up/right, hand on clip (2519)
// 2) move weapon up/right, hand removing clip (2518)
// 3) hold weapon up/right, hand removed clip (2517)
// 4) hold weapon up/right, hand inserting clip (2518)
// 5) move weapon down/left, clip inserted (2519)
else
{
int iFifths = (aplWeaponReload[p->curr_weapon][snum] - aplWeaponTotalTime[p->curr_weapon][snum]) / 5;
if (iFifths < 1)
{
iFifths = 1;
}
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb <
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
(iFifths
+ aplWeaponTotalTime[p->curr_weapon][snum]
)
)
{
// first segment
//
gun_pos += 80 - (10 * (aplWeaponTotalTime[p->curr_weapon][snum]
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
+ iFifths - kickback_pic));
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
weapon_xoffset += 80 - (10 * (aplWeaponTotalTime[p->curr_weapon][snum]
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
+ iFifths - kickback_pic));
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 168 - look_anghalf, looking_arc + 260 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
2519, gs, o, pal);
}
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb <
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
(iFifths * 2
+ aplWeaponTotalTime[p->curr_weapon][snum]
)
)
{
// second segment
// down
gun_pos += 80; //5*(iFifthsp->kickback_pic-aplWeaponTotalTime[p->curr_weapon][snum]); //D
weapon_xoffset += 80; //80*(*kb-aplWeaponTotalTime[p->curr_weapon][snum]);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 168 - look_anghalf, looking_arc + 260 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
2518, gs, o, pal);
}
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb <
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
(iFifths * 3
+ aplWeaponTotalTime[p->curr_weapon][snum]
)
)
{
// third segment
// up
gun_pos += 80;//5*(iFifths*2);
weapon_xoffset += 80; //80*(*kb-aplWeaponTotalTime[p->curr_weapon][snum]);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 168 - look_anghalf, looking_arc + 260 - gun_pos,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
2517, gs, o, pal);
}
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb <
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
(iFifths * 4
+ aplWeaponTotalTime[p->curr_weapon][snum]
)
)
{
// fourth segment
// down
gun_pos += 80; //5*(aplWeaponTotalTime[p->curr_weapon][snum]- p->kickback_pic); //D
weapon_xoffset += 80; //80*(*kb-aplWeaponTotalTime[p->curr_weapon][snum]);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 168 - look_anghalf, looking_arc + 260 - gun_pos, 2518, gs, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else
{
// move back down
// up and left
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos += 10 * (aplWeaponReload[p->curr_weapon][snum] - kickback_pic);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
//5*(aplWeaponReload[p->curr_weapon][snum]- p->kickback_pic); //U
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
weapon_xoffset += 10 * (aplWeaponReload[p->curr_weapon][snum] - kickback_pic);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
//80*(*kb-aplWeaponTotalTime[cw][snum]);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 168 - look_anghalf, looking_arc + 260 - gun_pos, 2519, gs, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displaychaingun = [&]
{
if (sprite[p->i].pal == 1)
pal = 1;
else
pal = sector[p->cursectnum].floorpal;
if (*kb > 0)
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= calcSinTableValue(kickback_pic * 128.) / 4096.;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (*kb > 0 && sprite[p->i].pal != 1) weapon_xoffset += 1 - (rand() & 3);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 168 - look_anghalf, looking_arc + 260 - gun_pos, CHAINGUN, gs, o, pal);
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
switch(*kb)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
case 0:
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 178 - look_anghalf,looking_arc + 233 - gun_pos, CHAINGUN + 1,gs,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
break;
default:
if (*kb > 4 && *kb < 12)
{
i = 0;
if (sprite[p->i].pal != 1) i = rand() & 7;
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(i + weapon_xoffset - 4 + 140 - look_anghalf,i + looking_arc - (kickback_pic / 2.) + 208 - gun_pos, CHAINGUN + 5 + ((*kb - 4) / 5),gs,o,pal);
Revert "- remove duplicate line.". In hindsight, I believe this was by design. This reverts commit 6fd6926d8d0ba9c54c749a8c75b0144d1055255e.
2020-08-03 03:29:37 +00:00
if (sprite[p->i].pal != 1) i = rand() & 7;
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(i + weapon_xoffset - 4 + 184 - look_anghalf,i + looking_arc - (kickback_pic / 2.) + 208 - gun_pos, CHAINGUN + 5 + ((*kb - 4) / 5),gs,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
if (*kb < 8)
{
i = rand() & 7;
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(i + weapon_xoffset - 4 + 162 - look_anghalf,i + looking_arc - (kickback_pic / 2.) + 208 - gun_pos, CHAINGUN + 5 + ((*kb - 2) / 5),gs,o,pal);
hud_drawpal(weapon_xoffset + 178 - look_anghalf,looking_arc + 233 - gun_pos, CHAINGUN + 1 + (*kb >> 1),gs,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
else hud_drawpal(weapon_xoffset + 178 - look_anghalf,looking_arc + 233 - gun_pos, CHAINGUN + 1,gs,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
break;
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displaypistol = [&]()
{
if (sprite[p->i].pal == 1)
pal = 1;
else
pal = sector[p->cursectnum].floorpal;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb < 5)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- increase precision of local variable `x` for `displaypistol()`.
2020-08-02 04:11:07 +00:00
short kb_frames[] = { 0,1,2,0,0 };
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- increase precision of local variable `x` for `displaypistol()`.
2020-08-02 04:11:07 +00:00
double l = 195 - 12 + weapon_xoffset;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb == 2)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
l -= 3;
{
- increase precision of local variable `x` for `displaypistol()`.
2020-08-02 04:11:07 +00:00
double x, y;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
short tilenum;
signed char shade;
char orientation;
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
x = (l - look_anghalf);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
y = (looking_arc + 244 - gun_pos);
tilenum = FIRSTGUN + kb_frames[*kb];
shade = gs;
orientation = 2;
hud_drawpal(
x,
y,
tilenum,
gs, 2, pal);
}
}
else
{
- fixing some HUD stuff.
2020-07-06 13:48:51 +00:00
pin = (isWW2GI() || isWorldTour() || (duke3d_globalflags & DUKE3D_NO_WIDESCREEN_PINNING)) ? 0 : RS_ALIGN_R;
- fixed World Tour weapon display and property parsing, resulting in incorrect ammo count for the flamethrower. Fixes #356
2020-09-06 22:45:11 +00:00
auto pic_5 = isWorldTour() ? FIRSTGUNRELOADWIDE : FIRSTGUN+5;
- weapon draw code tested and old version removed. # Conflicts: # source/games/duke/src/zz_player.cpp
2020-05-20 08:38:56 +00:00
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
const int WEAPON2_RELOAD_TIME = 50;
auto reload_time = isWW2GI() ? aplWeaponReload[PISTOL_WEAPON][snum] : WEAPON2_RELOAD_TIME;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb < 10)
- fixed World Tour weapon display and property parsing, resulting in incorrect ammo count for the flamethrower. Fixes #356
2020-09-06 22:45:11 +00:00
hud_drawpal(194 - look_anghalf, looking_arc + 230 - gun_pos, FIRSTGUN + 4, gs, o|pin, pal);
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb < 15)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- fixed World Tour weapon display and property parsing, resulting in incorrect ammo count for the flamethrower. Fixes #356
2020-09-06 22:45:11 +00:00
hud_drawpal(244 - (kickback_pic * 8.) - look_anghalf, looking_arc + 130 - gun_pos + (kickback_pic * 16.), FIRSTGUN + 6, gs, o | pin, pal);
hud_drawpal(224 - look_anghalf, looking_arc + 220 - gun_pos, pic_5, gs, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb < 20)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- fixed World Tour weapon display and property parsing, resulting in incorrect ammo count for the flamethrower. Fixes #356
2020-09-06 22:45:11 +00:00
hud_drawpal(124 + (kickback_pic * 2.) - look_anghalf, looking_arc + 430 - gun_pos - (kickback_pic * 8.), FIRSTGUN + 6, gs, o | pin, pal);
hud_drawpal(224 - look_anghalf, looking_arc + 220 - gun_pos, pic_5, gs, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb < (reload_time - 12))
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- fixed World Tour weapon display and property parsing, resulting in incorrect ammo count for the flamethrower. Fixes #356
2020-09-06 22:45:11 +00:00
hud_drawpal(184 - look_anghalf, looking_arc + 235 - gun_pos, FIRSTGUN + 8, gs, o | pin, pal);
hud_drawpal(224 - look_anghalf, looking_arc + 210 - gun_pos, pic_5, gs, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb < (reload_time - 6))
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- fixed World Tour weapon display and property parsing, resulting in incorrect ammo count for the flamethrower. Fixes #356
2020-09-06 22:45:11 +00:00
hud_drawpal(164 - look_anghalf, looking_arc + 245 - gun_pos, FIRSTGUN + 8, gs, o | pin, pal);
hud_drawpal(224 - look_anghalf, looking_arc + 220 - gun_pos, pic_5, gs, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb < (reload_time))
- fixed World Tour weapon display and property parsing, resulting in incorrect ammo count for the flamethrower. Fixes #356
2020-09-06 22:45:11 +00:00
hud_drawpal(194 - look_anghalf, looking_arc + 235 - gun_pos, pic_5, gs, o, pal);
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb < 23)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- fixed World Tour weapon display and property parsing, resulting in incorrect ammo count for the flamethrower. Fixes #356
2020-09-06 22:45:11 +00:00
hud_drawpal(184 - look_anghalf, looking_arc + 235 - gun_pos, FIRSTGUN + 8, gs, o | pin, pal);
hud_drawpal(224 - look_anghalf, looking_arc + 210 - gun_pos, pic_5, gs, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb < 25)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- fixed World Tour weapon display and property parsing, resulting in incorrect ammo count for the flamethrower. Fixes #356
2020-09-06 22:45:11 +00:00
hud_drawpal(164 - look_anghalf, looking_arc + 245 - gun_pos, FIRSTGUN + 8, gs, o | pin, pal);
hud_drawpal(224 - look_anghalf, looking_arc + 220 - gun_pos, pic_5, gs, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb < 27)
- fixed World Tour weapon display and property parsing, resulting in incorrect ammo count for the flamethrower. Fixes #356
2020-09-06 22:45:11 +00:00
hud_drawpal(194 - look_anghalf, looking_arc + 235 - gun_pos, pic_5, gs, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayhandbomb = [&]()
{
if (sprite[p->i].pal == 1)
pal = 1;
else
pal = sector[p->cursectnum].floorpal;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
static const uint8_t throw_frames[]
= { 0,0,0,0,0,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2 };
if (isWW2GI())
{
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb <= aplWeaponFireDelay[HANDBOMB_WEAPON][snum])
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
// it holds here
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= 5 * kickback_pic; //D
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb <
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
(
(aplWeaponTotalTime[HANDBOMB_WEAPON][snum] - aplWeaponFireDelay[HANDBOMB_WEAPON][snum]) / 2
+ aplWeaponFireDelay[HANDBOMB_WEAPON][snum]
)
)
{
// up and left
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos += 10 * (kickback_pic - aplWeaponFireDelay[HANDBOMB_WEAPON][snum]); //U
weapon_xoffset += 80 * (kickback_pic - aplWeaponFireDelay[HANDBOMB_WEAPON][snum]);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb < aplWeaponTotalTime[HANDBOMB_WEAPON][snum])
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
gun_pos += 240; // start high
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= 12 * (kickback_pic - aplWeaponFireDelay[HANDBOMB_WEAPON][snum]); //D
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
// move left
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
weapon_xoffset += 90 - (5 * (aplWeaponTotalTime[HANDBOMB_WEAPON][snum] - kickback_pic));
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
else
{
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb < 7)
gun_pos -= 10 * kickback_pic; //D
else if (*kb < 12)
gun_pos += 20 * (kickback_pic - 10); //U
else if (*kb < 20)
gun_pos -= 9 * (kickback_pic - 14); //D
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 190 - look_anghalf, looking_arc + 250 - gun_pos, HANDTHROW + throw_frames[*kb], gs, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 190 - look_anghalf, looking_arc + 260 - gun_pos, HANDTHROW, gs, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayhandremote = [&]()
{
signed char remote_frames[] = { 0,1,1,2,1,1,0,0,0,0,0 };
if (sprite[p->i].pal == 1)
pal = 1;
else
pal = sector[p->cursectnum].floorpal;
weapon_xoffset = -48;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb)
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 150 - look_anghalf, looking_arc + 258 - gun_pos, HANDREMOTE + remote_frames[*kb], gs, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
else
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 150 - look_anghalf, looking_arc + 258 - gun_pos, HANDREMOTE, gs, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displaydevastator_ww = [&]
{
if (sprite[p->i].pal == 1)
pal = 1;
else
pal = sector[p->cursectnum].floorpal;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb < aplWeaponTotalTime[p->curr_weapon][snum])
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
i = sgn(*kb >> 2);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (p->ammo_amount[p->curr_weapon] & 1)
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 30 - look_anghalf, looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal);
hud_drawpal(weapon_xoffset + 268 - look_anghalf, looking_arc + 238 - gun_pos, DEVISTATOR + i, -32, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 30 - look_anghalf, looking_arc + 240 - gun_pos, DEVISTATOR + i, -32, o | 4, pal);
hud_drawpal(weapon_xoffset + 268 - look_anghalf, looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
// else we are in 'reload time'
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb <
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
(
(aplWeaponReload[p->curr_weapon][snum] - aplWeaponTotalTime[p->curr_weapon][snum]) / 2
+ aplWeaponTotalTime[p->curr_weapon][snum]
)
)
{
// down
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= 10 * (kickback_pic - aplWeaponTotalTime[p->curr_weapon][snum]); //D
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
// weapon_xoffset+=80*(*kb-aplWeaponTotalTime[cw][snum]);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 268 - look_anghalf, looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal);
hud_drawpal(weapon_xoffset + 30 - look_anghalf, looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else
{
// move back down
// up and left
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= 10 * (aplWeaponReload[p->curr_weapon][snum] - kickback_pic); //U
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
// weapon_xoffset+=80*(*kb-aplWeaponTotalTime[cw][snum]);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 268 - look_anghalf, looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal);
hud_drawpal(weapon_xoffset + 30 - look_anghalf, looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
else
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 268 - look_anghalf, looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal);
hud_drawpal(weapon_xoffset + 30 - look_anghalf, looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displaydevastator = [&]
{
if (sprite[p->i].pal == 1)
pal = 1;
else
pal = sector[p->cursectnum].floorpal;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
char cycloidy[] = { 0,4,12,24,12,4,0 };
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
i = sgn(*kb >> 2);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (p->hbomb_hold_delay)
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal((cycloidy[*kb] >> 1) + weapon_xoffset + 268 - look_anghalf, cycloidy[*kb] + looking_arc + 238 - gun_pos, DEVISTATOR + i, -32, o, pal);
hud_drawpal(weapon_xoffset + 30 - look_anghalf, looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(-(cycloidy[*kb] >> 1) + weapon_xoffset + 30 - look_anghalf, cycloidy[*kb] + looking_arc + 240 - gun_pos, DEVISTATOR + i, -32, o | 4, pal);
hud_drawpal(weapon_xoffset + 268 - look_anghalf, looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
else
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 268 - look_anghalf, looking_arc + 238 - gun_pos, DEVISTATOR, gs, o, pal);
hud_drawpal(weapon_xoffset + 30 - look_anghalf, looking_arc + 240 - gun_pos, DEVISTATOR, gs, o | 4, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayfreezer = [&]
{
- fixing some HUD stuff.
2020-07-06 13:48:51 +00:00
pin = (isWW2GI() || isWorldTour() || (duke3d_globalflags & DUKE3D_NO_WIDESCREEN_PINNING)) ? 0 : RS_ALIGN_R;
auto pic = isWorldTour() ? FREEZEWIDE : FREEZE;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (sprite[p->i].pal == 1)
pal = 1;
else
pal = sector[p->cursectnum].floorpal;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
char cat_frames[] = { 0,0,1,1,2,2 };
if (sprite[p->i].pal != 1)
{
weapon_xoffset += rand() & 3;
looking_arc += rand() & 3;
}
gun_pos -= 16;
- fixed World Tour weapon display and property parsing, resulting in incorrect ammo count for the flamethrower. Fixes #356
2020-09-06 22:45:11 +00:00
hud_drawpal(weapon_xoffset + 210 - look_anghalf, looking_arc + 261 - gun_pos, isWorldTour() ? FREEZEFIREWIDE : FREEZE + 2, -32, o|pin, pal);
hud_drawpal(weapon_xoffset + 210 - look_anghalf, looking_arc + 235 - gun_pos, FREEZE + 3 + cat_frames[*kb % 6], -32, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- fixed World Tour weapon display and property parsing, resulting in incorrect ammo count for the flamethrower. Fixes #356
2020-09-06 22:45:11 +00:00
else hud_drawpal(weapon_xoffset + 210 - look_anghalf, looking_arc + 261 - gun_pos, isWorldTour() ? FREEZEWIDE : FREEZE, gs, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayshrinker_ww = [&]
{
weapon_xoffset += 28;
looking_arc += 18;
if (sprite[p->i].pal == 1)
pal = 1;
else
pal = sector[p->cursectnum].floorpal;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb == 0)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
// the 'at rest' display
if (ps[snum].ammo_amount[cw] <= 0) //p->last_weapon >= 0)
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 184 - look_anghalf,
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
looking_arc + 240 - gun_pos, SHRINKER + 3 + (*kb & 3), -32,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
o, 0);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 188 - look_anghalf,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
looking_arc + 240 - gun_pos, SHRINKER + 1, gs, o, pal);
}
else
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 184 - look_anghalf,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
looking_arc + 240 - gun_pos, SHRINKER + 2,
- interpolate `p->hard_landing` for Duke 3D.
2020-08-03 04:41:15 +00:00
16 - xs_CRoundToInt(calcSinTableValue(random_club_frame) / 1024.),
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
o, 0);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 188 - look_anghalf,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
looking_arc + 240 - gun_pos, SHRINKER, gs, o, pal);
}
}
else
{
// the 'active' display.
if (sprite[p->i].pal != 1)
{
weapon_xoffset += rand() & 3;
gun_pos += (rand() & 3);
}
if (*kb < aplWeaponTotalTime[p->curr_weapon][snum])
{
if (*kb < aplWeaponFireDelay[p->curr_weapon][snum])
{
// before fire time.
// nothing to modify
}
else
{
// after fire time.
// lower weapon to reload cartridge (not clip)
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= 10 * (aplWeaponTotalTime[p->curr_weapon][snum] - kickback_pic);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
// else we are in 'reload time'
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb <
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
(
(aplWeaponReload[p->curr_weapon][snum] - aplWeaponTotalTime[p->curr_weapon][snum]) / 2
+ aplWeaponTotalTime[p->curr_weapon][snum]
)
)
{
// down
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= 10 * (kickback_pic - aplWeaponTotalTime[p->curr_weapon][snum]); //D
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else
{
// up
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= 10 * (aplWeaponReload[p->curr_weapon][snum] - kickback_pic); //U
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
// draw weapon
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 184 - look_anghalf,
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
looking_arc + 240 - gun_pos, SHRINKER + 3 + (*kb & 3), -32,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
o, 0);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 188 - look_anghalf,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
looking_arc + 240 - gun_pos, SHRINKER + 1, gs, o, pal);
}
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displaygrower_ww = [&]
{
weapon_xoffset += 28;
looking_arc += 18;
if (sprite[p->i].pal == 1)
pal = 1;
else
pal = sector[p->cursectnum].floorpal;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb == 0)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 188 - look_anghalf,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
looking_arc + 240 - gun_pos, SHRINKER - 2, gs, o, pal);
}
}
else
{
if (sprite[p->i].pal != 1)
{
weapon_xoffset += rand() & 3;
gun_pos += (rand() & 3);
}
if (*kb < aplWeaponTotalTime[p->curr_weapon][snum])
{
if (*kb < aplWeaponFireDelay[p->curr_weapon][snum])
{
// before fire time.
// nothing to modify
}
else
{
// after fire time.
// lower weapon to reload cartridge (not clip)
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= 15 * (aplWeaponTotalTime[p->curr_weapon][snum] - kickback_pic);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
// else we are in 'reload time'
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
else if (*kb <
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
(
(aplWeaponReload[p->curr_weapon][snum] - aplWeaponTotalTime[p->curr_weapon][snum]) / 2
+ aplWeaponTotalTime[p->curr_weapon][snum]
)
)
{
// down
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= 5 * (kickback_pic - aplWeaponTotalTime[p->curr_weapon][snum]); //D
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else
{
// up
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
gun_pos -= 10 * (aplWeaponReload[p->curr_weapon][snum] - kickback_pic); //U
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
// display weapon
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 184 - look_anghalf,
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
looking_arc + 240 - gun_pos, SHRINKER + 3 + (*kb & 3), -32,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
o, 2);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 188 - look_anghalf,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
looking_arc + 240 - gun_pos, SHRINKER - 1, gs, o, pal);
}
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayshrinker = [&]
{
- fixed missing widescreen sprite for shrinker/grower and bad light level for the incinerator. Fixes #380
2020-09-08 20:50:38 +00:00
auto shrinker = isWorldTour() ? SHRINKERWIDE : SHRINKER;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
weapon_xoffset += 28;
looking_arc += 18;
if (sprite[p->i].pal == 1)
pal = 1;
else
pal = sector[p->cursectnum].floorpal;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb == 0)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
if (cw == GROW_WEAPON)
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 184 - look_anghalf,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
looking_arc + 240 - gun_pos, SHRINKER + 2,
- interpolate `p->hard_landing` for Duke 3D.
2020-08-03 04:41:15 +00:00
16 - xs_CRoundToInt(calcSinTableValue(random_club_frame) / 1024.),
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
o, 2);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 188 - look_anghalf,
- fixed missing widescreen sprite for shrinker/grower and bad light level for the incinerator. Fixes #380
2020-09-08 20:50:38 +00:00
looking_arc + 240 - gun_pos, shrinker - 2, gs, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 184 - look_anghalf,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
looking_arc + 240 - gun_pos, SHRINKER + 2,
- interpolate `p->hard_landing` for Duke 3D.
2020-08-03 04:41:15 +00:00
16 - xs_CRoundToInt(calcSinTableValue(random_club_frame) / 1024.),
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
o, 0);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 188 - look_anghalf,
- fixed missing widescreen sprite for shrinker/grower and bad light level for the incinerator. Fixes #380
2020-09-08 20:50:38 +00:00
looking_arc + 240 - gun_pos, shrinker, gs, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
else
{
if (sprite[p->i].pal != 1)
{
weapon_xoffset += rand() & 3;
gun_pos += (rand() & 3);
}
if (cw == GROW_WEAPON)
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 184 - look_anghalf,
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
looking_arc + 240 - gun_pos, SHRINKER + 3 + (*kb & 3), -32,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
o, 2);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 188 - look_anghalf,
- fixed missing widescreen sprite for shrinker/grower and bad light level for the incinerator. Fixes #380
2020-09-08 20:50:38 +00:00
looking_arc + 240 - gun_pos, shrinker - 1, gs, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 184 - look_anghalf,
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
looking_arc + 240 - gun_pos, SHRINKER + 3 + (*kb & 3), -32,
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
o, 0);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 188 - look_anghalf,
- fixed missing widescreen sprite for shrinker/grower and bad light level for the incinerator. Fixes #380
2020-09-08 20:50:38 +00:00
looking_arc + 240 - gun_pos, shrinker + 1, gs, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- displayflamethrower
2020-05-20 22:23:55 +00:00
auto displayflamethrower = [&]()
{
if (sprite[p->i].pal == 1)
pal = 1;
else
{
if (p->cursectnum < 0)
pal = 0;
else
pal = sector[p->cursectnum].floorpal;
}
if (*kb < 1 || sector[p->cursectnum].lotag == 2)
{
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 210 - look_anghalf, looking_arc + 261 - gun_pos, FLAMETHROWER, gs, o, pal);
hud_drawpal(weapon_xoffset + 210 - look_anghalf, looking_arc + 261 - gun_pos, FLAMETHROWERPILOT, gs, o, pal);
- displayflamethrower
2020-05-20 22:23:55 +00:00
}
else
{
static const uint8_t cat_frames[] = { 0, 0, 1, 1, 2, 2 };
if (sprite[p->i].pal != 1)
{
weapon_xoffset += krand() & 1;
looking_arc += krand() & 1;
}
gun_pos -= 16;
- fixed missing widescreen sprite for shrinker/grower and bad light level for the incinerator. Fixes #380
2020-09-08 20:50:38 +00:00
hud_drawpal(weapon_xoffset + 210 - look_anghalf, looking_arc + 261 - gun_pos, FLAMETHROWER + 1, -32, o, pal);
- replace `lookanghalf()` player_struct getter with inline that can accept `cl_syncinput` as a bool for whether to return an interpolated calculation or not. New HUD was being let down by using an uninterpolated `q16look_ang` regardless of whether `cl_syncinput` was true.
2020-08-03 06:27:14 +00:00
hud_drawpal(weapon_xoffset + 210 - look_anghalf, looking_arc + 235 - gun_pos, FLAMETHROWER + 2 + cat_frames[*kb % 6], -32, o, pal);
- displayflamethrower
2020-05-20 22:23:55 +00:00
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
switch (cw)
{
case KNEE_WEAPON:
displayknee();
break;
case TRIPBOMB_WEAPON:
displaytripbomb();
break;
case RPG_WEAPON:
displayrpg();
break;
case SHOTGUN_WEAPON:
if (isWW2GI()) displayshotgun_ww();
else displayshotgun();
break;
case CHAINGUN_WEAPON:
if (isWW2GI()) displaychaingun_ww();
else displaychaingun();
break;
case PISTOL_WEAPON:
displaypistol();
break;
case HANDBOMB_WEAPON:
displayhandbomb();
break;
case HANDREMOTE_WEAPON:
displayhandremote();
break;
case DEVISTATOR_WEAPON:
if (isWW2GI()) displaydevastator_ww();
else displaydevastator();
break;
case FREEZE_WEAPON:
displayfreezer();
break;
case SHRINKER_WEAPON:
if (isWW2GI()) displayshrinker_ww();
else displayshrinker();
break;
case GROW_WEAPON:
if (isWW2GI()) displaygrower_ww();
else displayshrinker();
break;
- displayflamethrower
2020-05-20 22:23:55 +00:00
case FLAMETHROWER_WEAPON:
displayflamethrower();
break;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
displayloogie(snum);
}
END_DUKE_NS
Reference in a new issue Copy permalink