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

1253 lines
36 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"
- use GetActor() wrapper in hud weapon code.
2020-10-23 18:42:20 +00:00
#include "dukeactor.h"
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
BEGIN_DUKE_NS
- Replace every line that just contains spaces or tabs with an empty line feed in all files except 3rd party libraries.
2021-12-30 09:30:21 +00:00
- All Games: Allow for HUD interpolation to be disabled. * Requested by users, really don't know why... * Interpolation values are guarded by the CVAR. * For Blood, integer truncation is employed just like original game. * For all games where more precise sine/cosine math has been utilised, no changes have been made.
2021-04-15 03:35:42 +00:00
inline static double getavel(int snum)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
return PlayerInputAngVel(snum) * (2048. / 360.);
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
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
void displayloogie(player_struct* p)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- fixed all warnings in Duke.
2021-05-12 15:33:33 +00:00
double a, y;
int z;
- make full use of `sintablef[2048]`.
2020-08-02 04:09:54 +00:00
double x;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
if (p->loogcnt == 0) return;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
y = (p->loogcnt << 2);
- fixed all warnings in Duke.
2021-05-12 15:33:33 +00:00
for (int i = 0; i < p->numloogs; i++)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- fixed all warnings in Duke.
2021-05-12 15:33:33 +00:00
a = fabs(bsinf((p->loogcnt + i) << 5, -5));
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
z = 4096 + ((p->loogcnt + i) << 9);
- Duke: fixed a few places using a sprite index where a player index is needed.
2021-08-30 06:08:33 +00:00
x = -getavel(p->GetPlayerNum()) + bsinf((p->loogcnt + i) << 6, -10);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- Duke: Replace `player_struct` `loogiex[64]` with `loogie[64].X` calls.
2021-12-30 11:45:53 +00:00
hud_drawsprite((p->loogie[i].X + x), (200 + p->loogiey[i] - y), z - (i << 8), 256 - a, LOOGIE, 0, 0, 2);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
int animatefist(int gs, player_struct* p, double look_anghalf, double looking_arc, double plravel, int fistpal)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- Duke: Don't truncate `fistzoom` to integer in `animatefist()`.
2021-11-13 10:15:09 +00:00
int fisti = min(p->fist_incs, short(32));
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (fisti <= 0) return 0;
- draw all overlay elements on the game screen.
2020-07-06 13:52:09 +00:00
hud_drawsprite(
- All Games: Allow for HUD interpolation to be disabled. * Requested by users, really don't know why... * Interpolation values are guarded by the CVAR. * For Blood, integer truncation is employed just like original game. * For all games where more precise sine/cosine math has been utilised, no changes have been made.
2021-04-15 03:35:42 +00:00
(-fisti + 222 + plravel),
- Duke: Don't truncate `fistzoom` to integer in `animatefist()`.
2021-11-13 10:15:09 +00:00
(looking_arc + 194 + bsinf((6 + fisti) << 7, -9)),
clamp(65536. - bcosf(fisti << 6, 2), 40920., 90612.), 0, FIST, gs, fistpal, 2);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
return 1;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
int animateknee(int gs, player_struct* p, double look_anghalf, double looking_arc, double horiz16th, double plravel, int pal)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (p->knee_incs > 11 || p->knee_incs == 0 || p->GetActor()->spr.extra <= 0) return 0;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- use explicitly sized types for static const arrays.
2021-11-07 12:30:32 +00:00
static const int8_t knee_y[] = { 0,-8,-16,-32,-64,-84,-108,-108,-108,-72,-32,-8 };
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
looking_arc += knee_y[p->knee_incs];
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
hud_drawpal(105 + plravel - look_anghalf + (knee_y[p->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;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
int animateknuckles(int gs, player_struct* p, double look_anghalf, double looking_arc, double horiz16th, double plravel, int pal)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (isWW2GI() || p->over_shoulder_on != 0 || p->knuckle_incs == 0 || p->GetActor()->spr.extra <= 0) return 0;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- use explicitly sized types for static const arrays.
2021-11-07 12:30:32 +00:00
static const uint8_t knuckle_frames[] = { 0,1,2,2,3,3,3,2,2,1,0 };
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
hud_drawpal(160 + plravel - look_anghalf, looking_arc + 180 - horiz16th, CRACKKNUCKLES + knuckle_frames[p->knuckle_incs >> 1], gs, 4, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
return 1;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- Duke: Clean up some duplicated code in hudweapon_*.cpp files.
2021-04-15 05:49:36 +00:00
void displaymasks_d(int snum, int p, double)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
if (ps[snum].scuba_on)
{
- replaced all remaining uses of tilesiz[].y
2020-11-23 07:39:49 +00:00
int y = 200 - tileHeight(SCUBAMASK);
hud_drawsprite(44, y, 65536, 0, SCUBAMASK, 0, p, 2 + 16);
hud_drawsprite((320 - 43), y, 65536, 0, SCUBAMASK, 0, p, 2 + 4 + 16);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
static int animatetip(int gs, player_struct* p, double look_anghalf, double looking_arc, double horiz16th, double plravel, int pal)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
if (p->tipincs == 0) return 0;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- use explicitly sized types for static const arrays.
2021-11-07 12:30:32 +00:00
static const int8_t tip_y[] = { 0,-8,-16,-32,-64,-84,-108,-108,-108,-108,-108,-108,-108,-108,-108,-108,-96,-72,-64,-32,-16 };
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- All Games: Allow for HUD interpolation to be disabled. * Requested by users, really don't know why... * Interpolation values are guarded by the CVAR. * For Blood, integer truncation is employed just like original game. * For all games where more precise sine/cosine math has been utilised, no changes have been made.
2021-04-15 03:35:42 +00:00
hud_drawpal(170 + plravel - look_anghalf,
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
(tip_y[p->tipincs] >> 1) + looking_arc + 240 - horiz16th, TIP + ((26 - p->tipincs) >> 4), gs, 0, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
return 1;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- restored original palette handling for access cards that got broken in 242f958c41f0b14eccb74dfeabbab6cd86a7dd70 Unlike all the other HUD sprites this one works differently.
2021-04-23 17:36:55 +00:00
int animateaccess(int gs, player_struct* p, double look_anghalf, double looking_arc, double horiz16th, double plravel)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if(p->access_incs == 0 || p->GetActor()->spr.extra <= 0) return 0;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- use explicitly sized types for static const arrays.
2021-11-07 12:30:32 +00:00
static const int8_t access_y[] = {0,-8,-16,-32,-64,-84,-108,-108,-108,-108,-108,-108,-108,-108,-108,-108,-96,-72,-64,-32,-16};
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
looking_arc += access_y[p->access_incs];
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- restored original palette handling for access cards that got broken in 242f958c41f0b14eccb74dfeabbab6cd86a7dd70 Unlike all the other HUD sprites this one works differently.
2021-04-23 17:36:55 +00:00
int pal;
if (p->access_spritenum != nullptr)
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
pal = p->access_spritenum->spr.pal;
- restored original palette handling for access cards that got broken in 242f958c41f0b14eccb74dfeabbab6cd86a7dd70 Unlike all the other HUD sprites this one works differently.
2021-04-23 17:36:55 +00:00
else pal = 0;
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
if((p->access_incs-3) > 0 && (p->access_incs-3)>>3)
hud_drawpal(170 + plravel - look_anghalf + (access_y[p->access_incs] >> 2), looking_arc + 266 - horiz16th, HANDHOLDINGLASER + (p->access_incs >> 3), gs, 0, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
else
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
hud_drawpal(170 + plravel - look_anghalf + (access_y[p->access_incs] >> 2), looking_arc + 266 - horiz16th, HANDHOLDINGACCESS, gs, 4, pal);
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;
- Duke: Clean up some duplicated code in hudweapon_*.cpp files.
2021-04-15 05:49:36 +00:00
int o, pal;
- All Games: Allow for HUD interpolation to be disabled. * Requested by users, really don't know why... * Interpolation values are guarded by the CVAR. * For Blood, integer truncation is employed just like original game. * For all games where more precise sine/cosine math has been utilised, no changes have been made.
2021-04-15 03:35:42 +00:00
double weapon_sway, weapon_xoffset, gun_pos, looking_arc, kickback_pic, random_club_frame, hard_landing, look_anghalf, horiz16th, plravel;
renamed all signed and unsigned chars to int8_t/uint8_t.
2021-11-07 11:43:00 +00:00
int8_t shade;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
struct player_struct *p;
p = &ps[snum];
auto kb = &p->kickback_pic;
int pin = 0;
o = 0;
- All Games: Allow for HUD interpolation to be disabled. * Requested by users, really don't know why... * Interpolation values are guarded by the CVAR. * For Blood, integer truncation is employed just like original game. * For all games where more precise sine/cosine math has been utilised, no changes have been made.
2021-04-15 03:35:42 +00:00
if (cl_hudinterpolation)
{
weapon_sway = interpolatedvaluef(p->oweapon_sway, p->weapon_sway, smoothratio);
kickback_pic = interpolatedvaluef(p->okickback_pic, p->kickback_pic, smoothratio);
random_club_frame = interpolatedvaluef(p->orandom_club_frame, p->random_club_frame, smoothratio);
hard_landing = interpolatedvaluef(p->ohard_landing, p->hard_landing, smoothratio);
gun_pos = 80 - interpolatedvaluef(p->oweapon_pos * p->oweapon_pos, p->weapon_pos * p->weapon_pos, smoothratio);
}
else
{
weapon_sway = p->weapon_sway;
kickback_pic = p->kickback_pic;
random_club_frame = p->random_club_frame;
hard_landing = p->hard_landing;
gun_pos = 80 - (p->weapon_pos * p->weapon_pos);
}
plravel = getavel(snum) * (1. / 16.);
- gameinput.h: Remove precise bool from `horizsumfrac()`, `look_anghalf()` and `looking_arc()` added in a4895cb270bff7edfd1f2c93f846c9b76f4e3573. * It looks terrible to have low precision math versions of look_anghalf and looking_arc since we always interpolate `look_ang` now, so lets just not.
2021-04-20 11:12:17 +00:00
horiz16th = p->horizon.horizsumfrac(smoothratio);
look_anghalf = p->angle.look_anghalf(smoothratio);
looking_arc = p->angle.looking_arc(smoothratio);
- All Games: Allow for HUD interpolation to be disabled. * Requested by users, really don't know why... * Interpolation values are guarded by the CVAR. * For Blood, integer truncation is employed just like original game. * For all games where more precise sine/cosine math has been utilised, no changes have been made.
2021-04-15 03:35:42 +00:00
hard_landing *= 8.;
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
gun_pos -= fabs(p->GetActor()->spr.xrepeat < 32 ? bsinf(weapon_sway * 4., -9) : bsinf(weapon_sway * 0.5, -10));
- All Games: Allow for HUD interpolation to be disabled. * Requested by users, really don't know why... * Interpolation values are guarded by the CVAR. * For Blood, integer truncation is employed just like original game. * For all games where more precise sine/cosine math has been utilised, no changes have been made.
2021-04-15 03:35:42 +00:00
gun_pos -= hard_landing;
weapon_xoffset = (160)-90;
weapon_xoffset -= bcosf(weapon_sway * 0.5) * (1. / 1536.);
weapon_xoffset -= 58 + p->weapon_ang;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
shade = p->GetActor()->spr.shade;
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
if(shade > 24) shade = 24;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
pal = !p->insector() ? 0 : p->GetActor()->spr.pal == 1 ? 1 : p->cursector->floorpal;
- Duke: Clean up some duplicated code in hudweapon_*.cpp files.
2021-04-15 05:49:36 +00:00
if (pal == 0)
pal = p->palookup;
- All Games: Allow for HUD interpolation to be disabled. * Requested by users, really don't know why... * Interpolation values are guarded by the CVAR. * For Blood, integer truncation is employed just like original game. * For all games where more precise sine/cosine math has been utilised, no changes have been made.
2021-04-15 03:35:42 +00:00
auto adjusted_arc = looking_arc - hard_landing;
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
bool playerVars = p->newOwner != nullptr || ud.cameraactor != nullptr || p->over_shoulder_on > 0 || (p->GetActor()->spr.pal != 1 && p->GetActor()->spr.extra <= 0);
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
bool playerAnims = animatefist(shade, p, look_anghalf, looking_arc, plravel, pal) || animateknuckles(shade, p, look_anghalf, adjusted_arc, horiz16th, plravel, pal) ||
- restored original palette handling for access cards that got broken in 242f958c41f0b14eccb74dfeabbab6cd86a7dd70 Unlike all the other HUD sprites this one works differently.
2021-04-23 17:36:55 +00:00
animatetip(shade, p, look_anghalf, adjusted_arc, horiz16th, plravel, pal) || animateaccess(shade, p, look_anghalf, adjusted_arc, horiz16th, plravel);
- 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
if(playerVars || playerAnims)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
return;
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
animateknee(shade, p, look_anghalf, adjusted_arc, horiz16th, plravel, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (isWW2GI())
{
if (p->last_weapon >= 0)
{
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
cw = aplWeaponWorksLike(p->last_weapon, snum);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else
{
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
cw = aplWeaponWorksLike(p->curr_weapon, snum);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
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 (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
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 80 - look_anghalf, looking_arc + 250 - gun_pos, KNEE, shade, 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
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 160 - 16 - look_anghalf, looking_arc + 214 - gun_pos, KNEE + 1, shade, 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
}
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (p->GetActor()->spr.xrepeat < 40)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
static int fistsign;
//shrunken..
if (p->jetpack_on == 0)
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
i = p->GetActor()->spr.xvel;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
looking_arc += 32 - (i >> 1);
fistsign += i >> 1;
}
- fixed all warnings in Duke.
2021-05-12 15:33:33 +00:00
double owo = weapon_xoffset;
- buildutils: Replace `calcSinTableValue()` use within Duke with `bsinf()`/`bcosf()`.
2020-11-22 10:29:58 +00:00
weapon_xoffset += bsinf(fistsign, -10);
- 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,
- buildutils: Replace `calcSinTableValue()` use within Duke with `bsinf()`/`bcosf()`.
2020-11-22 10:29:58 +00:00
looking_arc + 258 - fabs(bsinf(fistsign, -8)),
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
FIST, shade, o);
- fixed all warnings in Duke.
2021-05-12 15:33:33 +00:00
weapon_xoffset = owo;
- buildutils: Replace `calcSinTableValue()` use within Duke with `bsinf()`/`bcosf()`.
2020-11-22 10:29:58 +00:00
weapon_xoffset -= bsinf(fistsign, -10);
- 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,
- buildutils: Replace `calcSinTableValue()` use within Duke with `bsinf()`/`bcosf()`.
2020-11-22 10:29:58 +00:00
looking_arc + 200 + fabs(bsinf(fistsign, -8)),
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
FIST, shade, o | 4);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
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
{
- 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,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
looking_arc + 250 - gun_pos, KNEE, shade, 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 + 160 - look_anghalf,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
looking_arc + 214 - gun_pos, KNEE + 1, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displaytripbomb = [&]()
{
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,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
looking_arc + 234 - gun_pos, HANDHOLDINGLASER + 3, shade, 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
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,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
HANDHOLDINGLASER + (*kb >> 2), shade, 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,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
HANDHOLDINGLASER + (*kb >> 2), shade, o | 4, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayrpg = [&]()
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
pin = ((gs.displayflags & DUKE3D_NO_WIDESCREEN_PINNING)) ? 0 : RS_ALIGN_R;
auto rpgpic = RPGGUN;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- buildutils: Replace `calcSinTableValue()` use within Duke with `bsinf()`/`bcosf()`.
2020-11-22 10:29:58 +00:00
weapon_xoffset -= bsinf(768 + (kickback_pic * 128.), -11);
gun_pos += bsinf(768 + (kickback_pic * 128.), -11);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
if (*kb > 0)
{
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
if (*kb < (isWW2GI() ? aplWeaponTotalTime(RPG_WEAPON, snum) : 8))
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,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
RPGGUN + (*kb >> 1), shade, 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
(
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
(aplWeaponReload(p->curr_weapon, snum) - aplWeaponTotalTime(p->curr_weapon, snum)) / 2
+ aplWeaponTotalTime(p->curr_weapon, snum)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
)
)
{
// down
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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
}
}
}
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 164, (looking_arc * 2.) + 176 - gun_pos, rpgpic, shade, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayshotgun_ww = [&]()
{
if (*kb > 0)
{
- buildutils: Replace `calcSinTableValue()` use within Duke with `bsinf()`/`bcosf()`.
2020-11-22 10:29:58 +00:00
gun_pos -= bsinf(kickback_pic * 128., -12);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (*kb > 0 && p->GetActor()->spr.pal != 1)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
weapon_xoffset += 1 - (rand() & 3);
}
weapon_xoffset -= 8;
if (*kb == 0)
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 146 - look_anghalf, looking_arc + 202 - gun_pos, SHOTGUN, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
else if (*kb <= aplWeaponTotalTime(SHOTGUN_WEAPON, snum))
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 146 - look_anghalf, looking_arc + 202 - gun_pos, SHOTGUN + 1, shade, 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
(
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
(aplWeaponReload(p->curr_weapon, snum) - aplWeaponTotalTime(p->curr_weapon, snum)) / 2
+ aplWeaponTotalTime(p->curr_weapon, snum)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
)
)
{
// down
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
gun_pos -= 10 * (kickback_pic - aplWeaponTotalTime(p->curr_weapon, snum)); //D
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 146 - look_anghalf, looking_arc + 202 - gun_pos, SHOTGUN, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else
{
// move back down
// up and left
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
gun_pos -= 10 * (aplWeaponReload(p->curr_weapon, snum) - kickback_pic); //U
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 146 - look_anghalf, looking_arc + 202 - gun_pos, SHOTGUN, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayshotgun = [&]()
{
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:
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 168 - look_anghalf,looking_arc + 201 - gun_pos, SHOTGUN + 2,-128,o,pal);
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
[[fallthrough]];
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
case 0:
case 6:
case 7:
case 8:
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 146 - look_anghalf,looking_arc + 202 - gun_pos, SHOTGUN,shade,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
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;
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 178 - look_anghalf,looking_arc + 194 - gun_pos, SHOTGUN + 1 + ((*(kb)-1) >> 1),-128,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 158 - look_anghalf,looking_arc + 220 - gun_pos, SHOTGUN + 3,shade,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
break;
case 13:
case 14:
case 15:
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(32 + weapon_xoffset + 166 - look_anghalf,looking_arc + 210 - gun_pos, SHOTGUN + 4,shade,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
break;
case 16:
case 17:
case 18:
case 19:
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(64 + weapon_xoffset + 170 - look_anghalf,looking_arc + 196 - gun_pos, SHOTGUN + 5,shade,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
break;
case 20:
case 21:
case 22:
case 23:
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(64 + weapon_xoffset + 176 - look_anghalf,looking_arc + 196 - gun_pos, SHOTGUN + 6,shade,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
break;
case 24:
case 25:
case 26:
case 27:
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(64 + weapon_xoffset + 170 - look_anghalf,looking_arc + 196 - gun_pos, SHOTGUN + 5,shade,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
break;
case 28:
case 29:
case 30:
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(32 + weapon_xoffset + 156 - look_anghalf,looking_arc + 206 - gun_pos, SHOTGUN + 4,shade,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
break;
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displaychaingun_ww = [&]()
{
if (*kb > 0)
- buildutils: Replace `calcSinTableValue()` use within Duke with `bsinf()`/`bcosf()`.
2020-11-22 10:29:58 +00:00
gun_pos -= bsinf(kickback_pic * 128., -12);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (*kb > 0 && p->GetActor()->spr.pal != 1) weapon_xoffset += 1 - (rand() & 3);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
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);
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 178 - look_anghalf, looking_arc + 233 - gun_pos, CHAINGUN + 1, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
else if (*kb <= aplWeaponTotalTime(CHAINGUN_WEAPON, snum))
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 188 - look_anghalf, looking_arc + 243 - gun_pos, CHAINGUN + 2, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
// 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
{
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
int iFifths = (aplWeaponReload(p->curr_weapon, snum) - aplWeaponTotalTime(p->curr_weapon, snum)) / 5;
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
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
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
+ aplWeaponTotalTime(p->curr_weapon, snum)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
)
)
{
// first segment
//
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
gun_pos += 80 - (10 * (aplWeaponTotalTime(p->curr_weapon, snum) + iFifths - kickback_pic));
weapon_xoffset += 80 - (10 * (aplWeaponTotalTime(p->curr_weapon, snum) + iFifths - kickback_pic));
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 168 - look_anghalf, looking_arc + 260 - gun_pos, 2519, shade, o, 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 <
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
(iFifths * 2
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
+ aplWeaponTotalTime(p->curr_weapon, snum)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
)
)
{
// second segment
// down
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
gun_pos += 80; //5*(iFifthsp->kickback_pic-aplWeaponTotalTime(p->curr_weapon, snum)); //D
weapon_xoffset += 80; //80*(*kb-aplWeaponTotalTime(p->curr_weapon, snum));
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 168 - look_anghalf, looking_arc + 260 - gun_pos, 2518, shade, o, 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 <
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
(iFifths * 3
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
+ aplWeaponTotalTime(p->curr_weapon, snum)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
)
)
{
// third segment
// up
gun_pos += 80;//5*(iFifths*2);
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
weapon_xoffset += 80; //80*(*kb-aplWeaponTotalTime(p->curr_weapon, snum));
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 168 - look_anghalf, looking_arc + 260 - gun_pos, 2517, shade, o, 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 <
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
(iFifths * 4
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
+ aplWeaponTotalTime(p->curr_weapon, snum)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
)
)
{
// fourth segment
// down
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
gun_pos += 80; //5*(aplWeaponTotalTime(p->curr_weapon, snum)- p->kickback_pic); //D
weapon_xoffset += 80; //80*(*kb-aplWeaponTotalTime(p->curr_weapon, snum));
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 168 - look_anghalf, looking_arc + 260 - gun_pos, 2518, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else
{
// move back down
// up and left
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
gun_pos += 10 * (aplWeaponReload(p->curr_weapon, snum) - kickback_pic);
weapon_xoffset += 10 * (aplWeaponReload(p->curr_weapon, snum) - kickback_pic);
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 168 - look_anghalf, looking_arc + 260 - gun_pos, 2519, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displaychaingun = [&]
{
if (*kb > 0)
- buildutils: Replace `calcSinTableValue()` use within Duke with `bsinf()`/`bcosf()`.
2020-11-22 10:29:58 +00:00
gun_pos -= bsinf(kickback_pic * 128., -12);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (*kb > 0 && p->GetActor()->spr.pal != 1) weapon_xoffset += 1 - (rand() & 3);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 168 - look_anghalf, looking_arc + 260 - gun_pos, CHAINGUN, shade, 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:
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 178 - look_anghalf,looking_arc + 233 - gun_pos, CHAINGUN + 1,shade,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;
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (p->GetActor()->spr.pal != 1) i = rand() & 7;
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +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),shade,o,pal);
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (p->GetActor()->spr.pal != 1) i = rand() & 7;
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +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),shade,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
if (*kb < 8)
{
i = rand() & 7;
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +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),shade,o,pal);
hud_drawpal(weapon_xoffset + 178 - look_anghalf,looking_arc + 233 - gun_pos, CHAINGUN + 1 + (*kb >> 1),shade,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
else hud_drawpal(weapon_xoffset + 178 - look_anghalf,looking_arc + 233 - gun_pos, CHAINGUN + 1,shade,o,pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
break;
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displaypistol = [&]()
{
- 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
{
- use explicitly sized types for static const arrays.
2021-11-07 12:30:32 +00:00
static const uint8_t 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;
{
hud_drawpal(
- fixed incomplete merging of WW2GI/Duke code for the pistol animation
2020-09-28 06:55:59 +00:00
(l - look_anghalf),
(looking_arc + 244 - gun_pos),
FIRSTGUN + kb_frames[*kb],
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
shade, 2, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
else
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
pin = (isWW2GI() || (gs.displayflags & DUKE3D_NO_WIDESCREEN_PINNING)) ? 0 : RS_ALIGN_R;
auto pic_5 = 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;
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
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)
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(194 - look_anghalf, looking_arc + 230 - gun_pos, FIRSTGUN + 4, shade, 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
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(244 - (kickback_pic * 8.) - look_anghalf, looking_arc + 130 - gun_pos + (kickback_pic * 16.), FIRSTGUN + 6, shade, o | pin, pal);
hud_drawpal(224 - look_anghalf, looking_arc + 220 - gun_pos, pic_5, shade, 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
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(124 + (kickback_pic * 2.) - look_anghalf, looking_arc + 430 - gun_pos - (kickback_pic * 8.), FIRSTGUN + 6, shade, o | pin, pal);
hud_drawpal(224 - look_anghalf, looking_arc + 220 - gun_pos, pic_5, shade, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- fixed incomplete merging of WW2GI/Duke code for the pistol animation
2020-09-28 06:55:59 +00:00
else if (*kb < (isNamWW2GI()? (reload_time - 12) : 23))
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(184 - look_anghalf, looking_arc + 235 - gun_pos, FIRSTGUN + 8, shade, o | pin, pal);
hud_drawpal(224 - look_anghalf, looking_arc + 210 - gun_pos, pic_5, shade, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- fixed incomplete merging of WW2GI/Duke code for the pistol animation
2020-09-28 06:55:59 +00:00
else if (*kb < (isNamWW2GI()? (reload_time - 6) : 25))
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(164 - look_anghalf, looking_arc + 245 - gun_pos, FIRSTGUN + 8, shade, o | pin, pal);
hud_drawpal(224 - look_anghalf, looking_arc + 220 - gun_pos, pic_5, shade, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- fixed incomplete merging of WW2GI/Duke code for the pistol animation
2020-09-28 06:55:59 +00:00
else if (*kb < (isNamWW2GI()? reload_time : 27))
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(194 - look_anghalf, looking_arc + 235 - gun_pos, pic_5, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayhandbomb = [&]()
{
- 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())
{
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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
- tabified two files in Duke that were missed somehow, plus some comment cleanup elsewhere.
2021-11-09 23:05:42 +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
(
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
(aplWeaponTotalTime(HANDBOMB_WEAPON, snum) - aplWeaponFireDelay(HANDBOMB_WEAPON, snum)) / 2
+ aplWeaponFireDelay(HANDBOMB_WEAPON, snum)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
)
)
{
// up and left
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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
}
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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
}
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 190 - look_anghalf, looking_arc + 250 - gun_pos, HANDTHROW + throw_frames[*kb], shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
else
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 190 - look_anghalf, looking_arc + 260 - gun_pos, HANDTHROW, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayhandremote = [&]()
{
renamed all signed and unsigned chars to int8_t/uint8_t.
2021-11-07 11:43:00 +00:00
int8_t remote_frames[] = { 0,1,1,2,1,1,0,0,0,0,0 };
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
weapon_xoffset = -48;
- interpolate `p->kickback_pic` for Duke 3D.
2020-08-03 04:21:30 +00:00
if (*kb)
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 150 - look_anghalf, looking_arc + 258 - gun_pos, HANDREMOTE + remote_frames[*kb], shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
else
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 150 - look_anghalf, looking_arc + 258 - gun_pos, HANDREMOTE, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displaydevastator_ww = [&]
{
- 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
{
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
if (*kb < aplWeaponTotalTime(p->curr_weapon, snum))
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- Amalgamate ksgn and sgn into Sgn in cmdlib.h, and remove pragmas.h.
2021-01-04 12:35:33 +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)
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 30 - look_anghalf, looking_arc + 240 - gun_pos, DEVISTATOR, shade, o | 4, 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 + 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);
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 268 - look_anghalf, looking_arc + 238 - gun_pos, DEVISTATOR, shade, 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
(
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
(aplWeaponReload(p->curr_weapon, snum) - aplWeaponTotalTime(p->curr_weapon, snum)) / 2
+ aplWeaponTotalTime(p->curr_weapon, snum)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
)
)
{
// down
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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]);
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 268 - look_anghalf, looking_arc + 238 - gun_pos, DEVISTATOR, shade, o, pal);
hud_drawpal(weapon_xoffset + 30 - look_anghalf, looking_arc + 240 - gun_pos, DEVISTATOR, shade, 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
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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]);
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 268 - look_anghalf, looking_arc + 238 - gun_pos, DEVISTATOR, shade, o, pal);
hud_drawpal(weapon_xoffset + 30 - look_anghalf, looking_arc + 240 - gun_pos, DEVISTATOR, shade, o | 4, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
else
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 268 - look_anghalf, looking_arc + 238 - gun_pos, DEVISTATOR, shade, o, pal);
hud_drawpal(weapon_xoffset + 30 - look_anghalf, looking_arc + 240 - gun_pos, DEVISTATOR, shade, o | 4, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displaydevastator = [&]
{
- 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
{
- Duke/RR: eliminated all uses of 'char' outside of text management
2021-11-07 11:53:48 +00:00
static const uint8_t cycloidy[] = { 0,4,12,24,12,4,0 };
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- Amalgamate ksgn and sgn into Sgn in cmdlib.h, and remove pragmas.h.
2021-01-04 12:35:33 +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);
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 30 - look_anghalf, looking_arc + 240 - gun_pos, DEVISTATOR, shade, 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);
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 268 - look_anghalf, looking_arc + 238 - gun_pos, DEVISTATOR, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
else
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 268 - look_anghalf, looking_arc + 238 - gun_pos, DEVISTATOR, shade, o, pal);
hud_drawpal(weapon_xoffset + 30 - look_anghalf, looking_arc + 240 - gun_pos, DEVISTATOR, shade, o | 4, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayfreezer = [&]
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
pin = (isWW2GI() || (gs.displayflags & DUKE3D_NO_WIDESCREEN_PINNING)) ? 0 : RS_ALIGN_R;
auto pic = FREEZE;
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)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- Duke/RR: eliminated all uses of 'char' outside of text management
2021-11-07 11:53:48 +00:00
static const uint8_t cat_frames[] = { 0,0,1,1,2,2 };
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (p->GetActor()->spr.pal != 1)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
weapon_xoffset += rand() & 3;
looking_arc += rand() & 3;
}
gun_pos -= 16;
- addressed most unused/uninitialized variable warnings from MSVC.
2021-11-14 14:03:50 +00:00
hud_drawpal(weapon_xoffset + 210 - look_anghalf, looking_arc + 261 - gun_pos, pic + 2, -32, o|pin, pal);
hud_drawpal(weapon_xoffset + 210 - look_anghalf, looking_arc + 235 - gun_pos, pic + 3 + cat_frames[*kb % 6], -32, o | pin, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
- addressed most unused/uninitialized variable warnings from MSVC.
2021-11-14 14:03:50 +00:00
else hud_drawpal(weapon_xoffset + 210 - look_anghalf, looking_arc + 261 - gun_pos, pic, shade, 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;
- Duke: Clean up some duplicated code in hudweapon_*.cpp files.
2021-04-15 05:49:36 +00:00
- 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
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
if (p->ammo_amount[cw] <= 0) //p->last_weapon >= 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 + 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,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
looking_arc + 240 - gun_pos, SHRINKER + 1, shade, 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,
- buildutils: Replace `calcSinTableValue()` use within Duke with `bsinf()`/`bcosf()`.
2020-11-22 10:29:58 +00:00
16 - xs_CRoundToInt(bsinf(random_club_frame, -10)),
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,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
looking_arc + 240 - gun_pos, SHRINKER, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
else
{
// the 'active' display.
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (p->GetActor()->spr.pal != 1)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
weapon_xoffset += rand() & 3;
gun_pos += (rand() & 3);
}
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
if (*kb < aplWeaponTotalTime(p->curr_weapon, snum))
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
if (*kb < aplWeaponFireDelay(p->curr_weapon, snum))
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
// before fire time.
// nothing to modify
}
else
{
// after fire time.
// lower weapon to reload cartridge (not clip)
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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
(
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
(aplWeaponReload(p->curr_weapon, snum) - aplWeaponTotalTime(p->curr_weapon, snum)) / 2
+ aplWeaponTotalTime(p->curr_weapon, snum)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
)
)
{
// down
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
looking_arc + 240 - gun_pos, SHRINKER + 1, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displaygrower_ww = [&]
{
weapon_xoffset += 28;
looking_arc += 18;
- Duke: Clean up some duplicated code in hudweapon_*.cpp files.
2021-04-15 05:49:36 +00:00
- 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,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
looking_arc + 240 - gun_pos, SHRINKER - 2, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
else
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (p->GetActor()->spr.pal != 1)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
weapon_xoffset += rand() & 3;
gun_pos += (rand() & 3);
}
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
if (*kb < aplWeaponTotalTime(p->curr_weapon, snum))
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
if (*kb < aplWeaponFireDelay(p->curr_weapon, snum))
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
// before fire time.
// nothing to modify
}
else
{
// after fire time.
// lower weapon to reload cartridge (not clip)
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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
(
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +00:00
(aplWeaponReload(p->curr_weapon, snum) - aplWeaponTotalTime(p->curr_weapon, snum)) / 2
+ aplWeaponTotalTime(p->curr_weapon, snum)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
)
)
{
// down
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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
- moved gamevar storage to player and actor objects respectively. For actors this eliminates the need to for sprite indices which was the intended goal. It also properly associates the gamevars with their owners.
2021-12-05 12:43:31 +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,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
looking_arc + 240 - gun_pos, SHRINKER - 1, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
};
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
auto displayshrinker = [&]
{
- code changes for last commit - they were not picked up automatically. # Conflicts: # source/build/src/defs.cpp
2020-09-10 21:12:52 +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;
- Duke: Clean up some duplicated code in hudweapon_*.cpp files.
2021-04-15 05:49:36 +00:00
- 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,
- buildutils: Replace `calcSinTableValue()` use within Duke with `bsinf()`/`bcosf()`.
2020-11-22 10:29:58 +00:00
16 - xs_CRoundToInt(bsinf(random_club_frame, -10)),
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,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
looking_arc + 240 - gun_pos, shrinker - 2, shade, 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,
- buildutils: Replace `calcSinTableValue()` use within Duke with `bsinf()`/`bcosf()`.
2020-11-22 10:29:58 +00:00
16 - xs_CRoundToInt(bsinf(random_club_frame, -10)),
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,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
looking_arc + 240 - gun_pos, shrinker, shade, o, pal);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
}
else
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (p->GetActor()->spr.pal != 1)
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
{
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,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
looking_arc + 240 - gun_pos, shrinker - 1, shade, 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,
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
looking_arc + 240 - gun_pos, shrinker + 1, shade, 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 = [&]()
{
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
if (*kb < 1 || p->cursector->lotag == 2)
- displayflamethrower
2020-05-20 22:23:55 +00:00
{
- re-enabled the widescreen pinning code. It is still off by default - the idea here is to provide a means for the user to switch it on in case a mod replaces the weapons with non-widescreen-friendly versions.
2020-11-29 13:05:53 +00:00
hud_drawpal(weapon_xoffset + 210 - look_anghalf, looking_arc + 261 - gun_pos, FLAMETHROWER, shade, o, pal);
hud_drawpal(weapon_xoffset + 210 - look_anghalf, looking_arc + 261 - gun_pos, FLAMETHROWERPILOT, shade, o, pal);
- displayflamethrower
2020-05-20 22:23:55 +00:00
}
else
{
static const uint8_t cat_frames[] = { 0, 0, 1, 1, 2, 2 };
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (p->GetActor()->spr.pal != 1)
- displayflamethrower
2020-05-20 22:23:55 +00:00
{
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
}
}
- Duke: Remove some direct array accesses in lieu of `player_struct` pointer.
2021-04-15 06:34:24 +00:00
displayloogie(p);
hudweapon # Conflicts: # source/build/src/engine.cpp
2020-05-19 22:35:52 +00:00
}
END_DUKE_NS
Reference in a new issue Copy permalink