zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-12-13 14:10:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
raze/source/games/duke/src/player_r.cpp

4178 lines
94 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) 2017-2019 Nuke.YKT
- 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 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
*/
//-------------------------------------------------------------------------
#include "ns.h"
#include "global.h"
- got rid of the dynamic tilemap. Most tile access is in game specific code, the remaining code only accesses 51 tiles
2020-07-03 21:56:14 +00:00
#include "names_r.h"
- another safety commit.
2020-07-07 15:56:20 +00:00
#include "mapinfo.h"
- migrated EGS and deletesprite to new actor interface. Inline wrappers for old code exist. The backupplayer inline was moved into player.cpp because that's the only place it gets used.
2020-10-21 17:14:41 +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
- changed all SYNCINPUT #defines into runtime checks so that both parts can be used and consolidated the 4 versions of the SeaSick code.
2020-07-16 15:59:25 +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_r(player_struct* p)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- addressed most unused/uninitialized variable warnings from MSVC.
2021-11-14 14:03:50 +00:00
int damage = 0, shield_damage = 0;
- Duke/RR: replaced more local short variables with ints.
2021-11-07 13:36:39 +00:00
int gut = 0;
-'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
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->steroids_amount > 0 && p->steroids_amount < 400)
{
shield_damage = damage * (20 + (krand() % 30)) / 100;
damage -= shield_damage;
}
if (p->drink_amt > 31 && p->drink_amt < 65)
gut++;
if (p->eat > 31 && p->eat < 65)
gut++;
switch (gut)
{
case 1:
- fixed all warnings in Duke.
2021-05-12 15:33:33 +00:00
damage = damage * 3 / 4;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
break;
case 2:
- fixed all warnings in Duke.
2021-05-12 15:33:33 +00:00
damage /= 4;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
break;
}
- 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
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- RR shootmelee.
2020-10-24 04:58:52 +00:00
static void shootmelee(DDukeActor *actor, int p, int sx, int sy, int sz, int sa, int atwith)
-'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 sectp = actor->sector();
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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{};
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (p >= 0)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
zvel = -ps[p].horizon.sum().asq16() >> 11;
sz += (6 << 8);
sa += 15;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
else
{
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
int x;
- 3 more wrappers gone.
2020-11-02 22:10:19 +00:00
auto pspr = 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 = ((pspr->int_pos().Z - sz) << 8) / (x + 1);
sa = getangle(pspr->int_pos().X - sx, pspr->int_pos().Y - sy);
-'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 ), sectp, { bcos(sa), bsin(sa), zvel << 6 }, hit, CLIPMASK1);
- 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
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (isRRRA() && hit.hitSector != nullptr && ((hit.hitSector->lotag == 160 && zvel > 0) || (hit.hitSector->lotag == 161 && zvel < 0))
&& hit.actor() == nullptr && hit.hitWall == nullptr)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- hitscan in player_r.cpp
2021-11-17 23:01:29 +00:00
DukeStatIterator its(STAT_EFFECTOR);
- RR shootmelee.
2020-10-24 04:58:52 +00:00
while (auto effector = its.Next())
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
if (effector->sector() == hit.hitSector && effector->spr.picnum == SECTOREFFECTOR && effector->GetOwner()
- 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
&& effector->spr.lotag == SE_7_TELEPORT)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
int nx, ny, nz;
- use int_hitpos() access function where applicable
2022-08-16 22:59:32 +00:00
nx = hit.int_hitpos().X + (effector->GetOwner()->int_pos().X - effector->int_pos().X);
ny = hit.int_hitpos().Y + (effector->GetOwner()->int_pos().Y - effector->int_pos().Y);
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitSector->lotag == 161)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- use inline access functions to read floorz/ceilingz.
2022-02-02 23:46:04 +00:00
nz = effector->GetOwner()->sector()->int_floorz();
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
else
{
- use inline access functions to read floorz/ceilingz.
2022-02-02 23:46:04 +00:00
nz = effector->GetOwner()->sector()->int_ceilingz();
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
- use explicit types in hitscan calls
2022-08-20 13:47:52 +00:00
hitscan(vec3_t( nx, ny, nz ), effector->GetOwner()->sector(), { bcos(sa), bsin(sa), zvel << 6 }, hit, CLIPMASK1);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
break;
}
}
}
-'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 == nullptr) return;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitWall != nullptr || hit.actor())
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- RR shootmelee.
2020-10-24 04:58:52 +00:00
DDukeActor* wpn;
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (isRRRA() && atwith == SLINGBLADE)
-'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
wpn = CreateActor(hit.hitSector, hit.hitpos, SLINGBLADE, -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 (!wpn) 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
wpn->spr.extra += 50;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
else
{
- EGS with hitpos
2022-08-23 20:32:45 +00:00
wpn = 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 (!wpn) 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
wpn->spr.extra += (krand() & 7);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (p >= 0)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- RR shootmelee.
2020-10-24 04:58:52 +00:00
auto k = spawn(wpn, SMALLSMOKE);
- some simple replacements.
2022-02-07 07:47:18 +00:00
if (k) k->spr.pos.Z -= 8;
- RR shootmelee.
2020-10-24 04:58:52 +00:00
if (atwith == KNEE) S_PlayActorSound(KICK_HIT, wpn);
else if (isRRRA() && atwith == SLINGBLADE) S_PlayActorSound(260, wpn);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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
wpn->spr.extra += (gs.max_player_health >> 2);
-'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 (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(), wpn);
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)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- floatified position in checkhitwall
2022-08-23 20:39:07 +00:00
fi.checkhitwall(wpn, hit.hitWall, hit.hitpos, atwith);
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (p >= 0) fi.checkhitswitch(p, hit.hitWall, nullptr);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
-'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 (p >= 0 && zvel > 0 && hit.hitSector->lotag == 1)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- RR shootmelee.
2020-10-24 04:58:52 +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)
{
- converted some simple assignments
2022-08-29 17:30:19 +00:00
splash->spr.pos.XY() = hit.hitpos.XY();
splash->spr.angle = ps[p].angle.ang; // Total tweek
- more quick replacements
2022-09-03 08:05:20 +00:00
splash->vel.X = 2;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
ssp(actor, 0);
- remove vel clear wrappers
2022-09-03 08:02:25 +00:00
splash->vel.X = 0;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
}
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- RR shootweapon
2020-10-24 05:01:01 +00:00
static void shootweapon(DDukeActor* actor, int p, int sx, int sy, int sz, int sa, int atwith)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
auto sectp = actor->sector();
- fixed most warnings GCC pointed out in game code.
2021-11-14 12:33:35 +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
- the rest of player_r.cpp
2021-12-21 19:56:37 +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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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)
-'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
int dal = ((aimed->spr.xrepeat * tileHeight(aimed->spr.picnum)) << 1) + (5 << 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) << 8) / ldist(ps[p].GetActor(), aimed);
sa = getangle(aimed->int_pos().X - sx, aimed->int_pos().Y - sy);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (atwith == SHOTSPARK1)
{
- 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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
sa += 16 - (krand() & 31);
zvel = -ps[p].horizon.sum().asq16() >> 11;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
zvel += 128 - (krand() & 255);
}
}
else
{
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (atwith == SHOTGUN)
sa += 64 - (krand() & 127);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
else
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
sa += 16 - (krand() & 31);
- 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) zvel = -ps[p].horizon.sum().asq16() >> 11;
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
zvel += 128 - (krand() & 255);
}
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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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));
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
if (actor->spr.picnum != BOSS1)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- the rest of player_r.cpp
2021-12-21 19:56:37 +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);
-'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 (isRRRA() && hit.hitSector != nullptr && (((hit.hitSector->lotag == 160 && zvel > 0) || (hit.hitSector->lotag == 161 && zvel < 0))
&& hit.actor() == nullptr && hit.hitWall == nullptr))
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- hitscan in player_r.cpp
2021-11-17 23:01:29 +00:00
DukeStatIterator its(STAT_EFFECTOR);
- RR shootweapon
2020-10-24 05:01:01 +00:00
while (auto effector = its.Next())
-'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
if (effector->sector() == hit.hitSector && effector->spr.picnum == SECTOREFFECTOR && effector->GetOwner()
- 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
&& effector->spr.lotag == SE_7_TELEPORT)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
int nx, ny, nz;
- use int_hitpos() access function where applicable
2022-08-16 22:59:32 +00:00
nx = hit.int_hitpos().X + (effector->GetOwner()->int_pos().X - effector->int_pos().X);
ny = hit.int_hitpos().Y + (effector->GetOwner()->int_pos().Y - effector->int_pos().Y);
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitSector->lotag == 161)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- use inline access functions to read floorz/ceilingz.
2022-02-02 23:46:04 +00:00
nz = effector->GetOwner()->sector()->int_floorz();
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
else
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- use inline access functions to read floorz/ceilingz.
2022-02-02 23:46:04 +00:00
nz = effector->GetOwner()->sector()->int_ceilingz();
-'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( nx, ny, nz ), effector->GetOwner()->sector(), { bcos(sa), bsin(sa), zvel << 6 }, hit, CLIPMASK1);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
break;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
actor->spr.cstat |= CSTAT_SPRITE_BLOCK_ALL;
-'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 == nullptr) return;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (atwith == SHOTGUN)
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitSector->lotag == 1)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (krand() & 1)
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 ((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
- RR shootweapon
2020-10-24 05:01:01 +00:00
DDukeActor* spark;
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (p >= 0)
{
- hitpos replacements in spawn calls
2022-08-17 16:55:19 +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);
-'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)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
return;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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
}
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (hit.hitSector->lotag != 1)
- RR shootweapon
2020-10-24 05:01:01 +00:00
spawn(spark, SMALLSMOKE);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
-'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())
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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()->spr.picnum == 1930)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
return;
- 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
{
- RR shootweapon
2020-10-24 05:01:01 +00:00
auto l = spawn(spark, JIBS6);
- 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
if (l)
{
- some simple replacements.
2022-02-07 07:47:18 +00:00
l->spr.pos.Z += 4;
- more quick replacements
2022-09-03 08:05:20 +00:00
l->vel.X = 1;
- 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->spr.xrepeat = l->spr.yrepeat = 24;
- add_int_ang
2022-08-16 21:26:39 +00:00
l->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
}
- RR shootweapon
2020-10-24 05:01:01 +00:00
else spawn(spark, SMALLSMOKE);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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 ||
(isRRRA() && hit.actor()->spr.picnum == RRTILE8660) ||
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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
return;
}
}
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
else if (hit.hitWall != nullptr)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- RR shootweapon
2020-10-24 05:01:01 +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 (fi.isadoorwall(hit.hitWall->picnum) == 1)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
goto SKIPBULLETHOLE;
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
if (isablockdoor(hit.hitWall->picnum) == 1)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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 ||
(isRRRA() && hit.hitWall->picnum == RRTILE8660) ||
hit.hitWall->picnum == HANDSWITCH ||
hit.hitWall->picnum == HANDSWITCH + 1))
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- adapted all hitscan calls in Duke/RR.
2021-11-25 23:08:59 +00:00
fi.checkhitswitch(p, hit.hitWall, nullptr);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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 != nullptr && 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)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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());
- RR shootweapon
2020-10-24 05:01:01 +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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
goto SKIPBULLETHOLE;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
}
- RR shootweapon
2020-10-24 05:01:01 +00:00
DukeStatIterator it(STAT_MISC);
while (auto l = it.Next())
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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)
- RR shootweapon
2020-10-24 05:01:01 +00:00
if (dist(l, spark) < (12 + (krand() & 7)))
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
goto SKIPBULLETHOLE;
}
- little bit of cleanup on Duke's bullet hole code.
2022-01-13 19:53:36 +00:00
auto hole = spawn(spark, BULLETHOLE);
if (hole)
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
{
- set_int_xvel
2022-09-01 14:57:55 +00:00
hole->set_int_xvel(-1);
- no need to use int_delta when all we want is the angle.
2022-08-30 21:05:54 +00:00
hole->set_int_ang(getangle(-hit.hitWall->delta()) + 512);
- little bit of cleanup on Duke's bullet hole code.
2022-01-13 19:53:36 +00:00
ssp(hole, CLIPMASK0);
hole->spr.cstat2 |= CSTAT2_SPRITE_DECAL;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
else
{
- hitpos replacements in spawn calls
2022-08-17 16:55:19 +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) 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];
-'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())
- RR shootweapon
2020-10-24 05:01:01 +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;
-'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 != nullptr)
- floatified position in checkhitwall
2022-08-23 20:39:07 +00:00
fi.checkhitwall(spark, hit.hitWall, hit.hitpos, SHOTSPARK1);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if ((krand() & 255) < 10)
{
- use int_hitpos() access function where applicable
2022-08-16 22:59:32 +00:00
S_PlaySound3D(PISTOL_RICOCHET, spark, hit.int_hitpos());
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- RR shootstuff
2020-10-25 05:09:33 +00:00
static void shootstuff(DDukeActor* actor, int p, int sx, int sy, int sz, int sa, int atwith)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
auto sect = actor->sector();
- addressed most unused/uninitialized variable warnings from MSVC.
2021-11-14 14:03:50 +00:00
int vel = 0, zvel;
- Duke/RR: checked the rest of the code for shorts and replaced most local ones with ints.
2021-11-07 13:55:28 +00:00
int scount;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (isRRRA())
{
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
if (atwith != SPIT && 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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
scount = 1;
if (atwith == SPIT)
{
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
if (actor->spr.picnum == 8705)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
vel = 600;
else
vel = 400;
}
}
else
{
- the rest of player_r.cpp
2021-12-21 19:56:37 +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
scount = 1;
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (atwith == SPIT) vel = 400;
}
if (atwith != SPIT)
{
vel = 840;
sz -= (4 << 7);
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
if (actor->spr.picnum == 4649)
-'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
sx += bcos(actor->int_ang() + 256, -6);
sy += bsin(actor->int_ang() + 256, -6);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
sz += (12 << 8);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
if (actor->spr.picnum == VIXEN)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
sz -= (12 << 8);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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
- use int_ang().
2022-08-16 21:15:49 +00:00
sx += bcos(actor->int_ang() + 160, -7);
sy += bsin(actor->int_ang() + 160, -7);
- buildutils: Replace `sintable[]` use within Duke's player_r.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:30 +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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
else
{
int x;
- 3 more wrappers gone.
2020-11-02 22:10:19 +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);
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
if (actor->spr.picnum == HULK)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
sa -= (krand() & 31);
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
else if (actor->spr.picnum == VIXEN)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
sa -= (krand() & 16);
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
else if (actor->spr.picnum != UFOBEAM)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
int oldzvel = zvel;
int sizx, sizy;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (atwith == SPIT)
{
sizx = 18; sizy = 18;
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
if (!isRRRA() || actor->spr.picnum != MAMA) sz -= (10 << 8); else sz -= (20 << 8);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
else
{
if (atwith == COOLEXPLOSION1)
{
sizx = 8;
sizy = 8;
}
else if (atwith == FIRELASER)
{
if (p >= 0)
{
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
sizx = 34;
sizy = 34;
}
else
{
sizx = 18;
sizy = 18;
}
}
else
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
sizx = 18;
sizy = 18;
}
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
while (scount > 0)
{
- RR shootstuff
2020-10-25 05:09:33 +00:00
auto j = 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 (!j) 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
j->spr.extra += (krand() & 7);
j->spr.cstat = CSTAT_SPRITE_YCENTER;
- wrapped all literal assignments to clipdist - part 2
2022-09-09 16:17:20 +00:00
j->set_native_clipdist(4);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
- use int_ang().
2022-08-16 21:15:49 +00:00
sa = actor->int_ang() + 32 - (krand() & 63);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
zvel = oldzvel + 512 - (krand() & 1023);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (atwith == FIRELASER)
{
- 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 = 8;
j->spr.yrepeat = 8;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
scount--;
}
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- RR shootrpg and shootwhip.
2020-10-25 05:10:10 +00:00
static void shootrpg(DDukeActor* actor, int p, int sx, int sy, int sz, int sa, int atwith)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
auto sect = actor->sector();
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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;
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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* act90 = nullptr;
- the rest of player_r.cpp
2021-12-21 19:56:37 +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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
scount = 1;
vel = 644;
- 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;
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
if (isRRRA() && atwith == RPG2)
-'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 (aimed->spr.picnum == HEN || aimed->spr.picnum == HENSTAYPUT)
- 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
act90 = ps[screenpeek].GetActor();
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
else
- 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
act90 = 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
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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (atwith == RPG)
- 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
S_PlayActorSound(RPG_SHOOT, actor);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
else if (isRRRA())
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (atwith == RPG2)
- 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
S_PlayActorSound(244, actor);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
else if (atwith == RRTILE1790)
- 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
S_PlayActorSound(94, actor);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
else
{
int x;
- 3 more wrappers gone.
2020-11-02 22:10:19 +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);
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
if (actor->spr.picnum == BOSS3)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
sz -= (32 << 8);
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
else if (actor->spr.picnum == BOSS2)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
vel += 128;
sz += 24 << 8;
-'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
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
- the rest of player_r.cpp
2021-12-21 19:56:37 +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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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;
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (isRRRA() && atwith == RRTILE1790)
{
zvel = -(10 << 8);
vel <<= 1;
}
- 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_r.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:30 +00:00
sx + (bcos(sa + 348) / 448),
sy + (bsin(sa + 348) / 448),
- RR shootrpg and shootwhip.
2020-10-25 05:10:10 +00:00
sz - (1 << 8), atwith, 0, 14, 14, sa, vel, zvel, actor, 4);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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;
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (isRRRA())
{
if (atwith == RRTILE1790)
{
- 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 = 10;
- set_int_zvel
2022-08-31 22:28:40 +00:00
spawned->set_int_zvel(-(10 << 8));
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
else if (atwith == RPG2)
-'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
spawned->seek_actor = act90;
- 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.hitag = 0;
- some quick'n easy replacements.
2020-10-23 19:37:40 +00:00
fi.lotsofmoney(spawned, (krand() & 3) + 1);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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.extra += (krand() & 7);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
else
{
- renamed yvel to yint in Duke. It's never used as velocity, but as an auxiliary parameter so name it appropriately.
2022-09-01 16:15:52 +00:00
spawned->spr.yint = gs.numfreezebounces;
- 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 >>= 1;
spawned->spr.yrepeat >>= 1;
- add_int_zvel with -
2022-08-31 22:36:57 +00:00
spawned->add_int_zvel(- (2 << 4));
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (p == -1)
{
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
if (actor->spr.picnum == HULK)
-'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.xrepeat = 8;
spawned->spr.yrepeat = 8;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
else if (atwith != FREEZEBLAST)
-'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.xrepeat = 30;
spawned->spr.yrepeat = 30;
spawned->spr.extra >>= 2;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
else if (ps[p].curr_weapon == TIT_WEAPON)
{
- 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 >>= 2;
- add_int_ang
2022-08-16 21:26:39 +00:00
spawned->add_int_ang(16 - (krand() & 31));
- add_int_zvel
2022-08-31 22:30:16 +00:00
spawned->add_int_zvel( 256 - (krand() & 511));
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
else
-'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, -8), -bcos(sa, -8), 0 });
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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.xrepeat >>= 1;
spawned->spr.yrepeat >>= 1;
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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;
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (atwith == RPG || (atwith == RPG2 && isRRRA()))
- wrapped all literal assignments to clipdist - part 2
2022-09-09 16:17:20 +00:00
spawned->set_native_clipdist(4);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
else
- wrapped all literal assignments to clipdist - part 2
2022-09-09 16:17:20 +00:00
spawned->set_native_clipdist(40);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- RR shootrpg and shootwhip.
2020-10-25 05:10:10 +00:00
static void shootwhip(DDukeActor* actor, int p, int sx, int sy, int sz, int sa, int atwith)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
auto sect = actor->sector();
- addressed most unused/uninitialized variable warnings from MSVC.
2021-11-14 14:03:50 +00:00
int vel = 0, zvel;
- Duke/RR: replaced more local short variables with ints.
2021-11-07 13:36:39 +00:00
int scount;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- the rest of player_r.cpp
2021-12-21 19:56:37 +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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
scount = 1;
if (atwith == 3471)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
vel = 300;
sz -= (15 << 8);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
scount = 1;
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
else if (atwith == 3475)
{
vel = 300;
sz += (4 << 8);
scount = 1;
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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)
-'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
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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
else
{
int x;
- 3 more wrappers gone.
2020-11-02 22:10:19 +00:00
int j = findplayer(actor, &x);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
// sa = getangle(ps[j].oposx-sx,ps[j].oposy-sy);
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
if (actor->spr.picnum == VIXEN)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
sa -= (krand() & 16);
else
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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
int oldzvel = zvel;
int sizx = 18;
int sizy = 18;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (p >= 0) sizx = 7, sizy = 7;
else sizx = 8, sizy = 8;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
while (scount > 0)
{
- RR shootrpg and shootwhip.
2020-10-25 05:10:10 +00:00
auto j = 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 (!j) 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
j->spr.extra += (krand() & 7);
j->spr.cstat = CSTAT_SPRITE_YCENTER;
- wrapped all literal assignments to clipdist - part 2
2022-09-09 16:17:20 +00:00
j->set_native_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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
zvel = oldzvel + 512 - (krand() & 1023);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
scount--;
}
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
void shoot_r(DDukeActor* actor, int atwith)
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- lots of EGS calls.
2021-11-18 18:04:00 +00:00
int sa, p;
- fixed parameter ordering for WW2GI's change weapon event call. This happens when variables are ambiguously named... :?
2020-10-21 05:31:21 +00:00
int sx, sy, sz, vel, zvel, x;
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
- use an actor pointer in Get/SetGameVarID's parameters to weed out the ordering screwups.
2020-11-01 17:23:09 +00:00
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
auto const sect = actor->sector();
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
zvel = 0;
- Duke: abstracted all checks for TILE_APLAYER with an isPlayer method.
2021-12-31 17:47:00 +00:00
if (actor->isPlayer())
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
- use PlayerIndex plus a bit of cleanup.
2022-09-01 15:26:46 +00:00
p = actor->PlayerIndex();
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +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;
- Duke: floatified pyoff
2022-08-30 20:25:07 +00:00
sz = ps[p].player_int_pos().Z + ps[p].pyoff * zworldtoint + (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();
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
if (isRRRA()) ps[p].crack_time = CRACK_TIME;
}
else
{
p = -1;
- 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);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
sz -= (7 << 8);
- the rest of player_r.cpp
2021-12-21 19:56:37 +00:00
if (badguy(actor))
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
{
- buildutils: Replace `sintable[]` use within Duke's player_r.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:30 +00:00
sx -= bsin(sa, -7);
sy += bcos(sa, -7);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
}
-'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);
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 up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
{
return;
}
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +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, -1);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
return;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
case SLINGBLADE:
if (!isRRRA()) break;
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
[[fallthrough]];
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
case KNEE:
case GROWSPARK:
- RR shootmelee.
2020-10-24 04:58:52 +00:00
shootmelee(actor, p, sx, sy, sz, sa, atwith);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
return;
case SHOTSPARK1:
case SHOTGUN:
case CHAINGUN:
- RR shootweapon
2020-10-24 05:01:01 +00:00
shootweapon(actor, p, sx, sy, sz, sa, atwith);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
return;
- renamed RR's TRIPBOMBSPRITE to POWDERKEG
2022-01-19 09:05:41 +00:00
case POWDERKEG:
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
{
auto j = spawn(actor, atwith);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (j)
{
- more quick replacements
2022-09-03 08:05:20 +00:00
j->vel.X = 2;
- Utilise actor sprite's full precision in instances where angle was converted to Build and back again.
2022-08-28 03:15:31 +00:00
j->spr.angle = actor->spr.angle;
- replaced all add_int_z calls with constants.
2022-08-20 15:59:15 +00:00
j->spr.pos.Z -= 5;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
break;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
case BOWLINGBALL:
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
{
auto j = spawn(actor, atwith);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (j)
{
- set_int_xvel
2022-09-01 14:57:55 +00:00
j->set_int_xvel(250);
- Utilise actor sprite's full precision in instances where angle was converted to Build and back again.
2022-08-28 03:15:31 +00:00
j->spr.angle = actor->spr.angle;
- replaced all add_int_z calls with constants.
2022-08-20 15:59:15 +00:00
j->spr.pos.Z -= 15;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
break;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
}
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
case OWHIP:
case UWHIP:
- RR shootrpg and shootwhip.
2020-10-25 05:10:10 +00:00
shootwhip(actor, p, sx, sy, sz, sa, atwith);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
return;
case FIRELASER:
case SPIT:
case COOLEXPLOSION1:
- RR shootstuff
2020-10-25 05:09:33 +00:00
shootstuff(actor, p, sx, sy, sz, sa, atwith);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
return;
case RPG2:
case RRTILE1790:
if (isRRRA()) goto rrra_rpg2;
else break;
case FREEZEBLAST:
sz += (3 << 8);
case RPG:
case SHRINKSPARK:
rrra_rpg2:
- RR shootrpg and shootwhip.
2020-10-25 05:10:10 +00:00
shootrpg(actor, p, sx, sy, sz, sa, atwith);
- split up shoot_r as well and consolidated both blood splat functions.
2020-10-20 23:03:38 +00:00
break;
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
case CHEERBOMB:
if (!isRRRA()) break;
case MORTER:
- the rest of shoot_r.
2020-10-25 05:14:54 +00:00
{
- the rest of player_r.cpp
2021-12-21 19:56:37 +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
- the rest of shoot_r.
2020-10-25 05:14:54 +00:00
auto j = ps[findplayer(actor, &x)].GetActor();
x = ldist(j, 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;
if (atwith == CHEERBOMB)
EGS(sect,
- buildutils: Replace `sintable[]` use within Duke's player_r.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:30 +00:00
sx - bsin(sa + 512, -8),
sy + bcos(sa + 512, -8),
- the rest of shoot_r.
2020-10-25 05:14:54 +00:00
sz + (6 << 8), atwith, -64, 16, 16, sa, vel, zvel, actor, 1);
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
else
EGS(sect,
- buildutils: Replace `sintable[]` use within Duke's player_r.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:30 +00:00
sx - bsin(sa + 512, -8),
sy + bcos(sa + 512, -8),
- the rest of shoot_r.
2020-10-25 05:14:54 +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 rest of shoot_r.
2020-10-25 05:14:54 +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
//---------------------------------------------------------------------------
//
// this is one lousy hack job...
//
//---------------------------------------------------------------------------
- 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_r(int snum, int weap)
- 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 > 8 && 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 THROWSAW_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[BUZZSAW_WEAPON] > 0)
{
j = BUZZSAW_WEAPON;
p->subweapon = 1 << BUZZSAW_WEAPON;
}
- Duke: Implement `WeaponSel_Alt` for Duke and RR.
2020-08-29 11:27:58 +00:00
break;
case BUZZSAW_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[THROWSAW_WEAPON] > 0)
{
j = THROWSAW_WEAPON;
p->subweapon = 0;
}
- Duke: Implement `WeaponSel_Alt` for Duke and RR.
2020-08-29 11:27:58 +00:00
break;
case POWDERKEG_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[BOWLING_WEAPON] > 0)
{
j = BOWLING_WEAPON;
p->subweapon = 1 << BOWLING_WEAPON;
}
- Duke: Implement `WeaponSel_Alt` for Duke and RR.
2020-08-29 11:27:58 +00:00
break;
case BOWLING_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[POWDERKEG_WEAPON] > 0)
{
j = POWDERKEG_WEAPON;
p->subweapon = 0;
}
- Duke: Implement `WeaponSel_Alt` for Duke and RR.
2020-08-29 11:27:58 +00:00
break;
case KNEE_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 (isRRRA())
{
j = SLINGBLADE_WEAPON;
p->subweapon = 2;
}
- Duke: Implement `WeaponSel_Alt` for Duke and RR.
2020-08-29 11:27:58 +00:00
break;
case SLINGBLADE_WEAPON:
j = KNEE_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
p->subweapon = 0;
- Duke: Implement `WeaponSel_Alt` for Duke and RR.
2020-08-29 11:27:58 +00:00
break;
- Duke (RRRA): Fix alt weapon slot for `CHICKEN_WEAPON` and `CROSSBOW_WEAPON`. * Fixes #440.
2021-06-24 08:56:12 +00:00
case CROSSBOW_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[CHICKEN_WEAPON] > 0 && isRRRA())
{
j = CHICKEN_WEAPON;
p->subweapon = 4;
}
- Duke: Implement `WeaponSel_Alt` for Duke and RR.
2020-08-29 11:27:58 +00:00
break;
case CHICKEN_WEAPON:
- Duke (RRRA): Fix alt weapon slot for `CHICKEN_WEAPON` and `CROSSBOW_WEAPON`. * Fixes #440.
2021-06-24 08:56:12 +00:00
if (p->ammo_amount[CROSSBOW_WEAPON] > 0)
- 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
{
- Duke (RRRA): Fix alt weapon slot for `CHICKEN_WEAPON` and `CROSSBOW_WEAPON`. * Fixes #440.
2021-06-24 08:56:12 +00:00
j = CROSSBOW_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
p->subweapon = 0;
}
- Duke: Implement `WeaponSel_Alt` for Duke and RR.
2020-08-29 11:27:58 +00:00
break;
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;
if (isRRRA())
{
if (k == CHICKEN_WEAPON) k = CROSSBOW_WEAPON;
else if (k == BUZZSAW_WEAPON) k = THROWSAW_WEAPON;
else if (k == SLINGBLADE_WEAPON) k = KNEE_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;
while (k >= 0 && k < 10)
{
k += j;
if (k == -1) k = 9;
else if (k == 10) k = 0;
if (p->gotweapon[k] && p->ammo_amount[k] > 0)
{
j = k;
break;
}
i++;
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 == DYNAMITE_WEAPON && p->ammo_amount[DYNAMITE_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[DYNAMITE_WEAPON] = true;
- weapon draw code tested and old version removed. # Conflicts: # source/games/duke/src/zz_player.cpp
2020-05-20 08:38:56 +00:00
j = THROWINGDYNAMITE_WEAPON;
- safety commit
2020-05-17 11:25:39 +00:00
break;
}
}
}
else if (j == KNEE_WEAPON && isRRRA())
{
if (p->curr_weapon == KNEE_WEAPON)
{
p->subweapon = 2;
j = SLINGBLADE_WEAPON;
}
else if (p->subweapon & 2)
{
p->subweapon = 0;
j = KNEE_WEAPON;
}
}
else if (j == CROSSBOW_WEAPON && isRRRA())
{
if (p->curr_weapon == CROSSBOW_WEAPON || p->ammo_amount[CROSSBOW_WEAPON] == 0)
{
if (p->ammo_amount[CHICKEN_WEAPON] == 0)
return;
p->subweapon = 4;
j = CHICKEN_WEAPON;
}
else if ((p->subweapon & 4) || p->ammo_amount[CHICKEN_WEAPON] == 0)
{
p->subweapon = 0;
j = CROSSBOW_WEAPON;
}
}
else if (j == THROWSAW_WEAPON)
{
if (p->curr_weapon == THROWSAW_WEAPON || p->ammo_amount[THROWSAW_WEAPON] == 0)
{
p->subweapon = (1 << BUZZSAW_WEAPON);
j = BUZZSAW_WEAPON;
}
else if ((p->subweapon & (1 << BUZZSAW_WEAPON)) || p->ammo_amount[BUZZSAW_WEAPON] == 0)
{
p->subweapon = 0;
j = THROWSAW_WEAPON;
}
}
else if (j == POWDERKEG_WEAPON)
{
if (p->curr_weapon == POWDERKEG_WEAPON || p->ammo_amount[POWDERKEG_WEAPON] == 0)
{
p->subweapon = (1 << BOWLING_WEAPON);
j = BOWLING_WEAPON;
}
else if ((p->subweapon & (1 << BOWLING_WEAPON)) || p->ammo_amount[BOWLING_WEAPON] == 0)
{
p->subweapon = 0;
j = POWDERKEG_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
}
else if (j >= MIN_WEAPON && p->gotweapon[j] && p->curr_weapon != j) switch (j)
{
case KNEE_WEAPON:
fi.addweapon(p, j);
break;
case SLINGBLADE_WEAPON:
if (isRRRA())
{
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(496, ps[screenpeek].GetActor());
- safety commit
2020-05-17 11:25:39 +00:00
fi.addweapon(p, j);
}
break;
case PISTOL_WEAPON:
if (p->ammo_amount[PISTOL_WEAPON] == 0)
if (p->show_empty_weapon == 0)
{
p->last_full_weapon = p->curr_weapon;
p->show_empty_weapon = 32;
}
fi.addweapon(p, PISTOL_WEAPON);
break;
case CHICKEN_WEAPON:
if (!isRRRA()) break;
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
[[fallthrough]];
- safety commit
2020-05-17 11:25:39 +00:00
case SHOTGUN_WEAPON:
case RIFLEGUN_WEAPON:
case CROSSBOW_WEAPON:
case TIT_WEAPON:
case ALIENBLASTER_WEAPON:
case THROWSAW_WEAPON:
case BUZZSAW_WEAPON:
case POWDERKEG_WEAPON:
case BOWLING_WEAPON:
if (p->ammo_amount[j] == 0 && p->show_empty_weapon == 0)
{
p->last_full_weapon = p->curr_weapon;
p->show_empty_weapon = 32;
}
fi.addweapon(p, j);
break;
case MOTORCYCLE_WEAPON:
case BOAT_WEAPON:
if (isRRRA())
{
if (p->ammo_amount[j] == 0 && p->show_empty_weapon == 0)
{
p->show_empty_weapon = 32;
}
fi.addweapon(p, j);
}
break;
- weapon draw code tested and old version removed. # Conflicts: # source/games/duke/src/zz_player.cpp
2020-05-20 08:38:56 +00:00
case THROWINGDYNAMITE_WEAPON:
- safety commit
2020-05-17 11:25:39 +00:00
if (k >= 0) // Found in list of [1]'s
{
- weapon draw code tested and old version removed. # Conflicts: # source/games/duke/src/zz_player.cpp
2020-05-20 08:38:56 +00:00
p->curr_weapon = THROWINGDYNAMITE_WEAPON;
- safety commit
2020-05-17 11:25:39 +00:00
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 DYNAMITE_WEAPON:
if (p->ammo_amount[DYNAMITE_WEAPON] > 0 && p->gotweapon[DYNAMITE_WEAPON])
fi.addweapon(p, DYNAMITE_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_r(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();
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
if (isRRRA())
{
if (WindTime > 0)
WindTime--;
else if ((krand() & 127) == 8)
{
WindTime = 120 + ((krand() & 63) << 2);
WindDir = krand() & 2047;
}
if (BellTime > 0)
{
BellTime--;
- cleaned up the checkhitswitch interface to receive sprites as pointers.
2020-10-26 06:30:34 +00:00
if (BellTime == 0 && BellSprite)
- 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
BellSprite->spr.picnum++;
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
if (chickenphase > 0)
chickenphase--;
if (p->SeaSick)
{
p->SeaSick--;
if (p->SeaSick == 0)
p->sea_sick_stat = 0;
}
}
- use PlayerIndex plus a bit of cleanup.
2022-09-01 15:26:46 +00:00
snum = p->GetActor()->PlayerIndex();
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
p->player_par++;
if (p->yehaa_timer)
p->yehaa_timer--;
if (p->detonate_count > 0)
{
p->detonate_count++;
p->detonate_time--;
}
p->drink_timer--;
if (p->drink_timer <= 0)
{
p->drink_timer = 1024;
if (p->drink_amt)
{
p->drink_amt--;
}
}
p->eat_timer--;
if (p->eat_timer <= 0)
{
p->eat_timer = 1024;
if (p->eat)
p->eat--;
}
if (p->drink_amt >= 100)
{
- player.i, part 4.
2020-11-02 19:24:07 +00:00
if (!S_CheckActorSoundPlaying(pact, 420))
S_PlayActorSound(420, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
p->drink_amt -= 9;
p->eat >>= 1;
}
p->eatang = (1647 + p->eat * 8) & 2047;
if (p->eat >= 100)
p->eat = 100;
if (p->eat >= 31 && krand() < p->eat)
{
switch (krand() & 3)
{
case 0:
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(404, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
break;
case 1:
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(422, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
break;
case 2:
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(423, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
break;
case 3:
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(424, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
break;
}
if (numplayers < 2)
{
p->noise_radius = 16384;
madenoise(screenpeek);
- Remaining manual changes to replace player's `ang` with `DAngle` object.
2022-08-27 13:09:51 +00:00
p->vel.X += p->angle.ang.Cos() * (1 << 18);
p->vel.Y += p->angle.ang.Sin() * (1 << 18);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
p->eat -= 4;
if (p->eat < 0)
p->eat = 0;
}
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->drink_amt > 66 && (p->last_pissed_time % 26) == 0)
p->drink_amt--;
{
if (p->last_pissed_time == 5662)
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(434, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
else if (p->last_pissed_time == 5567)
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(434, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
else if (p->last_pissed_time == 5472)
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(433, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
else if (p->last_pissed_time == 5072)
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(435, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
else if (p->last_pissed_time == 5014)
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(434, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
else if (p->last_pissed_time == 4919)
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(433, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
if (p->last_pissed_time == 5668)
{
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);
p->eat = p->drink_amt = 0;
p->eatang = p->drunkang = 1647;
}
if (!(p->steroids_amount & 14))
if (snum == screenpeek || ud.coop == 1)
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(DUKE_TAKEPILLS, 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->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->keys[1] = 1; break;
case 21:p->keys[2] = 1; break;
case 23:p->keys[3] = 1; 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->keys[1] = 1; break;
case 21:p->keys[2] = 1; break;
case 23:p->keys[3] = 1; 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)
{
if (!wupass)
{
- migrated RR's cutscene definitions. Also turned several level-specific init options into map flags or map parameters.
2021-05-02 11:12:24 +00:00
int snd = currentLevel->rr_startsound ? currentLevel->rr_startsound : 391;
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
wupass = 1;
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(snd, pact);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
}
- All Games: Migrate each game's clock counter to backend solution.
2021-02-18 10:46:36 +00:00
else 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
}
}
- 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_r(player_struct* p)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- use explicitly sized types for static const arrays.
2021-11-07 13:09:55 +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,
- renamed RR's TRIPBOMBSPRITE to POWDERKEG
2022-01-19 09:05:41 +00:00
POWDERKEG, BOWLINGBALLSPRITE, FREEZEBLAST, HEAVYHBOMB };
- safety commit.
2020-05-17 21:44:53 +00:00
if (isRRRA())
{
if (p->OnMotorcycle && numplayers > 1)
{
- checkweapons_r.
2020-10-25 06:30:47 +00:00
auto j = spawn(p->GetActor(), 7220);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (j)
{
- set_int_ang(...int_ang())
2022-08-28 22:02:17 +00:00
j->spr.angle = p->angle.ang;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
j->saved_ammo = p->ammo_amount[MOTORCYCLE_WEAPON];
}
- safety commit.
2020-05-17 21:44:53 +00:00
p->OnMotorcycle = 0;
- 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[MOTORCYCLE_WEAPON] = false;
- 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.horiz = q16horiz(0);
- safety commit.
2020-05-17 21:44:53 +00:00
p->moto_do_bump = 0;
p->MotoSpeed = 0;
p->TiltStatus = 0;
p->moto_drink = 0;
p->VBumpTarget = 0;
p->VBumpNow = 0;
p->TurbCount = 0;
}
else if (p->OnBoat && numplayers > 1)
{
- checkweapons_r.
2020-10-25 06:30:47 +00:00
auto j = spawn(p->GetActor(), 7233);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (j)
{
- set_int_ang(...int_ang())
2022-08-28 22:02:17 +00:00
j->spr.angle = p->angle.ang;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
j->saved_ammo = p->ammo_amount[BOAT_WEAPON];
}
- safety commit.
2020-05-17 21:44:53 +00:00
p->OnBoat = 0;
- 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[BOAT_WEAPON] = false;
- 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.horiz = q16horiz(0);
- safety commit.
2020-05-17 21:44:53 +00:00
p->moto_do_bump = 0;
p->MotoSpeed = 0;
p->TiltStatus = 0;
p->moto_drink = 0;
p->VBumpTarget = 0;
p->VBumpNow = 0;
p->TurbCount = 0;
}
}
if (p->curr_weapon > 0)
{
if (krand() & 1)
- checkweapons_r.
2020-10-25 06:30:47 +00:00
spawn(p->GetActor(), weapon_sprites[p->curr_weapon]);
- safety commit.
2020-05-17 21:44:53 +00:00
else switch (p->curr_weapon)
{
case CHICKEN_WEAPON:
if (!isRRRA()) break;
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
[[fallthrough]];
- safety commit.
2020-05-17 21:44:53 +00:00
case DYNAMITE_WEAPON:
case CROSSBOW_WEAPON:
- checkweapons_r.
2020-10-25 06:30:47 +00:00
spawn(p->GetActor(), EXPLOSION2);
- safety commit.
2020-05-17 21:44:53 +00:00
break;
}
}
- checkweapons_r.
2020-10-25 06:30:47 +00:00
for (int i = 0; i < 5; i++)
- safety commit.
2020-05-17 21:44:53 +00:00
{
if (p->keys[i] == 1)
{
- checkweapons_r.
2020-10-25 06:30:47 +00:00
auto j = spawn(p->GetActor(), ACCESSCARD);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (j) switch (i)
- safety commit.
2020-05-17 21:44:53 +00:00
{
case 1:
- 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.lotag = 100;
- safety commit.
2020-05-17 21:44:53 +00:00
break;
case 2:
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
j->spr.lotag = 101;
- safety commit.
2020-05-17 21:44:53 +00:00
break;
case 3:
- 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.lotag = 102;
- safety commit.
2020-05-17 21:44:53 +00:00
break;
case 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
j->spr.lotag = 103;
- safety commit.
2020-05-17 21:44:53 +00:00
break;
}
}
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- 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
static void onMotorcycle(int snum, ESyncBits &actions)
- safety commit.
2020-05-17 21:44:53 +00:00
{
auto p = &ps[snum];
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
auto pact = p->GetActor();
- 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
int rng;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->MotoSpeed < 0)
p->MotoSpeed = 0;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- Duke/RR: Initial implementation of scaled `p->MotoSpeed` controller input.
2020-11-04 23:07:39 +00:00
if (p->vehForwardScale != 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
if (p->on_ground)
{
- Duke (RR): Fix braking on vehicles which never got picked up.
2021-01-03 08:25:49 +00:00
if (p->MotoSpeed == 0 && p->vehBraking)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (!S_CheckActorSoundPlaying(pact, 187))
S_PlayActorSound(187, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
else if (p->MotoSpeed == 0 && !S_CheckActorSoundPlaying(pact, 214))
- safety commit.
2020-05-17 21:44:53 +00:00
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (S_CheckActorSoundPlaying(pact, 187))
S_StopSound(187, pact);
S_PlayActorSound(214, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
else if (p->MotoSpeed >= 50 && !S_CheckActorSoundPlaying(pact, 188))
- safety commit.
2020-05-17 21:44:53 +00:00
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
S_PlayActorSound(188, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
else if (!S_CheckActorSoundPlaying(pact, 188) && !S_CheckActorSoundPlaying(pact, 214))
- safety commit.
2020-05-17 21:44:53 +00:00
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
S_PlayActorSound(188, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
}
else
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (S_CheckActorSoundPlaying(pact, 214))
- safety commit.
2020-05-17 21:44:53 +00:00
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
S_StopSound(214, pact);
if (!S_CheckActorSoundPlaying(pact, 189))
S_PlayActorSound(189, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (S_CheckActorSoundPlaying(pact, 188))
- safety commit.
2020-05-17 21:44:53 +00:00
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
S_StopSound(188, pact);
if (!S_CheckActorSoundPlaying(pact, 189))
S_PlayActorSound(189, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (!S_CheckActorSoundPlaying(pact, 189) && !S_CheckActorSoundPlaying(pact, 187))
S_PlayActorSound(187, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->drink_amt > 88 && p->moto_drink == 0)
{
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
rng = krand() & 63;
if (rng == 1)
- safety commit.
2020-05-17 21:44:53 +00:00
p->moto_drink = -10;
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
else if (rng == 2)
- safety commit.
2020-05-17 21:44:53 +00:00
p->moto_drink = 10;
}
else if (p->drink_amt > 99 && p->moto_drink == 0)
{
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
rng = krand() & 31;
if (rng == 1)
- safety commit.
2020-05-17 21:44:53 +00:00
p->moto_drink = -20;
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
else if (rng == 2)
- safety commit.
2020-05-17 21:44:53 +00:00
p->moto_drink = 20;
}
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->on_ground == 1)
{
- Duke (RR): Fix braking on vehicles which never got picked up.
2021-01-03 08:25:49 +00:00
if (p->vehBraking && p->MotoSpeed > 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
p->MotoSpeed -= p->moto_on_oil ? 2 : 4;
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->MotoSpeed < 0)
p->MotoSpeed = 0;
p->VBumpTarget = -30;
p->moto_do_bump = 1;
}
- Duke (RR): Fix braking on vehicles which never got picked up.
2021-01-03 08:25:49 +00:00
else if (p->vehForwardScale != 0 && !p->vehBraking)
- safety commit.
2020-05-17 21:44:53 +00:00
{
if (p->MotoSpeed < 40)
{
p->VBumpTarget = 70;
p->moto_bump_fast = 1;
}
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- Duke/RR: Initial implementation of scaled `p->MotoSpeed` controller input.
2020-11-04 23:07:39 +00:00
p->MotoSpeed += 2 * p->vehForwardScale;
p->vehForwardScale = 0;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->MotoSpeed > 120)
p->MotoSpeed = 120;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
if (!p->NotOnWater && p->MotoSpeed > 80)
p->MotoSpeed = 80;
- safety commit.
2020-05-17 21:44:53 +00:00
}
else if (p->MotoSpeed > 0)
p->MotoSpeed--;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- Duke (RR): Fix braking on vehicles which never got picked up.
2021-01-03 08:25:49 +00:00
if (p->moto_do_bump && (!p->vehBraking || p->MotoSpeed == 0))
- safety commit.
2020-05-17 21:44:53 +00:00
{
p->VBumpTarget = 0;
p->moto_do_bump = 0;
}
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- Duke (RR): Fix braking on vehicles which never got picked up.
2021-01-03 08:25:49 +00:00
if (p->vehReverseScale != 0 && p->MotoSpeed <= 0 && !p->vehBraking)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
bool temp = p->vehTurnRight;
- Duke/RR: Clean up vehicle turn left/right bools used in ticker functions.
2020-11-04 23:19:15 +00:00
p->vehTurnRight = p->vehTurnLeft;
p->vehTurnLeft = temp;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
p->MotoSpeed = -15 * p->vehReverseScale;
p->vehReverseScale = 0;
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
if (p->MotoSpeed != 0 && p->on_ground == 1)
{
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
if (!p->VBumpNow && (krand() & 3) == 2)
- Duke/RR; Don't lose the precision of `p->MotoSpeed` when calculating `p->VBumpTarget`.
2021-12-06 11:27:02 +00:00
p->VBumpTarget = p->MotoSpeed * (1. / 16.) * ((krand() & 7) - 4);
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- Duke/RR: Clean up vehicle turn left/right bools used in ticker functions.
2020-11-04 23:19:15 +00:00
if (p->vehTurnLeft || p->moto_drink < 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
if (p->moto_drink < 0)
p->moto_drink++;
}
- Duke/RR: Clean up vehicle turn left/right bools used in ticker functions.
2020-11-04 23:19:15 +00:00
else if (p->vehTurnRight || p->moto_drink > 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
if (p->moto_drink > 0)
p->moto_drink--;
}
}
- Blood/RR: Replace a few `playerSet*()` calls with `playerAdd*()`. Because the setters continually set until target is reached, can cause some perceivable smoothness issues if ticker re-targets's player's angle/horizon before input code has reached target.
2020-09-22 12:50:27 +00:00
- Duke (RRRA): Fix potential issue originating from 1bc51a7367e5bec8b0bf67aaba1e1e3a415a4f2d where horizon might have needed adjustment to 0 but wouldn't have done so. * Previously used to determine whether to apply a horizon adjustment on whether local variable `horiz` was 0 or not (since baseline horizon was 100). * For no particular reason, initalise `horiz` as FRACUNIT and process if it is not equal to one.
2020-10-15 09:33:28 +00:00
double horiz = FRACUNIT;
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->TurbCount)
{
if (p->TurbCount <= 1)
{
- Duke (RR): Repair issues with horizon following changes in 09a05f354c70a3820e1efe2d8b52da4b490daba6 and partially address vehicle turning speed in `processVehicleInput()`. * Issues with vehicle input handling with `cl_syncinput 1` still remain. Will address after work. * Partially addresses #128.
2020-10-14 23:20:52 +00:00
horiz = 0;
- safety commit.
2020-05-17 21:44:53 +00:00
p->TurbCount = 0;
p->VBumpTarget = 0;
p->VBumpNow = 0;
}
else
{
- Duke (RR): Repair issues with horizon following changes in 09a05f354c70a3820e1efe2d8b52da4b490daba6 and partially address vehicle turning speed in `processVehicleInput()`. * Issues with vehicle input handling with `cl_syncinput 1` still remain. Will address after work. * Partially addresses #128.
2020-10-14 23:20:52 +00:00
horiz = ((krand() & 15) - 7);
- safety commit.
2020-05-17 21:44:53 +00:00
p->TurbCount--;
p->moto_drink = (krand() & 3) - 2;
}
}
else if (p->VBumpTarget > p->VBumpNow)
{
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
p->VBumpNow += p->moto_bump_fast ? 6 : 1;
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->VBumpTarget < p->VBumpNow)
p->VBumpNow = p->VBumpTarget;
- Duke/RR; Don't lose the precision of `p->MotoSpeed` when calculating `p->VBumpTarget`.
2021-12-06 11:27:02 +00:00
horiz = p->VBumpNow * (1. / 3.);
- safety commit.
2020-05-17 21:44:53 +00:00
}
else if (p->VBumpTarget < p->VBumpNow)
{
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
p->VBumpNow -= p->moto_bump_fast ? 6 : 1;
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->VBumpTarget > p->VBumpNow)
p->VBumpNow = p->VBumpTarget;
- Duke/RR; Don't lose the precision of `p->MotoSpeed` when calculating `p->VBumpTarget`.
2021-12-06 11:27:02 +00:00
horiz = p->VBumpNow * (1. / 3.);
- safety commit.
2020-05-17 21:44:53 +00:00
}
else
{
p->VBumpTarget = 0;
p->moto_bump_fast = 0;
}
- Duke (RRRA): Fix potential issue originating from 1bc51a7367e5bec8b0bf67aaba1e1e3a415a4f2d where horizon might have needed adjustment to 0 but wouldn't have done so. * Previously used to determine whether to apply a horizon adjustment on whether local variable `horiz` was 0 or not (since baseline horizon was 100). * For no particular reason, initalise `horiz` as FRACUNIT and process if it is not equal to one.
2020-10-15 09:33:28 +00:00
if (horiz != FRACUNIT)
- Blood/RR: Replace a few `playerSet*()` calls with `playerAdd*()`. Because the setters continually set until target is reached, can cause some perceivable smoothness issues if ticker re-targets's player's angle/horizon before input code has reached target.
2020-09-22 12:50:27 +00:00
{
- Remove multiple `addadjustment()`/`settarget()` overloads in favour of native `binangle`/`fixedhoriz` versions only. * Simplifies these classes a bit. * Better shows intent in actual game code. * Removes unnecessary int to double conversions.
2022-05-30 10:35:41 +00:00
p->horizon.addadjustment(buildfhoriz(horiz) - p->horizon.horiz);
- Blood/RR: Replace a few `playerSet*()` calls with `playerAdd*()`. Because the setters continually set until target is reached, can cause some perceivable smoothness issues if ticker re-targets's player's angle/horizon before input code has reached target.
2020-09-22 12:50:27 +00:00
}
- fixed all warnings in Duke.
2021-05-12 15:33:33 +00:00
int currSpeed = int(p->MotoSpeed);
- Duke/RR: replaced more local short variables with ints.
2021-11-07 13:36:39 +00:00
int velAdjustment;
- Duke/RR: Clean up vehicle turn left/right bools used in ticker functions.
2020-11-04 23:19:15 +00:00
if (p->MotoSpeed >= 20 && p->on_ground == 1 && (p->vehTurnLeft || p->vehTurnRight))
- safety commit.
2020-05-17 21:44:53 +00:00
{
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
velAdjustment = p->vehTurnLeft ? -10 : 10;
- Fix RRRA bike/boat angle adjustments following changes in f343bd8d5e5ab963aec354c98785ece217cbd329. * Because we're wrapping a negative number around to be unsigned, we need to do that after we've done our bit-shift operations.
2021-04-11 08:34:07 +00:00
auto angAdjustment = (velAdjustment < 0 ? 350 : -350) << BAMBITS;
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->moto_on_mud || p->moto_on_oil || !p->NotOnWater)
{
- Duke/RR: Partially revert c9d875327850e839e3ad1f367ede15497d44fda3 by truncating `p->MotoSpeed` to integer when calculating xvel/yvel to preserve original vehicle feel.
2020-11-06 04:59:24 +00:00
currSpeed <<= p->moto_on_oil ? 3 : 2;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->moto_do_bump)
{
- Duke/RR: Partially revert c9d875327850e839e3ad1f367ede15497d44fda3 by truncating `p->MotoSpeed` to integer when calculating xvel/yvel to preserve original vehicle feel.
2020-11-06 04:59:24 +00:00
currSpeed >>= 5;
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
angAdjustment >>= 2;
- safety commit.
2020-05-17 21:44:53 +00:00
}
else
{
- Duke/RR: Partially revert c9d875327850e839e3ad1f367ede15497d44fda3 by truncating `p->MotoSpeed` to integer when calculating xvel/yvel to preserve original vehicle feel.
2020-11-06 04:59:24 +00:00
currSpeed >>= 7;
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
angAdjustment >>= 6;
- safety commit.
2020-05-17 21:44:53 +00:00
}
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- safety commit.
2020-05-17 21:44:53 +00:00
p->moto_on_mud = 0;
p->moto_on_oil = 0;
}
else
{
if (p->moto_do_bump)
{
- Duke/RR: Partially revert c9d875327850e839e3ad1f367ede15497d44fda3 by truncating `p->MotoSpeed` to integer when calculating xvel/yvel to preserve original vehicle feel.
2020-11-06 04:59:24 +00:00
currSpeed >>= 5;
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
angAdjustment >>= 4;
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (!S_CheckActorSoundPlaying(pact, 220))
S_PlayActorSound(220, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
else
{
- Duke/RR: Partially revert c9d875327850e839e3ad1f367ede15497d44fda3 by truncating `p->MotoSpeed` to integer when calculating xvel/yvel to preserve original vehicle feel.
2020-11-06 04:59:24 +00:00
currSpeed >>= 7;
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
angAdjustment >>= 7;
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- 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->vel.X += currSpeed * bcos(velAdjustment * -51 + p->angle.ang.Buildang(), 4);
p->vel.Y += currSpeed * bsin(velAdjustment * -51 + p->angle.ang.Buildang(), 4);
p->angle.addadjustment(deltaangle(p->angle.ang, p->angle.ang - DAngle::fromBam(angAdjustment)));
- safety commit.
2020-05-17 21:44:53 +00:00
}
else if (p->MotoSpeed >= 20 && p->on_ground == 1 && (p->moto_on_mud || p->moto_on_oil))
{
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
rng = krand() & 1;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
velAdjustment = rng == 0 ? -10 : 10;
- Replace `mulscale##()` calls with `MulScale()` from common. * Regex for reference: mulscale([0-9]+)\((.+)(\)+)
2021-01-04 11:36:54 +00:00
currSpeed = MulScale(currSpeed, p->moto_on_oil ? 10 : 5, 7);
- 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->vel.X += currSpeed * bcos(velAdjustment * -51 + p->angle.ang.Buildang(), 4);
p->vel.Y += currSpeed * bsin(velAdjustment * -51 + p->angle.ang.Buildang(), 4);
- safety commit.
2020-05-17 21:44:53 +00:00
}
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- Duke (RR): Fix braking on vehicles which never got picked up.
2021-01-03 08:25:49 +00:00
p->moto_on_mud = p->moto_on_oil = 0;
p->vehTurnLeft = p->vehTurnRight = p->vehBraking = false;
- safety commit.
2020-05-17 21:44:53 +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
static void onBoat(int snum, ESyncBits &actions)
- safety commit.
2020-05-17 21:44:53 +00:00
{
auto p = &ps[snum];
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
auto pact = p->GetActor();
- safety commit.
2020-05-17 21:44:53 +00:00
- Duke (RR): Fix braking on vehicles which never got picked up.
2021-01-03 08:25:49 +00:00
bool heeltoe;
- Duke/RR: replaced more local short variables with ints.
2021-11-07 13:36:39 +00:00
int rng;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->NotOnWater)
{
if (p->MotoSpeed > 0)
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (!S_CheckActorSoundPlaying(pact, 88))
S_PlayActorSound(88, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
else
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (!S_CheckActorSoundPlaying(pact, 87))
S_PlayActorSound(87, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->MotoSpeed < 0)
p->MotoSpeed = 0;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- Duke (RR): Fix braking on vehicles which never got picked up.
2021-01-03 08:25:49 +00:00
if (p->vehBraking && (p->vehForwardScale != 0))
- safety commit.
2020-05-17 21:44:53 +00:00
{
- Duke/RR: Convert remaining vehicle function local ints to bools where appropriate.
2020-11-04 23:15:55 +00:00
heeltoe = true;
- Duke (RR): Fix braking on vehicles which never got picked up.
2021-01-03 08:25:49 +00:00
p->vehBraking = false;
- Duke/RR: Initial implementation of scaled `p->MotoSpeed` controller input.
2020-11-04 23:07:39 +00:00
p->vehForwardScale = 0;
- safety commit.
2020-05-17 21:44:53 +00:00
}
else
- Duke/RR: Convert remaining vehicle function local ints to bools where appropriate.
2020-11-04 23:15:55 +00:00
heeltoe = false;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- Duke/RR: Initial implementation of scaled `p->MotoSpeed` controller input.
2020-11-04 23:07:39 +00:00
if (p->vehForwardScale != 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (p->MotoSpeed == 0 && !S_CheckActorSoundPlaying(pact, 89))
- safety commit.
2020-05-17 21:44:53 +00:00
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (S_CheckActorSoundPlaying(pact, 87))
S_StopSound(87, pact);
S_PlayActorSound(89, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
else if (p->MotoSpeed >= 50 && !S_CheckActorSoundPlaying(pact, 88))
S_PlayActorSound(88, pact);
else if (!S_CheckActorSoundPlaying(pact, 88) && !S_CheckActorSoundPlaying(pact, 89))
S_PlayActorSound(88, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
else
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (S_CheckActorSoundPlaying(pact, 89))
- safety commit.
2020-05-17 21:44:53 +00:00
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
S_StopSound(89, pact);
if (!S_CheckActorSoundPlaying(pact, 90))
S_PlayActorSound(90, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (S_CheckActorSoundPlaying(pact, 88))
- safety commit.
2020-05-17 21:44:53 +00:00
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
S_StopSound(88, pact);
if (!S_CheckActorSoundPlaying(pact, 90))
S_PlayActorSound(90, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (!S_CheckActorSoundPlaying(pact, 90) && !S_CheckActorSoundPlaying(pact, 87))
S_PlayActorSound(87, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
if (p->vehTurnLeft && !S_CheckActorSoundPlaying(pact, 91) && p->MotoSpeed > 30 && !p->NotOnWater)
S_PlayActorSound(91, pact);
if (p->vehTurnRight && !S_CheckActorSoundPlaying(pact, 91) && p->MotoSpeed > 30 && !p->NotOnWater)
S_PlayActorSound(91, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
if (!p->NotOnWater)
{
if (p->drink_amt > 88 && p->moto_drink == 0)
{
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
rng = krand() & 63;
if (rng == 1)
- safety commit.
2020-05-17 21:44:53 +00:00
p->moto_drink = -10;
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
else if (rng == 2)
- safety commit.
2020-05-17 21:44:53 +00:00
p->moto_drink = 10;
}
else if (p->drink_amt > 99 && p->moto_drink == 0)
{
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
rng = krand() & 31;
if (rng == 1)
- safety commit.
2020-05-17 21:44:53 +00:00
p->moto_drink = -20;
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
else if (rng == 2)
- safety commit.
2020-05-17 21:44:53 +00:00
p->moto_drink = 20;
}
}
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->on_ground == 1)
{
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
if (heeltoe)
- safety commit.
2020-05-17 21:44:53 +00:00
{
if (p->MotoSpeed <= 25)
{
p->MotoSpeed++;
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (!S_CheckActorSoundPlaying(pact, 182))
S_PlayActorSound(182, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
else
{
p->MotoSpeed -= 2;
if (p->MotoSpeed < 0)
p->MotoSpeed = 0;
p->VBumpTarget = 30;
p->moto_do_bump = 1;
}
}
- Duke (RR): Fix braking on vehicles which never got picked up.
2021-01-03 08:25:49 +00:00
else if (p->vehBraking && p->MotoSpeed > 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
p->MotoSpeed -= 2;
if (p->MotoSpeed < 0)
p->MotoSpeed = 0;
p->VBumpTarget = 30;
p->moto_do_bump = 1;
}
- Duke/RR: Initial implementation of scaled `p->MotoSpeed` controller input.
2020-11-04 23:07:39 +00:00
else if (p->vehForwardScale != 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
if (p->MotoSpeed < 40 && !p->NotOnWater)
{
p->VBumpTarget = -30;
p->moto_bump_fast = 1;
}
- Duke/RR: Initial implementation of scaled `p->MotoSpeed` controller input.
2020-11-04 23:07:39 +00:00
p->MotoSpeed += 1 * p->vehForwardScale;
p->vehForwardScale = 0;
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->MotoSpeed > 120)
p->MotoSpeed = 120;
}
else if (p->MotoSpeed > 0)
p->MotoSpeed--;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- Duke (RR): Fix braking on vehicles which never got picked up.
2021-01-03 08:25:49 +00:00
if (p->moto_do_bump && (!p->vehBraking || p->MotoSpeed == 0))
- safety commit.
2020-05-17 21:44:53 +00:00
{
p->VBumpTarget = 0;
p->moto_do_bump = 0;
}
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- Duke (RR): Fix braking on vehicles which never got picked up.
2021-01-03 08:25:49 +00:00
if (p->vehReverseScale != 0 && p->MotoSpeed == 0 && !p->vehBraking)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
bool temp = p->vehTurnRight;
- Duke/RR: Clean up vehicle turn left/right bools used in ticker functions.
2020-11-04 23:19:15 +00:00
p->vehTurnRight = p->vehTurnLeft;
p->vehTurnLeft = temp;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
p->MotoSpeed = -(!p->NotOnWater ? 25 : 20) * p->vehReverseScale;
p->vehReverseScale = 0;
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
if (p->MotoSpeed != 0 && p->on_ground == 1)
{
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
if (!p->VBumpNow && (krand() & 15) == 14)
- Duke/RR; Don't lose the precision of `p->MotoSpeed` when calculating `p->VBumpTarget`.
2021-12-06 11:27:02 +00:00
p->VBumpTarget = p->MotoSpeed * (1. / 16.) * ((krand() & 3) - 2);
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
if (p->vehTurnLeft && p->moto_drink < 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
p->moto_drink++;
- safety commit.
2020-05-17 21:44:53 +00:00
}
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
else if (p->vehTurnRight && p->moto_drink > 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
p->moto_drink--;
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
- Blood/RR: Replace a few `playerSet*()` calls with `playerAdd*()`. Because the setters continually set until target is reached, can cause some perceivable smoothness issues if ticker re-targets's player's angle/horizon before input code has reached target.
2020-09-22 12:50:27 +00:00
- Duke (RRRA): Fix potential issue originating from 1bc51a7367e5bec8b0bf67aaba1e1e3a415a4f2d where horizon might have needed adjustment to 0 but wouldn't have done so. * Previously used to determine whether to apply a horizon adjustment on whether local variable `horiz` was 0 or not (since baseline horizon was 100). * For no particular reason, initalise `horiz` as FRACUNIT and process if it is not equal to one.
2020-10-15 09:33:28 +00:00
double horiz = FRACUNIT;
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->TurbCount)
{
if (p->TurbCount <= 1)
{
- Duke (RR): Repair issues with horizon following changes in 09a05f354c70a3820e1efe2d8b52da4b490daba6 and partially address vehicle turning speed in `processVehicleInput()`. * Issues with vehicle input handling with `cl_syncinput 1` still remain. Will address after work. * Partially addresses #128.
2020-10-14 23:20:52 +00:00
horiz = 0;
- safety commit.
2020-05-17 21:44:53 +00:00
p->TurbCount = 0;
p->VBumpTarget = 0;
p->VBumpNow = 0;
}
else
{
- Duke (RR): Repair issues with horizon following changes in 09a05f354c70a3820e1efe2d8b52da4b490daba6 and partially address vehicle turning speed in `processVehicleInput()`. * Issues with vehicle input handling with `cl_syncinput 1` still remain. Will address after work. * Partially addresses #128.
2020-10-14 23:20:52 +00:00
horiz = ((krand() & 15) - 7);
- safety commit.
2020-05-17 21:44:53 +00:00
p->TurbCount--;
p->moto_drink = (krand() & 3) - 2;
}
}
else if (p->VBumpTarget > p->VBumpNow)
{
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
p->VBumpNow += p->moto_bump_fast ? 6 : 1;
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->VBumpTarget < p->VBumpNow)
p->VBumpNow = p->VBumpTarget;
- Duke/RR; Don't lose the precision of `p->MotoSpeed` when calculating `p->VBumpTarget`.
2021-12-06 11:27:02 +00:00
horiz = p->VBumpNow * (1. / 3.);
- safety commit.
2020-05-17 21:44:53 +00:00
}
else if (p->VBumpTarget < p->VBumpNow)
{
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
p->VBumpNow -= p->moto_bump_fast ? 6 : 1;
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->VBumpTarget > p->VBumpNow)
p->VBumpNow = p->VBumpTarget;
- Duke/RR; Don't lose the precision of `p->MotoSpeed` when calculating `p->VBumpTarget`.
2021-12-06 11:27:02 +00:00
horiz = p->VBumpNow * (1. / 3.);
- safety commit.
2020-05-17 21:44:53 +00:00
}
else
{
p->VBumpTarget = 0;
p->moto_bump_fast = 0;
}
- Duke (RRRA): Fix potential issue originating from 1bc51a7367e5bec8b0bf67aaba1e1e3a415a4f2d where horizon might have needed adjustment to 0 but wouldn't have done so. * Previously used to determine whether to apply a horizon adjustment on whether local variable `horiz` was 0 or not (since baseline horizon was 100). * For no particular reason, initalise `horiz` as FRACUNIT and process if it is not equal to one.
2020-10-15 09:33:28 +00:00
if (horiz != FRACUNIT)
- Blood/RR: Replace a few `playerSet*()` calls with `playerAdd*()`. Because the setters continually set until target is reached, can cause some perceivable smoothness issues if ticker re-targets's player's angle/horizon before input code has reached target.
2020-09-22 12:50:27 +00:00
{
- Remove multiple `addadjustment()`/`settarget()` overloads in favour of native `binangle`/`fixedhoriz` versions only. * Simplifies these classes a bit. * Better shows intent in actual game code. * Removes unnecessary int to double conversions.
2022-05-30 10:35:41 +00:00
p->horizon.addadjustment(buildfhoriz(horiz) - p->horizon.horiz);
- Blood/RR: Replace a few `playerSet*()` calls with `playerAdd*()`. Because the setters continually set until target is reached, can cause some perceivable smoothness issues if ticker re-targets's player's angle/horizon before input code has reached target.
2020-09-22 12:50:27 +00:00
}
- Duke/RR: Clean up vehicle turn left/right bools used in ticker functions.
2020-11-04 23:19:15 +00:00
if (p->MotoSpeed > 0 && p->on_ground == 1 && (p->vehTurnLeft || p->vehTurnRight))
- safety commit.
2020-05-17 21:44:53 +00:00
{
- fixed all warnings in Duke.
2021-05-12 15:33:33 +00:00
int currSpeed = int(p->MotoSpeed * 4.);
- Duke/RR: replaced more local short variables with ints.
2021-11-07 13:36:39 +00:00
int velAdjustment = p->vehTurnLeft ? -10 : 10;
- Fix RRRA bike/boat angle adjustments following changes in f343bd8d5e5ab963aec354c98785ece217cbd329. * Because we're wrapping a negative number around to be unsigned, we need to do that after we've done our bit-shift operations.
2021-04-11 08:34:07 +00:00
auto angAdjustment = (velAdjustment < 0 ? 350 : -350) << BAMBITS;
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
- safety commit.
2020-05-17 21:44:53 +00:00
if (p->moto_do_bump)
{
- Duke/RR: Partially revert c9d875327850e839e3ad1f367ede15497d44fda3 by truncating `p->MotoSpeed` to integer when calculating xvel/yvel to preserve original vehicle feel.
2020-11-06 04:59:24 +00:00
currSpeed >>= 6;
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
angAdjustment >>= 5;
- safety commit.
2020-05-17 21:44:53 +00:00
}
else
{
- Duke/RR: Partially revert c9d875327850e839e3ad1f367ede15497d44fda3 by truncating `p->MotoSpeed` to integer when calculating xvel/yvel to preserve original vehicle feel.
2020-11-06 04:59:24 +00:00
currSpeed >>= 7;
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
angAdjustment >>= 6;
- 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
}
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- 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->vel.X += currSpeed * bcos(velAdjustment * -51 + p->angle.ang.Buildang(), 4);
p->vel.Y += currSpeed * bsin(velAdjustment * -51 + p->angle.ang.Buildang(), 4);
p->angle.addadjustment(deltaangle(p->angle.ang, p->angle.ang - DAngle::fromBam(angAdjustment)));
- safety commit.
2020-05-17 21:44:53 +00:00
}
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
if (p->NotOnWater && p->MotoSpeed > 50)
p->MotoSpeed -= (p->MotoSpeed / 2.);
- safety commit.
2020-05-17 21:44:53 +00:00
- Duke (RR): Fix braking on vehicles which never got picked up.
2021-01-03 08:25:49 +00:00
p->vehTurnLeft = p->vehTurnRight = p->vehBraking = false;
- safety commit.
2020-05-17 21:44:53 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- RR: partially floatified movement()
2022-08-30 22:06:36 +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
{
auto p = &ps[snum];
- RR-movement + dummyplayersprite
2020-10-25 06:21:33 +00:00
auto pact = p->GetActor();
- RR: partially floatified movement()
2022-08-30 22:06:36 +00:00
double floorz = fz_ * zinttoworld;
double ceilingz = cz_ * zinttoworld;
- 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;
- RR: partially floatified movement()
2022-08-30 22:06:36 +00:00
double 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;
- don't use DAngle for calculating bobbing amplitudes. It makes more sense here to have a dedicated function since this is not really angular math.
2022-09-03 22:04:01 +00:00
p->pyoff = BobVal(p->pycount) * 2;
- 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;
p->footprintshade = 0;
}
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
else if (isRRRA() && (p->cursector->floorpicnum == RRTILE7756 || p->cursector->floorpicnum == RRTILE7888))
- safety commit.
2020-05-17 21:44:53 +00:00
{
p->footprintpal = 0;
p->footprintshade = 40;
}
else
{
p->footprintpal = 0;
p->footprintshade = 0;
}
}
}
}
else if (!p->OnMotorcycle)
{
footprints(snum);
}
- RR: partially floatified movement()
2022-08-30 22:06:36 +00:00
if (p->pos.Z < floorz - i) //falling
- safety commit.
2020-05-17 21:44:53 +00:00
{
- RR: partially floatified movement()
2022-08-30 22:06:36 +00:00
if ((actions & (SB_JUMP|SB_CROUCH)) == 0 && p->on_ground && (psect->floorstat & CSTAT_SECTOR_SLOPE) && p->pos.Z >= (floorz - i - 16))
p->pos.Z = floorz - i;
- safety commit.
2020-05-17 21:44:53 +00:00
else
{
p->on_ground = 0;
- RR: partially floatified movement()
2022-08-30 22:06:36 +00:00
if ((p->OnMotorcycle || p->OnBoat) && floorz - i * 2 > p->pos.Z)
- safety commit.
2020-05-17 21:44:53 +00:00
{
if (p->MotoOnGround)
{
p->VBumpTarget = 80;
p->moto_bump_fast = 1;
- Remove some uses of `xs_Float.h` functions in game-side code where overflow protection isn't needed. * Went a little bit nuts and just used this everywhere back way back when.
2022-07-21 10:18:40 +00:00
p->vel.Z -= int(gs.gravity * p->MotoSpeed * (1. / 16.));
- safety commit.
2020-05-17 21:44:53 +00:00
p->MotoOnGround = 0;
- RR-movement + dummyplayersprite
2020-10-25 06:21:33 +00:00
if (S_CheckActorSoundPlaying(pact, 188))
S_StopSound(188, pact);
S_PlayActorSound(189, pact);
- 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 += gs.gravity - 80 + int(120 - p->MotoSpeed);
- RR-movement + dummyplayersprite
2020-10-25 06:21:33 +00:00
if (!S_CheckActorSoundPlaying(pact, 189) && !S_CheckActorSoundPlaying(pact, 190))
S_PlayActorSound(190, pact);
- 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 += (gs.gravity + 80); // (TICSPERFRAME<<6);
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
- Duke: Replace `player_struct` `poszv` with `vel.Z` calls.
2021-12-30 11:14:04 +00:00
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++;
- RR-movement + dummyplayersprite
2020-10-25 06:21:33 +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
}
- RR: partially floatified movement()
2022-08-30 22:06:36 +00:00
if (p->pos.Z + p->vel.Z * zinttoworld >= floorz - i) // hit the ground
- stop screaming sound when landing. Fixes #116
2020-08-07 20:20:29 +00:00
{
- RR-movement + dummyplayersprite
2020-10-25 06:21:33 +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 (isRRRA()) p->MotoOnGround = 1;
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
if (p->falling_counter > 62 || (isRRRA() && p->falling_counter > 2 && p->insector() && p->cursector->lotag == 802))
- safety commit.
2020-05-17 21:44:53 +00:00
quickkill(p);
else if (p->falling_counter > 9)
{
int j = p->falling_counter;
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
pact->spr.extra -= j - (krand() & 3);
if (pact->spr.extra <= 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- RR-movement + dummyplayersprite
2020-10-25 06:21:33 +00:00
S_PlayActorSound(SQUISHED, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
}
else
{
- RR-movement + dummyplayersprite
2020-10-25 06:21:33 +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)
- safety commit.
2020-05-17 21:44:53 +00:00
{
if (p->OnMotorcycle)
{
- RR-movement + dummyplayersprite
2020-10-25 06:21:33 +00:00
if (S_CheckActorSoundPlaying(pact, 190))
S_StopSound(190, pact);
S_PlayActorSound(191, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
p->TurbCount = 12;
}
- RR-movement + dummyplayersprite
2020-10-25 06:21:33 +00:00
else S_PlayActorSound(DUKE_LAND, pact);
- 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
else if (p->vel.Z > 1024 && p->OnMotorcycle)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- RR-movement + dummyplayersprite
2020-10-25 06:21:33 +00:00
S_PlayActorSound(DUKE_LAND, pact);
- safety commit.
2020-05-17 21:44:53 +00:00
p->TurbCount = 12;
}
}
- 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;
- RR-movement + dummyplayersprite
2020-10-25 06:21:33 +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
- RR: partially floatified movement()
2022-08-30 22:06:36 +00:00
double k = (floorz - i - p->pos.Z) * 0.5;
if (abs(k) < 1) k = 0;
p->pos.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)
{
- RR: partially floatified movement()
2022-08-30 22:06:36 +00:00
p->pos.Z += ((floorz - i * 0.5) - p->pos.Z) * 0.5; //Smooth on the water
if (p->on_warping_sector == 0 && p->pos.Z > floorz - 16)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- RR: partially floatified movement()
2022-08-30 22:06:36 +00:00
p->pos.Z = floorz - 16;
- 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) && !p->OnMotorcycle) // 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);
}
- 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->OnMotorcycle && 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) && !p->OnMotorcycle && p->jumping_toggle == 0)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- RR: partially floatified movement()
2022-08-30 22:06:36 +00:00
playerJump(snum, fz_, cz_);
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
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->OnMotorcycle && p->jumping_toggle == 1)
- safety commit.
2020-05-17 21:44:53 +00:00
p->jumping_toggle = 0;
if (p->jumping_counter < 768)
{
- 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->jumping_counter > 768)
- 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
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
}
}
- RR: partially floatified movement()
2022-08-30 22:06:36 +00:00
p->pos.Z += p->vel.Z * zinttoworld;
- safety commit.
2020-05-17 21:44:53 +00:00
- RR: partially floatified movement()
2022-08-30 22:06:36 +00:00
if (p->pos.Z < ceilingz + 4)
- 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;
- RR: partially floatified movement()
2022-08-30 22:06:36 +00:00
p->pos.Z = ceilingz + 4;
- safety commit.
2020-05-17 21:44:53 +00:00
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- Duke/RR: floatified position stuff in unterwater()
2022-08-30 22:10:49 +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];
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
auto pact = p->GetActor();
- Duke/RR: floatified position stuff in unterwater()
2022-08-30 22:10:49 +00:00
double floorz = fz_ * zinttoworld;
double ceilingz = cz_ * zinttoworld;
- safety commit.
2020-05-17 21:44:53 +00:00
p->jumping_counter = 0;
p->pycount += 32;
p->pycount &= 2047;
- don't use DAngle for calculating bobbing amplitudes. It makes more sense here to have a dedicated function since this is not really angular math.
2022-09-03 22:04:01 +00:00
p->pyoff = BobVal(p->pycount);
- safety commit.
2020-05-17 21:44:53 +00:00
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +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) && !p->OnMotorcycle)
- 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) 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
}
- RR: fixed player input for diving. Fixes #260
2021-01-24 07:59:08 +00:00
else if ((actions & SB_CROUCH) || p->OnMotorcycle)
- 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) 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
{
- 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
- Duke/RR: floatified position stuff in unterwater()
2022-08-30 22:10:49 +00:00
p->pos.Z += p->vel.Z * zinttoworld;
- safety commit.
2020-05-17 21:44:53 +00:00
- Duke/RR: floatified position stuff in unterwater()
2022-08-30 22:10:49 +00:00
if (p->pos.Z > floorz - 15)
p->pos.Z += (((floorz - 15) - p->pos.Z) * 0.5);
- safety commit.
2020-05-17 21:44:53 +00:00
- Duke/RR: floatified position stuff in unterwater()
2022-08-30 22:10:49 +00:00
if (p->pos.Z < ceilingz + 4)
- safety commit.
2020-05-17 21:44:53 +00:00
{
- Duke/RR: floatified position stuff in unterwater()
2022-08-30 22:10:49 +00:00
p->pos.Z = ceilingz + 4;
- 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)
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +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) + 128, -6), bsin(p->angle.ang.Buildang() + 64 - (global_random & 128) + 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;
- Duke/RR: floatified position stuff in unterwater()
2022-08-30 22:10:49 +00:00
j->spr.pos.Z = p->pos.Z + 8;
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
j->spr.cstat = CSTAT_SPRITE_TRANS_FLIP | CSTAT_SPRITE_TRANSLUCENT;
- 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
}
4 more pieces
2020-05-17 22:10:42 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
void onMotorcycleMove(int snum, walltype* wal)
4 more pieces
2020-05-17 22:10:42 +00:00
{
auto p = &ps[snum];
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
auto pact = p->GetActor();
- no need to use int_delta when all we want is the angle.
2022-08-30 21:05:54 +00:00
int angleDelta = abs(p->angle.ang.Buildang() - getangle(wal->delta()));
- Remove some uses of `xs_Float.h` functions in game-side code where overflow protection isn't needed. * Went a little bit nuts and just used this everywhere back way back when.
2022-07-21 10:18:40 +00:00
double damageAmount = p->MotoSpeed * p->MotoSpeed;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- Change out `PlayerAngle::addadjustment()`'s input from `binangle` to `DAngle`.
2022-08-27 13:43:23 +00:00
p->angle.addadjustment(DAngle::fromBuildf(p->MotoSpeed / (krand() & 1 ? -2 : 2)));
4 more pieces
2020-05-17 22:10:42 +00:00
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
if (angleDelta >= 441 && angleDelta <= 581)
4 more pieces
2020-05-17 22:10:42 +00:00
{
- Remove some uses of `xs_Float.h` functions in game-side code where overflow protection isn't needed. * Went a little bit nuts and just used this everywhere back way back when.
2022-07-21 10:18:40 +00:00
damageAmount *= (1. / 256.);
4 more pieces
2020-05-17 22:10:42 +00:00
p->MotoSpeed = 0;
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (S_CheckActorSoundPlaying(pact, 238) == 0)
S_PlayActorSound(238, pact);
4 more pieces
2020-05-17 22:10:42 +00:00
}
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
else if (angleDelta >= 311 && angleDelta <= 711)
4 more pieces
2020-05-17 22:10:42 +00:00
{
- Remove some uses of `xs_Float.h` functions in game-side code where overflow protection isn't needed. * Went a little bit nuts and just used this everywhere back way back when.
2022-07-21 10:18:40 +00:00
damageAmount *= (1. / 2048.);
- Duke/RR: Promote `p->MotoSpeed` from `short` to `double` in prep for applying scaled controller input.
2020-11-04 22:17:18 +00:00
p->MotoSpeed -= (p->MotoSpeed / 2.) + (p->MotoSpeed / 4.);
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (S_CheckActorSoundPlaying(pact, 238) == 0)
S_PlayActorSound(238, pact);
4 more pieces
2020-05-17 22:10:42 +00:00
}
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
else if (angleDelta >= 111 && angleDelta <= 911)
4 more pieces
2020-05-17 22:10:42 +00:00
{
- Remove some uses of `xs_Float.h` functions in game-side code where overflow protection isn't needed. * Went a little bit nuts and just used this everywhere back way back when.
2022-07-21 10:18:40 +00:00
damageAmount *= (1. / 16384.);
- Duke/RR: Promote `p->MotoSpeed` from `short` to `double` in prep for applying scaled controller input.
2020-11-04 22:17:18 +00:00
p->MotoSpeed -= p->MotoSpeed / 2.;
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (S_CheckActorSoundPlaying(pact, 239) == 0)
S_PlayActorSound(239, pact);
4 more pieces
2020-05-17 22:10:42 +00:00
}
else
{
- Remove some uses of `xs_Float.h` functions in game-side code where overflow protection isn't needed. * Went a little bit nuts and just used this everywhere back way back when.
2022-07-21 10:18:40 +00:00
damageAmount *= (1. / 32768.);
- Duke/RR: Promote `p->MotoSpeed` from `short` to `double` in prep for applying scaled controller input.
2020-11-04 22:17:18 +00:00
p->MotoSpeed -= p->MotoSpeed / 8.;
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
if (S_CheckActorSoundPlaying(pact, 240) == 0)
S_PlayActorSound(240, pact);
4 more pieces
2020-05-17 22:10:42 +00:00
}
- Remove some uses of `xs_Float.h` functions in game-side code where overflow protection isn't needed. * Went a little bit nuts and just used this everywhere back way back when.
2022-07-21 10:18:40 +00:00
pact->spr.extra -= int(damageAmount);
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
if (pact->spr.extra <= 0)
4 more pieces
2020-05-17 22:10:42 +00:00
{
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
S_PlayActorSound(SQUISHED, pact);
4 more pieces
2020-05-17 22:10:42 +00:00
SetPlayerPal(p, PalEntry(63, 63, 0, 0));
}
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
else if (damageAmount)
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
S_PlayActorSound(DUKE_LAND_HURT, pact);
4 more pieces
2020-05-17 22:10:42 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
void onBoatMove(int snum, int psectlotag, walltype* wal)
4 more pieces
2020-05-17 22:10:42 +00:00
{
auto p = &ps[snum];
- use actors instead of indices for sound calls.
2020-10-25 06:42:29 +00:00
auto pact = p->GetActor();
- no need to use int_delta when all we want is the angle.
2022-08-30 21:05:54 +00:00
int angleDelta = abs(p->angle.ang.Buildang() - getangle(wal->delta()));
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
- Change out `PlayerAngle::addadjustment()`'s input from `binangle` to `DAngle`.
2022-08-27 13:43:23 +00:00
p->angle.addadjustment(DAngle::fromBuildf(p->MotoSpeed / (krand() & 1 ? -4 : 4)));
4 more pieces
2020-05-17 22:10:42 +00:00
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
if (angleDelta >= 441 && angleDelta <= 581)
4 more pieces
2020-05-17 22:10:42 +00:00
{
- Duke/RR: Promote `p->MotoSpeed` from `short` to `double` in prep for applying scaled controller input.
2020-11-04 22:17:18 +00:00
p->MotoSpeed = ((p->MotoSpeed / 2.) + (p->MotoSpeed / 4.)) / 4.;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
if (psectlotag == 1 && S_CheckActorSoundPlaying(pact, 178) == 0)
S_PlayActorSound(178, pact);
4 more pieces
2020-05-17 22:10:42 +00:00
}
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
else if (angleDelta >= 311 && angleDelta <= 711)
4 more pieces
2020-05-17 22:10:42 +00:00
{
- Duke/RR: Promote `p->MotoSpeed` from `short` to `double` in prep for applying scaled controller input.
2020-11-04 22:17:18 +00:00
p->MotoSpeed -= ((p->MotoSpeed / 2.) + (p->MotoSpeed / 4.)) / 8.;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
if (psectlotag == 1 && S_CheckActorSoundPlaying(pact, 179) == 0)
S_PlayActorSound(179, pact);
4 more pieces
2020-05-17 22:10:42 +00:00
}
- Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on.
2020-11-04 21:22:01 +00:00
else if (angleDelta >= 111 && angleDelta <= 911)
4 more pieces
2020-05-17 22:10:42 +00:00
{
- Duke/RR: Promote `p->MotoSpeed` from `short` to `double` in prep for applying scaled controller input.
2020-11-04 22:17:18 +00:00
p->MotoSpeed -= p->MotoSpeed / 16.;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
if (psectlotag == 1 && S_CheckActorSoundPlaying(pact, 180) == 0)
S_PlayActorSound(180, pact);
4 more pieces
2020-05-17 22:10:42 +00:00
}
else
{
- Duke/RR: Promote `p->MotoSpeed` from `short` to `double` in prep for applying scaled controller input.
2020-11-04 22:17:18 +00:00
p->MotoSpeed -= p->MotoSpeed / 64.;
- Duke/RR: Tidy formatting of `onMotorcycle()`, `onBoat()`, `onMotorcycleMove()` and `onBoatMove()`.
2020-11-05 08:32:14 +00:00
if (psectlotag == 1 && S_CheckActorSoundPlaying(pact, 181) == 0)
S_PlayActorSound(181, pact);
4 more pieces
2020-05-17 22:10:42 +00:00
}
}
- safety commit.
2020-05-17 21:44:53 +00:00
4 more pieces
2020-05-17 22:10:42 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- OnMotorcycle/BoatHit.
2020-10-25 07:09:24 +00:00
void onMotorcycleHit(int snum, DDukeActor* victim)
4 more pieces
2020-05-17 22:10:42 +00:00
{
auto p = &ps[snum];
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
if (badguy(victim) || victim->spr.picnum == APLAYER)
4 more pieces
2020-05-17 22:10:42 +00:00
{
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
if (victim->spr.picnum != APLAYER)
4 more pieces
2020-05-17 22:10:42 +00:00
{
if (numplayers == 1)
{
- OnMotorcycle/BoatHit.
2020-10-25 07:09:24 +00:00
Collision coll;
- 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
int ang = int(p->TiltStatus * 20 + p->angle.ang.Buildang());
- zvel wrapping, part 1.
2022-08-31 21:49:56 +00:00
movesprite_ex(victim, bcos(ang, -8), bsin(ang, -8), victim->int_zvel(), CLIPMASK0, coll);
4 more pieces
2020-05-17 22:10:42 +00:00
}
}
else
- OnMotorcycle/BoatHit.
2020-10-25 07:09:24 +00:00
victim->SetHitOwner(p->GetActor());
- renamed DDukeActor::picnum to attackertype. This one having the same name here as spritetype::picnum is just confusing as hell and badly describes this variable's function.
2021-12-27 22:52:16 +00:00
victim->attackertype = MOTOHIT;
- Remove some uses of `xs_Float.h` functions in game-side code where overflow protection isn't needed. * Went a little bit nuts and just used this everywhere back way back when.
2022-07-21 10:18:40 +00:00
victim->hitextra = int(p->MotoSpeed * 0.5);
- Duke/RR: Promote `p->MotoSpeed` from `short` to `double` in prep for applying scaled controller input.
2020-11-04 22:17:18 +00:00
p->MotoSpeed -= p->MotoSpeed / 4.;
4 more pieces
2020-05-17 22:10:42 +00:00
p->TurbCount = 6;
}
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
else if ((victim->spr.picnum == RRTILE2431 || victim->spr.picnum == RRTILE2443 || victim->spr.picnum == RRTILE2451 || victim->spr.picnum == RRTILE2455)
&& victim->spr.picnum != ACTIVATORLOCKED && p->MotoSpeed > 45)
4 more pieces
2020-05-17 22:10:42 +00:00
{
- OnMotorcycle/BoatHit.
2020-10-25 07:09:24 +00:00
S_PlayActorSound(SQUISHED, victim);
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
if (victim->spr.picnum == RRTILE2431 || victim->spr.picnum == RRTILE2451)
4 more pieces
2020-05-17 22:10:42 +00:00
{
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
if (victim->spr.lotag != 0)
4 more pieces
2020-05-17 22:10:42 +00:00
{
- RR processweapon pass 1
2020-10-25 07:12:25 +00:00
DukeSpriteIterator it;
while (auto act2 = it.Next())
4 more pieces
2020-05-17 22:10:42 +00:00
{
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
if ((act2->spr.picnum == RRTILE2431 || act2->spr.picnum == RRTILE2451) && act2->spr.pal == 4)
4 more pieces
2020-05-17 22:10:42 +00:00
{
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
if (victim->spr.lotag == act2->spr.lotag)
4 more pieces
2020-05-17 22:10:42 +00:00
{
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
act2->spr.xrepeat = 0;
act2->spr.yrepeat = 0;
4 more pieces
2020-05-17 22:10:42 +00:00
}
}
}
}
- OnMotorcycle/BoatHit.
2020-10-25 07:09:24 +00:00
fi.guts(victim, RRTILE2460, 12, myconnectindex);
fi.guts(victim, RRTILE2465, 3, myconnectindex);
4 more pieces
2020-05-17 22:10:42 +00:00
}
else
- OnMotorcycle/BoatHit.
2020-10-25 07:09:24 +00:00
fi.guts(victim, RRTILE2465, 3, myconnectindex);
fi.guts(victim, RRTILE2465, 3, myconnectindex);
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
victim->spr.xrepeat = 0;
victim->spr.yrepeat = 0;
4 more pieces
2020-05-17 22:10:42 +00:00
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- OnMotorcycle/BoatHit.
2020-10-25 07:09:24 +00:00
void onBoatHit(int snum, DDukeActor* victim)
4 more pieces
2020-05-17 22:10:42 +00:00
{
auto p = &ps[snum];
- a few quick ones, mostly simple search & replace.
2020-10-12 21:06:08 +00:00
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
if (badguy(victim) || victim->spr.picnum == APLAYER)
4 more pieces
2020-05-17 22:10:42 +00:00
{
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
if (victim->spr.picnum != APLAYER)
4 more pieces
2020-05-17 22:10:42 +00:00
{
if (numplayers == 1)
{
- OnMotorcycle/BoatHit.
2020-10-25 07:09:24 +00:00
Collision coll;
- 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
int ang = int(p->TiltStatus * 20 + p->angle.ang.Buildang());
- zvel wrapping, part 1.
2022-08-31 21:49:56 +00:00
movesprite_ex(victim, bcos(ang, -9), bsin(ang, -9), victim->int_zvel(), CLIPMASK0, coll);
4 more pieces
2020-05-17 22:10:42 +00:00
}
}
else
- OnMotorcycle/BoatHit.
2020-10-25 07:09:24 +00:00
victim->SetHitOwner(p->GetActor());
- renamed DDukeActor::picnum to attackertype. This one having the same name here as spritetype::picnum is just confusing as hell and badly describes this variable's function.
2021-12-27 22:52:16 +00:00
victim->attackertype = MOTOHIT;
- Remove some uses of `xs_Float.h` functions in game-side code where overflow protection isn't needed. * Went a little bit nuts and just used this everywhere back way back when.
2022-07-21 10:18:40 +00:00
victim->hitextra = int(p->MotoSpeed * 0.25);
- Duke/RR: Promote `p->MotoSpeed` from `short` to `double` in prep for applying scaled controller input.
2020-11-04 22:17:18 +00:00
p->MotoSpeed -= p->MotoSpeed / 4.;
4 more pieces
2020-05-17 22:10:42 +00:00
p->TurbCount = 6;
}
- safety commit.
2020-05-17 21:44:53 +00:00
}
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
processinput_r
2020-05-19 07:03: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];
- 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
{
- RRRA weapons work again.
2020-05-19 16:40:40 +00:00
if (!isRRRA() && p->curr_weapon >= MOTORCYCLE_WEAPON) return;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
switch (p->curr_weapon)
{
case DYNAMITE_WEAPON:
p->hbomb_hold_delay = 0;
if (p->ammo_amount[DYNAMITE_WEAPON] > 0)
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
- weapon draw code tested and old version removed. # Conflicts: # source/games/duke/src/zz_player.cpp
2020-05-20 08:38:56 +00:00
case THROWINGDYNAMITE_WEAPON:
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
p->hbomb_hold_delay = 0;
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
break;
case RIFLEGUN_WEAPON:
if (p->ammo_amount[RIFLEGUN_WEAPON] > 0) // && p->random_club_frame == 0)
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case BOWLING_WEAPON:
if (p->ammo_amount[BOWLING_WEAPON] > 0)
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case POWDERKEG_WEAPON:
if (p->ammo_amount[POWDERKEG_WEAPON] > 0)
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case BUZZSAW_WEAPON:
case THROWSAW_WEAPON:
if (p->curr_weapon == BUZZSAW_WEAPON)
{
if (p->ammo_amount[BUZZSAW_WEAPON] > 0)
{
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic = 1;
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(431, p->GetActor());
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
}
else if (p->ammo_amount[THROWSAW_WEAPON] > 0)
{
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic = 1;
- player.i, part 4.
2020-11-02 19:24:07 +00:00
S_PlayActorSound(SHRINKER_FIRE, p->GetActor());
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
break;
case ALIENBLASTER_WEAPON:
if (p->ammo_amount[ALIENBLASTER_WEAPON] > 0)
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case TIT_WEAPON:
if (p->ammo_amount[TIT_WEAPON] > 0)
{
processinput_r
2020-05-19 07:03: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;
}
break;
case MOTORCYCLE_WEAPON:
if (p->ammo_amount[MOTORCYCLE_WEAPON] > 0)
{
processinput_r
2020-05-19 07:03: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;
}
break;
case BOAT_WEAPON:
if (p->ammo_amount[BOAT_WEAPON] > 0)
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case CROSSBOW_WEAPON:
if (p->ammo_amount[CROSSBOW_WEAPON] > 0)
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case CHICKEN_WEAPON:
if (p->ammo_amount[CHICKEN_WEAPON] > 0)
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case KNEE_WEAPON:
case SLINGBLADE_WEAPON:
if (p->curr_weapon == SLINGBLADE_WEAPON)
{
if (p->ammo_amount[SLINGBLADE_WEAPON] > 0)
if (p->quick_kick == 0)
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
else if (!isRRRA() || p->ammo_amount[KNEE_WEAPON] > 0)
if (p->quick_kick == 0)
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
}
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- the remaining sector[] stuff in Duke/RR. What remains is either engine interface code or not easily replaced.
2021-11-18 19:17:47 +00:00
static void operateweapon(int snum, ESyncBits actions, sectortype* psectp)
- 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;
- Duke/RR: Fix RR crash while operating weapon outside of a sector (noclipping, etc).
2021-12-07 10:42:21 +00:00
int psectlotag = psectp ? psectp->lotag : 857;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- RRRA weapons work again.
2020-05-19 16:40:40 +00:00
if (!isRRRA() && p->curr_weapon >= MOTORCYCLE_WEAPON) return;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
switch (p->curr_weapon)
{
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
case DYNAMITE_WEAPON:
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 1)
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlaySound(401);
- 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;
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic++;
if (p->kickback_pic > 19)
- 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
p->okickback_pic = p->kickback_pic = 0;
- weapon draw code tested and old version removed. # Conflicts: # source/games/duke/src/zz_player.cpp
2020-05-20 08:38:56 +00:00
p->curr_weapon = THROWINGDYNAMITE_WEAPON;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
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;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->detonate_time = 45;
p->detonate_count = 1;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlaySound(402);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
break;
- weapon draw code tested and old version removed. # Conflicts: # source/games/duke/src/zz_player.cpp
2020-05-20 08:38:56 +00:00
case THROWINGDYNAMITE_WEAPON:
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
processinput_r
2020-05-19 07:03:07 +00:00
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
if (p->detonate_time < 0)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
p->hbomb_on = 0;
}
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 39)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
p->hbomb_on = 0;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->noise_radius = 8192;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
madenoise(snum);
}
processinput_r
2020-05-19 07:03:07 +00:00
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[DYNAMITE_WEAPON]--;
if (p->ammo_amount[CROSSBOW_WEAPON])
p->ammo_amount[CROSSBOW_WEAPON]--;
- 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) && !p->OnMotorcycle)
- 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;
- RR: fixed double negation in pitch math when throwing dynamite.
2021-05-20 17:06:11 +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)) * 2, i, pact, 1);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26: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)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26: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 (k == 15)
{
- renamed yvel to yint in Duke. It's never used as velocity, but as an auxiliary parameter so name it appropriately.
2022-09-01 16:15:52 +00:00
spawned->spr.yint = 3;
- some simple replacements.
2022-02-07 07:47:18 +00:00
spawned->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
}
- safety commit, weapon code incompletely ported.
2020-05-18 06:26: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
k = hits(p->GetActor());
if (k < 512)
{
- removed the mul vel wrappers
2022-09-03 08:04:16 +00:00
spawned->spr.angle += DAngle180;
spawned->vel *= 1./3.;
- 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
}
- safety commit, weapon code incompletely ported.
2020-05-18 06:26: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
p->hbomb_on = 1;
}
- 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
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_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 40)
- 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
p->okickback_pic = p->kickback_pic = 0;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->curr_weapon = DYNAMITE_WEAPON;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
p->last_weapon = -1;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->detonate_count = 0;
p->detonate_time = 45;
if (p->ammo_amount[DYNAMITE_WEAPON] > 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
fi.addweapon(p, DYNAMITE_WEAPON);
- 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, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
else checkavailweapon(p);
}
break;
case PISTOL_WEAPON:
processinput_r
2020-05-19 07:03: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);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->noise_radius = 8192;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
madenoise(snum);
- 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;
if (psectlotag != 857)
{
- Remaining manual changes to replace player's `ang` with `DAngle` object.
2022-08-27 13:09:51 +00:00
p->vel.X -= p->angle.ang.Cos() * (1 << 18);
p->vel.Y -= p->angle.ang.Sin() * (1 << 18);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
}
processinput_r
2020-05-19 07:03:07 +00:00
else if (p->kickback_pic == 2)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
if (p->ammo_amount[PISTOL_WEAPON] <= 0)
{
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +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);
}
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic++;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic >= 22)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
if (p->ammo_amount[PISTOL_WEAPON] <= 0)
{
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +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);
break;
}
else if ((p->ammo_amount[PISTOL_WEAPON] % 6) == 0)
{
processinput_r
2020-05-19 07:03:07 +00:00
switch (p->kickback_pic)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
case 24:
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(EJECT_CLIP, pact);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
case 30:
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(INSERT_CLIP, pact);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
break;
}
}
else
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic = 38;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 38)
- 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
p->okickback_pic = p->kickback_pic = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
checkavailweapon(p);
}
break;
case SHOTGUN_WEAPON:
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic++;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 6)
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
if (p->shotgun_state[0] == 0)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
if (p->ammo_amount[SHOTGUN_WEAPON] > 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)
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->shotgun_state[1] = 1;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 4)
- 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, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
p->ammo_amount[SHOTGUN_WEAPON]--;
- 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
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->noise_radius = 8192;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
madenoise(snum);
- 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;
}
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 7)
- 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 (p->shotgun_state[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, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
fi.shoot(pact, SHOTGUN);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
p->ammo_amount[SHOTGUN_WEAPON]--;
- 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
if (psectlotag != 857)
{
- Remaining manual changes to replace player's `ang` with `DAngle` object.
2022-08-27 13:09:51 +00:00
p->vel.X -= p->angle.ang.Cos() * (1 << 19);
p->vel.Y -= p->angle.ang.Sin() * (1 << 19);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
}
else if (psectlotag != 857)
{
- Remaining manual changes to replace player's `ang` with `DAngle` object.
2022-08-27 13:09:51 +00:00
p->vel.X -= p->angle.ang.Cos() * (1 << 18);
p->vel.Y -= p->angle.ang.Sin() * (1 << 18);
- 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 (p->shotgun_state[0])
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
processinput_r
2020-05-19 07:03:07 +00:00
switch (p->kickback_pic)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
case 16:
checkavailweapon(p);
break;
case 17:
- 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 28:
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
p->okickback_pic = p->kickback_pic = 0;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->shotgun_state[0] = 0;
p->shotgun_state[1] = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
return;
}
}
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
else if (p->shotgun_state[1])
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
processinput_r
2020-05-19 07:03:07 +00:00
switch (p->kickback_pic)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
case 26:
checkavailweapon(p);
break;
case 27:
- 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 38:
- Duke: Fix potential interpolation issues for RR's shotgun observed while working on something else.
2020-08-27 12:47:18 +00:00
p->okickback_pic = p->kickback_pic = 0;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->shotgun_state[0] = 0;
p->shotgun_state[1] = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
return;
}
}
else
{
processinput_r
2020-05-19 07:03:07 +00:00
switch (p->kickback_pic)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
case 16:
checkavailweapon(p);
- Duke: Fix potential interpolation issues for RR's shotgun observed while working on something else.
2020-08-27 12:47:18 +00:00
p->okickback_pic = p->kickback_pic = 0;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->shotgun_state[0] = 1;
p->shotgun_state[1] = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
return;
}
}
break;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
case RIFLEGUN_WEAPON:
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic++;
- Remove multiple `addadjustment()`/`settarget()` overloads in favour of native `binangle`/`fixedhoriz` versions only. * Simplifies these classes a bit. * Better shows intent in actual game code. * Removes unnecessary int to double conversions.
2022-05-30 10:35:41 +00:00
p->horizon.addadjustment(buildhoriz(1));
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->recoil++;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic <= 12)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
processinput_r
2020-05-19 07:03:07 +00:00
if ((p->kickback_pic % 3) == 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
p->ammo_amount[RIFLEGUN_WEAPON]--;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
processinput_r
2020-05-19 07:03: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)
{
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
- the remaining angle stuff.
2022-08-16 21:27:44 +00:00
j->set_int_ang((j->int_ang() + 1024) & 2047);
- add_int_xvel
2022-09-01 15:02:38 +00:00
j->add_int_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);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->noise_radius = 8192;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
madenoise(snum);
- 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;
if (psectlotag != 857)
{
- Remaining manual changes to replace player's `ang` with `DAngle` object.
2022-08-27 13:09:51 +00:00
p->vel.X -= p->angle.ang.Cos() * (1 << 18);
p->vel.Y -= p->angle.ang.Sin() * (1 << 18);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
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
{
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +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_r
2020-05-19 07:03: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->kickback_pic = 1;
- 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 BUZZSAW_WEAPON:
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic > 3)
- 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
p->okickback_pic = p->kickback_pic = 0;
- 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
p->noise_radius = 1024;
madenoise(snum);
checkavailweapon(p);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
processinput_r
2020-05-19 07:03:07 +00:00
else p->kickback_pic++;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
break;
case THROWSAW_WEAPON:
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 1)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
p->ammo_amount[THROWSAW_WEAPON]--;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(pact, SHRINKSPARK);
- 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
}
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic++;
if (p->kickback_pic > 20)
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +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
case TIT_WEAPON:
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic++;
if (p->kickback_pic == 2 || p->kickback_pic == 4)
- 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;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(CHAINGUN_FIRE, pact);
fi.shoot(pact, SHOTSPARK1);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->noise_radius = 16384;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
madenoise(snum);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->ammo_amount[TIT_WEAPON]--;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
checkavailweapon(p);
}
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 2)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- Change out `PlayerAngle::addadjustment()`'s input from `binangle` to `DAngle`.
2022-08-27 13:43:23 +00:00
p->angle.addadjustment(DAngle::fromBuild(16));
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
processinput_r
2020-05-19 07:03:07 +00:00
else if (p->kickback_pic == 4)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- Change out `PlayerAngle::addadjustment()`'s input from `binangle` to `DAngle`.
2022-08-27 13:43:23 +00:00
p->angle.addadjustment(DAngle::fromBuild(-16));
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic > 4)
p->kickback_pic = 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))
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +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
case MOTORCYCLE_WEAPON:
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic++;
if (p->kickback_pic == 2 || p->kickback_pic == 4)
- 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;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(CHAINGUN_FIRE, pact);
fi.shoot(pact, CHAINGUN);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->noise_radius = 16384;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
madenoise(snum);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->ammo_amount[MOTORCYCLE_WEAPON]--;
if (p->ammo_amount[MOTORCYCLE_WEAPON] <= 0)
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
p->okickback_pic = p->kickback_pic = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
else
checkavailweapon(p);
}
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 2)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- Change out `PlayerAngle::addadjustment()`'s input from `binangle` to `DAngle`.
2022-08-27 13:43:23 +00:00
p->angle.addadjustment(DAngle::fromBuild(4));
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
processinput_r
2020-05-19 07:03:07 +00:00
else if (p->kickback_pic == 4)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
- Change out `PlayerAngle::addadjustment()`'s input from `binangle` to `DAngle`.
2022-08-27 13:43:23 +00:00
p->angle.addadjustment(DAngle::fromBuild(-4));
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic > 4)
p->kickback_pic = 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))
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +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
case BOAT_WEAPON:
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 3)
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
{
p->MotoSpeed -= 20;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->ammo_amount[BOAT_WEAPON]--;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(pact, RRTILE1790);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic++;
if (p->kickback_pic > 20)
- 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
p->okickback_pic = p->kickback_pic = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
checkavailweapon(p);
}
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
if (p->ammo_amount[BOAT_WEAPON] <= 0)
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
p->okickback_pic = p->kickback_pic = 0;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
else
checkavailweapon(p);
break;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
case ALIENBLASTER_WEAPON:
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic++;
if (p->kickback_pic >= 7 && p->kickback_pic <= 11)
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(pact, FIRELASER);
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 5)
- 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(CAT_FIRE, pact);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->noise_radius = 2048;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
madenoise(snum);
}
processinput_r
2020-05-19 07:03:07 +00:00
else if (p->kickback_pic == 9)
- 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[ALIENBLASTER_WEAPON]--;
- 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
checkavailweapon(p);
}
processinput_r
2020-05-19 07:03:07 +00:00
else if (p->kickback_pic == 12)
- 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
p->vel.X -= p->angle.ang.Cos() * (1 << 18);
p->vel.Y -= p->angle.ang.Sin() * (1 << 18);
- Remove multiple `addadjustment()`/`settarget()` overloads in favour of native `binangle`/`fixedhoriz` versions only. * Simplifies these classes a bit. * Better shows intent in actual game code. * Removes unnecessary int to double conversions.
2022-05-30 10:35:41 +00:00
p->horizon.addadjustment(buildhoriz(20));
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->recoil += 20;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic > 20)
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +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
case POWDERKEG_WEAPON:
processinput_r
2020-05-19 07:03:07 +00:00
if (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
p->ammo_amount[POWDERKEG_WEAPON]--;
- 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[POWDERKEG_WEAPON] = false;
- 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) && !p->OnMotorcycle)
- 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
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
}
- 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
{
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
k = 32;
- 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
}
- 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
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, POWDERKEG, -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 * 2, i, pact, 1);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
}
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic++;
if (p->kickback_pic > 20)
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
{
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +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
}
break;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
case BOWLING_WEAPON:
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 30)
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
{
p->ammo_amount[BOWLING_WEAPON]--;
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(354, pact);
fi.shoot(pact, BOWLINGBALL);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->noise_radius = 1024;
madenoise(snum);
}
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic < 30)
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
{
- Remaining manual changes to replace player's `ang` with `DAngle` object.
2022-08-27 13:09:51 +00:00
p->vel.X -= p->angle.ang.Cos() * (1 << 18);
p->vel.Y -= p->angle.ang.Sin() * (1 << 18);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
}
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic++;
if (p->kickback_pic > 40)
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
{
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
p->okickback_pic = p->kickback_pic = 0;
- 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[BOWLING_WEAPON] = false;
- 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
case KNEE_WEAPON:
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic++;
if (p->kickback_pic == 3)
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(426, pact);
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 12)
- 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, KNEE);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->noise_radius = 1024;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
madenoise(snum);
}
processinput_r
2020-05-19 07:03:07 +00:00
else if (p->kickback_pic == 16)
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
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;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
case SLINGBLADE_WEAPON:
processinput_r
2020-05-19 07:03:07 +00:00
p->kickback_pic++;
if (p->kickback_pic == 3)
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(252, pact);
processinput_r
2020-05-19 07:03:07 +00:00
if (p->kickback_pic == 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
fi.shoot(pact, SLINGBLADE);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->noise_radius = 1024;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
madenoise(snum);
}
processinput_r
2020-05-19 07:03:07 +00:00
else if (p->kickback_pic == 16)
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +00:00
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;
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
case CROSSBOW_WEAPON:
processinput_r
2020-05-19 07:03: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
{
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->ammo_amount[CROSSBOW_WEAPON]--;
if (p->ammo_amount[DYNAMITE_WEAPON])
p->ammo_amount[DYNAMITE_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);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->noise_radius = 32768;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
madenoise(snum);
checkavailweapon(p);
}
processinput_r
2020-05-19 07:03:07 +00:00
else if (p->kickback_pic == 16)
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(450, pact);
processinput_r
2020-05-19 07:03:07 +00:00
else if (p->kickback_pic == 34)
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +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
case CHICKEN_WEAPON:
processinput_r
2020-05-19 07:03: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
{
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->ammo_amount[CHICKEN_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, RPG2);
- weapon code cleaned up
2020-05-18 20:28:12 +00:00
p->noise_radius = 32768;
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
madenoise(snum);
checkavailweapon(p);
}
processinput_r
2020-05-19 07:03:07 +00:00
else if (p->kickback_pic == 16)
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
S_PlayActorSound(450, pact);
processinput_r
2020-05-19 07:03:07 +00:00
else if (p->kickback_pic == 34)
- Duke/RR: Address weapon drawer interpolation concerns raised in #403.
2020-09-16 11:01:09 +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
- safety commit, weapon code incompletely ported.
2020-05-18 06:26:09 +00:00
}
}
processinput_r
2020-05-19 07:03:07 +00:00
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
//---------------------------------------------------------------------------
//
// this function exists because gotos suck. :P
//
//---------------------------------------------------------------------------
- the remaining sector[] stuff in Duke/RR. What remains is either engine interface code or not easily replaced.
2021-11-18 19:17:47 +00:00
static void processweapon(int snum, ESyncBits actions, sectortype* psectp)
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
{
auto p = &ps[snum];
- RR processweapon pass 1
2020-10-25 07:12:25 +00:00
auto pact = p->GetActor();
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
int shrunk = (pact->spr.yrepeat < 8);
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
if (p->detonate_count > 0)
{
if (ud.god)
{
p->detonate_time = 45;
p->detonate_count = 0;
}
else if (p->detonate_time <= 0 && p->kickback_pic < 5)
{
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlaySound(14);
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
quickkill(p);
}
}
if (isRRRA() && (p->curr_weapon == KNEE_WEAPON || p->curr_weapon == SLINGBLADE_WEAPON))
p->random_club_frame += 64;
if (p->curr_weapon == THROWSAW_WEAPON || p->curr_weapon == BUZZSAW_WEAPON)
p->random_club_frame += 64; // Glowing
if (p->curr_weapon == TRIPBOMB_WEAPON || p->curr_weapon == BOWLING_WEAPON)
p->random_club_frame += 64;
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))
{
fireweapon(snum);
}
else if (p->kickback_pic)
{
- the remaining sector[] stuff in Duke/RR. What remains is either engine interface code or not easily replaced.
2021-11-18 19:17:47 +00:00
operateweapon(snum, actions, psectp);
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
}
}
processinput_r
2020-05-19 07:03:07 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void processinput_r(int snum)
{
- processinput part 1.
2020-10-25 07:25:45 +00:00
int i, k, doubvel, fz, cz, truefdist;
Collision chz, clz;
- some leftover shorts plus utilities that ended up unused but may be useful later.
2021-11-07 15:46:23 +00:00
bool shrunk;
- final preparations for changing type of cursectnum
2021-11-21 07:50:04 +00:00
int psectlotag;
processinput_r
2020-05-19 07:03:07 +00:00
- RR processweapon pass 1
2020-10-25 07:12:25 +00:00
auto p = &ps[snum];
auto pact = p->GetActor();
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
- made ps an array of player_struct like it originally was.
2020-07-14 22:26:58 +00:00
auto sb_fvel = PlayerInputForwardVel(snum);
auto sb_svel = PlayerInputSideVel(snum);
auto sb_avel = PlayerInputAngVel(snum);
processinput_r
2020-05-19 07:03:07 +00:00
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
auto psectp = p->cursector;
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
if (p->OnMotorcycle && pact->spr.extra > 0)
processinput_r
2020-05-19 07:03: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
onMotorcycle(snum, actions);
processinput_r
2020-05-19 07:03:07 +00:00
}
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
else if (p->OnBoat && pact->spr.extra > 0)
processinput_r
2020-05-19 07:03: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
onBoat(snum, actions);
processinput_r
2020-05-19 07:03:07 +00:00
}
- final preparations for changing type of cursectnum
2021-11-21 07:50:04 +00:00
if (psectp == nullptr)
processinput_r
2020-05-19 07:03:07 +00:00
{
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
if (pact->spr.extra > 0 && ud.clipping == 0)
processinput_r
2020-05-19 07:03:07 +00:00
{
quickkill(p);
- RR processweapon pass 1
2020-10-25 07:12:25 +00:00
S_PlayActorSound(SQUISHED, pact);
processinput_r
2020-05-19 07:03:07 +00:00
}
- final preparations for changing type of cursectnum
2021-11-21 07:50:04 +00:00
psectp = &sector[0];
processinput_r
2020-05-19 07:03:07 +00:00
}
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
psectlotag = psectp->lotag;
processinput_r
2020-05-19 07:03:07 +00:00
if (psectlotag == 867)
{
- final preparations for changing type of cursectnum
2021-11-21 07:50:04 +00:00
DukeSectIterator it(psectp);
- processinput part 1.
2020-10-25 07:25:45 +00:00
while (auto act2 = it.Next())
processinput_r
2020-05-19 07:03: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 (act2->spr.picnum == RRTILE380)
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
if (act2->int_pos().Z - (8 << 8) < p->player_int_pos().Z)
processinput_r
2020-05-19 07:03:07 +00:00
psectlotag = 2;
}
}
- migrated RRRA as well.
2021-05-02 12:01:10 +00:00
else if (psectlotag == 7777 && (currentLevel->gameflags & LEVEL_RR_HULKSPAWN))
processinput_r
2020-05-19 07:03:07 +00:00
lastlevel = 1;
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
if (psectlotag == 848 && psectp->floorpicnum == WATERTILE2)
processinput_r
2020-05-19 07:03:07 +00:00
psectlotag = 1;
if (psectlotag == 857)
- wrapped all literal assignments to clipdist - part 2
2022-09-09 16:17:20 +00:00
pact->set_native_clipdist(1);
processinput_r
2020-05-19 07:03:07 +00:00
else
- wrapped all literal assignments to clipdist - part 2
2022-09-09 16:17:20 +00:00
pact->set_native_clipdist(64);
processinput_r
2020-05-19 07:03:07 +00:00
p->spritebridge = 0;
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
shrunk = (pact->spr.yrepeat < 8);
- processinput part 1.
2020-10-25 07:25:45 +00:00
int tempfz;
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
if (pact->spr.clipdist == 64)
processinput_r
2020-05-19 07:03:07 +00:00
{
- another batch of utility use
2022-02-05 11:05:29 +00:00
getzrange(p->player_int_pos(), psectp, &cz, chz, &fz, clz, 163L, CLIPMASK0);
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
tempfz = getflorzofslopeptr(psectp, p->player_int_pos().X, p->player_int_pos().Y);
processinput_r
2020-05-19 07:03:07 +00:00
}
else
{
- another batch of utility use
2022-02-05 11:05:29 +00:00
getzrange(p->player_int_pos(), psectp, &cz, chz, &fz, clz, 4L, CLIPMASK0);
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
tempfz = getflorzofslopeptr(psectp, p->player_int_pos().X, p->player_int_pos().Y);
processinput_r
2020-05-19 07:03:07 +00:00
}
- floatified player_struct::truecz/truefz.
2022-02-04 16:49:48 +00:00
p->truefz = tempfz * 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_r
2020-05-19 07:03: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 - tempfz);
- 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_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
- wrap all checks of cl_syncinput in an inline function.
2020-11-30 22:40:16 +00:00
if (SyncInput())
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
}
- processinput part 1.
2020-10-25 07:25:45 +00:00
if (chz.type == kHitSprite)
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03: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_r
2020-05-19 07:03: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
else if (chz.actor()->spr.picnum == LADDER)
processinput_r
2020-05-19 07:03:07 +00:00
{
if (!p->stairs)
{
p->stairs = 10;
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if ((actions & SB_JUMP) && !p->OnMotorcycle)
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
}
}
else
p->stairs--;
}
}
- processinput part 1.
2020-10-25 07:25:45 +00:00
if (clz.type == kHitSprite)
processinput_r
2020-05-19 07:03:07 +00:00
{
- Remove some uses of `xs_Float.h` functions in game-side code where overflow protection isn't needed. * Went a little bit nuts and just used this everywhere back way back when.
2022-07-21 10:18:40 +00:00
auto doVehicleHit = [&]()
{
if (badguy(clz.actor()))
{
clz.actor()->attackertype = MOTOHIT;
clz.actor()->hitextra = int(2 + (p->MotoSpeed * 0.5));
p->MotoSpeed -= p->MotoSpeed * (1. / 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 ((clz.actor()->spr.cstat & (CSTAT_SPRITE_ALIGNMENT_FLOOR| CSTAT_SPRITE_BLOCK)) == (CSTAT_SPRITE_ALIGNMENT_FLOOR | CSTAT_SPRITE_BLOCK))
processinput_r
2020-05-19 07:03:07 +00:00
{
psectlotag = 0;
p->footprintcount = 0;
p->spritebridge = 1;
}
if (p->OnMotorcycle)
- Remove some uses of `xs_Float.h` functions in game-side code where overflow protection isn't needed. * Went a little bit nuts and just used this everywhere back way back when.
2022-07-21 10:18:40 +00:00
doVehicleHit();
processinput_r
2020-05-19 07:03:07 +00:00
if (p->OnBoat)
{
- Remove some uses of `xs_Float.h` functions in game-side code where overflow protection isn't needed. * Went a little bit nuts and just used this everywhere back way back when.
2022-07-21 10:18:40 +00:00
doVehicleHit();
processinput_r
2020-05-19 07:03:07 +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
else if (badguy(clz.actor()) && clz.actor()->spr.xrepeat > 24 && abs(pact->int_pos().Z - clz.actor()->int_pos().Z) < (84 << 8))
processinput_r
2020-05-19 07:03:07 +00:00
{
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
int 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_r
2020-05-19 07:03: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.picnum == LADDER)
processinput_r
2020-05-19 07:03:07 +00:00
{
if (!p->stairs)
{
p->stairs = 10;
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if ((actions & SB_CROUCH) && !p->OnMotorcycle)
processinput_r
2020-05-19 07:03:07 +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
cz = clz.actor()->int_pos().Z;
- 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();
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
fz = clz.actor()->int_pos().Z + (4 << 8);
processinput_r
2020-05-19 07:03:07 +00:00
}
}
else
p->stairs--;
}
- 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 if (clz.actor()->spr.picnum == TOILET || clz.actor()->spr.picnum == RRTILE2121)
processinput_r
2020-05-19 07:03:07 +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) && !p->OnMotorcycle)
processinput_r
2020-05-19 07:03:07 +00:00
//if (Sound[436].num == 0)
{
- processinput part 1.
2020-10-25 07:25:45 +00:00
S_PlayActorSound(436, pact);
processinput_r
2020-05-19 07:03:07 +00:00
p->last_pissed_time = 4000;
p->eat = 0;
}
}
}
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
if (pact->spr.extra > 0) fi.incur_damage(p);
processinput_r
2020-05-19 07:03:07 +00:00
else
{
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
pact->spr.extra = 0;
processinput_r
2020-05-19 07:03:07 +00:00
p->shield_amount = 0;
}
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
p->last_extra = pact->spr.extra;
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03: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_r.cpp
2021-12-21 19:50:51 +00:00
if (pact->spr.extra <= 0 && !ud.god)
processinput_r
2020-05-19 07:03:07 +00:00
{
playerisdead(snum, psectlotag, fz, cz);
- adjustments for input
2020-07-16 13:03:09 +00:00
return;
processinput_r
2020-05-19 07:03:07 +00:00
}
- Duke: Apply same `fistsign` fix from 4ee64df844a9245239f188b778dbb4fc8fbe08b5 to RR code.
2022-06-06 01:04:51 +00:00
if (p->GetActor()->spr.xrepeat < 8 && p->jetpack_on == 0)
{
p->ofistsign = p->fistsign;
- more xvel wraps.
2022-09-01 14:52:45 +00:00
p->fistsign += p->GetActor()->int_xvel();
- Duke: Apply same `fistsign` fix from 4ee64df844a9245239f188b778dbb4fc8fbe08b5 to RR code.
2022-06-06 01:04:51 +00:00
}
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
{
- use clear_xvel wrapper.
2022-09-01 14:35:47 +00:00
p->vel.X = p->vel.Y = 0;
- remove vel clear wrappers
2022-09-03 08:02:25 +00:00
pact->vel.X = 0;
processinput_r
2020-05-19 07:03:07 +00:00
fi.doincrements(p);
- the remaining sector[] stuff in Duke/RR. What remains is either engine interface code or not easily replaced.
2021-11-18 19:17:47 +00:00
if (p->curr_weapon == THROWINGDYNAMITE_WEAPON) processweapon(snum, actions, psectp);
processinput_r
2020-05-19 07:03: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);
- Duke (RR): Also fix location of `p->apply_seasick()` in the ticker as well.
2021-01-03 09:06:28 +00:00
p->apply_seasick(1);
processinput_r
2020-05-19 07:03:07 +00:00
- __int_opos is gone.
2022-02-05 11:30:00 +00:00
auto oldpos = p->opos;
- 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
- made on_crane a pointer as well.
2020-10-17 08:44:00 +00:00
if (p->on_crane != nullptr)
processinput_r
2020-05-19 07:03:07 +00:00
goto HORIZONLY;
- more wraps
2022-09-01 15:08:49 +00:00
p->playerweaponsway(pact->int_xvel());
processinput_r
2020-05-19 07:03:07 +00:00
- set_int_xvel
2022-09-01 14:57:55 +00:00
pact->set_int_xvel(int(clamp((p->pos.XY() - p->bobpos).Length(), 0., 32.) * worldtoint));
- right shifts
2022-09-01 15:00:11 +00:00
if (p->on_ground) p->bobcounter += p->GetActor()->int_xvel() >> 1;
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
// Shrinking code
i = 40;
- adjustments for input
2020-07-16 13:03:09 +00:00
if (psectlotag == ST_17_PLATFORM_UP || (isRRRA() && psectlotag == ST_18_ELEVATOR_DOWN))
processinput_r
2020-05-19 07:03:07 +00:00
{
int tmp;
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
tmp = getanimationgoal(anim_floorz, p->cursector);
processinput_r
2020-05-19 07:03:07 +00:00
if (tmp >= 0)
{
- player.i, part 4.
2020-11-02 19:24:07 +00:00
if (!S_CheckActorSoundPlaying(pact, 432))
- RR processweapon pass 1
2020-10-25 07:12:25 +00:00
S_PlayActorSound(432, pact);
processinput_r
2020-05-19 07:03:07 +00:00
}
else
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_StopSound(432);
processinput_r
2020-05-19 07:03:07 +00:00
}
if (isRRRA() && p->sea_sick_stat)
{
p->pycount += 32;
p->pycount &= 2047;
- don't use DAngle for calculating bobbing amplitudes. It makes more sense here to have a dedicated function since this is not really angular math.
2022-09-03 22:04:01 +00:00
p->pyoff = BobVal(p->pycount) * (p->SeaSick? 32 : 1);
processinput_r
2020-05-19 07:03:07 +00:00
}
- adjustments for input
2020-07-16 13:03:09 +00:00
if (psectlotag == ST_2_UNDERWATER)
processinput_r
2020-05-19 07:03:07 +00:00
{
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
underwater(snum, actions, fz, cz);
processinput_r
2020-05-19 07:03:07 +00:00
}
- 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
else
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03: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;
- 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
//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))
- 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
{
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;
- 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
}
- wrap all checks of cl_syncinput in an inline function.
2020-11-30 22:40:16 +00:00
else 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
{
//p->ang += syncangvel * constant
//ENGINE calculates angvel for you
// may still be needed later for demo recording
- 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);
- 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
}
- use DCoreActor::insector instead of spritetype::insector.
2021-12-30 15:24:51 +00:00
if (p->spritebridge == 0 && pact->insector())
processinput_r
2020-05-19 07:03:07 +00:00
{
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
int j = pact->sector()->floorpicnum;
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03: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 :
- fixed typo in floor damage check. This rendered the boots ineffective on lava. Fixes #114
2020-08-07 21:30:08 +00:00
(isRRRA() && (j == RRTILE7768 || j == RRTILE7820) ? 3 : -1);
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
- buildutils: Replace `sintable[]` use within Duke's player_r.cpp with `bsin()`/`bcos()`.
2020-11-15 11:07:30 +00:00
k = bsin(p->bobcounter, -12);
processinput_r
2020-05-19 07:03:07 +00:00
if (isRRRA() && p->spritebridge == 0 && p->on_ground)
{
if (psectlotag == 1)
p->NotOnWater = 0;
else if (p->OnBoat)
{
if (psectlotag == 1234)
p->NotOnWater = 0;
else
p->NotOnWater = 1;
}
else
p->NotOnWater = 1;
}
- 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_r
2020-05-19 07:03:07 +00:00
{
if (p->spritebridge == 0 && p->walking_snd_toggle == 0 && p->on_ground)
{
- processinput part 1.
2020-10-25 07:25:45 +00:00
int j;
processinput_r
2020-05-19 07:03:07 +00:00
switch (psectlotag)
{
case 0:
- processinput part 1.
2020-10-25 07:25:45 +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;
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
else j = psectp->floorpicnum;
processinput_r
2020-05-19 07:03:07 +00:00
break;
case 1:
if ((krand() & 1) == 0)
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
if (!isRRRA() || (!p->OnBoat && !p->OnMotorcycle && p->cursector->hitag != 321))
- RR processweapon pass 1
2020-10-25 07:12:25 +00:00
S_PlayActorSound(DUKE_ONWATER, pact);
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (!isRRRA() && ((p->curr_weapon == KNEE_WEAPON && p->kickback_pic > 10 && p->on_ground) || (p->on_ground && (actions & SB_CROUCH))))
processinput_r
2020-05-19 07:03:07 +00:00
{
- 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_r
2020-05-19 07:03: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_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
}
}
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
if (isRRRA() && psectp->floorpicnum == RRTILE7888)
processinput_r
2020-05-19 07:03:07 +00:00
{
if (p->OnMotorcycle)
if (p->on_ground)
p->moto_on_oil = 1;
}
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
else if (isRRRA() && psectp->floorpicnum == RRTILE7889)
processinput_r
2020-05-19 07:03:07 +00:00
{
if (p->OnMotorcycle)
{
if (p->on_ground)
p->moto_on_mud = 1;
}
else if (p->boot_amount > 0)
p->boot_amount--;
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_r
2020-05-19 07:03:07 +00:00
}
}
else
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
if (psectp->floorpicnum == RRTILE3073 || psectp->floorpicnum == RRTILE2702)
processinput_r
2020-05-19 07:03:07 +00:00
{
if (p->OnMotorcycle)
{
if (p->on_ground)
{
- 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 - 0x1800, 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 - 0x1800, 16);
processinput_r
2020-05-19 07:03:07 +00:00
}
}
else
if (p->boot_amount > 0)
p->boot_amount--;
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 - 0x1800, 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 - 0x1800, 16);
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
}
}
HORIZONLY:
if (psectlotag == 1 || p->spritebridge == 1) i = (4L << 8);
else i = (20L << 8);
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
if (p->insector() && p->cursector->lotag == 2) k = 0;
processinput_r
2020-05-19 07:03:07 +00:00
else k = 1;
- processinput part 1.
2020-10-25 07:25:45 +00:00
Collision clip{};
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03: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), i, CLIPMASK0, clip);
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
- handle the clipmove result in processinput.
2020-10-25 07:50:03 +00:00
if (clip.type != kHitNone)
checkplayerhurt_r(p, clip);
processinput_r
2020-05-19 07:03:07 +00:00
else if (isRRRA() && p->hurt_delay2 > 0)
p->hurt_delay2--;
- handle the clipmove result in processinput.
2020-10-25 07:50:03 +00:00
if (clip.type == kHitWall)
processinput_r
2020-05-19 07:03: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
auto wal = clip.hitWall;
processinput_r
2020-05-19 07:03:07 +00:00
if (p->OnMotorcycle)
{
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
onMotorcycleMove(snum, wal);
processinput_r
2020-05-19 07:03:07 +00:00
}
else if (p->OnBoat)
{
- Duke: use sector pointer in movement code
2021-11-18 16:34:31 +00:00
onBoatMove(snum, psectlotag, wal);
processinput_r
2020-05-19 07:03:07 +00:00
}
else
{
- RR: movement code
2021-11-17 21:48:48 +00:00
if (wal->lotag >= 40 && wal->lotag <= 44)
processinput_r
2020-05-19 07:03:07 +00:00
{
- RR: movement code
2021-11-17 21:48:48 +00:00
if (wal->lotag < 44)
processinput_r
2020-05-19 07:03: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
dofurniture(clip.hitWall, p->cursector, snum);
- got rid of int_ploz and int_phiz.
2022-08-21 13:47:44 +00:00
pushmove(p->pos, &p->cursector, 172, (4 << 8), (4 << 8), CLIPMASK0);
processinput_r
2020-05-19 07:03:07 +00:00
}
else
- got rid of int_ploz and int_phiz.
2022-08-21 13:47:44 +00:00
pushmove(p->pos, &p->cursector, 172, (4 << 8), (4 << 8), CLIPMASK0);
processinput_r
2020-05-19 07:03:07 +00:00
}
}
}
- handle the clipmove result in processinput.
2020-10-25 07:50:03 +00:00
if (clip.type == kHitSprite)
processinput_r
2020-05-19 07:03:07 +00:00
{
if (p->OnMotorcycle)
{
- 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
onMotorcycleHit(snum, clip.actor());
processinput_r
2020-05-19 07:03:07 +00:00
}
else if (p->OnBoat)
{
- 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
onBoatHit(snum, clip.actor());
processinput_r
2020-05-19 07:03: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
else if (badguy(clip.actor()))
- RRRA: fixed vehicle collision with psychedelic cactuses. This did not fully match the original source which had a critical difference here between RR and RRRA.
2020-11-05 06:30:56 +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 (clip.actor()->spr.statnum != 1)
processinput_r
2020-05-19 07:03: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
clip.actor()->timetosleep = 0;
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (clip.actor()->spr.picnum == BILLYRAY)
- 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
S_PlayActorSound(404, clip.actor());
- RRRA: fixed vehicle collision with psychedelic cactuses. This did not fully match the original source which had a critical difference here between RR and RRRA.
2020-11-05 06:30:56 +00:00
else
- 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
check_fta_sounds_r(clip.actor());
- moved some common utilities into the backend.
2021-11-26 20:52:01 +00:00
ChangeActorStat(clip.actor(), 1);
processinput_r
2020-05-19 07:03:07 +00:00
}
- RRRA: fixed vehicle collision with psychedelic cactuses. This did not fully match the original source which had a critical difference here between RR and RRRA.
2020-11-05 06:30:56 +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
else if (!isRRRA() && clip.actor()->spr.picnum == RRTILE3410)
- RRRA: fixed vehicle collision with psychedelic cactuses. This did not fully match the original source which had a critical difference here between RR and RRRA.
2020-11-05 06:30:56 +00:00
{
quickkill(p);
S_PlayActorSound(446, pact);
}
if (isRRRA())
{
- 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 (clip.actor()->spr.picnum == RRTILE3410)
- RRRA: fixed vehicle collision with psychedelic cactuses. This did not fully match the original source which had a critical difference here between RR and RRRA.
2020-11-05 06:30:56 +00:00
{
quickkill(p);
S_PlayActorSound(446, pact);
}
- 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 if (clip.actor()->spr.picnum == RRTILE2443 && clip.actor()->spr.pal == 19)
- RRRA: fixed vehicle collision with psychedelic cactuses. This did not fully match the original source which had a critical difference here between RR and RRRA.
2020-11-05 06:30:56 +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
clip.actor()->spr.pal = 0;
- RRRA: fixed vehicle collision with psychedelic cactuses. This did not fully match the original source which had a critical difference here between RR and RRRA.
2020-11-05 06:30:56 +00:00
p->DrugMode = 5;
- 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
ps[snum].GetActor()->spr.extra = gs.max_player_health;
- RRRA: fixed vehicle collision with psychedelic cactuses. This did not fully match the original source which had a critical difference here between RR and RRRA.
2020-11-05 06:30:56 +00:00
}
}
processinput_r
2020-05-19 07:03:07 +00:00
}
if (p->jetpack_on == 0)
{
- second batch of xvel wraps.
2022-09-01 14:48:02 +00:00
if (pact->int_xvel() > 16)
processinput_r
2020-05-19 07:03:07 +00:00
{
if (psectlotag != ST_1_ABOVE_WATER && psectlotag != ST_2_UNDERWATER && p->on_ground && (!isRRRA() || !p->sea_sick_stat))
{
p->pycount += 52;
p->pycount &= 2047;
- Duke: floatified pyoff
2022-08-30 20:25:07 +00:00
const double factor = 64. / 1596; // What is 1596?
- don't use DAngle for calculating bobbing amplitudes. It makes more sense here to have a dedicated function since this is not really angular math.
2022-09-03 22:04:01 +00:00
p->pyoff = abs(pact->int_xvel() * BobVal(p->pycount)) * factor;
processinput_r
2020-05-19 07:03:07 +00:00
}
}
else if (psectlotag != ST_2_UNDERWATER && psectlotag != 1 && (!isRRRA() || !p->sea_sick_stat))
p->pyoff = 0;
}
// RBG***
- more cleanup.
2022-02-06 21:56:25 +00:00
SetActor(pact, p->pos.plusZ(gs.playerheight));
processinput_r
2020-05-19 07:03:07 +00:00
if (psectlotag == 800 && (!isRRRA() || !p->lotag800kill))
{
if (isRRRA()) p->lotag800kill = 1;
quickkill(p);
return;
}
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 == ST_31_TWO_WAY_TRAIN)
processinput_r
2020-05-19 07:03: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 act = barrier_cast<DDukeActor*>(psectp->hitagactor);
- removed the non-Blood float_* access wrappers
2022-09-03 08:03:30 +00:00
if (act && act->vel.X != 0 && act->temp_data[0] == 0)
processinput_r
2020-05-19 07:03: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)
- RR processweapon pass 1
2020-10-25 07:12:25 +00:00
if (!S_CheckActorSoundPlaying(pact, DUKE_ONWATER))
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
if (!isRRRA() || (!p->OnBoat && !p->OnMotorcycle && p->cursector->hitag != 321))
- RR processweapon pass 1
2020-10-25 07:12:25 +00:00
S_PlayActorSound(DUKE_ONWATER, pact);
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03: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_r
2020-05-19 07:03: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;
- non 'actor' parts of player_r.cpp
2021-12-21 19:50:51 +00:00
if (pact->spr.clipdist == 64)
- floatified player_struct::pos.
2022-02-05 12:29:21 +00:00
blocked = (pushmove(p->pos, &p->cursector, 128, (4 << 8), (4 << 8), CLIPMASK0) < 0 && furthestangle(p->GetActor(), 8) < 512);
processinput_r
2020-05-19 07:03:07 +00:00
else
- floatified player_struct::pos.
2022-02-05 12:29:21 +00:00
blocked = (pushmove(p->pos, &p->cursector, 16, (4 << 8), (4 << 8), CLIPMASK0) < 0 && furthestangle(p->GetActor(), 8) < 512);
processinput_r
2020-05-19 07:03:07 +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_r
2020-05-19 07:03: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_r
2020-05-19 07:03: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_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
}
- another batch of wrapper replacements
2022-08-28 09:34:54 +00:00
if (ud.clipping == 0 && (!p->cursector || (p->cursector && p->cursector->ceilingz > (p->cursector->floorz - 12))))
processinput_r
2020-05-19 07:03:07 +00:00
{
quickkill(p);
return;
}
- 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_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
{
- handle the run key.
2020-08-28 22:57:07 +00:00
playerLookUp(snum, actions);
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
{
- handle the run key.
2020-08-28 22:57:07 +00:00
playerLookDown(snum, actions);
processinput_r
2020-05-19 07:03: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) && !p->OnMotorcycle)
processinput_r
2020-05-19 07:03:07 +00:00
{
- handle the run key.
2020-08-28 22:57:07 +00:00
playerAimUp(snum, actions);
processinput_r
2020-05-19 07:03: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) && !p->OnMotorcycle)
processinput_r
2020-05-19 07:03:07 +00:00
{
- handle the run key.
2020-08-28 22:57:07 +00:00
playerAimDown(snum, actions);
processinput_r
2020-05-19 07:03:07 +00:00
}
if (p->recoil && p->kickback_pic == 0)
{
- Duke/RR: replaced more local short variables with ints.
2021-11-07 13:36:39 +00:00
int d = p->recoil >> 1;
processinput_r
2020-05-19 07:03:07 +00:00
if (!d)
d = 1;
p->recoil -= d;
- Remove multiple `addadjustment()`/`settarget()` overloads in favour of native `binangle`/`fixedhoriz` versions only. * Simplifies these classes a bit. * Better shows intent in actual game code. * Removes unnecessary int to double conversions.
2022-05-30 10:35:41 +00:00
p->horizon.addadjustment(buildhoriz(-d));
processinput_r
2020-05-19 07:03:07 +00:00
}
- 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
- wrap all checks of cl_syncinput in an inline function.
2020-11-30 22:40:16 +00:00
if (SyncInput())
processinput_r
2020-05-19 07:03:07 +00:00
{
Merge branch 'scriptable_cutscenes' into newrenderer
2021-05-02 20:37:46 +00:00
p->horizon.applyinput(GetPlayerHorizon(snum), &actions);
processinput_r
2020-05-19 07:03:07 +00:00
}
- cleanup on player CVAR use.
2020-11-29 08:00:00 +00:00
p->checkhardlanding();
- 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
processinput_r
2020-05-19 07:03:07 +00:00
//Shooting code/changes
if (p->show_empty_weapon > 0)
p->show_empty_weapon--;
if (p->show_empty_weapon == 1)
{
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, { FEM10, NAKED1, STATUE });
processinput_r
2020-05-19 07:03: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_r
2020-05-19 07:03: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_r
2020-05-19 07:03:07 +00:00
}
else p->weapon_pos--;
}
- the remaining sector[] stuff in Duke/RR. What remains is either engine interface code or not easily replaced.
2021-11-18 19:17:47 +00:00
processweapon(snum, actions, psectp);
- P_ProcessWeapon transitioned.
2020-05-19 07:54:52 +00:00
}
processinput_r
2020-05-19 07:03:07 +00:00
OnMotorcycle etc.
2020-05-22 06:56:42 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- remove C-style struct parameters.
2022-02-07 10:04:19 +00:00
void OnMotorcycle(player_struct *p, DDukeActor* motosprite)
OnMotorcycle etc.
2020-05-22 06:56:42 +00:00
{
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
if (!p->OnMotorcycle && !(p->cursector->lotag == 2))
- properly tabified everything.
2020-07-20 21:21:27 +00:00
{
if (motosprite)
{
- cleanup, part 3.
2022-02-05 12:40:30 +00:00
p->pos.X = motosprite->spr.pos.X;
p->pos.Y = motosprite->spr.pos.Y;
- Utilise actor sprite's full precision in instances where angle was converted to Build and back again.
2022-08-28 03:15:31 +00:00
p->angle.ang = motosprite->spr.angle;
- use a dedicated variable to store the vehicle ammo for RRRA's bike and boat. owner should be reserved for pointers.
2020-10-28 06:30:17 +00:00
p->ammo_amount[MOTORCYCLE_WEAPON] = motosprite->saved_ammo;
- properly tabified everything.
2020-07-20 21:21:27 +00:00
deletesprite(motosprite);
}
p->over_shoulder_on = 0;
p->OnMotorcycle = 1;
p->last_full_weapon = p->curr_weapon;
p->curr_weapon = MOTORCYCLE_WEAPON;
- 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[MOTORCYCLE_WEAPON] = true;
- 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;
- 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.horiz = q16horiz(0);
- properly tabified everything.
2020-07-20 21:21:27 +00:00
}
This completes player_r.cpp
2020-10-27 05:50:06 +00:00
if (!S_CheckActorSoundPlaying(p->GetActor(),186))
S_PlayActorSound(186, p->GetActor());
OnMotorcycle etc.
2020-05-22 06:56:42 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- remove C-style struct parameters.
2022-02-07 10:04:19 +00:00
void OffMotorcycle(player_struct *p)
OnMotorcycle etc.
2020-05-22 06:56:42 +00:00
{
- player.i, part 4.
2020-11-02 19:24:07 +00:00
auto pact = p->GetActor();
- properly tabified everything.
2020-07-20 21:21:27 +00:00
if (p->OnMotorcycle)
{
- player.i, part 4.
2020-11-02 19:24:07 +00:00
if (S_CheckActorSoundPlaying(pact,188))
S_StopSound(188,pact);
if (S_CheckActorSoundPlaying(pact,187))
S_StopSound(187,pact);
if (S_CheckActorSoundPlaying(pact,186))
S_StopSound(186,pact);
if (S_CheckActorSoundPlaying(pact,214))
S_StopSound(214,pact);
if (!S_CheckActorSoundPlaying(pact,42))
S_PlayActorSound(42, pact);
- properly tabified everything.
2020-07-20 21:21:27 +00:00
p->OnMotorcycle = 0;
- 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[MOTORCYCLE_WEAPON] = false;
- properly tabified everything.
2020-07-20 21:21:27 +00:00
p->curr_weapon = p->last_full_weapon;
checkavailweapon(p);
- 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.horiz = q16horiz(0);
- properly tabified everything.
2020-07-20 21:21:27 +00:00
p->moto_do_bump = 0;
p->MotoSpeed = 0;
p->TiltStatus = 0;
p->moto_drink = 0;
p->VBumpTarget = 0;
p->VBumpNow = 0;
p->TurbCount = 0;
- added ZeroVelocity function to DBloodActor.
2022-08-23 19:25:05 +00:00
p->vel.X = 0 - p->angle.ang.Cos() * (1 << 7);
p->vel.Y = 0 - p->angle.ang.Sin() * (1 << 7);
- properly tabified everything.
2020-07-20 21:21:27 +00:00
p->moto_underwater = 0;
- starting at the bottom of player_r.cpp.
2020-10-23 19:53:39 +00:00
auto spawned = spawn(p->GetActor(), EMPTYBIKE);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (spawned)
{
- set_int_ang(...int_ang())
2022-08-28 22:02:17 +00:00
spawned->spr.angle = p->angle.ang;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
spawned->saved_ammo = p->ammo_amount[MOTORCYCLE_WEAPON];
}
- properly tabified everything.
2020-07-20 21:21:27 +00:00
}
OnMotorcycle etc.
2020-05-22 06:56:42 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- remove C-style struct parameters.
2022-02-07 10:04:19 +00:00
void OnBoat(player_struct *p, DDukeActor* boat)
OnMotorcycle etc.
2020-05-22 06:56:42 +00:00
{
- properly tabified everything.
2020-07-20 21:21:27 +00:00
if (!p->OnBoat)
{
- starting at the bottom of player_r.cpp.
2020-10-23 19:53:39 +00:00
if (boat)
- properly tabified everything.
2020-07-20 21:21:27 +00:00
{
- cleanup, part 3.
2022-02-05 12:40:30 +00:00
p->pos.X = boat->spr.pos.X;
p->pos.Y = boat->spr.pos.Y;
- Utilise actor sprite's full precision in instances where angle was converted to Build and back again.
2022-08-28 03:15:31 +00:00
p->angle.ang = boat->spr.angle;
- use a dedicated variable to store the vehicle ammo for RRRA's bike and boat. owner should be reserved for pointers.
2020-10-28 06:30:17 +00:00
p->ammo_amount[BOAT_WEAPON] = boat->saved_ammo;
- starting at the bottom of player_r.cpp.
2020-10-23 19:53:39 +00:00
deletesprite(boat);
- properly tabified everything.
2020-07-20 21:21:27 +00:00
}
p->over_shoulder_on = 0;
p->OnBoat = 1;
p->last_full_weapon = p->curr_weapon;
p->curr_weapon = BOAT_WEAPON;
- 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[BOAT_WEAPON] = true;
- 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;
- 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.horiz = q16horiz(0);
- properly tabified everything.
2020-07-20 21:21:27 +00:00
}
OnMotorcycle etc.
2020-05-22 06:56:42 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- remove C-style struct parameters.
2022-02-07 10:04:19 +00:00
void OffBoat(player_struct *p)
OnMotorcycle etc.
2020-05-22 06:56:42 +00:00
{
- properly tabified everything.
2020-07-20 21:21:27 +00:00
if (p->OnBoat)
{
p->OnBoat = 0;
- 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[BOAT_WEAPON] = false;
- properly tabified everything.
2020-07-20 21:21:27 +00:00
p->curr_weapon = p->last_full_weapon;
checkavailweapon(p);
- 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.horiz = q16horiz(0);
OnMotorcycle etc.
2020-05-22 06:56:42 +00:00
p->moto_do_bump = 0;
p->MotoSpeed = 0;
- properly tabified everything.
2020-07-20 21:21:27 +00:00
p->TiltStatus = 0;
p->moto_drink = 0;
p->VBumpTarget = 0;
p->VBumpNow = 0;
p->TurbCount = 0;
- added ZeroVelocity function to DBloodActor.
2022-08-23 19:25:05 +00:00
p->vel.X = 0 - p->angle.ang.Cos() * (1 << 7);
p->vel.Y = 0 - p->angle.ang.Sin() * (1 << 7);
- properly tabified everything.
2020-07-20 21:21:27 +00:00
p->moto_underwater = 0;
- starting at the bottom of player_r.cpp.
2020-10-23 19:53:39 +00:00
auto spawned = spawn(p->GetActor(), EMPTYBOAT);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (spawned)
{
- set_int_ang(...int_ang())
2022-08-28 22:02:17 +00:00
spawned->spr.angle = p->angle.ang;
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
spawned->saved_ammo = p->ammo_amount[BOAT_WEAPON];
}
- properly tabified everything.
2020-07-20 21:21:27 +00:00
}
OnMotorcycle etc.
2020-05-22 06:56:42 +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