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

3177 lines
75 KiB
C++
Raw Normal View History

- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +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
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +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
along 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"
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
#include "gamevar.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"
- clearcamera and ssp.
2020-10-21 17:38:53 +00:00
#include "dukeactor.h"
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
BEGIN_DUKE_NS
-processinput_d
2020-05-18 22:26:07 +00:00
void fireweapon_ww(int snum);
dukeplayer stuff
2021-11-21 07:48:36 +00:00
void operateweapon_ww(int snum, ESyncBits actions);
-processinput_d
2020-05-18 22:26:07 +00:00
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- remove C-style struct parameters.
2022-02-07 10:04:19 +00:00
void incur_damage_d(player_struct* p)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
int damage = 0L, shield_damage = 0L;
- 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
p->GetActor()->spr.extra -= p->extra_extra8 >> 8;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +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
damage = p->GetActor()->spr.extra - p->last_extra;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
if (damage < 0)
{
p->extra_extra8 = 0;
if (p->shield_amount > 0)
{
shield_damage = damage * (20 + (rand() % 30)) / 100;
damage -= shield_damage;
p->shield_amount += shield_damage;
if (p->shield_amount < 0)
{
damage += p->shield_amount;
p->shield_amount = 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
p->GetActor()->spr.extra = p->last_extra + damage;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
static void shootfireball(DDukeActor *actor, int p, int sx, int sy, int sz, int sa)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
int vel, zvel;
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.extra >= 0)
actor->spr.shade = -96;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sz -= (4 << 7);
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.picnum != BOSS5)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
vel = 840;
else {
vel = 968;
sz += 6144;
}
if (p < 0)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sa += 16 - (krand() & 31);
int scratch;
- 3 more wrappers gone.
2020-11-02 22:10:19 +00:00
int j = findplayer(actor, &scratch);
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
zvel = (((ps[j].player_int_opos().Z - sz + (3 << 8))) * vel) / ldist(ps[j].GetActor(), actor);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
else
{
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
zvel = -MulScale(ps[p].horizon.sum().asq16(), 98, 16);
- buildutils: Replace `sintable[]` use within Duke's player_d.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:03 +00:00
sx += bcos(sa + 348) / 448;
sy += bsin(sa + 348) / 448;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sz += (3 << 8);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
int sizx = 18;
int sizy = 18;
if (p >= 0)
- added the SHOOT event and fixed some issues with poor code generation for the game data accessors. They created different code depending on the passed index, this was changed to always emit the optional parameter, even when not needed, so that the interpreter does not need to second-guess.
2020-09-17 21:02:52 +00:00
{
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sizx = 7;
sizy = 7;
}
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
auto spawned = EGS(actor->sector(), sx, sy, sz, FIREBALL, -127, sizx, sizy, sa, vel, zvel, actor, (short)4);
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
if (spawned)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
spawned->spr.extra += (krand() & 7);
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.picnum == BOSS5 || p >= 0)
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
{
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
spawned->spr.xrepeat = 40;
spawned->spr.yrepeat = 40;
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
}
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
spawned->spr.yvel = p;
spawned->spr.cstat = CSTAT_SPRITE_YCENTER;
spawned->spr.clipdist = 4;
- added the SHOOT event and fixed some issues with poor code generation for the game data accessors. They created different code depending on the passed index, this was changed to always emit the optional parameter, even when not needed, so that the interpreter does not need to second-guess.
2020-09-17 21:02:52 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
- added the SHOOT event and fixed some issues with poor code generation for the game data accessors. They created different code depending on the passed index, this was changed to always emit the optional parameter, even when not needed, so that the interpreter does not need to second-guess.
2020-09-17 21:02:52 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- added the SHOOT event and fixed some issues with poor code generation for the game data accessors. They created different code depending on the passed index, this was changed to always emit the optional parameter, even when not needed, so that the interpreter does not need to second-guess.
2020-09-17 21:02:52 +00:00
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
static void shootflamethrowerflame(DDukeActor* actor, int p, int sx, int sy, int sz, int sa)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- fixed most warnings GCC pointed out in game code.
2021-11-14 12:33:35 +00:00
int vel, zvel = 0;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.extra >= 0)
actor->spr.shade = -96;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
vel = 400;
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
DDukeActor* spawned = nullptr;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (p < 0)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
int x;
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
int j = findplayer(actor, &x);
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
sa = getangle(ps[j].player_int_opos().X - sx, ps[j].player_int_opos().Y - sy);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.picnum == BOSS5)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
vel = 528;
sz += 6144;
}
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
else if (actor->spr.picnum == BOSS3)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sz -= 8192;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
int l = ldist(ps[j].GetActor(), actor);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (l != 0)
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
zvel = ((ps[j].player_int_opos().Z - sz) * vel) / l;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (badguy(actor) && (actor->spr.hitag & face_player_smart) != 0)
- use int_ang().
2022-08-16 21:15:49 +00:00
sa = (short)(actor->int_ang() + (krand() & 31) - 16);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
if (actor->sector()->lotag == 2 && (krand() % 5) == 0)
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
spawned = spawn(actor, WATERBUBBLE);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
else
{
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
zvel = -MulScale(ps[p].horizon.sum().asq16(), 81, 16);
- 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 (ps[p].GetActor()->spr.xvel != 0)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
vel = (int)((((512 - (1024
- another batch of utility use
2022-02-05 11:05:29 +00:00
- abs(abs(getangle(sx - ps[p].player_int_opos().X, sy - ps[p].player_int_opos().Y) - sa) - 1024)))
- 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
* 0.001953125f) * ps[p].GetActor()->spr.xvel) + 400);
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
if (actor->sector()->lotag == 2 && (krand() % 5) == 0)
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
spawned = spawn(actor, WATERBUBBLE);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
if (spawned == nullptr)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
spawned = spawn(actor, FLAMETHROWERFLAME);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (!spawned) return;
- 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
spawned->spr.xvel = (short)vel;
spawned->spr.zvel = (short)zvel;
}
- Duke: sixth batch of refactoring writes to spr.pos.
2022-01-30 17:33:11 +00:00
spawned->set_int_pos({ sx + bsin(sa + 630) / 448, sy + bsin(sa + 112) / 448, sz - 256 });
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
spawned->setsector(actor->sector());
- 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
spawned->spr.cstat = CSTAT_SPRITE_YCENTER;
- set_int_ang in Duke. Also changed SOUNDFX actor to use a different variable for its index.
2022-08-16 21:20:35 +00:00
spawned->set_int_ang(sa);
- 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
spawned->spr.xrepeat = 2;
spawned->spr.yrepeat = 2;
spawned->spr.clipdist = 40;
spawned->spr.yvel = p;
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
spawned->SetOwner(actor);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (p == -1)
{
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.picnum == BOSS5)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- Duke: sixth batch of refactoring writes to spr.pos.
2022-01-30 17:33:11 +00:00
spawned->add_int_pos({ -bsin(sa) / 56, bcos(sa) / 56, 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
spawned->spr.xrepeat = 10;
spawned->spr.yrepeat = 10;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
}
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
static void shootknee(DDukeActor* actor, int p, int sx, int sy, int sz, int sa)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
auto sectp = actor->sector();
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
int zvel;
- Silence all the `-Wuninitialized` and `-Wmaybe-uninitialized` warnings relating to `HitInfo` objects passed through to functions by reference.
2021-12-06 11:24:22 +00:00
HitInfo hit{};
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (p >= 0)
{
zvel = -ps[p].horizon.sum().asq16() >> 11;
sz += (6 << 8);
sa += 15;
}
else
{
int x;
- 3 more wrappers gone.
2020-11-02 22:10:19 +00:00
auto pactor = ps[findplayer(actor, &x)].GetActor();
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
zvel = ((pactor->int_pos().Z - sz) << 8) / (x + 1);
sa = getangle(pactor->int_pos().X - sx, pactor->int_pos().Y - sy);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
- use explicit types in hitscan calls
2022-08-20 13:47:52 +00:00
hitscan(vec3_t( sx, sy, sz ), sectp, { bcos(sa), bsin(sa), zvel << 6 }, hit, CLIPMASK1);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitSector == nullptr) return;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
- use int_hitpos() access function where applicable
2022-08-16 22:59:32 +00:00
if ((abs(sx - hit.int_hitpos().X) + abs(sy - hit.int_hitpos().Y)) < 1024)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall || hit.actor())
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- EGS with hitpos
2022-08-23 20:32:45 +00:00
auto knee = CreateActor(hit.hitSector, hit.hitpos, KNEE, -15, 0, 0, sa, 32, 0, actor, 4);
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
if (knee)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +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
knee->spr.extra += (krand() & 7);
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
if (p >= 0)
{
auto k = spawn(knee, SMALLSMOKE);
- some simple replacements.
2022-02-07 07:47:18 +00:00
if (k) k->spr.pos.Z -= 8;
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
S_PlayActorSound(KICK_HIT, knee);
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
if (p >= 0 && ps[p].steroids_amount > 0 && ps[p].steroids_amount < 400)
- 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
knee->spr.extra += (gs.max_player_health >> 2);
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +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 (hit.actor() && hit.actor()->spr.picnum != ACCESSSWITCH && hit.actor()->spr.picnum != ACCESSSWITCH2)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
fi.checkhitsprite(hit.actor(), knee);
if (p >= 0) fi.checkhitswitch(p, nullptr, hit.actor());
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
else if (hit.hitWall)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- wall and sprite flags in Duke, just simple cases.
2021-12-18 14:11:21 +00:00
if (hit.hitWall->cstat & CSTAT_WALL_BOTTOM_SWAP)
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall->twoSided())
- another batch of wrapper replacements
2022-08-28 09:34:54 +00:00
if (hit.hitpos.Z >= hit.hitWall->nextSector()->floorz)
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
hit.hitWall =hit.hitWall->nextWall();
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall->picnum != ACCESSSWITCH && hit.hitWall->picnum != ACCESSSWITCH2)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- floatified position in checkhitwall
2022-08-23 20:39:07 +00:00
fi.checkhitwall(knee, hit.hitWall, hit.hitpos, KNEE);
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (p >= 0) fi.checkhitswitch(p, hit.hitWall, nullptr);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
}
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
else if (p >= 0 && zvel > 0 && hit.hitSector->lotag == 1)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- replaced a bit more.
2020-10-23 20:06:02 +00:00
auto splash = spawn(ps[p].GetActor(), WATERSPLASH2);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (splash)
{
- use int_hitpos() access function where applicable
2022-08-16 22:59:32 +00:00
splash->set_int_xy(hit.int_hitpos().X, hit.int_hitpos().Y);
- Replace player's `ang` with `DAngle` object. * This commit does not build. Committed items are everything that's been done by find and replace. * Next commit has hand-performed changes that are better separated out for clarity.
2022-08-27 13:09:22 +00:00
splash->set_int_ang(ps[p].angle.ang.Buildang()); // Total tweek
- 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
splash->spr.xvel = 32;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
ssp(actor, CLIPMASK0);
- 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
splash->spr.xvel = 0;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- shootweapon
2020-10-24 04:33:31 +00:00
static void shootweapon(DDukeActor *actor, int p, int sx, int sy, int sz, int sa, int atwith)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
auto sectp = actor->sector();
- addressed most unused/uninitialized variable warnings from MSVC.
2021-11-14 14:03:50 +00:00
int zvel = 0;
- Silence all the `-Wuninitialized` and `-Wmaybe-uninitialized` warnings relating to `HitInfo` objects passed through to functions by reference.
2021-12-06 11:24:22 +00:00
HitInfo hit{};
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.extra >= 0) actor->spr.shade = -96;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (p >= 0)
{
- use an actor pointer in Get/SetGameVarID's parameters to weed out the ordering screwups.
2020-11-01 17:23:09 +00:00
SetGameVarID(g_iAimAngleVarID, AUTO_AIM_ANGLE, actor, p);
- fixed the messed up parameter order of OnEvent. This should serve as a textbook example why passing around indices is a very, very bad idea!
2020-11-01 16:57:40 +00:00
OnEvent(EVENT_GETAUTOAIMANGLE, p, ps[p].GetActor(), -1);
- Duke: made gamevars type safe and capable of managing actor pointers. Also a few unrelated changes needed to make it compile again.
2021-12-05 16:36:57 +00:00
int varval = GetGameVarID(g_iAimAngleVarID, actor, p).value();
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
DDukeActor* aimed = nullptr;
- use an actor pointer in Get/SetGameVarID's parameters to weed out the ordering screwups.
2020-11-01 17:23:09 +00:00
if (varval > 0)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
aimed = aim(actor, varval);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
if (aimed)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +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
int dal = ((aimed->spr.xrepeat * tileHeight(aimed->spr.picnum)) << 1) + (5 << 8);
switch (aimed->spr.picnum)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
case GREENSLIME:
case GREENSLIME + 1:
case GREENSLIME + 2:
case GREENSLIME + 3:
case GREENSLIME + 4:
case GREENSLIME + 5:
case GREENSLIME + 6:
case GREENSLIME + 7:
case ROTATEGUN:
dal -= (8 << 8);
break;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
zvel = ((aimed->int_pos().Z - sz - dal) << 8) / ldist(ps[p].GetActor(), aimed);
sa = getangle(aimed->int_pos().X - sx, aimed->int_pos().Y - sy);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (isWW2GI())
{
int angRange = 32;
int zRange = 256;
- use an actor pointer in Get/SetGameVarID's parameters to weed out the ordering screwups.
2020-11-01 17:23:09 +00:00
SetGameVarID(g_iAngRangeVarID, 32, actor, p);
SetGameVarID(g_iZRangeVarID, 256, actor, p);
- fixed the messed up parameter order of OnEvent. This should serve as a textbook example why passing around indices is a very, very bad idea!
2020-11-01 16:57:40 +00:00
OnEvent(EVENT_GETSHOTRANGE, p, ps[p].GetActor(), -1);
- Duke: made gamevars type safe and capable of managing actor pointers. Also a few unrelated changes needed to make it compile again.
2021-12-05 16:36:57 +00:00
angRange = GetGameVarID(g_iAngRangeVarID, actor, p).value();
zRange = GetGameVarID(g_iZRangeVarID, actor, p).value();
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sa += (angRange / 2) - (krand() & (angRange - 1));
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
if (aimed == nullptr)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
// no target
zvel = -ps[p].horizon.sum().asq16() >> 11;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
zvel += (zRange / 2) - (krand() & (zRange - 1));
}
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
else if (aimed == nullptr)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
sa += 16 - (krand() & 31);
zvel = -ps[p].horizon.sum().asq16() >> 11;
zvel += 128 - (krand() & 255);
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sz -= (2 << 8);
}
else
{
int x;
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
int j = findplayer(actor, &x);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sz -= (4 << 8);
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
zvel = ((ps[j].player_int_pos().Z - sz) << 8) / (ldist(ps[j].GetActor(), actor));
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.picnum != BOSS1)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
zvel += 128 - (krand() & 255);
sa += 32 - (krand() & 63);
}
else
{
zvel += 128 - (krand() & 255);
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
sa = getangle(ps[j].player_int_pos().X - sx, ps[j].player_int_pos().Y - sy) + 64 - (krand() & 127);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
}
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
actor->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL;
- use explicit types in hitscan calls
2022-08-20 13:47:52 +00:00
hitscan(vec3_t( sx, sy, sz ), sectp, { bcos(sa), bsin(sa), zvel << 6 }, hit, CLIPMASK1);
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
actor->spr.cstat |= CSTAT_SPRITE_BLOCK_ALL;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
- replaced a bit more.
2020-10-23 20:06:02 +00:00
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitSector == nullptr) return;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if ((krand() & 15) == 0 && hit.hitSector->lotag == 2)
- use int_hitpos() access function where applicable
2022-08-16 22:59:32 +00:00
tracers(hit.int_hitpos().X, hit.int_hitpos().Y, hit.int_hitpos().Z, sx, sy, sz, 8 - (ud.multimode >> 1));
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- shootweapon
2020-10-24 04:33:31 +00:00
DDukeActor* spark;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (p >= 0)
{
- EGS with hitpos
2022-08-23 20:32:45 +00:00
spark = CreateActor(hit.hitSector, hit.hitpos, SHOTSPARK1, -15, 10, 10, sa, 0, 0, actor, 4);
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
if (!spark) return;
- 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
spark->spr.extra = ScriptCode[gs.actorinfo[atwith].scriptaddress];
spark->spr.extra += (krand() % 6);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall == nullptr && hit.actor() == nullptr)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
if (zvel < 0)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- deal with most of CSTAT_SECTOR_SKY and CSTAT_SECTOR_SLOPE
2021-12-18 12:14:56 +00:00
if (hit.hitSector->ceilingstat & CSTAT_SECTOR_SKY)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +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
spark->spr.xrepeat = 0;
spark->spr.yrepeat = 0;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
return;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
else
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
fi.checkhitceiling(hit.hitSector);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- replaced a bit more.
2020-10-23 20:06:02 +00:00
spawn(spark, SMALLSMOKE);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.actor())
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
fi.checkhitsprite(hit.actor(), spark);
- Duke: abstracted all checks for TILE_APLAYER with an isPlayer method.
2021-12-31 17:47:00 +00:00
if (hit.actor()->isPlayer() && (ud.coop != 1 || ud.ffire == 1))
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +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
spark->spr.xrepeat = spark->spr.yrepeat = 0;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
auto jib = spawn(spark, JIBS6);
if (jib)
{
- some simple replacements.
2022-02-07 07:47:18 +00:00
jib->spr.pos.Z += 4;
- 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
jib->spr.xvel = 16;
jib->spr.xrepeat = jib->spr.yrepeat = 24;
- add_int_ang
2022-08-16 21:26:39 +00:00
jib->add_int_ang(64 - (krand() & 127));
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- replaced a bit more.
2020-10-23 20:06:02 +00:00
else spawn(spark, SMALLSMOKE);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (p >= 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
hit.actor()->spr.picnum == DIPSWITCH ||
hit.actor()->spr.picnum == DIPSWITCH + 1 ||
hit.actor()->spr.picnum == DIPSWITCH2 ||
hit.actor()->spr.picnum == DIPSWITCH2 + 1 ||
hit.actor()->spr.picnum == DIPSWITCH3 ||
hit.actor()->spr.picnum == DIPSWITCH3 + 1 ||
hit.actor()->spr.picnum == HANDSWITCH ||
hit.actor()->spr.picnum == HANDSWITCH + 1))
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
fi.checkhitswitch(p, nullptr, hit.actor());
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
return;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
}
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
else if (hit.hitWall)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- replaced a bit more.
2020-10-23 20:06:02 +00:00
spawn(spark, SMALLSMOKE);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (fi.isadoorwall(hit.hitWall->picnum) == 1)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
goto SKIPBULLETHOLE;
if (p >= 0 && (
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
hit.hitWall->picnum == DIPSWITCH ||
hit.hitWall->picnum == DIPSWITCH + 1 ||
hit.hitWall->picnum == DIPSWITCH2 ||
hit.hitWall->picnum == DIPSWITCH2 + 1 ||
hit.hitWall->picnum == DIPSWITCH3 ||
hit.hitWall->picnum == DIPSWITCH3 + 1 ||
hit.hitWall->picnum == HANDSWITCH ||
hit.hitWall->picnum == HANDSWITCH + 1))
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
fi.checkhitswitch(p, hit.hitWall, nullptr);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
return;
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall->hitag != 0 || (hit.hitWall->twoSided() && hit.hitWall->nextWall()->hitag != 0))
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
goto SKIPBULLETHOLE;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitSector && hit.hitSector->lotag == 0)
if (hit.hitWall->overpicnum != BIGFORCE)
if ((hit.hitWall->twoSided() && hit.hitWall->nextSector()->lotag == 0) ||
(!hit.hitWall->twoSided() && hit.hitSector->lotag == 0))
- wall and sprite flags in Duke, just simple cases.
2021-12-18 14:11:21 +00:00
if ((hit.hitWall->cstat & CSTAT_WALL_MASKED) == 0)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall->twoSided())
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
DukeSectIterator it(hit.hitWall->nextSector());
- shootweapon
2020-10-24 04:33:31 +00:00
while (auto l = it.Next())
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- little bit of cleanup on Duke's bullet hole code.
2022-01-13 19:53:36 +00:00
if (l->spr.statnum == STAT_EFFECTOR && l->spr.lotag == SE_13_EXPLOSIVE)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
goto SKIPBULLETHOLE;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
}
- shootweapon
2020-10-24 04:33:31 +00:00
DukeStatIterator it(STAT_MISC);
while (auto l = it.Next())
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +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 (l->spr.picnum == BULLETHOLE)
- shootweapon
2020-10-24 04:33:31 +00:00
if (dist(l, spark) < (12 + (krand() & 7)))
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
goto SKIPBULLETHOLE;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- replaced a bit more.
2020-10-23 20:06:02 +00:00
auto hole = spawn(spark, BULLETHOLE);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (hole)
{
- 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
hole->spr.xvel = -1;
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
auto delta = hit.hitWall->delta();
- set_int_ang in Duke. Also changed SOUNDFX actor to use a different variable for its index.
2022-08-16 21:20:35 +00:00
hole->set_int_ang(getangle(-delta.X, -delta.Y) + 512);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
ssp(hole, CLIPMASK0);
- little bit of cleanup on Duke's bullet hole code.
2022-01-13 19:53:36 +00:00
hole->spr.cstat2 |= CSTAT2_SPRITE_DECAL;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
SKIPBULLETHOLE:
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- wall and sprite flags in Duke, just simple cases.
2021-12-18 14:11:21 +00:00
if (hit.hitWall->cstat & CSTAT_WALL_BOTTOM_SWAP)
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall->twoSided())
- another batch of wrapper replacements
2022-08-28 09:34:54 +00:00
if (hit.hitpos.Z >= hit.hitWall->nextSector()->floorz)
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
hit.hitWall = hit.hitWall->nextWall();
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- floatified position in checkhitwall
2022-08-23 20:39:07 +00:00
fi.checkhitwall(spark, hit.hitWall, hit.hitpos, SHOTSPARK1);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
}
else
{
- EGS with hitpos
2022-08-23 20:32:45 +00:00
spark = CreateActor(hit.hitSector, hit.hitpos, SHOTSPARK1, -15, 24, 24, sa, 0, 0, actor, 4);
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
if (spark)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +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
spark->spr.extra = ScriptCode[gs.actorinfo[atwith].scriptaddress];
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.actor())
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
{
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
fi.checkhitsprite(hit.actor(), spark);
- Duke: abstracted all checks for TILE_APLAYER with an isPlayer method.
2021-12-31 17:47:00 +00:00
if (!hit.actor()->isPlayer())
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
spawn(spark, SMALLSMOKE);
- 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
else spark->spr.xrepeat = spark->spr.yrepeat = 0;
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
}
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
else if (hit.hitWall)
- floatified position in checkhitwall
2022-08-23 20:39:07 +00:00
fi.checkhitwall(spark, hit.hitWall, hit.hitpos, SHOTSPARK1);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if ((krand() & 255) < 4)
{
- use int_hitpos() access function where applicable
2022-08-16 22:59:32 +00:00
S_PlaySound3D(PISTOL_RICOCHET, spark, hit.int_hitpos());
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- shootstuff and shootrpg.
2020-10-24 04:40:41 +00:00
static void shootstuff(DDukeActor* actor, int p, int sx, int sy, int sz, int sa, int atwith)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
sectortype* sect = actor->sector();
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
int vel, zvel;
- Duke/RR: replaced more local short variables with ints.
2021-11-07 13:36:39 +00:00
int l, scount;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.extra >= 0) actor->spr.shade = -96;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
scount = 1;
if (atwith == SPIT) vel = 292;
else
{
if (atwith == COOLEXPLOSION1)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.picnum == BOSS2) vel = 644;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
else vel = 348;
sz -= (4 << 7);
}
else
{
vel = 840;
sz -= (4 << 7);
}
}
- added the remaining CON features from EDuke 2.x Not everything will do something, though. This was some incredibly careless code operating without a safety net allowing uncontrolled write access to the map structure. Most of the critical fields have been made read-only, which has been the only mode of access in the mods I checked. Note that this does not enable scripting of the weapon sprite drawer, only the gameplay related features were done.
2020-09-17 20:36:09 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (p >= 0)
{
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
auto aimed = aim(actor, AUTO_AIM_ANGLE);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
if (aimed)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +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
int dal = ((aimed->spr.xrepeat * tileHeight(aimed->spr.picnum)) << 1) - (12 << 8);
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
zvel = ((aimed->int_pos().Z - sz - dal) * vel) / ldist(ps[p].GetActor(), aimed);
sa = getangle(aimed->int_pos().X - sx, aimed->int_pos().Y - sy);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
else
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
zvel = -MulScale(ps[p].horizon.sum().asq16(), 98, 16);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
else
{
int x;
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
int j = findplayer(actor, &x);
- tabified two files in Duke that were missed somehow, plus some comment cleanup elsewhere.
2021-11-09 23:05:42 +00:00
// sa = getangle(ps[j].oposx-sx,ps[j].oposy-sy);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sa += 16 - (krand() & 31);
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
zvel = (((ps[j].player_int_opos().Z - sz + (3 << 8))) * vel) / ldist(ps[j].GetActor(), actor);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
int oldzvel = zvel;
int sizx, sizy;
if (atwith == SPIT) { sizx = 18; sizy = 18, sz -= (10 << 8); }
else
{
if (atwith == FIRELASER)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (p >= 0)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sizx = 34;
sizy = 34;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
else
{
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sizx = 18;
sizy = 18;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
else
{
sizx = 18;
sizy = 18;
}
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (p >= 0) sizx = 7, sizy = 7;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
while (scount > 0)
{
- shootstuff and shootrpg.
2020-10-24 04:40:41 +00:00
auto spawned = EGS(sect, sx, sy, sz, atwith, -127, sizx, sizy, sa, vel, zvel, actor, 4);
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
if (!spawned) return;
- 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
spawned->spr.extra += (krand() & 7);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (atwith == COOLEXPLOSION1)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +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
spawned->spr.shade = 0;
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.picnum == BOSS2)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +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
l = spawned->spr.xvel;
spawned->spr.xvel = 1024;
- shootstuff and shootrpg.
2020-10-24 04:40:41 +00:00
ssp(spawned, CLIPMASK0);
- 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
spawned->spr.xvel = l;
- add_int_ang
2022-08-16 21:26:39 +00:00
spawned->add_int_ang(128 - (krand() & 255));
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +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
spawned->spr.cstat = CSTAT_SPRITE_YCENTER;
spawned->spr.clipdist = 4;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- use int_ang().
2022-08-16 21:15:49 +00:00
sa = actor->int_ang() + 32 - (krand() & 63);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
zvel = oldzvel + 512 - (krand() & 1023);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
scount--;
}
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- shootstuff and shootrpg.
2020-10-24 04:40:41 +00:00
static void shootrpg(DDukeActor *actor, int p, int sx, int sy, int sz, int sa, int atwith)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
auto sect = actor->sector();
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
int vel, zvel;
- Duke/RR: replaced more local short variables with ints.
2021-11-07 13:36:39 +00:00
int l, scount;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.extra >= 0) actor->spr.shade = -96;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
scount = 1;
vel = 644;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
DDukeActor* aimed = nullptr;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (p >= 0)
{
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
aimed = aim(actor, 48);
if (aimed)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +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
int dal = ((aimed->spr.xrepeat * tileHeight(aimed->spr.picnum)) << 1) + (8 << 8);
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
zvel = ((aimed->int_pos().Z - sz - dal) * vel) / ldist(ps[p].GetActor(), aimed);
- 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 (aimed->spr.picnum != RECON)
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
sa = getangle(aimed->int_pos().X - sx, aimed->int_pos().Y - sy);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
else zvel = -MulScale(ps[p].horizon.sum().asq16(), 81, 16);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (atwith == RPG)
- shootstuff and shootrpg.
2020-10-24 04:40:41 +00:00
S_PlayActorSound(RPG_SHOOT, actor);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
else
{
int x;
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
int j = findplayer(actor, &x);
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
sa = getangle(ps[j].player_int_opos().X - sx, ps[j].player_int_opos().Y - sy);
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.picnum == BOSS3)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
int zoffs = (32 << 8);
if (isWorldTour()) // Twentieth Anniversary World Tour
- 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
zoffs = (int)((actor->spr.yrepeat / 80.0f) * zoffs);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sz -= zoffs;
}
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
else if (actor->spr.picnum == BOSS2)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
vel += 128;
int zoffs = 24 << 8;
if (isWorldTour()) // Twentieth Anniversary World Tour
- 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
zoffs = (int)((actor->spr.yrepeat / 80.0f) * zoffs);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sz += zoffs;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- shootstuff and shootrpg.
2020-10-24 04:40:41 +00:00
l = ldist(ps[j].GetActor(), actor);
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
zvel = ((ps[j].player_int_opos().Z - sz) * vel) / l;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (badguy(actor) && (actor->spr.hitag & face_player_smart))
- use int_ang().
2022-08-16 21:15:49 +00:00
sa = actor->int_ang() + (krand() & 31) - 16;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
if (p < 0) aimed = nullptr;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- some quick'n easy replacements.
2020-10-23 19:37:40 +00:00
auto spawned = EGS(sect,
- buildutils: Replace `sintable[]` use within Duke's player_d.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:03 +00:00
sx + (bcos(sa + 348) / 448),
sy + (bsin(sa + 348) / 448),
- shootstuff and shootrpg.
2020-10-24 04:40:41 +00:00
sz - (1 << 8), atwith, 0, 14, 14, sa, vel, zvel, actor, 4);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
if (!spawned) return;
- 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
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
spawned->spr.extra += (krand() & 7);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (atwith != FREEZEBLAST)
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
spawned->temp_actor = aimed;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
else
{
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
spawned->spr.yvel = gs.numfreezebounces;
spawned->spr.xrepeat >>= 1;
spawned->spr.yrepeat >>= 1;
spawned->spr.zvel -= (2 << 4);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
if (p == -1)
{
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.picnum == BOSS3)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- buildutils: Replace `sintable[]` use within Duke's player_d.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:03 +00:00
int xoffs = bsin(sa, -6);
int yoffs = -bcos(sa, -6);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
int aoffs = 4;
if ((krand() & 1) != 0)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
xoffs = -xoffs;
yoffs = -yoffs;
aoffs = -8;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (isWorldTour()) // Twentieth Anniversary World Tour
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +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
float siz = actor->spr.yrepeat / 80.0f;
- fixed all warnings in Duke.
2021-05-12 15:33:33 +00:00
xoffs = int(xoffs * siz);
yoffs = int(yoffs * siz);
aoffs = int(aoffs * siz);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- Duke: sixth batch of refactoring writes to spr.pos.
2022-01-30 17:33:11 +00:00
spawned->add_int_pos({ xoffs, yoffs, 0 });
- add_int_ang
2022-08-16 21:26:39 +00:00
spawned->add_int_ang(aoffs);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
spawned->spr.xrepeat = 42;
spawned->spr.yrepeat = 42;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
else if (actor->spr.picnum == BOSS2)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- buildutils: Replace `sintable[]` use within Duke's player_d.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:03 +00:00
int xoffs = bsin(sa) / 56;
int yoffs = -bcos(sa) / 56;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
int aoffs = 8 + (krand() & 255) - 128;
if (isWorldTour()) { // Twentieth Anniversary World Tour
- 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
int siz = actor->spr.yrepeat;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
xoffs = Scale(xoffs, siz, 80);
yoffs = Scale(yoffs, siz, 80);
aoffs = Scale(aoffs, siz, 80);
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- Duke: sixth batch of refactoring writes to spr.pos.
2022-01-30 17:33:11 +00:00
spawned->add_int_pos({ -xoffs, -yoffs, 0 });
- the remaining angle stuff.
2022-08-16 21:27:44 +00:00
spawned->add_int_ang(-aoffs);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
spawned->spr.xrepeat = 24;
spawned->spr.yrepeat = 24;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
else if (atwith != FREEZEBLAST)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
spawned->spr.xrepeat = 30;
spawned->spr.yrepeat = 30;
spawned->spr.extra >>= 2;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +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 ((isWW2GI() && aplWeaponWorksLike(ps[p].curr_weapon, p) == DEVISTATOR_WEAPON) || (!isWW2GI() && ps[p].curr_weapon == DEVISTATOR_WEAPON))
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
spawned->spr.extra >>= 2;
- add_int_ang
2022-08-16 21:26:39 +00:00
spawned->add_int_ang(16 - (krand() & 31));
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
spawned->spr.zvel += 256 - (krand() & 511);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (ps[p].hbomb_hold_delay)
{
- Duke: sixth batch of refactoring writes to spr.pos.
2022-01-30 17:33:11 +00:00
spawned->add_int_pos({ -bsin(sa) / 644, bcos(sa) / 644, 0 });
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
else
{
- Duke: sixth batch of refactoring writes to spr.pos.
2022-01-30 17:33:11 +00:00
spawned->add_int_pos({ bsin(sa, -8), -bcos(sa, -8), 0 });
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
spawned->spr.xrepeat >>= 1;
spawned->spr.yrepeat >>= 1;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
spawned->spr.cstat = CSTAT_SPRITE_YCENTER;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (atwith == RPG)
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
spawned->spr.clipdist = 4;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
else
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
spawned->spr.clipdist = 40;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- shootlaser and shootgrowspark
2020-10-24 04:46:34 +00:00
static void shootlaser(DDukeActor* actor, int p, int sx, int sy, int sz, int sa)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
auto sectp = actor->sector();
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
int zvel;
- remaining hitscans in player_d.cpp
2021-11-17 22:57:17 +00:00
int j;
- Silence all the `-Wuninitialized` and `-Wmaybe-uninitialized` warnings relating to `HitInfo` objects passed through to functions by reference.
2021-12-06 11:24:22 +00:00
HitInfo hit{};
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (p >= 0)
zvel = -ps[p].horizon.sum().asq16() >> 11;
else zvel = 0;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- use explicit types in hitscan calls
2022-08-20 13:47:52 +00:00
hitscan(vec3_t( sx, sy, sz - ps[p].pyoff ), sectp, { bcos(sa), bsin(sa), zvel << 6 }, hit, CLIPMASK1);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
j = 0;
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.actor()) return;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall && hit.hitSector)
- wall[] in shootknee, shootweapon and shootlaser.
2021-11-17 21:46:50 +00:00
{
- use int_hitpos() access function where applicable
2022-08-16 22:59:32 +00:00
if (((hit.int_hitpos().X - sx) * (hit.int_hitpos().X - sx) + (hit.int_hitpos().Y - sy) * (hit.int_hitpos().Y - sy)) < (290 * 290))
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall->twoSided())
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall->nextSector()->lotag <= 2 && hit.hitSector->lotag <= 2)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
j = 1;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
else if (hit.hitSector->lotag <= 2)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
j = 1;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
- wall[] in shootknee, shootweapon and shootlaser.
2021-11-17 21:46:50 +00:00
if (j == 1)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- EGS with hitpos
2022-08-23 20:32:45 +00:00
auto bomb = CreateActor(hit.hitSector, hit.hitpos, TRIPBOMB, -16, 4, 5, sa, 0, 0, actor, STAT_STANDABLE);
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
if (!bomb) return;
- wall[] in shootknee, shootweapon and shootlaser.
2021-11-17 21:46:50 +00:00
if (isWW2GI())
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- Duke: made gamevars type safe and capable of managing actor pointers. Also a few unrelated changes needed to make it compile again.
2021-12-05 16:36:57 +00:00
int lTripBombControl = GetGameVar("TRIPBOMB_CONTROL", TRIPBOMB_TRIPWIRE, nullptr, -1).value();
- wall[] in shootknee, shootweapon and shootlaser.
2021-11-17 21:46:50 +00:00
if (lTripBombControl & TRIPBOMB_TIMER)
{
- Duke: made gamevars type safe and capable of managing actor pointers. Also a few unrelated changes needed to make it compile again.
2021-12-05 16:36:57 +00:00
int lLifetime = GetGameVar("STICKYBOMB_LIFETIME", NAM_GRENADE_LIFETIME, nullptr, p).value();
int lLifetimeVar = GetGameVar("STICKYBOMB_LIFETIME_VAR", NAM_GRENADE_LIFETIME_VAR, nullptr, p).value();
- wall[] in shootknee, shootweapon and shootlaser.
2021-11-17 21:46:50 +00:00
// set timer. blows up when at zero....
- 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
bomb->spr.extra = lLifetime
- Replace `mulscale()` calls with `MulScale()` from common.
2021-01-04 11:57:26 +00:00
+ MulScale(krand(), lLifetimeVar, 14)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
- lLifetimeVar;
- wall[] in shootknee, shootweapon and shootlaser.
2021-11-17 21:46:50 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- 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
- wall[] in shootknee, shootweapon and shootlaser.
2021-11-17 21:46:50 +00:00
// this originally used the sprite index as tag to link the laser segments.
// This value is never used again to reference an actor by index. Decouple this for robustness.
ud.bomb_tag = (ud.bomb_tag + 1) & 32767;
- 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
bomb->spr.hitag = ud.bomb_tag;
- wall[] in shootknee, shootweapon and shootlaser.
2021-11-17 21:46:50 +00:00
S_PlayActorSound(LASERTRIP_ONWALL, bomb);
- 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
bomb->spr.xvel = -20;
- wall[] in shootknee, shootweapon and shootlaser.
2021-11-17 21:46:50 +00:00
ssp(bomb, CLIPMASK0);
- 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
bomb->spr.cstat = CSTAT_SPRITE_ALIGNMENT_WALL;
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
auto delta = hit.hitWall->delta();
- set_int_ang in Duke. Also changed SOUNDFX actor to use a different variable for its index.
2022-08-16 21:20:35 +00:00
bomb->set_int_ang(getangle(-delta.X, -delta.Y) - 512);
bomb->temp_data[5] = bomb->int_ang();
- 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
- wall[] in shootknee, shootweapon and shootlaser.
2021-11-17 21:46:50 +00:00
if (p >= 0)
ps[p].ammo_amount[TRIPBOMB_WEAPON]--;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
}
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- shootlaser and shootgrowspark
2020-10-24 04:46:34 +00:00
static void shootgrowspark(DDukeActor* actor, int p, int sx, int sy, int sz, int sa)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
auto sect = actor->sector();
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
int zvel;
- remaining hitscans in player_d.cpp
2021-11-17 22:57:17 +00:00
int k;
- Silence all the `-Wuninitialized` and `-Wmaybe-uninitialized` warnings relating to `HitInfo` objects passed through to functions by reference.
2021-12-06 11:24:22 +00:00
HitInfo hit{};
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (p >= 0)
{
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
auto aimed = aim(actor, AUTO_AIM_ANGLE);
if (aimed)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +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
int dal = ((aimed->spr.xrepeat * tileHeight(aimed->spr.picnum)) << 1) + (5 << 8);
switch (aimed->spr.picnum)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
case GREENSLIME:
case GREENSLIME + 1:
case GREENSLIME + 2:
case GREENSLIME + 3:
case GREENSLIME + 4:
case GREENSLIME + 5:
case GREENSLIME + 6:
case GREENSLIME + 7:
case ROTATEGUN:
dal -= (8 << 8);
break;
}
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
zvel = ((aimed->int_pos().Z - sz - dal) << 8) / (ldist(ps[p].GetActor(), aimed));
sa = getangle(aimed->int_pos().X - sx, aimed->int_pos().Y - sy);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
else
{
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sa += 16 - (krand() & 31);
zvel = -ps[p].horizon.sum().asq16() >> 11;
zvel += 128 - (krand() & 255);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sz -= (2 << 8);
}
else
{
int x;
- 3 more wrappers gone.
2020-11-02 22:10:19 +00:00
int j = findplayer(actor, &x);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sz -= (4 << 8);
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
zvel = ((ps[j].player_int_pos().Z - sz) << 8) / (ldist(ps[j].GetActor(), actor));
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
zvel += 128 - (krand() & 255);
sa += 32 - (krand() & 63);
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
k = 0;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- tabified two files in Duke that were missed somehow, plus some comment cleanup elsewhere.
2021-11-09 23:05:42 +00:00
//RESHOOTGROW:
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
actor->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL;
- use explicit types in hitscan calls
2022-08-20 13:47:52 +00:00
hitscan(vec3_t( sx, sy, sz ), sect, { bcos(sa), bsin(sa), zvel << 6 }, hit, CLIPMASK1);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
actor->spr.cstat |= CSTAT_SPRITE_BLOCK_ALL;
- fixed WT's incinerator and a few other minor things I found while comparing Raze's WT support code with BuildGDX's. Fixes #357
2020-09-07 19:38:17 +00:00
- use int_hitpos() access function where applicable
2022-08-16 22:59:32 +00:00
auto spark = EGS(sect, hit.int_hitpos().X, hit.int_hitpos().Y, hit.int_hitpos().Z, GROWSPARK, -16, 28, 28, sa, 0, 0, actor, 1);
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
if (!spark) return;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +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
spark->spr.pal = 2;
spark->spr.cstat |= CSTAT_SPRITE_YCENTER | CSTAT_SPRITE_TRANSLUCENT;
spark->spr.xrepeat = spark->spr.yrepeat = 1;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall == nullptr && hit.actor() == nullptr && hit.hitSector != nullptr)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- deal with most of CSTAT_SECTOR_SKY and CSTAT_SECTOR_SLOPE
2021-12-18 12:14:56 +00:00
if (zvel < 0 && (hit.hitSector->ceilingstat & CSTAT_SECTOR_SKY) == 0)
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
fi.checkhitceiling(hit.hitSector);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
else if (hit.actor() != nullptr) fi.checkhitsprite(hit.actor(), spark);
else if (hit.hitWall != nullptr)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall->picnum != ACCESSSWITCH && hit.hitWall->picnum != ACCESSSWITCH2)
- change wall parameter of checkhitwall.
2021-11-17 22:49:49 +00:00
{
- floatified position in checkhitwall
2022-08-23 20:39:07 +00:00
fi.checkhitwall(spark, hit.hitWall, hit.hitpos, GROWSPARK);
- change wall parameter of checkhitwall.
2021-11-17 22:49:49 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
void shoot_d(DDukeActor* actor, int atwith)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- lots of EGS calls.
2021-11-18 18:04:00 +00:00
int l, j;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
int sx, sy, sz, sa, p, vel, zvel, x, dal;
- Duke: abstracted all checks for TILE_APLAYER with an isPlayer method.
2021-12-31 17:47:00 +00:00
if (actor->isPlayer())
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
p = actor->spr.yvel;
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
else
{
p = -1;
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- this was nonsense. atwith is a tile number, not a sprite index.
2020-10-24 05:28:07 +00:00
SetGameVarID(g_iAtWithVarID, atwith, actor, p);
- use an actor pointer in Get/SetGameVarID's parameters to weed out the ordering screwups.
2020-11-01 17:23:09 +00:00
SetGameVarID(g_iReturnVarID, 0, actor, p);
- fixed the messed up parameter order of OnEvent. This should serve as a textbook example why passing around indices is a very, very bad idea!
2020-11-01 16:57:40 +00:00
OnEvent(EVENT_SHOOT, p, ps[p].GetActor(), -1);
- Duke: made gamevars type safe and capable of managing actor pointers. Also a few unrelated changes needed to make it compile again.
2021-12-05 16:36:57 +00:00
if (GetGameVarID(g_iReturnVarID, actor, p).safeValue() != 0)
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
return;
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
auto sect = actor->sector();
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
zvel = 0;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- Duke: abstracted all checks for TILE_APLAYER with an isPlayer method.
2021-12-31 17:47:00 +00:00
if (actor->isPlayer())
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
{
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
sx = ps[p].player_int_pos().X;
sy = ps[p].player_int_pos().Y;
sz = ps[p].player_int_pos().Z + ps[p].pyoff + (4 << 8);
- Replace player's `ang` with `DAngle` object. * This commit does not build. Committed items are everything that's been done by find and replace. * Next commit has hand-performed changes that are better separated out for clarity.
2022-08-27 13:09:22 +00:00
sa = ps[p].angle.ang.Buildang();
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
ps[p].crack_time = CRACK_TIME;
}
else
{
- more int_ang()
2022-08-16 21:17:01 +00:00
sa = actor->int_ang();
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
sx = actor->int_pos().X;
sy = actor->int_pos().Y;
sz = actor->int_pos().Z - (actor->spr.yrepeat * tileHeight(actor->spr.picnum) << 1) + (4 << 8);
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.picnum != ROTATEGUN)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
sz -= (7 << 8);
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (badguy(actor) && actor->spr.picnum != COMMANDER)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- buildutils: Replace `sintable[]` use within Duke's player_d.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:03 +00:00
sx -= bsin(sa + 96, -7);
sy += bcos(sa + 96, -7);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
if (isWorldTour())
{ // Twentieth Anniversary World Tour
switch (atwith)
{
case FIREBALL:
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
shootfireball(actor, p, sx, sy, sz, sa);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
return;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
case FLAMETHROWERFLAME:
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
shootflamethrowerflame(actor, p, sx, sy, sz, sa);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
return;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
case FIREFLY: // BOSS5 shot
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
{
auto k = spawn(actor, atwith);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (k)
{
- use setsector from DCoreActor. Also did a bit of cleanup
2021-12-30 15:36:04 +00:00
k->setsector(sect);
- Duke: sixth batch of refactoring writes to spr.pos.
2022-01-30 17:33:11 +00:00
k->set_int_pos({ sx, sy, sz });
- set_int_ang in Duke. Also changed SOUNDFX actor to use a different variable for its index.
2022-08-16 21:20:35 +00:00
k->set_int_ang(sa);
- 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
k->spr.xvel = 500;
k->spr.zvel = 0;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
return;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
}
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
}
switch (atwith)
{
case BLOODSPLAT1:
case BLOODSPLAT2:
case BLOODSPLAT3:
case BLOODSPLAT4:
- player.cpp is free of array references, except one that's unavoidable for now.
2020-10-23 17:50:18 +00:00
shootbloodsplat(actor, p, sx, sy, sz, sa, atwith, BIGFORCE, OOZFILTER, NEWBEAST);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
break;
case KNEE:
- shootfireball, shootflamethrowerflame, shootknee
2020-10-23 18:16:47 +00:00
shootknee(actor, p, sx, sy, sz, sa);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
break;
case SHOTSPARK1:
case SHOTGUN:
case CHAINGUN:
- shootweapon
2020-10-24 04:33:31 +00:00
shootweapon(actor, p, sx, sy, sz, sa, atwith);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
return;
case FIRELASER:
case SPIT:
case COOLEXPLOSION1:
- shootstuff and shootrpg.
2020-10-24 04:40:41 +00:00
shootstuff(actor, p, sx, sy, sz, sa, atwith);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
return;
case FREEZEBLAST:
sz += (3 << 8);
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
[[fallthrough]];
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
case RPG:
- shootstuff and shootrpg.
2020-10-24 04:40:41 +00:00
shootrpg(actor, p, sx, sy, sz, sa, atwith);
- split shoot_d into smaller, easier to manage chunks. 1100 lines for a single function is too much.
2020-10-20 22:17:09 +00:00
break;
case HANDHOLDINGLASER:
- shootlaser and shootgrowspark
2020-10-24 04:46:34 +00:00
shootlaser(actor, p, sx, sy, sz, sa);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
return;
case BOUNCEMINE:
case MORTER:
- the last bit of shoot_d.
2020-10-25 05:15:21 +00:00
{
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.extra >= 0) actor->spr.shade = -96;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- renamed all shadowing variables in Duke.
2021-12-24 09:53:27 +00:00
auto plActor = ps[findplayer(actor, &x)].GetActor();
x = ldist(plActor, actor);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
zvel = -x >> 1;
if (zvel < -4096)
zvel = -2048;
vel = x >> 4;
EGS(sect,
- buildutils: Replace `sintable[]` use within Duke's player_d.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:03 +00:00
sx - bsin(sa, -8),
sy + bcos(sa, -8),
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
sz + (6 << 8), atwith, -64, 32, 32, sa, vel, zvel, actor, 1);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
break;
- the last bit of shoot_d.
2020-10-25 05:15:21 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
case GROWSPARK:
- shootlaser and shootgrowspark
2020-10-24 04:46:34 +00:00
shootgrowspark(actor, p, sx, sy, sz, sa);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
break;
case SHRINKER:
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
{
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
if (actor->spr.extra >= 0) actor->spr.shade = -96;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
if (p >= 0)
{
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
auto aimed = isNamWW2GI() ? nullptr : aim(actor, AUTO_AIM_ANGLE);
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
if (aimed)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +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
dal = ((aimed->spr.xrepeat * tileHeight(aimed->spr.picnum)) << 1);
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
zvel = ((aimed->int_pos().Z - sz - dal - (4 << 8)) * 768) / (ldist(ps[p].GetActor(), aimed));
sa = getangle(aimed->int_pos().X - sx, aimed->int_pos().Y - sy);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
else zvel = -MulScale(ps[p].horizon.sum().asq16(), 98, 16);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- 's->' in player_d.cpp
2021-12-21 19:40:35 +00:00
else if (actor->spr.statnum != 3)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- aim and all calling instances. This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-01 19:57:02 +00:00
j = findplayer(actor, &x);
l = ldist(ps[j].GetActor(), actor);
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
zvel = ((ps[j].player_int_opos().Z - sz) * 512) / l;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
else zvel = 0;
- renamed all shadowing variables in Duke.
2021-12-24 09:53:27 +00:00
auto spawned = EGS(sect,
- buildutils: Replace `sintable[]` use within Duke's player_d.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:03 +00:00
sx - bsin(sa, -12),
sy + bcos(sa, -12),
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
sz + (2 << 8), SHRINKSPARK, -16, 28, 28, sa, 768, zvel, actor, 4);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- renamed all shadowing variables in Duke.
2021-12-24 09:53:27 +00:00
if (spawned)
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
{
- renamed all shadowing variables in Duke.
2021-12-24 09:53:27 +00:00
spawned->spr.cstat = CSTAT_SPRITE_YCENTER;
spawned->spr.clipdist = 32;
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
return;
}
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
return;
}
- safety commit
2020-05-17 11:25:39 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- rework of weapon input to use common features in shared code. This also adds stubs for all unimplemented features in the games for easier addition.
2020-08-26 22:53:35 +00:00
void selectweapon_d(int snum, int weap) // playernum, weaponnum
- safety commit
2020-05-17 11:25:39 +00:00
{
- rework of weapon input to use common features in shared code. This also adds stubs for all unimplemented features in the games for easier addition.
2020-08-26 22:53:35 +00:00
int i, j, k;
- safety commit
2020-05-17 11:25:39 +00:00
auto p = &ps[snum];
- 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->last_pissed_time <= (26 * 218) && p->show_empty_weapon == 0 && p->kickback_pic == 0 && p->quick_kick == 0 && p->GetActor()->spr.xrepeat > 32 && p->access_incs == 0 && p->knee_incs == 0)
- safety commit
2020-05-17 11:25:39 +00:00
{
if ((p->weapon_pos == 0 || (p->holster_weapon && p->weapon_pos == -9)))
{
- rework of weapon input to use common features in shared code. This also adds stubs for all unimplemented features in the games for easier addition.
2020-08-26 22:53:35 +00:00
if (weap == WeaponSel_Alt)
{
- Duke/RR: Selecting the alternative weapon must set the proper bits in 'subweapon'. Otherwise the weapon cycling breaks. Fixes #182
2020-12-01 20:07:38 +00:00
j = p->curr_weapon;
- Duke: Implement `WeaponSel_Alt` for Duke and RR.
2020-08-29 11:27:58 +00:00
switch (p->curr_weapon)
{
case SHRINKER_WEAPON:
- Duke/RR: Selecting the alternative weapon must set the proper bits in 'subweapon'. Otherwise the weapon cycling breaks. Fixes #182
2020-12-01 20:07:38 +00:00
if (p->ammo_amount[GROW_WEAPON] > 0 && p->gotweapon[GROW_WEAPON] && isPlutoPak())
{
j = GROW_WEAPON;
p->subweapon |= (1 << GROW_WEAPON);
}
- Duke: Implement `WeaponSel_Alt` for Duke and RR.
2020-08-29 11:27:58 +00:00
break;
case GROW_WEAPON:
- Duke/RR: Selecting the alternative weapon must set the proper bits in 'subweapon'. Otherwise the weapon cycling breaks. Fixes #182
2020-12-01 20:07:38 +00:00
if (p->ammo_amount[SHRINKER_WEAPON] > 0 && p->gotweapon[SHRINKER_WEAPON])
{
j = SHRINKER_WEAPON;
p->subweapon &= ~(1 << GROW_WEAPON);
}
- Duke: Implement `WeaponSel_Alt` for Duke and RR.
2020-08-29 11:27:58 +00:00
break;
- Duke: Add missing World Tour flamethrower from alt weapon mode implementation completed in 51a08fbaf34e86f9eb8ab69f4fc836ecf9c91b98.
2020-08-29 12:30:45 +00:00
case FREEZE_WEAPON:
- Duke/RR: Selecting the alternative weapon must set the proper bits in 'subweapon'. Otherwise the weapon cycling breaks. Fixes #182
2020-12-01 20:07:38 +00:00
if (p->ammo_amount[FLAMETHROWER_WEAPON] > 0 && p->gotweapon[FLAMETHROWER_WEAPON] && isWorldTour())
{
j = FLAMETHROWER_WEAPON;
p->subweapon |= (1 << FLAMETHROWER_WEAPON);
}
- Duke: Add missing World Tour flamethrower from alt weapon mode implementation completed in 51a08fbaf34e86f9eb8ab69f4fc836ecf9c91b98.
2020-08-29 12:30:45 +00:00
break;
case FLAMETHROWER_WEAPON:
- Duke/RR: Selecting the alternative weapon must set the proper bits in 'subweapon'. Otherwise the weapon cycling breaks. Fixes #182
2020-12-01 20:07:38 +00:00
if (p->ammo_amount[FREEZE_WEAPON] > 0 && p->gotweapon[FREEZE_WEAPON])
{
j = FREEZE_WEAPON;
p->subweapon &= ~(1 << FLAMETHROWER_WEAPON);
}
- Duke: Add missing World Tour flamethrower from alt weapon mode implementation completed in 51a08fbaf34e86f9eb8ab69f4fc836ecf9c91b98.
2020-08-29 12:30:45 +00:00
break;
- Duke: Implement `WeaponSel_Alt` for Duke and RR.
2020-08-29 11:27:58 +00:00
default:
break;
}
- rework of weapon input to use common features in shared code. This also adds stubs for all unimplemented features in the games for easier addition.
2020-08-26 22:53:35 +00:00
}
else if (weap == WeaponSel_Next || weap == WeaponSel_Prev)
- safety commit
2020-05-17 11:25:39 +00:00
{
k = p->curr_weapon;
- rework of weapon input to use common features in shared code. This also adds stubs for all unimplemented features in the games for easier addition.
2020-08-26 22:53:35 +00:00
j = (weap == WeaponSel_Prev ? -1 : 1); // JBF: prev (-1) or next (1) weapon choice
- safety commit
2020-05-17 11:25:39 +00:00
i = 0;
- Duke: replaced the game type macros with inline functions.
2020-10-11 09:39:51 +00:00
while ((k >= 0 && k < 10) || (isPlutoPak() && k == GROW_WEAPON && (p->subweapon & (1 << GROW_WEAPON)) != 0)
- world tour weapon code added and redundancy reduction.
2020-05-17 12:20:49 +00:00
|| (isWorldTour() && k == FLAMETHROWER_WEAPON && (p->subweapon & (1 << FLAMETHROWER_WEAPON)) != 0))
- safety commit
2020-05-17 11:25:39 +00:00
{
- world tour weapon code added and redundancy reduction.
2020-05-17 12:20:49 +00:00
if (k == FLAMETHROWER_WEAPON) //Twentieth Anniversary World Tour
{
if (j == -1) k = TRIPBOMB_WEAPON;
else k = PISTOL_WEAPON;
}
else if (k == GROW_WEAPON) // JBF: this is handling next/previous with the grower selected
- safety commit
2020-05-17 11:25:39 +00:00
{
- fixed warnings in Duke.
2021-10-08 17:21:29 +00:00
if (j == -1)
- safety commit
2020-05-17 11:25:39 +00:00
k = 5;
else k = 7;
}
else
{
k += j;
- world tour weapon code added and redundancy reduction.
2020-05-17 12:20:49 +00:00
// JBF 20040116: so we don't select grower with v1.3d
- Duke: replaced the game type macros with inline functions.
2020-10-11 09:39:51 +00:00
if (isPlutoPak() && k == SHRINKER_WEAPON && (p->subweapon & (1 << GROW_WEAPON))) // JBF: activates grower
- world tour weapon code added and redundancy reduction.
2020-05-17 12:20:49 +00:00
k = GROW_WEAPON; // if enabled
if (isWorldTour() && k == FREEZE_WEAPON && (p->subweapon & (1 << FLAMETHROWER_WEAPON)) != 0)
k = FLAMETHROWER_WEAPON;
- safety commit
2020-05-17 11:25:39 +00:00
}
if (k == -1) k = 9;
else if (k == 10) k = 0;
if (p->gotweapon[k] && p->ammo_amount[k] > 0)
{
- Duke: replaced the game type macros with inline functions.
2020-10-11 09:39:51 +00:00
if (isPlutoPak()) // JBF 20040116: so we don't select grower with v1.3d
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
{
- safety commit
2020-05-17 11:25:39 +00:00
if (k == SHRINKER_WEAPON && (p->subweapon & (1 << GROW_WEAPON)))
k = GROW_WEAPON;
- world tour weapon code added and redundancy reduction.
2020-05-17 12:20:49 +00:00
if (isWorldTour() && k == FREEZE_WEAPON && (p->subweapon & (1 << FLAMETHROWER_WEAPON)) != 0)
k = FLAMETHROWER_WEAPON;
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
}
- safety commit
2020-05-17 11:25:39 +00:00
j = k;
break;
}
- Duke: replaced the game type macros with inline functions.
2020-10-11 09:39:51 +00:00
else if (isPlutoPak() && k == GROW_WEAPON && p->ammo_amount[GROW_WEAPON] == 0 && p->gotweapon[SHRINKER_WEAPON] && p->ammo_amount[SHRINKER_WEAPON] > 0) // JBF 20040116: added isPlutoPak() so we don't select grower with v1.3d
- world tour weapon code added and redundancy reduction.
2020-05-17 12:20:49 +00:00
{
j = SHRINKER_WEAPON;
p->subweapon &= ~(1 << GROW_WEAPON);
break;
}
- Duke: replaced the game type macros with inline functions.
2020-10-11 09:39:51 +00:00
else if (isPlutoPak() && k == SHRINKER_WEAPON && p->ammo_amount[SHRINKER_WEAPON] == 0 && p->gotweapon[SHRINKER_WEAPON] && p->ammo_amount[GROW_WEAPON] > 0) // JBF 20040116: added isPlutoPak() so we don't select grower with v1.3d
- world tour weapon code added and redundancy reduction.
2020-05-17 12:20:49 +00:00
{
j = GROW_WEAPON;
p->subweapon |= (1 << GROW_WEAPON);
break;
}
//Twentieth Anniversary World Tour
else if (isWorldTour() && k == FLAMETHROWER_WEAPON && p->ammo_amount[FLAMETHROWER_WEAPON] == 0 && p->gotweapon[FREEZE_WEAPON] && p->ammo_amount[FREEZE_WEAPON] > 0)
{
j = FREEZE_WEAPON;
p->subweapon &= ~(1 << FLAMETHROWER_WEAPON);
break;
}
else if (isWorldTour() && k == FREEZE_WEAPON && p->ammo_amount[FREEZE_WEAPON] == 0 && p->gotweapon[FLAMETHROWER_WEAPON] && p->ammo_amount[FLAMETHROWER_WEAPON] > 0)
{
j = FLAMETHROWER_WEAPON;
p->subweapon |= (1 << FLAMETHROWER_WEAPON);
break;
}
- safety commit
2020-05-17 11:25:39 +00:00
i++; // absolutely no weapons, so use foot
if (i == 10)
{
fi.addweapon(p, KNEE_WEAPON);
break;
}
}
}
Revert "- Duke: Restore a little bit of original code to make comparisons between us and the source easier." This reverts commit 7607190dad52268591d738b0be4f2c0096af68fb. * Not good in hindsight... We need the actual value from the backend to ensure we can match up against `WeaponSel_Next`/`WeaponSel_Prev`/`WeaponSel_Alt` as required.
2021-07-17 12:42:58 +00:00
else j = weap - 1;
- safety commit
2020-05-17 11:25:39 +00:00
k = -1;
if (j == HANDBOMB_WEAPON && p->ammo_amount[HANDBOMB_WEAPON] == 0)
{
- access_spritenum
2020-10-25 05:34:25 +00:00
DukeStatIterator it(STAT_ACTOR);
while (auto act = it.Next())
- safety commit
2020-05-17 11:25:39 +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 (act->spr.picnum == HEAVYHBOMB && act->GetOwner() == p->GetActor())
- safety commit
2020-05-17 11:25:39 +00:00
{
- engine side preparations for Duke Statusbar scriptification. Mainly, gotweapon had to be reverted to a flat bool array to avoid implementing FixedBitArray for the VM. Also adding a few new tile names and PushV for string arrays.
2021-05-15 08:23:50 +00:00
p->gotweapon[HANDBOMB_WEAPON] = true;
- safety commit
2020-05-17 11:25:39 +00:00
j = HANDREMOTE_WEAPON;
break;
}
}
}
- world tour weapon code added and redundancy reduction.
2020-05-17 12:20:49 +00:00
//Twentieth Anniversary World Tour
if (j == FREEZE_WEAPON && isWorldTour())
{
if (p->curr_weapon != FLAMETHROWER_WEAPON && p->curr_weapon != FREEZE_WEAPON)
{
if (p->ammo_amount[FLAMETHROWER_WEAPON] > 0)
{
if ((p->subweapon & (1 << FLAMETHROWER_WEAPON)) == (1 << FLAMETHROWER_WEAPON))
j = FLAMETHROWER_WEAPON;
else if (p->ammo_amount[FREEZE_WEAPON] == 0)
{
j = FLAMETHROWER_WEAPON;
p->subweapon |= (1 << FLAMETHROWER_WEAPON);
}
}
else if (p->ammo_amount[FREEZE_WEAPON] > 0)
p->subweapon &= ~(1 << FLAMETHROWER_WEAPON);
}
else if (p->curr_weapon == FREEZE_WEAPON)
{
p->subweapon |= (1 << FLAMETHROWER_WEAPON);
j = FLAMETHROWER_WEAPON;
}
else
p->subweapon &= ~(1 << FLAMETHROWER_WEAPON);
}
- Duke: replaced the game type macros with inline functions.
2020-10-11 09:39:51 +00:00
if (j == SHRINKER_WEAPON && isPlutoPak()) // JBF 20040116: so we don't select the grower with v1.3d
- safety commit
2020-05-17 11:25:39 +00:00
{
if (p->curr_weapon != GROW_WEAPON && p->curr_weapon != SHRINKER_WEAPON)
{
if (p->ammo_amount[GROW_WEAPON] > 0)
{
if ((p->subweapon & (1 << GROW_WEAPON)) == (1 << GROW_WEAPON))
j = GROW_WEAPON;
else if (p->ammo_amount[SHRINKER_WEAPON] == 0)
{
j = GROW_WEAPON;
p->subweapon |= (1 << GROW_WEAPON);
}
}
else if (p->ammo_amount[SHRINKER_WEAPON] > 0)
p->subweapon &= ~(1 << GROW_WEAPON);
}
else if (p->curr_weapon == SHRINKER_WEAPON)
{
p->subweapon |= (1 << GROW_WEAPON);
j = GROW_WEAPON;
}
else
p->subweapon &= ~(1 << GROW_WEAPON);
}
if (p->holster_weapon)
{
- processed all remaining local input CCMDs and removed some bits only needed for multiplayer. These MP bits should be reimplemented as network commands later, they only take up valuable space in the bit field.
2020-08-27 22:03:35 +00:00
PlayerSetInput(snum, SB_HOLSTER);
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
p->oweapon_pos = p->weapon_pos = -9;
- safety commit
2020-05-17 11:25:39 +00:00
}
- fixed warnings in Duke.
2021-10-08 17:21:29 +00:00
else if (j >= MIN_WEAPON && p->gotweapon[j] && p->curr_weapon != j) switch (j)
- safety commit
2020-05-17 11:25:39 +00:00
{
case KNEE_WEAPON:
fi.addweapon(p, KNEE_WEAPON);
break;
case PISTOL_WEAPON:
case SHOTGUN_WEAPON:
case CHAINGUN_WEAPON:
case RPG_WEAPON:
case DEVISTATOR_WEAPON:
case FREEZE_WEAPON:
- world tour weapon code added and redundancy reduction.
2020-05-17 12:20:49 +00:00
case FLAMETHROWER_WEAPON:
- safety commit
2020-05-17 11:25:39 +00:00
case GROW_WEAPON:
case SHRINKER_WEAPON:
if (p->ammo_amount[j] == 0 && p->show_empty_weapon == 0)
{
p->show_empty_weapon = 32;
p->last_full_weapon = p->curr_weapon;
}
fi.addweapon(p, j);
break;
case HANDREMOTE_WEAPON:
if (k >= 0) // Found in list of [1]'s
{
p->curr_weapon = HANDREMOTE_WEAPON;
p->last_weapon = -1;
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
p->oweapon_pos = p->weapon_pos = 10;
- safety commit
2020-05-17 11:25:39 +00:00
}
break;
case HANDBOMB_WEAPON:
if (p->ammo_amount[HANDBOMB_WEAPON] > 0 && p->gotweapon[HANDBOMB_WEAPON])
fi.addweapon(p, HANDBOMB_WEAPON);
break;
case TRIPBOMB_WEAPON:
if (p->ammo_amount[TRIPBOMB_WEAPON] > 0 && p->gotweapon[TRIPBOMB_WEAPON])
fi.addweapon(p, TRIPBOMB_WEAPON);
break;
}
}
}
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- remove C-style struct parameters.
2022-02-07 10:04:19 +00:00
int doincrements_d(player_struct* p)
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
{
int snum;
- player.i, part 4.
2020-11-02 19:24:07 +00:00
auto pact = p->GetActor();
- 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
snum = pact->spr.yvel;
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
p->player_par++;
if (p->invdisptime > 0)
p->invdisptime--;
- Duke: Interpolate `tipincs` when drawing onscreen (tipping the dancers).
2022-06-05 23:40:47 +00:00
if (p->tipincs > 0)
{
p->otipincs = p->tipincs;
p->tipincs--;
}
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
if (p->last_pissed_time > 0)
{
p->last_pissed_time--;
if (p->last_pissed_time == (26 * 219))
{
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(FLUSH_TOILET, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
if (snum == screenpeek || ud.coop == 1)
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(DUKE_PISSRELIEF, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
if (p->last_pissed_time == (26 * 218))
{
p->holster_weapon = 0;
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
p->oweapon_pos = p->weapon_pos = 10;
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
}
if (p->crack_time > 0)
{
p->crack_time--;
if (p->crack_time == 0)
{
p->knuckle_incs = 1;
- Duke: Fix bug where player wasn't cracking knuckles after 777 idle tics while `cl_syncinput` was 1. * Use opportunity to replace the literal constant of `777` with an enum.
2020-08-27 05:54:49 +00:00
p->crack_time = CRACK_TIME;
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
}
if (p->steroids_amount > 0 && p->steroids_amount < 400)
{
p->steroids_amount--;
if (p->steroids_amount == 0)
checkavailinven(p);
if (!(p->steroids_amount & 7))
if (snum == screenpeek || ud.coop == 1)
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(DUKE_HARTBEAT, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
if (p->heat_on && p->heat_amount > 0)
{
p->heat_amount--;
if (p->heat_amount == 0)
{
p->heat_on = 0;
checkavailinven(p);
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(NITEVISION_ONOFF, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
}
- holoduke_on is now a pointer as well.
2020-10-21 08:48:38 +00:00
if (p->holoduke_on != nullptr)
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
{
p->holoduke_amount--;
if (p->holoduke_amount <= 0)
{
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(TELEPORTER, pact);
- holoduke_on is now a pointer as well.
2020-10-21 08:48:38 +00:00
p->holoduke_on = nullptr;
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
checkavailinven(p);
}
}
if (p->jetpack_on && p->jetpack_amount > 0)
{
p->jetpack_amount--;
if (p->jetpack_amount <= 0)
{
p->jetpack_on = 0;
checkavailinven(p);
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(DUKE_JETPACK_OFF, pact);
S_StopSound(DUKE_JETPACK_IDLE, pact);
S_StopSound(DUKE_JETPACK_ON, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +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->quick_kick > 0 && p->GetActor()->spr.pal != 1)
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
{
- re-added EDuke32's last_quick_kick to remove flicker during the animation. Fixes #7.
2020-07-26 08:18:55 +00:00
p->last_quick_kick = p->quick_kick + 1;
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
p->quick_kick--;
if (p->quick_kick == 8)
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(p->GetActor(), KNEE);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
- re-added EDuke32's last_quick_kick to remove flicker during the animation. Fixes #7.
2020-07-26 08:18:55 +00:00
else if (p->last_quick_kick > 0)
p->last_quick_kick--;
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +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 && p->GetActor()->spr.pal != 1)
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
{
- Duke: Interpolate `access_incs` when drawing onscreen (security card usage).
2022-06-05 23:47:30 +00:00
p->oaccess_incs = p->access_incs;
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
p->access_incs++;
- 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.extra <= 0)
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
p->access_incs = 12;
if (p->access_incs == 12)
{
- access_spritenum
2020-10-25 05:34:25 +00:00
if (p->access_spritenum != nullptr)
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
{
- use pointers for checkhitswitch and took separated clearcameras to a new functions to make this free of gotos.
2021-11-17 23:16:53 +00:00
fi.checkhitswitch(snum, nullptr, p->access_spritenum);
- 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
switch (p->access_spritenum->spr.pal)
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
{
case 0:p->got_access &= (0xffff - 0x1); break;
case 21:p->got_access &= (0xffff - 0x2); break;
case 23:p->got_access &= (0xffff - 0x4); break;
}
- access_spritenum
2020-10-25 05:34:25 +00:00
p->access_spritenum = nullptr;
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
else
{
- make access_wallnum a pointer
2021-11-17 23:20:39 +00:00
fi.checkhitswitch(snum, p->access_wall, nullptr);
switch (p->access_wall->pal)
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
{
case 0:p->got_access &= (0xffff - 0x1); break;
case 21:p->got_access &= (0xffff - 0x2); break;
case 23:p->got_access &= (0xffff - 0x4); break;
}
}
}
if (p->access_incs > 20)
{
- Duke: Interpolate `access_incs` when drawing onscreen (security card usage).
2022-06-05 23:47:30 +00:00
p->oaccess_incs = p->access_incs = 0;
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
p->oweapon_pos = p->weapon_pos = 10;
p->okickback_pic = p->kickback_pic = 0;
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
}
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
if (p->scuba_on == 0 && p->insector() && p->cursector->lotag == 2)
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
{
if (p->scuba_amount > 0)
{
p->scuba_on = 1;
p->inven_icon = 6;
FTA(76, p);
}
else
{
if (p->airleft > 0)
p->airleft--;
else
{
p->extra_extra8 += 32;
- grouped all of Duke's constant per-session state in a single struct. Mainly done so later the script export can be done more easily. This also renames a few of the affected variables for clarity.
2020-11-29 12:54:58 +00:00
if (p->last_extra < (gs.max_player_health >> 1) && (p->last_extra & 3) == 0)
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(DUKE_LONGTERM_PAIN, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
}
}
else if (p->scuba_amount > 0 && p->scuba_on)
{
p->scuba_amount--;
if (p->scuba_amount == 0)
{
p->scuba_on = 0;
checkavailinven(p);
}
}
if (p->knuckle_incs)
{
p->knuckle_incs++;
if (p->knuckle_incs == 10 && !isWW2GI())
{
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
if (PlayClock > 1024)
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
if (snum == screenpeek || ud.coop == 1)
{
if (rand() & 1)
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(DUKE_CRACK, pact);
else S_PlayActorSound(DUKE_CRACK2, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(DUKE_CRACK_FIRST, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
else if (p->knuckle_incs == 22 || PlayerInput(snum, SB_FIRE))
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
p->knuckle_incs = 0;
return 1;
}
return 0;
}
- safety commit.
2020-05-17 21:44:53 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- remove C-style struct parameters.
2022-02-07 10:04:19 +00:00
void checkweapons_d(player_struct* p)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- Duke/RR: replaced more local short variables with ints.
2021-11-07 13:36:39 +00:00
static const uint16_t weapon_sprites[MAX_WEAPONS] = { KNEE, FIRSTGUNSPRITE, SHOTGUNSPRITE,
- safety commit.
2020-05-17 21:44:53 +00:00
CHAINGUNSPRITE, RPGSPRITE, HEAVYHBOMB, SHRINKERSPRITE, DEVISTATORSPRITE,
TRIPBOMBSPRITE, FREEZESPRITE, HEAVYHBOMB, SHRINKERSPRITE };
int cw;
if (isWW2GI())
{
- 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
int snum = p->GetActor()->spr.yvel;
- 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);
- safety commit.
2020-05-17 21:44:53 +00:00
}
else
cw = p->curr_weapon;
if (cw < 1 || cw >= MAX_WEAPONS) return;
if (cw)
{
if (krand() & 1)
- player.i, part 4.
2020-11-02 19:24:07 +00:00
spawn(p->GetActor(), weapon_sprites[cw]);
- safety commit.
2020-05-17 21:44:53 +00:00
else switch (cw)
{
case RPG_WEAPON:
case HANDBOMB_WEAPON:
- player.i, part 4.
2020-11-02 19:24:07 +00:00
spawn(p->GetActor(), EXPLOSION2);
- safety commit.
2020-05-17 21:44:53 +00:00
break;
}
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
static void operateJetpack(int snum, ESyncBits actions, int psectlotag, int fz, int cz, int shrunk)
- safety commit.
2020-05-17 21:44:53 +00:00
{
auto p = &ps[snum];
- player index and hittypes in player_d.cpp
2020-10-25 05:50:31 +00:00
auto pact = p->GetActor();
- safety commit.
2020-05-17 21:44:53 +00:00
p->on_ground = 0;
p->jumping_counter = 0;
p->hard_landing = 0;
p->falling_counter = 0;
p->pycount += 32;
p->pycount &= 2047;
- buildutils: Replace `sintable[]` use within Duke's player_d.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:03 +00:00
p->pyoff = bsin(p->pycount, -7);
- safety commit.
2020-05-17 21:44:53 +00:00
- player index and hittypes in player_d.cpp
2020-10-25 05:50:31 +00:00
if (p->jetpack_on && S_CheckActorSoundPlaying(pact, DUKE_SCREAM))
- stop Duke screaming while falling if player puts the jet pack on. No need to keep screaming if the player has saved themselves.
2020-08-11 03:48:16 +00:00
{
- player index and hittypes in player_d.cpp
2020-10-25 05:50:31 +00:00
S_StopSound(DUKE_SCREAM, pact);
- stop Duke screaming while falling if player puts the jet pack on. No need to keep screaming if the player has saved themselves.
2020-08-11 03:48:16 +00:00
}
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->jetpack_on < 11)
{
p->jetpack_on++;
- cleanup, part 3.
2022-02-05 12:40:30 +00:00
p->pos.Z -= (p->jetpack_on * 0.5); //Goin up
- safety commit.
2020-05-17 21:44:53 +00:00
}
- player index and hittypes in player_d.cpp
2020-10-25 05:50:31 +00:00
else if (p->jetpack_on == 11 && !S_CheckActorSoundPlaying(pact, DUKE_JETPACK_IDLE))
S_PlayActorSound(DUKE_JETPACK_IDLE, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
- cleanup, part 3.
2022-02-05 12:40:30 +00:00
double dist;
if (shrunk) dist = 2;
else dist = 8;
- safety commit.
2020-05-17 21:44:53 +00:00
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (actions & SB_JUMP) //A (soar high)
- safety commit.
2020-05-17 21:44:53 +00:00
{
// jump
- use an actor pointer in Get/SetGameVarID's parameters to weed out the ordering screwups.
2020-11-01 17:23:09 +00:00
SetGameVarID(g_iReturnVarID, 0, p->GetActor(), snum);
- fixed the messed up parameter order of OnEvent. This should serve as a textbook example why passing around indices is a very, very bad idea!
2020-11-01 16:57:40 +00:00
OnEvent(EVENT_SOARUP, snum, p->GetActor(), -1);
- Duke: made gamevars type safe and capable of managing actor pointers. Also a few unrelated changes needed to make it compile again.
2021-12-05 16:36:57 +00:00
if (GetGameVarID(g_iReturnVarID, p->GetActor(), snum).value() == 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- cleanup, part 3.
2022-02-05 12:40:30 +00:00
p->pos.Z -= dist;
- Duke: Fix bug where player wasn't cracking knuckles after 777 idle tics while `cl_syncinput` was 1. * Use opportunity to replace the literal constant of `777` with an enum.
2020-08-27 05:54:49 +00:00
p->crack_time = CRACK_TIME;
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (actions & SB_CROUCH) //Z (soar low)
- safety commit.
2020-05-17 21:44:53 +00:00
{
// crouch
- use an actor pointer in Get/SetGameVarID's parameters to weed out the ordering screwups.
2020-11-01 17:23:09 +00:00
SetGameVarID(g_iReturnVarID, 0, p->GetActor(), snum);
- fixed the messed up parameter order of OnEvent. This should serve as a textbook example why passing around indices is a very, very bad idea!
2020-11-01 16:57:40 +00:00
OnEvent(EVENT_SOARDOWN, snum, p->GetActor(), -1);
- Duke: made gamevars type safe and capable of managing actor pointers. Also a few unrelated changes needed to make it compile again.
2021-12-05 16:36:57 +00:00
if (GetGameVarID(g_iReturnVarID, p->GetActor(), snum).value() == 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- cleanup, part 3.
2022-02-05 12:40:30 +00:00
p->pos.Z += dist;
- Duke: Fix bug where player wasn't cracking knuckles after 777 idle tics while `cl_syncinput` was 1. * Use opportunity to replace the literal constant of `777` with an enum.
2020-08-27 05:54:49 +00:00
p->crack_time = CRACK_TIME;
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
int k;
if (shrunk == 0 && (psectlotag == 0 || psectlotag == 2)) k = 32;
else k = 16;
if (psectlotag != 2 && p->scuba_on == 1)
p->scuba_on = 0;
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
if (p->player_int_pos().Z > (fz - (k << 8)))
- cleanup, part 3.
2022-02-05 12:40:30 +00:00
p->pos.Z += (((fz - (k << 8)) - p->player_int_pos().Z) >> 1) * zinttoworld;
- one more batch of trivial replacements
2022-08-20 18:57:54 +00:00
if (p->pos.Z < pact->ceilingz + 18)
- cleanup, part 3.
2022-02-05 12:40:30 +00:00
p->pos.Z = pact->ceilingz + 18;
- safety commit.
2020-05-17 21:44:53 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
static void movement(int snum, ESyncBits actions, sectortype* psect, int fz, int cz, int shrunk, int truefdist, int psectlotag)
- safety commit.
2020-05-17 21:44:53 +00:00
{
int j;
auto p = &ps[snum];
- player index and hittypes in player_d.cpp
2020-10-25 05:50:31 +00:00
auto pact = p->GetActor();
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->airleft != 15 * 26)
p->airleft = 15 * 26; //Aprox twenty seconds.
if (p->scuba_on == 1)
p->scuba_on = 0;
int i = 40;
- fixed broken jumping. This was a nasty, but typical case for Duke where a variable did not contain what the name said and was carried along way too much code. Fixes #112
2020-08-07 19:59:11 +00:00
if (psectlotag == ST_1_ABOVE_WATER && p->spritebridge == 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
if (shrunk == 0)
{
i = 34;
p->pycount += 32;
p->pycount &= 2047;
- buildutils: Replace `sintable[]` use within Duke's player_d.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:03 +00:00
p->pyoff = bsin(p->pycount, -6);
- safety commit.
2020-05-17 21:44:53 +00:00
}
else i = 12;
- added a float version of gs.playerheight.
2022-02-04 17:06:08 +00:00
if (shrunk == 0 && truefdist <= gs.int_playerheight)
- safety commit.
2020-05-17 21:44:53 +00:00
{
if (p->on_ground == 1)
{
- RR-movement + dummyplayersprite
2020-10-25 06:21:33 +00:00
if (p->dummyplayersprite == nullptr)
p->dummyplayersprite = spawn(pact, PLAYERONWATER);
- safety commit.
2020-05-17 21:44:53 +00:00
p->footprintcount = 6;
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
if (p->cursector->floorpicnum == FLOORSLIME)
- safety commit.
2020-05-17 21:44:53 +00:00
p->footprintpal = 8;
else p->footprintpal = 0;
p->footprintshade = 0;
}
}
}
else
{
footprints(snum);
}
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
if (p->player_int_pos().Z < (fz - (i << 8))) //falling
- safety commit.
2020-05-17 21:44:53 +00:00
{
// not jumping or crouching
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
if ((actions & (SB_JUMP|SB_CROUCH)) == 0 && p->on_ground && (psect->floorstat & CSTAT_SECTOR_SLOPE) && p->player_int_pos().Z >= (fz - (i << 8) - (16 << 8)))
- wrapped player::pos z-assignments.
2022-02-05 11:56:49 +00:00
p->player_set_int_z(fz - (i << 8));
- safety commit.
2020-05-17 21:44:53 +00:00
else
{
p->on_ground = 0;
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
p->vel.Z += (gs.gravity + 80); // (TICSPERFRAME<<6);
if (p->vel.Z >= (4096 + 2048)) p->vel.Z = (4096 + 2048);
if (p->vel.Z > 2400 && p->falling_counter < 255)
- safety commit.
2020-05-17 21:44:53 +00:00
{
p->falling_counter++;
- player index and hittypes in player_d.cpp
2020-10-25 05:50:31 +00:00
if (p->falling_counter == 38 && !S_CheckActorSoundPlaying(pact, DUKE_SCREAM))
S_PlayActorSound(DUKE_SCREAM, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
if ((p->player_int_pos().Z + p->vel.Z) >= (fz - (i << 8))) // hit the ground
- stop screaming sound when landing. Fixes #116
2020-08-07 20:20:29 +00:00
{
- player index and hittypes in player_d.cpp
2020-10-25 05:50:31 +00:00
S_StopSound(DUKE_SCREAM, pact);
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
if (!p->insector() || p->cursector->lotag != 1)
- safety commit.
2020-05-17 21:44:53 +00:00
{
if (p->falling_counter > 62) quickkill(p);
else if (p->falling_counter > 9)
{
j = p->falling_counter;
- 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
pact->spr.extra -= j - (krand() & 3);
if (pact->spr.extra <= 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- player index and hittypes in player_d.cpp
2020-10-25 05:50:31 +00:00
S_PlayActorSound(SQUISHED, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
SetPlayerPal(p, PalEntry(63, 63, 0, 0));
}
else
{
- player index and hittypes in player_d.cpp
2020-10-25 05:50:31 +00:00
S_PlayActorSound(DUKE_LAND, pact);
S_PlayActorSound(DUKE_LAND_HURT, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
SetPlayerPal(p, PalEntry(32, 16, 0, 0));
}
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
else if (p->vel.Z > 2048) S_PlayActorSound(DUKE_LAND, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
- stop screaming sound when landing. Fixes #116
2020-08-07 20:20:29 +00:00
}
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
else
{
p->falling_counter = 0;
- player index and hittypes in player_d.cpp
2020-10-25 05:50:31 +00:00
S_StopSound(-1, pact, CHAN_VOICE);
- safety commit.
2020-05-17 21:44:53 +00:00
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
if (psectlotag != ST_1_ABOVE_WATER && psectlotag != ST_2_UNDERWATER && p->on_ground == 0 && p->vel.Z > (6144 >> 1))
p->hard_landing = p->vel.Z >> 10;
- safety commit.
2020-05-17 21:44:53 +00:00
p->on_ground = 1;
if (i == 40)
{
//Smooth on the ground
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
int k = ((fz - (i << 8)) - p->player_int_pos().Z) >> 1;
- safety commit.
2020-05-17 21:44:53 +00:00
if (abs(k) < 256) k = 0;
- wrapped player::pos z-assignments.
2022-02-05 11:56:49 +00:00
p->player_add_int_z(k);
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
p->vel.Z -= 768;
if (p->vel.Z < 0) p->vel.Z = 0;
- safety commit.
2020-05-17 21:44:53 +00:00
}
else if (p->jumping_counter == 0)
{
- wrapped player::pos z-assignments.
2022-02-05 11:56:49 +00:00
p->player_add_int_z(((fz - (i << 7)) - p->player_int_pos().Z) >> 1); //Smooth on the water
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
if (p->on_warping_sector == 0 && p->player_int_pos().Z > fz - (16 << 8))
- safety commit.
2020-05-17 21:44:53 +00:00
{
- wrapped player::pos z-assignments.
2022-02-05 11:56:49 +00:00
p->player_set_int_z(fz - (16 << 8));
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
p->vel.Z >>= 1;
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
p->on_warping_sector = 0;
- Duke: Add some comments to 40ffb23b44e12ebcc5f556e2f2dadd05e3cf53b0 so it can be better fixed in the future when multiplayer is going.
2022-01-13 11:42:48 +00:00
if ((actions & SB_CROUCH) || crouch_toggle) // FIXME: The crouch_toggle check here is not network safe and needs revision when multiplayer is going.
- safety commit.
2020-05-17 21:44:53 +00:00
{
playerCrouch(snum);
}
// jumping
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if ((actions & SB_JUMP) == 0 && p->jumping_toggle == 1)
- safety commit.
2020-05-17 21:44:53 +00:00
p->jumping_toggle = 0;
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
else if ((actions & SB_JUMP))
- safety commit.
2020-05-17 21:44:53 +00:00
{
playerJump(snum, fz, cz);
}
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (p->jumping_counter && (actions & SB_JUMP) == 0)
- safety commit.
2020-05-17 21:44:53 +00:00
p->jumping_toggle = 0;
}
if (p->jumping_counter)
{
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if ((actions & SB_JUMP) == 0 && p->jumping_toggle == 1)
- safety commit.
2020-05-17 21:44:53 +00:00
p->jumping_toggle = 0;
if (p->jumping_counter < (1024 + 256))
{
if (psectlotag == 1 && p->jumping_counter > 768)
{
p->jumping_counter = 0;
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
p->vel.Z = -512;
- safety commit.
2020-05-17 21:44:53 +00:00
}
else
{
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
p->vel.Z -= bsin(2048 - 128 + p->jumping_counter) / 12;
- safety commit.
2020-05-17 21:44:53 +00:00
p->jumping_counter += 180;
p->on_ground = 0;
}
}
else
{
p->jumping_counter = 0;
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
p->vel.Z = 0;
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
- wrapped player::pos z-assignments.
2022-02-05 11:56:49 +00:00
p->player_add_int_z(p->vel.Z);
- safety commit.
2020-05-17 21:44:53 +00:00
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
if (p->player_int_pos().Z < (cz + (4 << 8)))
- safety commit.
2020-05-17 21:44:53 +00:00
{
p->jumping_counter = 0;
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
if (p->vel.Z < 0)
- Duke: Replace `player_struct` `posyv` with `vel.Y` calls.
2021-12-30 11:18:56 +00:00
p->vel.X = p->vel.Y = 0;
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
p->vel.Z = 128;
- wrapped player::pos z-assignments.
2022-02-05 11:56:49 +00:00
p->player_set_int_z(cz + (4 << 8));
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
static void underwater(int snum, ESyncBits actions, int fz, int cz)
- safety commit.
2020-05-17 21:44:53 +00:00
{
auto p = &ps[snum];
- Duke underwater.
2020-10-25 06:01:58 +00:00
auto pact = p->GetActor();
- safety commit.
2020-05-17 21:44:53 +00:00
// under water
p->jumping_counter = 0;
p->pycount += 32;
p->pycount &= 2047;
- buildutils: Replace `sintable[]` use within Duke's player_d.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:03 +00:00
p->pyoff = bsin(p->pycount, -7);
- safety commit.
2020-05-17 21:44:53 +00:00
- Duke underwater.
2020-10-25 06:01:58 +00:00
if (!S_CheckActorSoundPlaying(pact, DUKE_UNDERWATER))
S_PlayActorSound(DUKE_UNDERWATER, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (actions & SB_JUMP)
- safety commit.
2020-05-17 21:44:53 +00:00
{
// jump
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
if (p->vel.Z > 0) p->vel.Z = 0;
p->vel.Z -= 348;
if (p->vel.Z < -(256 * 6)) p->vel.Z = -(256 * 6);
- safety commit.
2020-05-17 21:44:53 +00:00
}
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
else if (actions & SB_CROUCH)
- safety commit.
2020-05-17 21:44:53 +00:00
{
// crouch
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
if (p->vel.Z < 0) p->vel.Z = 0;
p->vel.Z += 348;
if (p->vel.Z > (256 * 6)) p->vel.Z = (256 * 6);
- safety commit.
2020-05-17 21:44:53 +00:00
}
else
{
// normal view
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
if (p->vel.Z < 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
p->vel.Z += 256;
if (p->vel.Z > 0)
p->vel.Z = 0;
- safety commit.
2020-05-17 21:44:53 +00:00
}
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
if (p->vel.Z > 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
p->vel.Z -= 256;
if (p->vel.Z < 0)
p->vel.Z = 0;
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
if (p->vel.Z > 2048)
p->vel.Z >>= 1;
- safety commit.
2020-05-17 21:44:53 +00:00
- wrapped player::pos z-assignments.
2022-02-05 11:56:49 +00:00
p->player_add_int_z(p->vel.Z);
- safety commit.
2020-05-17 21:44:53 +00:00
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
if (p->player_int_pos().Z > (fz - (15 << 8)))
- wrapped player::pos z-assignments.
2022-02-05 11:56:49 +00:00
p->player_add_int_z(((fz - (15 << 8)) - p->player_int_pos().Z) >> 1);
- safety commit.
2020-05-17 21:44:53 +00:00
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
if (p->player_int_pos().Z < (cz + (4 << 8)))
- safety commit.
2020-05-17 21:44:53 +00:00
{
- wrapped player::pos z-assignments.
2022-02-05 11:56:49 +00:00
p->player_set_int_z(cz + (4 << 8));
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
p->vel.Z = 0;
- safety commit.
2020-05-17 21:44:53 +00:00
}
if (p->scuba_on && (krand() & 255) < 8)
{
- Duke underwater.
2020-10-25 06:01:58 +00:00
auto j = spawn(pact, WATERBUBBLE);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (j)
{
- Replace player's `ang` with `DAngle` object. * This commit does not build. Committed items are everything that's been done by find and replace. * Next commit has hand-performed changes that are better separated out for clarity.
2022-08-27 13:09:22 +00:00
j->add_int_pos({ bcos(p->angle.ang.Buildang() + 64 - (global_random & 128), -6), bsin(p->angle.ang.Buildang() + 64 - (global_random & 128), -6), 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
j->spr.xrepeat = 3;
j->spr.yrepeat = 2;
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
j->set_int_z(p->player_int_pos().Z + (8 << 8));
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
}
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int operateTripbomb(int snum)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
auto p = &ps[snum];
- Silence all the `-Wuninitialized` and `-Wmaybe-uninitialized` warnings relating to `HitInfo` objects passed through to functions by reference.
2021-12-06 11:24:22 +00:00
HitInfo hit{};
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- Remaining manual changes to replace player's `ang` with `DAngle` object.
2022-08-27 13:09:51 +00:00
hitscan(p->player_int_pos(), p->cursector, { int(p->angle.ang.Cos() * (1 << 14)), int(p->angle.ang.Sin() * (1 << 14)), -p->horizon.sum().asq16() >> 11 }, hit, CLIPMASK1);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitSector == nullptr || hit.actor())
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
return 0;
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall != nullptr && hit.hitSector->lotag > 2)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
return 0;
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall != nullptr && hit.hitWall->overpicnum >= 0)
if (hit.hitWall->overpicnum == BIGFORCE)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
return 0;
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
DDukeActor* act;
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
DukeSectIterator it(hit.hitSector);
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
while ((act = it.Next()))
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- another trip bomb flag.
2022-01-19 08:02:20 +00:00
if (!actorflag(act, SFLAG_BLOCK_TRIPBOMB) &&
- use int_hitpos() access function where applicable
2022-08-16 22:59:32 +00:00
abs(act->int_pos().Z - hit.int_hitpos().Z) < (12 << 8) && ((act->int_pos().X - hit.int_hitpos().X) * (act->int_pos().X - hit.int_hitpos().X) + (act->int_pos().Y - hit.int_hitpos().Y) * (act->int_pos().Y - hit.int_hitpos().Y)) < (290 * 290))
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
return 0;
}
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
if (act == nullptr && hit.hitWall != nullptr && (hit.hitWall->cstat & CSTAT_WALL_MASKED) == 0)
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if ((hit.hitWall->twoSided() && hit.hitWall->nextSector()->lotag <= 2) || (!hit.hitWall->twoSided() && hit.hitSector->lotag <= 2))
- use int_hitpos() access function where applicable
2022-08-16 22:59:32 +00:00
if (((hit.int_hitpos().X - p->player_int_pos().X) * (hit.int_hitpos().X - p->player_int_pos().X) + (hit.int_hitpos().Y - p->player_int_pos().Y) * (hit.int_hitpos().Y - p->player_int_pos().Y)) < (290 * 290))
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- cleanup, part 3.
2022-02-05 12:40:30 +00:00
p->pos.Z = p->opos.Z;
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
p->vel.Z = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
return 1;
}
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
-processinput_d
2020-05-18 22:26:07 +00:00
static void fireweapon(int snum)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
auto p = &ps[snum];
- player.i, part 4.
2020-11-02 19:24:07 +00:00
auto pact = p->GetActor();
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- Duke: Fix bug where player wasn't cracking knuckles after 777 idle tics while `cl_syncinput` was 1. * Use opportunity to replace the literal constant of `777` with an enum.
2020-08-27 05:54:49 +00:00
p->crack_time = CRACK_TIME;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
if (p->holster_weapon == 1)
{
if (p->last_pissed_time <= (26 * 218) && p->weapon_pos == -9)
{
p->holster_weapon = 0;
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
p->oweapon_pos = p->weapon_pos = 10;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
FTA(74, p);
}
}
else switch (p->curr_weapon)
{
case HANDBOMB_WEAPON:
p->hbomb_hold_delay = 0;
if (p->ammo_amount[HANDBOMB_WEAPON] > 0)
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case HANDREMOTE_WEAPON:
p->hbomb_hold_delay = 0;
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case PISTOL_WEAPON:
if (p->ammo_amount[PISTOL_WEAPON] > 0)
{
p->ammo_amount[PISTOL_WEAPON]--;
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
break;
case CHAINGUN_WEAPON:
if (p->ammo_amount[CHAINGUN_WEAPON] > 0) // && p->random_club_frame == 0)
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case SHOTGUN_WEAPON:
if (p->ammo_amount[SHOTGUN_WEAPON] > 0 && p->random_club_frame == 0)
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case TRIPBOMB_WEAPON:
if (p->ammo_amount[TRIPBOMB_WEAPON] > 0)
{
if (operateTripbomb(snum))
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
break;
case SHRINKER_WEAPON:
case GROW_WEAPON:
if (p->curr_weapon == GROW_WEAPON)
{
if (p->ammo_amount[GROW_WEAPON] > 0)
{
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic = 1;
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(EXPANDERSHOOT, pact);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
}
else if (p->ammo_amount[SHRINKER_WEAPON] > 0)
{
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic = 1;
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(SHRINKER_FIRE, pact);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
break;
case FREEZE_WEAPON:
if (p->ammo_amount[FREEZE_WEAPON] > 0)
{
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic = 1;
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(CAT_FIRE, pact);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
break;
case DEVISTATOR_WEAPON:
if (p->ammo_amount[DEVISTATOR_WEAPON] > 0)
{
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
p->hbomb_hold_delay = !p->hbomb_hold_delay;
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(CAT_FIRE, pact);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
break;
case RPG_WEAPON:
if (p->ammo_amount[RPG_WEAPON] > 0)
{
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
break;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
case FLAMETHROWER_WEAPON: // Twentieth Anniversary World Tour
if (isWorldTour() && p->ammo_amount[FLAMETHROWER_WEAPON] > 0)
{
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic = 1;
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
if (p->cursector->lotag != 2)
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(FLAMETHROWER_INTRO, pact);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
}
break;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
case KNEE_WEAPON:
if (p->quick_kick == 0)
{
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
break;
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
dukeplayer stuff
2021-11-21 07:48:36 +00:00
static void operateweapon(int snum, ESyncBits actions)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
auto p = &ps[snum];
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
auto pact = p->GetActor();
int i, k;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
// already firing...
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
switch (p->curr_weapon)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
case HANDBOMB_WEAPON: // grenade in NAM
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (p->kickback_pic == 6 && (actions & SB_FIRE))
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
p->rapid_fire_hold = 1;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
break;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic++;
if (p->kickback_pic == 12)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->ammo_amount[HANDBOMB_WEAPON]--;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (p->on_ground && (actions & SB_CROUCH))
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
k = 15;
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
i = MulScale(p->horizon.sum().asq16(), 20, 16);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
else
{
k = 140;
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
i = -512 - MulScale(p->horizon.sum().asq16(), 20, 16);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
auto spawned = EGS(p->cursector,
- Remaining manual changes to replace player's `ang` with `DAngle` object.
2022-08-27 13:09:51 +00:00
p->player_int_pos().X + p->angle.ang.Cos() * (1 << 8),
p->player_int_pos().Y + p->angle.ang.Sin() * (1 << 8),
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
p->player_int_pos().Z, HEAVYHBOMB, -16, 9, 9,
- Replace player's `ang` with `DAngle` object. * This commit does not build. Committed items are everything that's been done by find and replace. * Next commit has hand-performed changes that are better separated out for clarity.
2022-08-27 13:09:22 +00:00
p->angle.ang.Buildang(), (k + (p->hbomb_hold_delay << 5)), i, pact, 1);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
if (isNam())
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +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
spawned->spr.extra = MulScale(krand(), NAM_GRENADE_LIFETIME_VAR, 14);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
if (k == 15)
{
- 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
spawned->spr.yvel = 3;
- some simple replacements.
2022-02-07 07:47:18 +00:00
spawned->spr.pos.Z += 8;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
k = hits(pact);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
if (k < 512)
{
- add_int_ang
2022-08-16 21:26:39 +00:00
spawned->add_int_ang(1024);
- 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
spawned->spr.zvel /= 3;
spawned->spr.xvel /= 3;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
p->hbomb_on = 1;
}
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
else if (p->kickback_pic < 12 && (actions & SB_FIRE))
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
p->hbomb_hold_delay++;
-processinput_d
2020-05-18 22:26:07 +00:00
else if (p->kickback_pic > 19)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
// don't change to remote when in NAM: grenades are timed
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
if (isNam()) checkavailweapon(p);
else
{
p->curr_weapon = HANDREMOTE_WEAPON;
p->last_weapon = -1;
- fix some interpolation harshness with `p->weapon_pos`.
2020-08-03 05:05:38 +00:00
p->oweapon_pos = p->weapon_pos = 10;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
}
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
break;
case HANDREMOTE_WEAPON: // knife in NAM
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic++;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->kickback_pic == 2)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->hbomb_on = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->kickback_pic == 10)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 0;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
int weapon = isNam() ? TRIPBOMB_WEAPON : HANDBOMB_WEAPON;
if (p->ammo_amount[weapon] > 0)
fi.addweapon(p, weapon);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
else
checkavailweapon(p);
}
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
break;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
case PISTOL_WEAPON: // m-16 in NAM
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->kickback_pic == 1)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(pact, SHOTSPARK1);
S_PlayActorSound(PISTOL_FIRE, pact);
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
lastvisinc = PlayClock + 32;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->visibility = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
-processinput_d
2020-05-18 22:26:07 +00:00
else if (p->kickback_pic == 2)
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
spawn(pact, SHELL);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic++;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->kickback_pic >= 5)
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
{
if (p->ammo_amount[PISTOL_WEAPON] <= 0 || (p->ammo_amount[PISTOL_WEAPON] % (isNam() ? 20 : 12)))
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 0;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
checkavailweapon(p);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
else
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
-processinput_d
2020-05-18 22:26:07 +00:00
switch (p->kickback_pic)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
case 5:
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(EJECT_CLIP, pact);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
break;
//#ifdef NAM
- tabified two files in Duke that were missed somehow, plus some comment cleanup elsewhere.
2021-11-09 23:05:42 +00:00
// case WEAPON2_RELOAD_TIME - 15:
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
//#else
case 8:
//#endif
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(INSERT_CLIP, pact);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
break;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
}
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
}
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
// 3 second re-load time
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->kickback_pic == (isNam() ? 50 : 27))
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
{
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 0;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
checkavailweapon(p);
}
break;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
case SHOTGUN_WEAPON:
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic++;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->kickback_pic == 4)
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
{
- renamed all shadowing variables in Duke.
2021-12-24 09:53:27 +00:00
for(int ii = 0; ii < 7; ii++)
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(pact, SHOTGUN);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->ammo_amount[SHOTGUN_WEAPON]--;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(SHOTGUN_FIRE, pact);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
lastvisinc = PlayClock + 32;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->visibility = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
-processinput_d
2020-05-18 22:26:07 +00:00
switch(p->kickback_pic)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
case 13:
checkavailweapon(p);
break;
case 15:
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(SHOTGUN_COCK, pact);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case 17:
case 20:
p->kickback_pic++;
break;
case 24:
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
{
auto j = spawn(pact, SHOTGUNSHELL);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (j)
{
- add_int_ang
2022-08-16 21:26:39 +00:00
j->add_int_ang(1024);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
ssp(j, CLIPMASK0);
- add_int_ang
2022-08-16 21:26:39 +00:00
j->add_int_ang(1024);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
}
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
p->kickback_pic++;
break;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
}
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
case 31:
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
return;
}
break;
case CHAINGUN_WEAPON: // m-60 in NAM
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic++;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->kickback_pic <= 12)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
-processinput_d
2020-05-18 22:26:07 +00:00
if (((p->kickback_pic) % 3) == 0)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
p->ammo_amount[CHAINGUN_WEAPON]--;
-processinput_d
2020-05-18 22:26:07 +00:00
if ((p->kickback_pic % 3) == 0)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
auto j = spawn(pact, SHELL);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (j)
{
- the remaining angle stuff.
2022-08-16 21:27:44 +00:00
j->set_int_ang((j->int_ang() + 1024) & 2047);
- 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
j->spr.xvel += 32;
- some simple replacements.
2022-02-07 07:47:18 +00:00
j->spr.pos.Z += 3;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
ssp(j, CLIPMASK0);
}
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(CHAINGUN_FIRE, pact);
fi.shoot(pact, CHAINGUN);
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
lastvisinc = PlayClock + 32;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
p->visibility = 0;
checkavailweapon(p);
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if ((actions & SB_FIRE) == 0)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
}
}
}
-processinput_d
2020-05-18 22:26:07 +00:00
else if (p->kickback_pic > 10)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (actions & SB_FIRE) p->okickback_pic = p->kickback_pic = 1;
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
else p->okickback_pic = p->kickback_pic = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
break;
case GROW_WEAPON: // m-14 with scope (sniper rifle)
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
bool check;
if (isNam())
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic++;
check = (p->kickback_pic == 3);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
else
{
-processinput_d
2020-05-18 22:26:07 +00:00
check = (p->kickback_pic > 3);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
if (check)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
// fire now, but don't reload right away...
if (isNam())
{
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic++;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
if (p->ammo_amount[p->curr_weapon] <= 1)
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
else
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 0;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->ammo_amount[p->curr_weapon]--;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(pact, GROWSPARK);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
//#ifdef NAM
//#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
if (!(aplWeaponFlags(p->curr_weapon, snum) & WEAPON_FLAG_NOVISIBLE))
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
{
// make them visible if not set...
p->visibility = 0;
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
lastvisinc = PlayClock + 32;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
checkavailweapon(p);
//#endif
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
-processinput_d
2020-05-18 22:26:07 +00:00
else if (!isNam()) p->kickback_pic++;
- fixed NAM's sniper rifle. This was using one of WW2GI's apl* variables, but shouldn't.
2022-01-08 20:42:44 +00:00
if (isNam() && p->kickback_pic > 30)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
// reload now...
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 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 (!(aplWeaponFlags(p->curr_weapon, snum) & WEAPON_FLAG_NOVISIBLE))
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
// make them visible if not set...
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
p->visibility = 0;
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
lastvisinc = PlayClock + 32;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
checkavailweapon(p);
}
break;
case SHRINKER_WEAPON: // m-79 in NAM (Grenade launcher)
-processinput_d
2020-05-18 22:26:07 +00:00
if ((!isNam() && p->kickback_pic > 10) || (isNam() && p->kickback_pic == 10))
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
{
-processinput_d
2020-05-18 22:26:07 +00:00
if (isNam()) p->kickback_pic++; // fire now, but wait for reload...
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
else p->okickback_pic = p->kickback_pic = 0;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->ammo_amount[SHRINKER_WEAPON]--;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(pact, SHRINKER);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
if (!isNam())
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
p->visibility = 0;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
//flashColor = 176 + (252 << 8) + (120 << 16);
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
lastvisinc = PlayClock + 32;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
checkavailweapon(p);
}
}
-processinput_d
2020-05-18 22:26:07 +00:00
else if (isNam() && p->kickback_pic > 30)
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
{
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 0;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->visibility = 0;
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
lastvisinc = PlayClock + 32;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
checkavailweapon(p);
}
-processinput_d
2020-05-18 22:26:07 +00:00
else p->kickback_pic++;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case DEVISTATOR_WEAPON:
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->kickback_pic)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic++;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- use the correct code for the devastator in operateweapon. The code present was from EDuke 2.1, I have no idea if it ever worked there. It was replaced with JFDuke's. Fixes #104.
2020-08-05 19:48:16 +00:00
if (isNam())
{
if ((p->kickback_pic >= 2) &&
p->kickback_pic < 5 &&
-processinput_d
2020-05-18 22:26:07 +00:00
(p->kickback_pic & 1))
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- use the correct code for the devastator in operateweapon. The code present was from EDuke 2.1, I have no idea if it ever worked there. It was replaced with JFDuke's. Fixes #104.
2020-08-05 19:48:16 +00:00
p->visibility = 0;
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
lastvisinc = PlayClock + 32;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(pact, RPG);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
p->ammo_amount[DEVISTATOR_WEAPON]--;
checkavailweapon(p);
}
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
if (p->kickback_pic > 5) p->okickback_pic = p->kickback_pic = 0;
- use the correct code for the devastator in operateweapon. The code present was from EDuke 2.1, I have no idea if it ever worked there. It was replaced with JFDuke's. Fixes #104.
2020-08-05 19:48:16 +00:00
}
else if (p->kickback_pic & 1)
{
p->visibility = 0;
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
lastvisinc = PlayClock + 32;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(pact, RPG);
- use the correct code for the devastator in operateweapon. The code present was from EDuke 2.1, I have no idea if it ever worked there. It was replaced with JFDuke's. Fixes #104.
2020-08-05 19:48:16 +00:00
p->ammo_amount[DEVISTATOR_WEAPON]--;
checkavailweapon(p);
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
if (p->ammo_amount[DEVISTATOR_WEAPON] <= 0) p->okickback_pic = p->kickback_pic = 0;
- use the correct code for the devastator in operateweapon. The code present was from EDuke 2.1, I have no idea if it ever worked there. It was replaced with JFDuke's. Fixes #104.
2020-08-05 19:48:16 +00:00
}
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
if (p->kickback_pic > 5) p->okickback_pic = p->kickback_pic = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
break;
case FREEZE_WEAPON:
// flame thrower in NAM
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->kickback_pic < 4)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic++;
if (p->kickback_pic == 3)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
p->ammo_amount[p->curr_weapon]--;
p->visibility = 0;
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
lastvisinc = PlayClock + 32;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(pact, FREEZEBLAST);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
checkavailweapon(p);
}
- 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 (pact->spr.xrepeat < 32)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 0; break;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
}
else
{
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (actions & SB_FIRE)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 1;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(CAT_FIRE, pact);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
else p->okickback_pic = p->kickback_pic = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
break;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
case FLAMETHROWER_WEAPON:
if (!isWorldTour()) // Twentieth Anniversary World Tour
break;
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic++;
if (p->kickback_pic == 2)
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
{
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
if (p->cursector->lotag != 2)
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
{
p->ammo_amount[FLAMETHROWER_WEAPON]--;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(pact, FIREBALL);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
}
checkavailweapon(p);
}
-processinput_d
2020-05-18 22:26:07 +00:00
else if (p->kickback_pic == 16)
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
{
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if ((actions & SB_FIRE) != 0)
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
{
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 1;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(FLAMETHROWER_INTRO, pact);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
}
else
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 0;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
}
break;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
case TRIPBOMB_WEAPON: // Claymore in NAM
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->kickback_pic < 4)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- cleanup, part 3.
2022-02-05 12:40:30 +00:00
p->pos.Z = p->opos.Z;
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
p->vel.Z = 0;
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->kickback_pic == 3)
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(pact, HANDHOLDINGLASER);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->kickback_pic == 16)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
checkavailweapon(p);
- fix some interpolation harshness with `p->weapon_pos`.
2020-08-03 05:05:38 +00:00
p->oweapon_pos = p->weapon_pos = -9;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
-processinput_d
2020-05-18 22:26:07 +00:00
else p->kickback_pic++;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case KNEE_WEAPON:
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic++;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
if (p->kickback_pic == 7) fi.shoot(pact, KNEE);
-processinput_d
2020-05-18 22:26:07 +00:00
else if (p->kickback_pic == 14)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (actions & SB_FIRE)
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 1 + (krand() & 3);
else p->okickback_pic = p->kickback_pic = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
if (p->wantweaponfire >= 0)
checkavailweapon(p);
break;
case RPG_WEAPON: // m-72 in NAM (LAW)
-processinput_d
2020-05-18 22:26:07 +00:00
p->kickback_pic++;
if (p->kickback_pic == 4)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
p->ammo_amount[RPG_WEAPON]--;
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
lastvisinc = PlayClock + 32;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
p->visibility = 0;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(pact, RPG);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
checkavailweapon(p);
}
Revert "- subjective fix to Duke 3D's RPG harsh recoil." This reverts commit 839a7bcbe4a02e2d38470ea7a114473d59580e91. Revert "- Duke: Restore RPG harsh recoil behind a CVAR." This reverts commit 88a49b0d2248243c687989e3a5a50f265a9fa089. # Conflicts: # source/core/gamecvars.cpp # source/core/gamecvars.h
2021-03-31 09:35:10 +00:00
else if (p->kickback_pic == 20)
- fix some interpolation harshness with `p->kickback_pic`.
2020-08-03 05:02:30 +00:00
p->okickback_pic = p->kickback_pic = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
}
}
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
//---------------------------------------------------------------------------
//
// this function exists because gotos suck. :P
//
//---------------------------------------------------------------------------
dukeplayer stuff
2021-11-21 07:48:36 +00:00
static void processweapon(int snum, ESyncBits actions)
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
{
auto p = &ps[snum];
- access_spritenum
2020-10-25 05:34:25 +00:00
auto pact = p->GetActor();
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
int shrunk = (pact->spr.yrepeat < 32);
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
- processed all remaining local input CCMDs and removed some bits only needed for multiplayer. These MP bits should be reimplemented as network commands later, they only take up valuable space in the bit field.
2020-08-27 22:03:35 +00:00
if (isNamWW2GI() && (actions & SB_HOLSTER)) // 'Holster Weapon
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
{
if (isWW2GI())
{
- use an actor pointer in Get/SetGameVarID's parameters to weed out the ordering screwups.
2020-11-01 17:23:09 +00:00
SetGameVarID(g_iReturnVarID, 0, p->GetActor(), snum);
SetGameVarID(g_iWeaponVarID, p->curr_weapon, p->GetActor(), snum);
- 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
SetGameVarID(g_iWorksLikeVarID, aplWeaponWorksLike(p->curr_weapon, snum), p->GetActor(), snum);
- fixed the messed up parameter order of OnEvent. This should serve as a textbook example why passing around indices is a very, very bad idea!
2020-11-01 16:57:40 +00:00
OnEvent(EVENT_HOLSTER, snum, p->GetActor(), -1);
- Duke: made gamevars type safe and capable of managing actor pointers. Also a few unrelated changes needed to make it compile again.
2021-12-05 16:36:57 +00:00
if (GetGameVarID(g_iReturnVarID, p->GetActor(), snum).value() == 0)
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
{
// now it uses the game definitions...
- 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 (aplWeaponFlags(p->curr_weapon, snum) & WEAPON_FLAG_HOLSTER_CLEARS_CLIP)
- P_ProcessWeapon transitioned.
2020-05-19 07:54: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 (p->ammo_amount[p->curr_weapon] > aplWeaponClip(p->curr_weapon, snum)
&& (p->ammo_amount[p->curr_weapon] % aplWeaponClip(p->curr_weapon, snum)) != 0)
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
{
// throw away the remaining clip
p->ammo_amount[p->curr_weapon] -=
- 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
p->ammo_amount[p->curr_weapon] % aplWeaponClip(p->curr_weapon, snum);
// p->kickback_pic = aplWeaponFireDelay(p->curr_weapon, snum)+1; // animate, but don't shoot...
p->kickback_pic = aplWeaponTotalTime(p->curr_weapon, snum) + 1; // animate, but don't shoot...
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
actions &= ~SB_FIRE; // not firing...
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
}
return;
}
}
}
else if (p->curr_weapon == PISTOL_WEAPON)
{
if (p->ammo_amount[PISTOL_WEAPON] > 20)
{
// throw away the remaining clip
p->ammo_amount[PISTOL_WEAPON] -= p->ammo_amount[PISTOL_WEAPON] % 20;
p->kickback_pic = 3; // animate, but don't shoot...
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
actions &= ~SB_FIRE; // not firing...
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
}
return;
}
}
- 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 (isWW2GI() && (aplWeaponFlags(p->curr_weapon, snum) & WEAPON_FLAG_GLOWS))
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
p->random_club_frame += 64; // Glowing
if (!isWW2GI() && (p->curr_weapon == SHRINKER_WEAPON || p->curr_weapon == GROW_WEAPON))
p->random_club_frame += 64; // Glowing
if (p->rapid_fire_hold == 1)
{
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (actions & SB_FIRE) return;
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
p->rapid_fire_hold = 0;
}
if (shrunk || p->tipincs || p->access_incs)
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
actions &= ~SB_FIRE;
else if (shrunk == 0 && (actions & SB_FIRE) && p->kickback_pic == 0 && p->fist_incs == 0 &&
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
p->last_weapon == -1 && (p->weapon_pos == 0 || p->holster_weapon == 1))
{
if (!isWW2GI()) fireweapon(snum);
else fireweapon_ww(snum);
}
else if (p->kickback_pic)
{
dukeplayer stuff
2021-11-21 07:48:36 +00:00
if (!isWW2GI()) operateweapon(snum, actions);
else operateweapon_ww(snum, actions);
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
}
}
-processinput_d
2020-05-18 22:26:07 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
processinput_r
2020-05-19 07:03:07 +00:00
void processinput_d(int snum)
-processinput_d
2020-05-18 22:26:07 +00:00
{
- newowner and related code.
2020-11-02 23:20:51 +00:00
int j, k, doubvel, fz, cz, truefdist;
- handled the last remaining sprite references in player_d.cpp.
2020-10-25 06:12:04 +00:00
Collision chz, clz;
bool shrunk;
dukeplayer stuff
2021-11-21 07:48:36 +00:00
int psectlotag;
- remove C-style struct parameters.
2022-02-07 10:04:19 +00:00
player_struct* p;
-processinput_d
2020-05-18 22:26:07 +00:00
p = &ps[snum];
- access_spritenum
2020-10-25 05:34:25 +00:00
auto pact = p->GetActor();
-processinput_d
2020-05-18 22:26:07 +00:00
- Blood/Duke/RR/SW: Drop `resetinputhelpers()`.
2020-10-12 03:42:43 +00:00
p->horizon.resetadjustment();
p->angle.resetadjustment();
- removed old process input code.
2020-05-19 17:50:31 +00:00
- Clean-up of input functions. * Remove unused `getincanglef()`. * Remove unused `getincangleq16()`. * In `PlayerHorizon` struct, clamp value when setting target in `__settarget()`, not each public `settarget()` overload. * Rename `PlayerAngle` method `applylook()` to `applyinput()`. * Rename `PlayerHorizon` method `sethorizon()` to `applyinput()`. * In `PlayerHorizon::applylook()`, slightly clean return to centre code so it doesn't do math if already at 0. * In `PlayerAngle::applylook()`, slightly clean rotscrnang/look_ang code so it doesn't do math if already at 0 and reposition where mouse input is applied so that if input is applied, the player never enters a spin. * In `Duke3d::player_struct::apply_seasick()`, use `buildfang()` method instead of scaling float to BAM within function.
2021-04-21 10:41:04 +00:00
ESyncBits& actions = p->sync.actions;
-processinput_d
2020-05-18 22:26:07 +00:00
- statistics output
2020-07-03 19:44:57 +00:00
auto sb_fvel = PlayerInputForwardVel(snum);
auto sb_svel = PlayerInputSideVel(snum);
auto sb_avel = PlayerInputAngVel(snum);
-processinput_d
2020-05-18 22:26:07 +00:00
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
auto psectp = p->cursector;
dukeplayer stuff
2021-11-21 07:48:36 +00:00
if (psectp == nullptr)
-processinput_d
2020-05-18 22:26:07 +00:00
{
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
if (pact->spr.extra > 0 && ud.clipping == 0)
-processinput_d
2020-05-18 22:26:07 +00:00
{
quickkill(p);
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(SQUISHED, pact);
-processinput_d
2020-05-18 22:26:07 +00:00
}
dukeplayer stuff
2021-11-21 07:48:36 +00:00
psectp = &sector[0];
-processinput_d
2020-05-18 22:26:07 +00:00
}
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
psectlotag = psectp->lotag;
-processinput_d
2020-05-18 22:26:07 +00:00
p->spritebridge = 0;
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
shrunk = (pact->spr.yrepeat < 32);
- another batch of utility use
2022-02-05 11:05:29 +00:00
getzrange(p->player_int_pos(), psectp, &cz, chz, &fz, clz, 163, CLIPMASK0);
-processinput_d
2020-05-18 22:26:07 +00:00
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
j = getflorzofslopeptr(psectp, p->player_int_pos().X, p->player_int_pos().Y);
-processinput_d
2020-05-18 22:26:07 +00:00
- floatified player_struct::truecz/truefz.
2022-02-04 16:49:48 +00:00
p->truefz = j * zinttoworld;
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
p->truecz = getceilzofslopeptr(psectp, p->player_int_pos().X, p->player_int_pos().Y) * zinttoworld;
-processinput_d
2020-05-18 22:26:07 +00:00
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
truefdist = abs(p->player_int_pos().Z - j);
- added a float version of gs.playerheight.
2022-02-04 17:06:08 +00:00
if (clz.type == kHitSector && psectlotag == 1 && truefdist > gs.int_playerheight + (16 << 8))
-processinput_d
2020-05-18 22:26:07 +00:00
psectlotag = 0;
- remapped all copy assignments to DDukeActor::ceilingz/floorz. This commit does not work! It was split for clarity.
2022-02-03 23:44:13 +00:00
pact->floorz = fz * zinttoworld;
pact->ceilingz = cz * zinttoworld;
-processinput_d
2020-05-18 22:26:07 +00:00
- wrap all checks of cl_syncinput in an inline function.
2020-11-30 22:40:16 +00:00
if (SyncInput())
-processinput_d
2020-05-18 22:26:07 +00:00
{
- gamecontrol: Initial setup of `PlayerHorizon` struct and deployment within Duke. * Started with the most complicated game first. * Struct made up of fixedhoriz class units. * Append currently outgoing function names with `2` at the end to avoid conflict.
2020-10-07 06:12:37 +00:00
p->horizon.backup();
- calcviewpitch(): Set `scaleAdjust` to default to 1 in prototype like other functions in gameinput.cpp.
2021-01-01 22:32:19 +00:00
doslopetilting(p);
-processinput_d
2020-05-18 22:26:07 +00:00
}
- handled the last remaining sprite references in player_d.cpp.
2020-10-25 06:12:04 +00:00
if (chz.type == kHitSprite)
-processinput_d
2020-05-18 22:26:07 +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 (chz.actor()->spr.statnum == 1 && chz.actor()->spr.extra >= 0)
-processinput_d
2020-05-18 22:26:07 +00:00
{
- made Collision derive from a common base class and refactored clipmove to a single engine-side entry point. Done for Doom so far.
2021-11-26 12:41:15 +00:00
chz.setNone();
- floatified player_struct::truecz/truefz.
2022-02-04 16:49:48 +00:00
cz = p->truecz * zworldtoint;
-processinput_d
2020-05-18 22:26:07 +00:00
}
}
- handled the last remaining sprite references in player_d.cpp.
2020-10-25 06:12:04 +00:00
if (clz.type == kHitSprite)
-processinput_d
2020-05-18 22:26:07 +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 ((clz.actor()->spr.cstat & (CSTAT_SPRITE_ALIGNMENT_FLOOR | CSTAT_SPRITE_BLOCK)) == (CSTAT_SPRITE_ALIGNMENT_FLOOR | CSTAT_SPRITE_BLOCK))
-processinput_d
2020-05-18 22:26:07 +00:00
{
psectlotag = 0;
p->footprintcount = 0;
p->spritebridge = 1;
}
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
else if (badguy(clz.actor()) && clz.actor()->spr.xrepeat > 24 && abs(pact->int_pos().Z - clz.actor()->int_pos().Z) < (84 << 8))
-processinput_d
2020-05-18 22:26:07 +00:00
{
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
j = getangle(clz.actor()->int_pos().X - p->player_int_pos().X, clz.actor()->int_pos().Y - p->player_int_pos().Y);
- Duke: Replace `player_struct` `posxv` with `vel.X` calls.
2021-12-30 11:14:55 +00:00
p->vel.X -= bcos(j, 4);
- Duke: Replace `player_struct` `posyv` with `vel.Y` calls.
2021-12-30 11:18:56 +00:00
p->vel.Y -= bsin(j, 4);
-processinput_d
2020-05-18 22:26:07 +00:00
}
}
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
if (pact->spr.extra > 0) fi.incur_damage(p);
-processinput_d
2020-05-18 22:26:07 +00:00
else
{
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
pact->spr.extra = 0;
-processinput_d
2020-05-18 22:26:07 +00:00
p->shield_amount = 0;
}
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
p->last_extra = pact->spr.extra;
-processinput_d
2020-05-18 22:26:07 +00:00
- Duke: Interpolate `loogcnt` when drawing onscreen.
2022-06-06 01:24:38 +00:00
if (p->loogcnt > 0)
{
p->oloogcnt = p->loogcnt;
p->loogcnt--;
}
else
{
p->oloogcnt = p->loogcnt = 0;
}
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->fist_incs)
{
if (endoflevel(snum)) return;
}
if (p->timebeforeexit > 1 && p->last_extra > 0)
{
if (timedexit(snum))
return;
}
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
if (pact->spr.extra <= 0 && !ud.god)
-processinput_d
2020-05-18 22:26:07 +00:00
{
playerisdead(snum, psectlotag, fz, cz);
- adjustments for input
2020-07-16 13:03:09 +00:00
return;
-processinput_d
2020-05-18 22:26:07 +00:00
}
- uncouple the fist animation for being shrunk from the display frame rate.
2022-01-15 14:48:50 +00:00
if (p->GetActor()->spr.xrepeat < 40 && p->jetpack_on == 0)
{
- Duke: Fix `fistsign` smoothness.
2022-06-06 00:51:57 +00:00
p->ofistsign = p->fistsign;
- uncouple the fist animation for being shrunk from the display frame rate.
2022-01-15 14:48:50 +00:00
p->fistsign += p->GetActor()->spr.xvel;
}
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->transporter_hold > 0)
{
p->transporter_hold--;
if (p->transporter_hold == 0 && p->on_warping_sector)
p->transporter_hold = 2;
}
if (p->transporter_hold < 0)
p->transporter_hold++;
- newowner and related code.
2020-11-02 23:20:51 +00:00
if (p->newOwner != nullptr)
-processinput_d
2020-05-18 22:26:07 +00:00
{
- Duke: Replace `player_struct` `posyv` with `vel.Y` calls.
2021-12-30 11:18:56 +00:00
p->vel.X = p->vel.Y = pact->spr.xvel = 0;
-processinput_d
2020-05-18 22:26:07 +00:00
fi.doincrements(p);
- 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 (isWW2GI() && aplWeaponWorksLike(p->curr_weapon, snum) == HANDREMOTE_WEAPON) processweapon(snum, actions);
dukeplayer stuff
2021-11-21 07:48:36 +00:00
if (!isWW2GI() && p->curr_weapon == HANDREMOTE_WEAPON) processweapon(snum, actions);
-processinput_d
2020-05-18 22:26:07 +00:00
return;
}
doubvel = TICSPERFRAME;
- converted the remaining input bits. Looks like it is working in all games except Blood (not that it surprises me that it's Blood again which has issues...)
2020-08-29 11:32:14 +00:00
checklook(snum,actions);
- newowner and related code.
2020-11-02 23:20:51 +00:00
int ii = 40;
- __int_opos is gone.
2022-02-05 11:30:00 +00:00
auto oldpos = p->opos;
-processinput_d
2020-05-18 22:26:07 +00:00
- made on_crane a pointer as well.
2020-10-17 08:44:00 +00:00
if (p->on_crane != nullptr)
-processinput_d
2020-05-18 22:26:07 +00:00
goto HORIZONLY;
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
p->playerweaponsway(pact->spr.xvel);
-processinput_d
2020-05-18 22:26:07 +00:00
- floatified bobpos.
2022-02-05 12:58:12 +00:00
pact->spr.xvel = int(clamp((p->pos.XY() - p->bobpos).Length(), 0., 32.) * worldtoint);
- 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->on_ground) p->bobcounter += p->GetActor()->spr.xvel >> 1;
-processinput_d
2020-05-18 22:26:07 +00:00
- Duke: Fix nullptr check for Duke and RR that was causing a crash in a glitched spot in RR's E1L1.
2022-01-04 03:00:18 +00:00
p->backuppos(ud.clipping == 0 && ((p->insector() && p->cursector->floorpicnum == MIRROR) || !p->insector()));
-processinput_d
2020-05-18 22:26:07 +00:00
// Shrinking code
- adjustments for input
2020-07-16 13:03:09 +00:00
if (psectlotag == ST_2_UNDERWATER)
-processinput_d
2020-05-18 22:26:07 +00:00
{
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
underwater(snum, actions, fz, cz);
-processinput_d
2020-05-18 22:26:07 +00:00
}
else if (p->jetpack_on)
{
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
operateJetpack(snum, actions, psectlotag, fz, cz, shrunk);
-processinput_d
2020-05-18 22:26:07 +00:00
}
- adjustments for input
2020-07-16 13:03:09 +00:00
else if (psectlotag != ST_2_UNDERWATER)
-processinput_d
2020-05-18 22:26:07 +00:00
{
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
movement(snum, actions, psectp, fz, cz, shrunk, truefdist, psectlotag);
-processinput_d
2020-05-18 22:26:07 +00:00
}
- ensure player's angle input while playing with `cl_syncinput 0` is scaled appropriately when sector's lotag is ST_2_UNDERWATER.
2020-08-05 12:57:47 +00:00
p->psectlotag = psectlotag;
-processinput_d
2020-05-18 22:26:07 +00:00
//Do the quick lefts and rights
- Duke: Pass the player_struct through to FinalizeInput() in line with other functions.
2021-01-02 00:04:03 +00:00
if (movementBlocked(p))
-processinput_d
2020-05-18 22:26:07 +00:00
{
doubvel = 0;
- Duke: Replace `player_struct` `posxv` with `vel.X` calls.
2021-12-30 11:14:55 +00:00
p->vel.X = 0;
- Duke: Replace `player_struct` `posyv` with `vel.Y` calls.
2021-12-30 11:18:56 +00:00
p->vel.Y = 0;
-processinput_d
2020-05-18 22:26:07 +00:00
}
- wrap all checks of cl_syncinput in an inline function.
2020-11-30 22:40:16 +00:00
else if (SyncInput())
- make `cl_syncinput` work for Duke. * Current setup was broken and unusable. * Fixed interpolation issues. * Only call `GetInput()` at frame-rate when `cl_syncinput` is 0. * Create `oq16look_ang` and interpolate it for enhanced smoothness. * Always reset `horizAngleAdjust` and `horizSkew` in `processinput_d()`. * Don't pre-scale `sb_avel` in `processinput_d()` and `processinput_r()`. * Promote `p->angvel` from short to fixed_t. * Don't descale `sync[snum].q16horz` in `processinput_d()` and `processinput_r()`. * Ensure `false` bool is provided to `sethorizon()` call in `processinput_d()` and `processinput_r()`. * Reset `p->q16angvel` in `resetplayerstats()`.
2020-07-28 12:12:09 +00:00
{
//p->ang += syncangvel * constant
//ENGINE calculates angvel for you
// may still be needed later for demo recording
-processinput_d
2020-05-18 22:26:07 +00:00
- cleanup on player CVAR use.
2020-11-29 08:00:00 +00:00
sb_avel = p->adjustavel(sb_avel);
- Clean-up of input functions. * Remove unused `getincanglef()`. * Remove unused `getincangleq16()`. * In `PlayerHorizon` struct, clamp value when setting target in `__settarget()`, not each public `settarget()` overload. * Rename `PlayerAngle` method `applylook()` to `applyinput()`. * Rename `PlayerHorizon` method `sethorizon()` to `applyinput()`. * In `PlayerHorizon::applylook()`, slightly clean return to centre code so it doesn't do math if already at 0. * In `PlayerAngle::applylook()`, slightly clean rotscrnang/look_ang code so it doesn't do math if already at 0 and reposition where mouse input is applied so that if input is applied, the player never enters a spin. * In `Duke3d::player_struct::apply_seasick()`, use `buildfang()` method instead of scaling float to BAM within function.
2021-04-21 10:41:04 +00:00
p->angle.applyinput(sb_avel, &actions);
-processinput_d
2020-05-18 22:26:07 +00:00
}
- use DCoreActor::insector instead of spritetype::insector.
2021-12-30 15:24:51 +00:00
if (p->spritebridge == 0 && pact->insector())
-processinput_d
2020-05-18 22:26:07 +00:00
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
j = pact->sector()->floorpicnum;
-processinput_d
2020-05-18 22:26:07 +00:00
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
if (j == PURPLELAVA || pact->sector()->ceilingpicnum == PURPLELAVA)
-processinput_d
2020-05-18 22:26:07 +00:00
{
if (p->boot_amount > 0)
{
p->boot_amount--;
p->inven_icon = 7;
if (p->boot_amount <= 0)
checkavailinven(p);
}
else
{
- player.i, part 4.
2020-11-02 19:24:07 +00:00
if (!S_CheckActorSoundPlaying(pact, DUKE_LONGTERM_PAIN))
S_PlayActorSound(DUKE_LONGTERM_PAIN, pact);
-processinput_d
2020-05-18 22:26:07 +00:00
SetPlayerPal(p, PalEntry(32, 0, 8, 0));
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
pact->spr.extra--;
-processinput_d
2020-05-18 22:26:07 +00:00
}
}
k = 0;
- added a float version of gs.playerheight.
2022-02-04 17:06:08 +00:00
if (p->on_ground && truefdist <= gs.int_playerheight + (16 << 8))
-processinput_d
2020-05-18 22:26:07 +00:00
{
- flags for the bolts.
2022-01-21 13:02:59 +00:00
int whichsound = (gs.tileinfo[j].flags & TFLAG_ELECTRIC) ? 0 : j == FLOORSLIME ? 1 : j == FLOORPLASMA ? 2 : -1;
-processinput_d
2020-05-18 22:26:07 +00:00
if (j >= 0) k = makepainsounds(snum, whichsound);
}
if (k)
{
FTA(75, p);
p->boot_amount -= 2;
if (p->boot_amount <= 0)
checkavailinven(p);
}
}
- Duke: Replace `player_struct` `posyv` with `vel.Y` calls.
2021-12-30 11:18:56 +00:00
if (p->vel.X || p->vel.Y || sb_fvel || sb_svel)
-processinput_d
2020-05-18 22:26:07 +00:00
{
- Duke: Fix bug where player wasn't cracking knuckles after 777 idle tics while `cl_syncinput` was 1. * Use opportunity to replace the literal constant of `777` with an enum.
2020-08-27 05:54:49 +00:00
p->crack_time = CRACK_TIME;
-processinput_d
2020-05-18 22:26:07 +00:00
- buildutils: Replace `sintable[]` use within Duke's player_d.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:03 +00:00
k = bsin(p->bobcounter, -12);
-processinput_d
2020-05-18 22:26:07 +00:00
- added a float version of gs.playerheight.
2022-02-04 17:06:08 +00:00
if (truefdist < gs.int_playerheight + (8 << 8) && (k == 1 || k == 3))
-processinput_d
2020-05-18 22:26:07 +00:00
{
if (p->spritebridge == 0 && p->walking_snd_toggle == 0 && p->on_ground)
{
switch (psectlotag)
{
case 0:
- handled the last remaining sprite references in player_d.cpp.
2020-10-25 06:12:04 +00:00
if (clz.type == kHitSprite)
- 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
j = clz.actor()->spr.picnum;
- handled the last remaining sprite references in player_d.cpp.
2020-10-25 06:12:04 +00:00
else
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
j = psectp->floorpicnum;
-processinput_d
2020-05-18 22:26:07 +00:00
switch (j)
{
case PANNEL1:
case PANNEL2:
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(DUKE_WALKINDUCTS, pact);
-processinput_d
2020-05-18 22:26:07 +00:00
p->walking_snd_toggle = 1;
break;
}
break;
case 1:
if ((krand() & 1) == 0)
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(DUKE_ONWATER, pact);
-processinput_d
2020-05-18 22:26:07 +00:00
p->walking_snd_toggle = 1;
break;
}
}
}
else if (p->walking_snd_toggle > 0)
p->walking_snd_toggle--;
if (p->jetpack_on == 0 && p->steroids_amount > 0 && p->steroids_amount < 400)
doubvel <<= 1;
- Duke: Replace `player_struct` `posxv` with `vel.X` calls.
2021-12-30 11:14:55 +00:00
p->vel.X += ((sb_fvel * doubvel) << 6);
- Duke: Replace `player_struct` `posyv` with `vel.Y` calls.
2021-12-30 11:18:56 +00:00
p->vel.Y += ((sb_svel * doubvel) << 6);
-processinput_d
2020-05-18 22:26:07 +00:00
bool check;
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (!isWW2GI()) check = ((p->curr_weapon == KNEE_WEAPON && p->kickback_pic > 10 && p->on_ground) || (p->on_ground && (actions & SB_CROUCH)));
- 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 check = ((aplWeaponWorksLike(p->curr_weapon, snum) == KNEE_WEAPON && p->kickback_pic > 10 && p->on_ground) || (p->on_ground && (actions & SB_CROUCH)));
-processinput_d
2020-05-18 22:26:07 +00:00
if (check)
{
- Duke: Replace `player_struct` `posxv` with `vel.X` calls.
2021-12-30 11:14:55 +00:00
p->vel.X = MulScale(p->vel.X, gs.playerfriction - 0x2000, 16);
- Duke: Replace `player_struct` `posyv` with `vel.Y` calls.
2021-12-30 11:18:56 +00:00
p->vel.Y = MulScale(p->vel.Y, gs.playerfriction - 0x2000, 16);
-processinput_d
2020-05-18 22:26:07 +00:00
}
else
{
if (psectlotag == 2)
{
- Duke: Replace `player_struct` `posxv` with `vel.X` calls.
2021-12-30 11:14:55 +00:00
p->vel.X = MulScale(p->vel.X, gs.playerfriction - 0x1400, 16);
- Duke: Replace `player_struct` `posyv` with `vel.Y` calls.
2021-12-30 11:18:56 +00:00
p->vel.Y = MulScale(p->vel.Y, gs.playerfriction - 0x1400, 16);
-processinput_d
2020-05-18 22:26:07 +00:00
}
else
{
- Duke: Replace `player_struct` `posxv` with `vel.X` calls.
2021-12-30 11:14:55 +00:00
p->vel.X = MulScale(p->vel.X, gs.playerfriction, 16);
- Duke: Replace `player_struct` `posyv` with `vel.Y` calls.
2021-12-30 11:18:56 +00:00
p->vel.Y = MulScale(p->vel.Y, gs.playerfriction, 16);
-processinput_d
2020-05-18 22:26:07 +00:00
}
}
- Duke: Replace `player_struct` `posyv` with `vel.Y` calls.
2021-12-30 11:18:56 +00:00
if (abs(p->vel.X) < 2048 && abs(p->vel.Y) < 2048)
p->vel.X = p->vel.Y = 0;
-processinput_d
2020-05-18 22:26:07 +00:00
if (shrunk)
{
- Duke: Replace `player_struct` `posxv` with `vel.X` calls.
2021-12-30 11:14:55 +00:00
p->vel.X =
MulScale(p->vel.X, gs.playerfriction - (gs.playerfriction >> 1) + (gs.playerfriction >> 2), 16);
- Duke: Replace `player_struct` `posyv` with `vel.Y` calls.
2021-12-30 11:18:56 +00:00
p->vel.Y =
MulScale(p->vel.Y, gs.playerfriction - (gs.playerfriction >> 1) + (gs.playerfriction >> 2), 16);
-processinput_d
2020-05-18 22:26:07 +00:00
}
}
HORIZONLY:
- newowner and related code.
2020-11-02 23:20:51 +00:00
if (psectlotag == 1 || p->spritebridge == 1) ii = (4L << 8);
else ii = (20L << 8);
-processinput_d
2020-05-18 22:26:07 +00:00
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
if (p->insector() && p->cursector->lotag == 2) k = 0;
-processinput_d
2020-05-18 22:26:07 +00:00
else k = 1;
- handle the clipmove result in processinput.
2020-10-25 07:50:03 +00:00
Collision clip{};
-processinput_d
2020-05-18 22:26:07 +00:00
if (ud.clipping)
{
- use player_add_int_xy and player_set_int_xy.
2022-02-05 12:12:19 +00:00
p->player_add_int_xy({ p->vel.X >> 14, p->vel.Y >> 14 });
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
updatesector(p->player_int_pos().X, p->player_int_pos().Y, &p->cursector);
- moved some common utilities into the backend.
2021-11-26 20:52:01 +00:00
ChangeActorSect(pact, p->cursector);
-processinput_d
2020-05-18 22:26:07 +00:00
}
else
- floatified player_struct::pos.
2022-02-05 12:29:21 +00:00
clipmove(p->pos, &p->cursector, p->vel.X, p->vel.Y, 164, (4 << 8), ii, CLIPMASK0, clip);
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->jetpack_on == 0 && psectlotag != 2 && psectlotag != 1 && shrunk)
- cleanup, part 3.
2022-02-05 12:40:30 +00:00
p->pos.Z += 32;
-processinput_d
2020-05-18 22:26:07 +00:00
- handle the clipmove result in processinput.
2020-10-25 07:50:03 +00:00
if (clip.type != kHitNone)
checkplayerhurt_d(p, clip);
-processinput_d
2020-05-18 22:26:07 +00:00
if (p->jetpack_on == 0)
{
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
if (pact->spr.xvel > 16)
-processinput_d
2020-05-18 22:26:07 +00:00
{
if (psectlotag != 1 && psectlotag != 2 && p->on_ground)
{
p->pycount += 52;
p->pycount &= 2047;
- non 'actor' parts of player_d.cpp
2021-12-21 19:33:39 +00:00
p->pyoff = abs(pact->spr.xvel * bsin(p->pycount)) / 1596;
-processinput_d
2020-05-18 22:26:07 +00:00
}
}
else if (psectlotag != 2 && psectlotag != 1)
p->pyoff = 0;
}
// RBG***
- GetActor pos replacement
2022-08-22 16:34:01 +00:00
SetActor(pact, p->pos.plusZ(gs.playerheight));
-processinput_d
2020-05-18 22:26:07 +00:00
if (psectlotag < 3)
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
psectp = pact->sector();
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
if (ud.clipping == 0 && psectp->lotag == 31)
-processinput_d
2020-05-18 22:26:07 +00:00
{
- added GC handling for all backend pointers in the map data. GC is not active yet!
2021-12-05 23:50:33 +00:00
auto secact = barrier_cast<DDukeActor*>(psectp->hitagactor);
- 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 (secact && secact->spr.xvel && secact->temp_data[0] == 0)
-processinput_d
2020-05-18 22:26:07 +00:00
{
quickkill(p);
return;
}
}
}
- added a float version of gs.playerheight.
2022-02-04 17:06:08 +00:00
if (truefdist < gs.int_playerheight && p->on_ground && psectlotag != 1 && shrunk == 0 && p->insector() && p->cursector->lotag == 1)
- handle the clipmove result in processinput.
2020-10-25 07:50:03 +00:00
if (!S_CheckActorSoundPlaying(pact, DUKE_ONWATER))
S_PlayActorSound(DUKE_ONWATER, pact);
-processinput_d
2020-05-18 22:26:07 +00:00
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
if (p->cursector != pact->sector())
- moved some common utilities into the backend.
2021-11-26 20:52:01 +00:00
ChangeActorSect(pact, p->cursector);
-processinput_d
2020-05-18 22:26:07 +00:00
- Duke/RR: better handling for one random kill scenario in the player movement code. Using the same appoach as EDuke32 - instead of outright killing the player it will first reset its position and retry the pushmove check.
2022-01-04 23:39:09 +00:00
int retry = 0;
while (ud.clipping == 0)
-processinput_d
2020-05-18 22:26:07 +00:00
{
- Duke/RR: better handling for one random kill scenario in the player movement code. Using the same appoach as EDuke32 - instead of outright killing the player it will first reset its position and retry the pushmove check.
2022-01-04 23:39:09 +00:00
int blocked;
- floatified player_struct::pos.
2022-02-05 12:29:21 +00:00
blocked = (pushmove(p->pos, &p->cursector, 164, (4 << 8), (4 << 8), CLIPMASK0) < 0 && furthestangle(p->GetActor(), 8) < 512);
- Duke/RR: better handling for one random kill scenario in the player movement code. Using the same appoach as EDuke32 - instead of outright killing the player it will first reset its position and retry the pushmove check.
2022-01-04 23:39:09 +00:00
- Duke: cleanup on z-checks, part 3.
2022-02-03 23:55:12 +00:00
if (fabs(pact->floorz - pact->ceilingz) < 48 || blocked)
-processinput_d
2020-05-18 22:26:07 +00:00
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
if (!(pact->sector()->lotag & 0x8000) && (isanunderoperator(pact->sector()->lotag) ||
isanearoperator(pact->sector()->lotag)))
fi.activatebysector(pact->sector(), pact);
- Duke/RR: better handling for one random kill scenario in the player movement code. Using the same appoach as EDuke32 - instead of outright killing the player it will first reset its position and retry the pushmove check.
2022-01-04 23:39:09 +00:00
if (blocked)
-processinput_d
2020-05-18 22:26:07 +00:00
{
- Duke/RR: better handling for one random kill scenario in the player movement code. Using the same appoach as EDuke32 - instead of outright killing the player it will first reset its position and retry the pushmove check.
2022-01-04 23:39:09 +00:00
if (!retry++)
{
- floatified player_struct::pos.
2022-02-05 12:29:21 +00:00
p->pos = p->opos = oldpos;
- Duke/RR: better handling for one random kill scenario in the player movement code. Using the same appoach as EDuke32 - instead of outright killing the player it will first reset its position and retry the pushmove check.
2022-01-04 23:39:09 +00:00
continue;
}
-processinput_d
2020-05-18 22:26:07 +00:00
quickkill(p);
return;
}
}
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
else if (abs(fz - cz) < (32 << 8) && isanunderoperator(psectp->lotag))
- operatesectors and activatebysector.
2021-11-18 17:51:19 +00:00
fi.activatebysector(psectp, pact);
- Duke/RR: better handling for one random kill scenario in the player movement code. Using the same appoach as EDuke32 - instead of outright killing the player it will first reset its position and retry the pushmove check.
2022-01-04 23:39:09 +00:00
break;
-processinput_d
2020-05-18 22:26:07 +00:00
}
// center_view
- processed all remaining local input CCMDs and removed some bits only needed for multiplayer. These MP bits should be reimplemented as network commands later, they only take up valuable space in the bit field.
2020-08-27 22:03:35 +00:00
if (actions & SB_CENTERVIEW || p->hard_landing)
-processinput_d
2020-05-18 22:26:07 +00:00
{
playerCenterView(snum);
}
- converted the remaining input bits. Looks like it is working in all games except Blood (not that it surprises me that it's Blood again which has issues...)
2020-08-29 11:32:14 +00:00
else if (actions & SB_LOOK_UP)
-processinput_d
2020-05-18 22:26:07 +00:00
{
- handle the run key.
2020-08-28 22:57:07 +00:00
playerLookUp(snum, actions);
-processinput_d
2020-05-18 22:26:07 +00:00
}
- converted the remaining input bits. Looks like it is working in all games except Blood (not that it surprises me that it's Blood again which has issues...)
2020-08-29 11:32:14 +00:00
else if (actions & SB_LOOK_DOWN)
-processinput_d
2020-05-18 22:26:07 +00:00
{
- handle the run key.
2020-08-28 22:57:07 +00:00
playerLookDown(snum, actions);
-processinput_d
2020-05-18 22:26:07 +00:00
}
- converted the remaining input bits. Looks like it is working in all games except Blood (not that it surprises me that it's Blood again which has issues...)
2020-08-29 11:32:14 +00:00
else if (actions & SB_AIM_UP)
-processinput_d
2020-05-18 22:26:07 +00:00
{
- handle the run key.
2020-08-28 22:57:07 +00:00
playerAimUp(snum, actions);
-processinput_d
2020-05-18 22:26:07 +00:00
}
- converted the remaining input bits. Looks like it is working in all games except Blood (not that it surprises me that it's Blood again which has issues...)
2020-08-29 11:32:14 +00:00
else if (actions & SB_AIM_DOWN)
-processinput_d
2020-05-18 22:26:07 +00:00
{ // aim_down
- handle the run key.
2020-08-28 22:57:07 +00:00
playerAimDown(snum, actions);
-processinput_d
2020-05-18 22:26:07 +00:00
}
- more consolidation between old and new input paths. This also simplifies the one_eighty handling to be closer to the original idea.
2020-07-17 01:00:43 +00:00
- wrap all checks of cl_syncinput in an inline function.
2020-11-30 22:40:16 +00:00
if (SyncInput())
- revert most of e474ebc2b75514459ffeace8a1cfd298b9074512 and adjust player's angle/horizon in a way that's compatible with `cl_syncinput 0` and `cl_syncinput 1`. Previous attempts at leveraging `applylook()` and `sethorizon()` in different spots had pros and cons, but ultimately changing where these functions were called from was a net negative and had hard to diagnose issues. Maintaining two types of player input is considerable work. Lessons have been learned and will be beneficial when it comes time to re-doing the other games. Ideas from PR #98 for optimising RRRA vehicle experience while `cl_syncinput 0` is in use have been implemented here.
2020-08-05 07:53:22 +00:00
{
Merge branch 'scriptable_cutscenes' into newrenderer
2021-05-02 20:37:46 +00:00
p->horizon.applyinput(GetPlayerHorizon(snum), &actions);
- revert most of e474ebc2b75514459ffeace8a1cfd298b9074512 and adjust player's angle/horizon in a way that's compatible with `cl_syncinput 0` and `cl_syncinput 1`. Previous attempts at leveraging `applylook()` and `sethorizon()` in different spots had pros and cons, but ultimately changing where these functions were called from was a net negative and had hard to diagnose issues. Maintaining two types of player input is considerable work. Lessons have been learned and will be beneficial when it comes time to re-doing the other games. Ideas from PR #98 for optimising RRRA vehicle experience while `cl_syncinput 0` is in use have been implemented here.
2020-08-05 07:53:22 +00:00
}
- cleanup on player CVAR use.
2020-11-29 08:00:00 +00:00
p->checkhardlanding();
-processinput_d
2020-05-18 22:26:07 +00:00
//Shooting code/changes
if (p->show_empty_weapon > 0)
{
p->show_empty_weapon--;
if (p->show_empty_weapon == 0)
{
if (p->last_full_weapon == GROW_WEAPON)
p->subweapon |= (1 << GROW_WEAPON);
else if (p->last_full_weapon == SHRINKER_WEAPON)
p->subweapon &= ~(1 << GROW_WEAPON);
fi.addweapon(p, p->last_full_weapon);
return;
}
}
- player.cpp is free of array references, except one that's unavoidable for now.
2020-10-23 17:50:18 +00:00
dokneeattack(snum, { FEM1, FEM2, FEM3, FEM4, FEM5, FEM6, FEM7, FEM8, FEM9, FEM10, PODFEM1, NAKED1, STATUE });
-processinput_d
2020-05-18 22:26:07 +00:00
if (fi.doincrements(p)) return;
if (p->weapon_pos != 0)
{
if (p->weapon_pos == -9)
{
if (p->last_weapon >= 0)
{
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
p->oweapon_pos = p->weapon_pos = 10;
- tabified two files in Duke that were missed somehow, plus some comment cleanup elsewhere.
2021-11-09 23:05:42 +00:00
// if(p->curr_weapon == KNEE_WEAPON) p->kickback_pic = 1;
-processinput_d
2020-05-18 22:26:07 +00:00
p->last_weapon = -1;
}
else if (p->holster_weapon == 0)
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
p->oweapon_pos = p->weapon_pos = 10;
-processinput_d
2020-05-18 22:26:07 +00:00
}
else p->weapon_pos--;
}
// HACKS
dukeplayer stuff
2021-11-21 07:48:36 +00:00
processweapon(snum, actions);
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
}
-processinput_d
2020-05-18 22:26:07 +00:00
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
END_DUKE_NS
Reference in a new issue Copy permalink