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

4353 lines
94 KiB
C++
Raw Normal View History

- reshuffling stuff.
2020-05-07 12:55:04 +00:00
//-------------------------------------------------------------------------
/*
Copyright (C) 1996, 2003 - 3D Realms Entertainment
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
Copyright (C) 2017-2019 Nuke.YKT
- copyright
2020-05-13 14:19:39 +00:00
Copyright (C) 2020 - Christoph Oelckers
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
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"
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
#include "mmulti.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"
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
BEGIN_DUKE_NS
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
void dojaildoor();
void moveminecart();
void ballreturn(short spr);
short pinsectorresetdown(short sect);
short pinsectorresetup(short sect);
short checkpins(short sect);
void resetpins(short sect);
void resetlanepics(void);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
bool ceilingspace_r(int sectnum)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if( (sector[sectnum].ceilingstat&1) && sector[sectnum].ceilingpal == 0 )
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
switch(sector[sectnum].ceilingpicnum)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
case MOONSKY1:
case BIGORBIT1:
return 1;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
bool floorspace_r(int sectnum)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if( (sector[sectnum].floorstat&1) && sector[sectnum].ceilingpal == 0 )
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
switch(sector[sectnum].floorpicnum)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
case MOONSKY1:
case BIGORBIT1:
return 1;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
return 0;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- check_fta_sounds.
2020-10-22 17:08:10 +00:00
void check_fta_sounds_r(DDukeActor* actor)
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
{
- check_fta_sounds.
2020-10-22 17:08:10 +00:00
if (actor->s.extra > 0) switch (actor->s.picnum)
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
{
case COOT: // LIZTROOP
if (!isRRRA() && (krand() & 3) == 2)
- check_fta_sounds.
2020-10-22 17:08:10 +00:00
S_PlayActorSound(PRED_RECOG, actor);
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
break;
case BILLYCOCK:
case BILLYRAY:
case BRAYSNIPER: // PIGCOP
- check_fta_sounds.
2020-10-22 17:08:10 +00:00
S_PlayActorSound(PIG_RECOG, actor);
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
break;
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
void addweapon_r(struct player_struct* p, int weapon)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
short cw = p->curr_weapon;
if (p->OnMotorcycle || p->OnBoat)
{
p->gotweapon.Set(weapon);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
if (weapon == THROWSAW_WEAPON)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
p->gotweapon.Set(BUZZSAW_WEAPON);
p->ammo_amount[BUZZSAW_WEAPON] = 1;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
else if (weapon == CROSSBOW_WEAPON)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
p->gotweapon.Set(CHICKEN_WEAPON);
- RR: Picking up the crossbow should also enable the dynamite as a separate weapon.
2020-10-24 18:43:36 +00:00
p->gotweapon.Set(DYNAMITE_WEAPON);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
else if (weapon == SLINGBLADE_WEAPON)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
p->ammo_amount[SLINGBLADE_WEAPON] = 1;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
return;
}
if (p->gotweapon[weapon] == 0)
{
p->gotweapon.Set(weapon);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
if (weapon == THROWSAW_WEAPON)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
p->gotweapon.Set(BUZZSAW_WEAPON);
if (isRRRA()) p->ammo_amount[BUZZSAW_WEAPON] = 1;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
if (isRRRA())
{
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
if (weapon == CROSSBOW_WEAPON)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
p->gotweapon.Set(CHICKEN_WEAPON);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
if (weapon == SLINGBLADE_WEAPON)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
p->ammo_amount[SLINGBLADE_WEAPON] = 50;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
- RR: Picking up the crossbow should also enable the dynamite as a separate weapon.
2020-10-24 18:43:36 +00:00
if (weapon == CROSSBOW_WEAPON)
{
p->gotweapon.Set(DYNAMITE_WEAPON);
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
if (weapon != DYNAMITE_WEAPON)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
cw = weapon;
}
else
cw = weapon;
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
if (weapon == DYNAMITE_WEAPON)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
p->last_weapon = -1;
p->random_club_frame = 0;
if (p->holster_weapon == 0)
{
p->weapon_pos = -1;
p->last_weapon = p->curr_weapon;
}
else
{
p->weapon_pos = 10;
p->holster_weapon = 0;
p->last_weapon = -1;
}
- 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;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
p->curr_weapon = cw;
switch (weapon)
{
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
case SLINGBLADE_WEAPON:
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (!isRRRA()) break;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
case KNEE_WEAPON:
- properly tabified everything.
2020-07-20 21:21:27 +00:00
case DYNAMITE_WEAPON:
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
case TRIPBOMB_WEAPON:
- 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:
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
break;
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
case SHOTGUN_WEAPON:
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(SHOTGUN_COCK, p->i);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
break;
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
case PISTOL_WEAPON:
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(INSERT_CLIP, p->i);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
break;
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
default:
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(EJECT_CLIP, p->i);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
break;
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
void hitradius_r(DDukeActor* actor, int r, int hp1, int hp2, int hp3, int hp4)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
walltype* wal;
int d, q, x1, y1;
int sectcnt, sectend, dasect, startwall, endwall, nextsect;
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
short p, x, sect;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
static const uint8_t statlist[] = { STAT_DEFAULT, STAT_ACTOR, STAT_STANDABLE, STAT_PLAYER, STAT_FALLER, STAT_ZOMBIEACTOR, STAT_MISC };
short tempshort[MAXSECTORS]; // originally hijacked a global buffer which is bad. Q: How many do we really need? RedNukem says 64.
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
auto spri = &actor->s;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- renaming in hitradius
2020-10-24 20:41:14 +00:00
if (spri->xrepeat < 11)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- renaming in hitradius
2020-10-24 20:41:14 +00:00
if (spri->picnum == RPG || ((isRRRA()) && spri->picnum == RPG2)) goto SKIPWALLCHECK;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- renaming in hitradius
2020-10-24 20:41:14 +00:00
tempshort[0] = spri->sectnum;
dasect = spri->sectnum;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
sectcnt = 0; sectend = 1;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
do
{
dasect = tempshort[sectcnt++];
- renaming in hitradius
2020-10-24 20:41:14 +00:00
if (((sector[dasect].ceilingz - spri->z) >> 8) < r)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- renaming in hitradius
2020-10-24 20:41:14 +00:00
d = abs(wall[sector[dasect].wallptr].x - spri->x) + abs(wall[sector[dasect].wallptr].y - spri->y);
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (d < r)
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
fi.checkhitceiling(dasect);
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
else
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
// ouch...
- renaming in hitradius
2020-10-24 20:41:14 +00:00
d = abs(wall[wall[wall[sector[dasect].wallptr].point2].point2].x - spri->x) + abs(wall[wall[wall[sector[dasect].wallptr].point2].point2].y - spri->y);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
if (d < r)
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
fi.checkhitceiling(dasect);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
startwall = sector[dasect].wallptr;
endwall = startwall + sector[dasect].wallnum;
for (x = startwall, wal = &wall[startwall]; x < endwall; x++, wal++)
- renaming in hitradius
2020-10-24 20:41:14 +00:00
if ((abs(wal->x - spri->x) + abs(wal->y - spri->y)) < r)
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
{
nextsect = wal->nextsector;
if (nextsect >= 0)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
for (dasect = sectend - 1; dasect >= 0; dasect--)
if (tempshort[dasect] == nextsect) break;
if (dasect < 0) tempshort[sectend++] = nextsect;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- renaming in hitradius
2020-10-24 20:41:14 +00:00
x1 = (((wal->x + wall[wal->point2].x) >> 1) + spri->x) >> 1;
y1 = (((wal->y + wall[wal->point2].y) >> 1) + spri->y) >> 1;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
updatesector(x1, y1, &sect);
- renaming in hitradius
2020-10-24 20:41:14 +00:00
if (sect >= 0 && cansee(x1, y1, spri->z, sect, spri->x, spri->y, spri->z, spri->sectnum))
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
fi.checkhitwall(actor->GetIndex(), x, wal->x, wal->y, spri->z, spri->picnum);
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
}
} while (sectcnt < sectend);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
SKIPWALLCHECK:
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
q = -(24 << 8) + (krand() & ((32 << 8) - 1));
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
auto Owner = actor->GetOwner();
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
for (x = 0; x < 7; x++)
{
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
DukeStatIterator it1(statlist[x]);
while (auto act2 = it1.Next())
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
auto spri2 = &act2->s;
- renaming in hitradius
2020-10-24 20:41:14 +00:00
if (x == 0 || x >= 5 || AFLAMABLE(spri2->picnum))
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- renaming in hitradius
2020-10-24 20:41:14 +00:00
if (spri2->cstat & 257)
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
if (dist(actor, act2) < r)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
if (badguy(act2) && !cansee(spri2->x, spri2->y, spri2->z + q, spri2->sectnum, spri->x, spri->y, spri->z + q, spri->sectnum))
- all commands now get run by the original code.
2020-05-14 22:37:49 +00:00
{
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
continue;
- all commands now get run by the original code.
2020-05-14 22:37:49 +00:00
}
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
fi.checkhitsprite(act2->GetIndex(), actor->GetIndex());
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
else if (spri2->extra >= 0 && act2 != actor && (badguy(act2) || spri2->picnum == QUEBALL || spri2->picnum == RRTILE3440 || spri2->picnum == STRIPEBALL || (spri2->cstat & 257) || spri2->picnum == DUKELYINGDEAD))
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
if (spri->picnum == MORTER && act2 == Owner)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
continue;
}
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
if ((isRRRA()) && spri->picnum == CHEERBOMB && act2 == Owner)
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
{
continue;
}
- renaming in hitradius
2020-10-24 20:41:14 +00:00
if (spri2->picnum == APLAYER) spri2->z -= PHEIGHT;
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
d = dist(actor, act2);
- renaming in hitradius
2020-10-24 20:41:14 +00:00
if (spri2->picnum == APLAYER) spri2->z += PHEIGHT;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
- renaming in hitradius
2020-10-24 20:41:14 +00:00
if (d < r && cansee(spri2->x, spri2->y, spri2->z - (8 << 8), spri2->sectnum, spri->x, spri->y, spri->z - (12 << 8), spri->sectnum))
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
{
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
if ((isRRRA()) && spri2->picnum == MINION && spri2->pal == 19)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
continue;
}
- renaming in hitradius
2020-10-24 20:41:14 +00:00
act2->ang = getangle(spri2->x - spri->x, spri2->y - spri->y);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- renaming in hitradius
2020-10-24 20:41:14 +00:00
if (spri->picnum == RPG && spri2->extra > 0)
act2->picnum = RPG;
else if ((isRRRA()) && spri->picnum == RPG2 && spri2->extra > 0)
act2->picnum = RPG;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
else
- renaming in hitradius
2020-10-24 20:41:14 +00:00
act2->picnum = RADIUSEXPLOSION;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (d < r / 3)
{
if (hp4 == hp3) hp4++;
- renaming in hitradius
2020-10-24 20:41:14 +00:00
act2->extra = hp3 + (krand() % (hp4 - hp3));
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
else if (d < 2 * r / 3)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (hp3 == hp2) hp3++;
- renaming in hitradius
2020-10-24 20:41:14 +00:00
act2->extra = hp2 + (krand() % (hp3 - hp2));
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
else if (d < r)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (hp2 == hp1) hp2++;
- renaming in hitradius
2020-10-24 20:41:14 +00:00
act2->extra = hp1 + (krand() % (hp2 - hp1));
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
int pic = spri2->picnum;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if ((isRRRA())?
(pic != HULK && pic != MAMA && pic != BILLYPLAY && pic != COOTPLAY && pic != MAMACLOUD) :
(pic != HULK && pic != SBMOVE))
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
if (spri2->xvel < 0) spri2->xvel = 0;
spri2->xvel += (spri2->extra << 2);
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- renaming in hitradius
2020-10-24 20:41:14 +00:00
if (spri2->picnum == STATUEFLASH || spri2->picnum == QUEBALL ||
spri2->picnum == STRIPEBALL || spri2->picnum == RRTILE3440)
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
fi.checkhitsprite(act2->GetIndex(), actor->GetIndex());
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
if (spri2->picnum != RADIUSEXPLOSION &&
Owner && Owner->s.statnum < MAXSTATUS)
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
{
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
if (spri2->picnum == APLAYER)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
p = act2->PlayerIndex();
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (ps[p].newowner >= 0)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
clearcamera(&ps[p]);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
- hitradius # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 20:04:39 +00:00
act2->SetHitOwner(actor->GetOwner());
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
}
}
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
int movesprite_ex_r(DDukeActor* actor, int xchange, int ychange, int zchange, unsigned int cliptype, Collision &result)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
int daz, h, oldx, oldy;
short retval, dasectnum, cd;
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
auto spri = &actor->s;
int bg = badguy(actor);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- use pointer for sprite access in movesprite_r. Bringing it in line with movesprite_d.
2020-10-24 07:20:45 +00:00
if (spri->statnum == 5 || (bg && spri->xrepeat < 4))
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- use pointer for sprite access in movesprite_r. Bringing it in line with movesprite_d.
2020-10-24 07:20:45 +00:00
spri->x += (xchange * TICSPERFRAME) >> 2;
spri->y += (ychange * TICSPERFRAME) >> 2;
spri->z += (zchange * TICSPERFRAME) >> 2;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
if (bg)
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
setsprite(actor, spri->x, spri->y, spri->z);
return result.setNone();
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- use pointer for sprite access in movesprite_r. Bringing it in line with movesprite_d.
2020-10-24 07:20:45 +00:00
dasectnum = spri->sectnum;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- use pointer for sprite access in movesprite_r. Bringing it in line with movesprite_d.
2020-10-24 07:20:45 +00:00
daz = spri->z;
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
h = ((tileHeight(spri->picnum) * spri->yrepeat) << 1);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
daz -= h;
if (bg)
{
- use pointer for sprite access in movesprite_r. Bringing it in line with movesprite_d.
2020-10-24 07:20:45 +00:00
oldx = spri->x;
oldy = spri->y;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- use pointer for sprite access in movesprite_r. Bringing it in line with movesprite_d.
2020-10-24 07:20:45 +00:00
if (spri->xrepeat > 60)
retval = clipmove(&spri->x, &spri->y, &daz, &dasectnum, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 1024L, (4 << 8), (4 << 8), cliptype);
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
else
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
cd = 192;
- use pointer for sprite access in movesprite_r. Bringing it in line with movesprite_d.
2020-10-24 07:20:45 +00:00
retval = clipmove(&spri->x, &spri->y, &daz, &dasectnum, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), cd, (4 << 8), (4 << 8), cliptype);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
if (dasectnum < 0 || (dasectnum >= 0 && actor->actorstayput >= 0 && actor->actorstayput != dasectnum))
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- use pointer for sprite access in movesprite_r. Bringing it in line with movesprite_d.
2020-10-24 07:20:45 +00:00
spri->x = oldx;
spri->y = oldy;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (sector[dasectnum].lotag == ST_1_ABOVE_WATER)
- use pointer for sprite access in movesprite_r. Bringing it in line with movesprite_d.
2020-10-24 07:20:45 +00:00
spri->ang = (krand() & 2047);
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
else if ((actor->temp_data[0] & 3) == 1)
- use pointer for sprite access in movesprite_r. Bringing it in line with movesprite_d.
2020-10-24 07:20:45 +00:00
spri->ang = (krand() & 2047);
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
setsprite(actor, oldx, oldy, spri->z);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
if (dasectnum < 0) dasectnum = 0;
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
return result.setSector(dasectnum);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- fixed bad collision state check in movesprite. Fixes #147
2020-10-24 19:36:27 +00:00
if ((retval & kHitTypeMask) > kHitSector && (actor->cgg == 0)) spri->ang += 768;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
else
{
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
if (spri->statnum == STAT_PROJECTILE)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
retval =
- use pointer for sprite access in movesprite_r. Bringing it in line with movesprite_d.
2020-10-24 07:20:45 +00:00
clipmove(&spri->x, &spri->y, &daz, &dasectnum, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 8L, (4 << 8), (4 << 8), cliptype);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
else
retval =
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
clipmove(&spri->x, &spri->y, &daz, &dasectnum, ((xchange * TICSPERFRAME) << 11), ((ychange * TICSPERFRAME) << 11), 128, (4 << 8), (4 << 8), cliptype);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
if (dasectnum >= 0)
- use pointer for sprite access in movesprite_r. Bringing it in line with movesprite_d.
2020-10-24 07:20:45 +00:00
if ((dasectnum != spri->sectnum))
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
changespritesect(actor, dasectnum);
- use pointer for sprite access in movesprite_r. Bringing it in line with movesprite_d.
2020-10-24 07:20:45 +00:00
daz = spri->z + ((zchange * TICSPERFRAME) >> 3);
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
if ((daz > actor->ceilingz) && (daz <= actor->floorz))
- use pointer for sprite access in movesprite_r. Bringing it in line with movesprite_d.
2020-10-24 07:20:45 +00:00
spri->z = daz;
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
else if (retval == 0)
return result.setSector(dasectnum);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- foundation for a better collision info management. The way this is handled is the main reason why Build maps are size limited, but since it is extremely invasive it needs to be taken out of the game code piece by piece, this is the framework for doing this for Duke.
2020-10-24 07:31:15 +00:00
return result.setFromEngine(retval);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- pass spawner as an actor pointer to 'lotsofstuff'. Allows doing this without using sprite indices.
2020-10-24 07:35:43 +00:00
void lotsoffeathers_r(DDukeActor *actor, short n)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- pass spawner as an actor pointer to 'lotsofstuff'. Allows doing this without using sprite indices.
2020-10-24 07:35:43 +00:00
lotsofstuff(actor, n, MONEY);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- guts_d and guts_r.
2020-10-22 17:21:21 +00:00
void guts_r(DDukeActor* actor, short gtype, short n, short p)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- guts_d and guts_r.
2020-10-22 17:21:21 +00:00
auto s = &actor->s;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
int gutz, floorz;
int i=0, j;
int sx, sy;
uint8_t pal;
- guts_d and guts_r.
2020-10-22 17:21:21 +00:00
if (badguy(actor) && s->xrepeat < 16)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
sx = sy = 8;
else sx = sy = 32;
gutz = s->z - (8 << 8);
floorz = getflorzofslope(s->sectnum, s->x, s->y);
if (gutz > (floorz - (8 << 8)))
gutz = floorz - (8 << 8);
- consolidated gutsdir functions by making the spawn offset for Duke's commander an actor property.
2020-10-21 22:05:08 +00:00
gutz += actorinfo[s->picnum].gutsoffset;
- guts_d and guts_r.
2020-10-22 17:21:21 +00:00
if (badguy(actor) && s->pal == 6)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
pal = 6;
else
{
pal = 0;
if (isRRRA())
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (s->picnum == MINION && (s->pal == 8 || s->pal == 19)) pal = s->pal;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
for (j = 0; j < n; j++)
{
// RANDCORRECT version from RR.
int a = krand() & 2047;
int r1 = krand();
int r2 = krand();
int r3 = krand();
int r4 = krand();
int r5 = krand();
// TRANSITIONAL: owned by a player???
- guts_d and guts_r.
2020-10-22 17:21:21 +00:00
auto spawned = EGS(s->sectnum, s->x + (r5 & 255) - 128, s->y + (r4 & 255) - 128, gutz - (r3 & 8191), gtype, -32, sx >> 1, sy >> 1, a, 48 + (r2 & 31), -512 - (r1 & 2047), ps[p].GetActor(), 5);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
if (pal != 0)
- guts_d and guts_r.
2020-10-22 17:21:21 +00:00
spawned->s.pal = pal;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
void movefta_r(void)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
int x, px, py, sx, sy;
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
short j, p, psect, ssect;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
DukeStatIterator it(STAT_ZOMBIEACTOR);
while(auto act = it.Next())
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
{
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
auto s = &act->s;
p = findplayer(act, &x);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
j = 0;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
ssect = psect = s->sectnum;
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
if (ps[p].GetActor()->s.extra > 0)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
if (x < 30000)
{
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
act->timetosleep++;
if (act->timetosleep >= (x >> 8))
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
if (badguy(act))
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
px = ps[p].oposx + 64 - (krand() & 127);
py = ps[p].oposy + 64 - (krand() & 127);
updatesector(px, py, &psect);
if (psect == -1)
{
continue;
}
sx = s->x + 64 - (krand() & 127);
sy = s->y + 64 - (krand() & 127);
updatesector(px, py, &ssect);
if (ssect == -1)
{
continue;
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (s->pal == 33 || s->picnum == VIXEN ||
(isRRRA() && (isIn(s->picnum, COOT, COOTSTAYPUT, BIKER, BIKERB, BIKERBV2, CHEER, CHEERB,
CHEERSTAYPUT, MINIONBOAT, HULKBOAT, CHEERBOAT, RABBIT, COOTPLAY, BILLYPLAY, MAKEOUT, MAMA)
|| (s->picnum == MINION && s->pal == 8)))
|| (sintable[(s->ang + 512) & 2047] * (px - sx) + sintable[s->ang & 2047] * (py - sy) >= 0))
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
int r1 = krand();
int r2 = krand();
j = cansee(sx, sy, s->z - (r2 % (52 << 8)), s->sectnum, px, py, ps[p].oposz - (r1 % (32 << 8)), ps[p].cursectnum);
}
}
else
{
int r1 = krand();
int r2 = krand();
j = cansee(s->x, s->y, s->z - ((r2 & 31) << 8), s->sectnum, ps[p].oposx, ps[p].oposy, ps[p].oposz - ((r1 & 31) << 8), ps[p].cursectnum);
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (j) switch (s->picnum)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
case RUBBERCAN:
case EXPLODINGBARREL:
case WOODENHORSE:
case HORSEONSIDE:
case CANWITHSOMETHING:
case FIREBARREL:
case FIREVASE:
case NUKEBARREL:
case NUKEBARRELDENTED:
case NUKEBARRELLEAKED:
if (sector[s->sectnum].ceilingstat & 1)
s->shade = sector[s->sectnum].ceilingshade;
else s->shade = sector[s->sectnum].floorshade;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
act->timetosleep = 0;
changespritestat(act, STAT_STANDABLE);
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
break;
default:
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
#if 0
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
// TRANSITIONAL: RedNukem has this here. Needed?
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
if (actorflag(spriteNum, SFLAG_USEACTIVATOR) && sector[s prite[spriteNum].sectnum].lotag & 16384) break;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
#endif
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
act->timetosleep = 0;
check_fta_sounds_r(act);
changespritestat(act, STAT_ACTOR);
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
break;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
else act->timetosleep = 0;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
if (/*!j &&*/ badguy(act)) // this is like RedneckGDX. j is uninitialized here, i.e. most likely not 0.
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
if (sector[s->sectnum].ceilingstat & 1)
s->shade = sector[s->sectnum].ceilingshade;
else s->shade = sector[s->sectnum].floorshade;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (s->picnum != HEN || s->picnum != COW || s->picnum != PIG || s->picnum != DOGRUN || ((isRRRA()) && s->picnum != RABBIT))
{
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
if (wakeup(act, p))
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
act->timetosleep = 0;
check_fta_sounds_r(act);
changespritestat(act, STAT_ACTOR);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
DDukeActor* ifhitsectors_r(int sectnum)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
DukeStatIterator it(STAT_MISC);
while (auto a1 = it.Next())
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
if (a1->s.picnum == EXPLOSION2 || (a1->s.picnum == EXPLOSION3 && sectnum == a1->s.sectnum))
return a1;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- movefta and ifhitsectors.
2020-10-22 17:27:59 +00:00
return nullptr;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- ifhitbyweapon. # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 19:41:14 +00:00
int ifhitbyweapon_r(DDukeActor *actor)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- ifhitbyweapon. # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 19:41:14 +00:00
int p;
auto hitowner = actor->GetHitOwner();
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
auto spri = &actor->s;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
if (actor->extra >= 0)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
if (spri->extra >= 0)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
if (spri->picnum == APLAYER)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (ud.god) return -1;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- ifhitbyweapon. # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 19:41:14 +00:00
p = actor->PlayerIndex();
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- ifhitbyweapon. # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 19:41:14 +00:00
if (hitowner &&
hitowner->s.picnum == APLAYER &&
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
ud.coop == 1 &&
ud.ffire == 0)
return -1;
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
spri->extra -= actor->extra;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- ifhitbyweapon. # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 19:41:14 +00:00
if (hitowner)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
if (spri->extra <= 0 && actor->picnum != FREEZEBLAST)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
spri->extra = 0;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- ifhitbyweapon. # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 19:41:14 +00:00
ps[p].wackedbyactor = hitowner;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- ifhitbyweapon. # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 19:41:14 +00:00
if (hitowner->s.picnum == APLAYER && p != hitowner->PlayerIndex())
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- ifhitbyweapon. # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 19:41:14 +00:00
ps[p].frag_ps = hitowner->PlayerIndex();
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- ifhitbyweapon. # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 19:41:14 +00:00
actor->SetHitOwner(ps[p].GetActor());
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
int pn = actor->picnum;
- inverted logic.
2020-05-14 19:52:00 +00:00
if (pn == RPG2 && !isRRRA()) pn = 0; // avoid messing around with gotos.
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
switch (pn)
{
case RADIUSEXPLOSION:
case RPG:
case HYDRENT:
case HEAVYHBOMB:
case SEENINE:
case OOZFILTER:
case EXPLODINGBARREL:
case TRIPBOMBSPRITE:
case RPG2:
ps[p].posxv +=
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
actor->extra * (sintable[(actor->ang + 512) & 2047]) << 2;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
ps[p].posyv +=
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
actor->extra * (sintable[actor->ang & 2047]) << 2;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
break;
default:
ps[p].posxv +=
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
actor->extra * (sintable[(actor->ang + 512) & 2047]) << 1;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
ps[p].posyv +=
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
actor->extra * (sintable[actor->ang & 2047]) << 1;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
break;
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
else
{
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
if (actor->extra == 0)
if (spri->xrepeat < 24)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
return -1;
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
spri->extra -= actor->extra;
- ifhitbyweapon. # Conflicts: # source/games/duke/src/actors_d.cpp # source/games/duke/src/actors_r.cpp
2020-10-21 19:41:14 +00:00
if (spri->picnum != RECON && actor->GetOwner() && actor->GetOwner()->s.statnum < MAXSTATUS)
actor->SetOwner(hitowner);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
actor->extra = -1;
return actor->picnum;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
- ifhitbyweapon cleanup. Variables renamed and array accesses replaced with pointers in RR version.
2020-10-24 08:45:30 +00:00
actor->extra = -1;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
return -1;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- actor iterators for movefx and its RRRA subfunction.
2020-10-24 08:30:17 +00:00
void respawn_rrra(DDukeActor* oldact, DDukeActor* newact)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- actor iterators for movefx and its RRRA subfunction.
2020-10-24 08:30:17 +00:00
auto newspr = &newact->s;
newspr->pal = oldact->s.pal;
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (newspr->picnum == MAMA)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (newspr->pal == 30)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
newspr->xrepeat = 26;
newspr->yrepeat = 26;
newspr->clipdist = 75;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
else if (newspr->pal == 31)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
newspr->xrepeat = 36;
newspr->yrepeat = 36;
newspr->clipdist = 100;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
else if (newspr->pal == 32)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
newspr->xrepeat = 50;
newspr->yrepeat = 50;
newspr->clipdist = 100;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
else
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
newspr->xrepeat = 50;
newspr->yrepeat = 50;
newspr->clipdist = 100;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (newspr->pal == 8)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
newspr->cstat |= 2;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (newspr->pal != 6)
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
{
- actor iterators for movefx and its RRRA subfunction.
2020-10-24 08:30:17 +00:00
deletesprite(oldact);
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
return;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- actor iterators for movefx and its RRRA subfunction.
2020-10-24 08:30:17 +00:00
oldact->s.extra = (66 - 13);
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
newspr->pal = 0;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
void movefallers_r(void)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movefallers.
2020-10-22 17:31:06 +00:00
DukeStatIterator it(STAT_FALLER);
while (auto act = it.Next())
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movefallers.
2020-10-22 17:31:06 +00:00
auto s = &act->s;
int sect = s->sectnum;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- movefallers.
2020-10-22 17:31:06 +00:00
if (act->temp_data[0] == 0)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
s->z -= (16 << 8);
- movefallers.
2020-10-22 17:31:06 +00:00
act->temp_data[1] = s->ang;
int x = s->extra;
int j = fi.ifhitbyweapon(act);
if (j >= 0)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (j == RPG || (isRRRA() && j == RPG2) || j == RADIUSEXPLOSION || j == SEENINE || j == OOZFILTER)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
if (s->extra <= 0)
{
- movefallers.
2020-10-22 17:31:06 +00:00
act->temp_data[0] = 1;
DukeStatIterator it(STAT_FALLER);
while (auto ac2 = it.Next())
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movefallers.
2020-10-22 17:31:06 +00:00
if (ac2->s.hitag == s->hitag)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movefallers.
2020-10-22 17:31:06 +00:00
ac2->temp_data[0] = 1;
ac2->s.cstat &= (65535 - 64);
if (ac2->s.picnum == CEILINGSTEAM || ac2->s.picnum == STEAM)
ac2->s.cstat |= 32768;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
}
}
else
{
- movefallers.
2020-10-22 17:31:06 +00:00
act->extra = 0;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
s->extra = x;
}
}
- movefallers.
2020-10-22 17:31:06 +00:00
s->ang = act->temp_data[1];
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
s->z += (16 << 8);
}
- movefallers.
2020-10-22 17:31:06 +00:00
else if (act->temp_data[0] == 1)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
if (s->lotag > 0)
{
s->lotag -= 3;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
s->xvel = ((64 + krand()) & 127);
s->zvel = -(1024 + (krand() & 1023));
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
else
{
if (s->xvel > 0)
{
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
s->xvel -= 2;
- movefallers.
2020-10-22 17:31:06 +00:00
ssp(act, CLIPMASK0);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- movefallers.
2020-10-22 17:31:06 +00:00
int x;
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
if (fi.floorspace(s->sectnum)) x = 0;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
else
{
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
if (fi.ceilingspace(s->sectnum))
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
x = gc / 6;
else
x = gc;
}
if (s->z < (sector[sect].floorz - FOURSLEIGHT))
{
s->zvel += x;
if (s->zvel > 6144)
s->zvel = 6144;
s->z += s->zvel;
}
if ((sector[sect].floorz - s->z) < (16 << 8))
{
- movefallers.
2020-10-22 17:31:06 +00:00
int j = 1 + (krand() & 7);
for (x = 0; x < j; x++) RANDOMSCRAP(act);
deletesprite(act);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
}
}
}
//---------------------------------------------------------------------------
//
// split out of movestandables
//
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- movecrack, movefireext, moveviewscreen.
2020-10-22 17:40:14 +00:00
static void movecrack(DDukeActor* actor)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movecrack, movefireext, moveviewscreen.
2020-10-22 17:40:14 +00:00
auto s = &actor->s;
int* t = &actor->temp_data[0];
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
if (s->hitag > 0)
{
t[0] = s->cstat;
t[1] = s->ang;
- movecrack, movefireext, moveviewscreen.
2020-10-22 17:40:14 +00:00
int j = fi.ifhitbyweapon(actor);
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (j == RPG || (isRRRA() && j == RPG2) || j == RADIUSEXPLOSION || j == SEENINE || j == OOZFILTER)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movecrack, movefireext, moveviewscreen.
2020-10-22 17:40:14 +00:00
DukeStatIterator it(STAT_STANDABLE);
while (auto a1 = it.Next())
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movecrack, movefireext, moveviewscreen.
2020-10-22 17:40:14 +00:00
if (s->hitag == a1->s.hitag && (a1->s.picnum == OOZFILTER || a1->s.picnum == SEENINE))
if (a1->s.shade != -32)
a1->s.shade = -32;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- movecrack, movefireext, moveviewscreen.
2020-10-22 17:40:14 +00:00
detonate(actor, EXPLOSION2);
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
}
else
{
s->cstat = t[0];
s->ang = t[1];
s->extra = 0;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- move*bolt.
2020-10-22 17:46:42 +00:00
static void movebolt(DDukeActor* actor)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- move*bolt.
2020-10-22 17:46:42 +00:00
auto s = &actor->s;
int* t = &actor->temp_data[0];
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
int x;
int sect = s->sectnum;
- move*bolt.
2020-10-22 17:46:42 +00:00
auto p = findplayer(&actor->s, &x);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
if (x > 20480) return;
if (t[3] == 0)
t[3] = sector[sect].floorshade;
CLEAR_THE_BOLT:
if (t[2])
{
t[2]--;
sector[sect].floorshade = 20;
sector[sect].ceilingshade = 20;
return;
}
if ((s->xrepeat | s->yrepeat) == 0)
{
s->xrepeat = t[0];
s->yrepeat = t[1];
}
else if ((krand() & 8) == 0)
{
t[0] = s->xrepeat;
t[1] = s->yrepeat;
t[2] = global_random & 4;
s->xrepeat = s->yrepeat = 0;
goto CLEAR_THE_BOLT;
}
s->picnum++;
int l = global_random & 7;
s->xrepeat = l + 8;
if (l & 1) s->cstat ^= 2;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (s->picnum == (BOLT1 + 1) && (krand() & 1) && sector[sect].floorpicnum == HURTRAIL)
- move*bolt.
2020-10-22 17:46:42 +00:00
S_PlayActorSound(SHORT_CIRCUIT, actor);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (s->picnum == BOLT1 + 4) s->picnum = BOLT1;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
if (s->picnum & 1)
{
sector[sect].floorshade = 0;
sector[sect].ceilingshade = 0;
}
else
{
sector[sect].floorshade = 20;
sector[sect].ceilingshade = 20;
}
}
//---------------------------------------------------------------------------
//
// this has been broken up into lots of smaller subfunctions
//
//---------------------------------------------------------------------------
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
void movestandables_r(void)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movestandables.
2020-10-22 17:51:42 +00:00
DukeStatIterator it(STAT_STANDABLE);
while (auto act = it.Next())
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movestandables.
2020-10-22 17:51:42 +00:00
int picnum = act->s.picnum;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- movestandables.
2020-10-22 17:51:42 +00:00
if (act->s.sectnum < 0)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movestandables.
2020-10-22 17:51:42 +00:00
deletesprite(act);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
continue;
}
- movestandables.
2020-10-22 17:51:42 +00:00
act->bposx = act->s.x;
act->bposy = act->s.y;
act->bposz = act->s.z;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
if (picnum >= CRANE && picnum <= CRANE +3)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movestandables.
2020-10-22 17:51:42 +00:00
movecrane(act, CRANE);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
else if (picnum >= WATERFOUNTAIN && picnum <= WATERFOUNTAIN + 3)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movestandables.
2020-10-22 17:51:42 +00:00
movefountain(act, WATERFOUNTAIN);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
else if (AFLAMABLE(picnum))
{
- movestandables.
2020-10-22 17:51:42 +00:00
moveflammable(act, TIRE, BOX, BLOODPOOL);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
else if (picnum >= CRACK1 && picnum <= CRACK1 + 3)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movestandables.
2020-10-22 17:51:42 +00:00
movecrack(act);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
else if (picnum == OOZFILTER || picnum == SEENINE || picnum == SEENINEDEAD || picnum == (SEENINEDEAD + 1))
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movestandables.
2020-10-22 17:51:42 +00:00
moveooz(act, SEENINE, SEENINEDEAD, OOZFILTER, EXPLOSION2);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
else if (picnum == MASTERSWITCH)
{
- movestandables.
2020-10-22 17:51:42 +00:00
movemasterswitch(act, SEENINE, OOZFILTER);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
else if (picnum == TRASH)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movestandables.
2020-10-22 17:51:42 +00:00
movetrash(act);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
else if (picnum >= BOLT1 && picnum <= BOLT1 + 3)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movestandables.
2020-10-22 17:51:42 +00:00
movebolt(act);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
else if (picnum == WATERDRIP)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movestandables.
2020-10-22 17:51:42 +00:00
movewaterdrip(act, WATERDRIP);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
else if (picnum == DOORSHOCK)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movestandables.
2020-10-22 17:51:42 +00:00
movedoorshock(act);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
else if (picnum == TOUCHPLATE)
{
- movestandables.
2020-10-22 17:51:42 +00:00
movetouchplate(act, TOUCHPLATE);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
else if (picnum == CANWITHSOMETHING)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- movestandables.
2020-10-22 17:51:42 +00:00
movecanwithsomething(act);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
else if (isIn(picnum,
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
EXPLODINGBARREL,
WOODENHORSE,
HORSEONSIDE,
FIREBARREL,
FIREVASE,
NUKEBARREL,
NUKEBARRELDENTED,
NUKEBARRELLEAKED,
TOILETWATER,
RUBBERCAN,
STEAM,
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
CEILINGSTEAM))
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
int x;
- movestandables.
2020-10-22 17:51:42 +00:00
int p = findplayer(&act->s, &x);
execute(act, p, x);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- chickenarrow and movefireball.
2020-10-22 17:59:38 +00:00
static void chickenarrow(DDukeActor* actor)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- chickenarrow and movefireball.
2020-10-22 17:59:38 +00:00
auto s = &actor->s;
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
s->hitag++;
- chickenarrow and movefireball.
2020-10-22 17:59:38 +00:00
if (actor->picnum != BOSS2 && s->xrepeat >= 10 && sector[s->sectnum].lotag != 2)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- chickenarrow and movefireball.
2020-10-22 17:59:38 +00:00
auto spawned = spawn(actor, SMALLSMOKE);
spawned->s.z += (1 << 8);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
if ((krand() & 15) == 2)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- chickenarrow and movefireball.
2020-10-22 17:59:38 +00:00
spawn(actor, MONEY);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
}
}
- chickenarrow and movefireball.
2020-10-22 17:59:38 +00:00
auto ts = &hittype[s->lotag]; // Grrrr...
if (ts->s.extra <= 0)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
s->lotag = 0;
if (s->lotag != 0 && s->hitag > 5)
{
int ang, ang2, ang3;
- chickenarrow and movefireball.
2020-10-22 17:59:38 +00:00
ang = getangle(ts->s.x - s->x, ts->s.y - s->y);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
ang2 = ang - s->ang;
ang3 = abs(ang2);
if (ang2 < 100)
{
if (ang3 > 1023)
s->ang += 51;
else
s->ang -= 51;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
else if (ang2 > 100)
{
if (ang3 > 1023)
s->ang -= 51;
else
s->ang += 51;
}
else
s->ang = ang;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
if (s->hitag > 180)
if (s->zvel <= 0)
s->zvel += 200;
}
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
static bool weaponhitsprite(DDukeActor *proj, DDukeActor *targ, const vec3_t &oldpos)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
auto s = &proj->s;
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
if (isRRRA())
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
if (targ->s.picnum == MINION
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
&& (s->picnum == RPG || s->picnum == RPG2)
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
&& targ->s.pal == 19)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
S_PlayActorSound(RPG_EXPLODE, proj);
spawn(proj, EXPLOSION2)->s.pos = oldpos;
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
return true;
}
}
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
else if (s->picnum == FREEZEBLAST && targ->s.pal == 1)
if (badguy(targ) || targ->s.picnum == APLAYER)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
auto star = spawn(proj, TRANSPORTERSTAR);
star->s.pal = 1;
star->s.xrepeat = 32;
star->s.yrepeat = 32;
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
deletesprite(proj);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
return true;
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
fi.checkhitsprite(targ->GetIndex(), proj->GetIndex());
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
if (targ->s.picnum == APLAYER)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
int p = targ->s.yvel;
S_PlayActorSound(PISTOL_BODYHIT, targ);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
if (s->picnum == SPIT)
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
if (isRRRA() && proj->GetOwner() && proj->GetOwner()->s.picnum == MAMA)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
guts_r(proj, RABBITJIBA, 2, myconnectindex);
guts_r(proj, RABBITJIBB, 2, myconnectindex);
guts_r(proj, RABBITJIBC, 2, myconnectindex);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
ps[p].horizon.addadjustment(32);
ps[p].sync.actions |= SB_CENTERVIEW;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
if (ps[p].loogcnt == 0)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
if (!S_CheckActorSoundPlaying(ps[p].GetActor(), DUKE_LONGTERM_PAIN))
S_PlayActorSound(DUKE_LONGTERM_PAIN, ps[p].GetActor());
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
int j = 3 + (krand() & 3);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
ps[p].numloogs = j;
ps[p].loogcnt = 24 * 4;
for (int x = 0; x < j; x++)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
ps[p].loogiex[x] = krand() % 320;
ps[p].loogiey[x] = krand() % 200;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
}
}
return false;
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
static bool weaponhitwall(DDukeActor *proj, int wal, const vec3_t& oldpos)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
auto s = &proj->s;
if (isRRRA() && proj->GetOwner() && proj->GetOwner()->s.picnum == MAMA)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
guts_r(proj, RABBITJIBA, 2, myconnectindex);
guts_r(proj, RABBITJIBB, 2, myconnectindex);
guts_r(proj, RABBITJIBC, 2, myconnectindex);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
if (s->picnum != RPG && (!isRRRA() || s->picnum != RPG2) && s->picnum != FREEZEBLAST && s->picnum != SPIT && s->picnum != SHRINKSPARK && (wall[wal].overpicnum == MIRROR || wall[wal].picnum == MIRROR))
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
int k = getangle(
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
wall[wall[wal].point2].x - wall[wal].x,
wall[wall[wal].point2].y - wall[wal].y);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
s->ang = ((k << 1) - s->ang) & 2047;
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
proj->SetOwner(proj);
spawn(proj, TRANSPORTERSTAR);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
return true;
}
else
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
setsprite(proj, oldpos);
fi.checkhitwall(proj->GetIndex(), wal, s->x, s->y, s->z, s->picnum);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
if (!isRRRA() && s->picnum == FREEZEBLAST)
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
if (wall[wal].overpicnum != MIRROR && wall[wal].picnum != MIRROR)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
s->extra >>= 1;
if (s->xrepeat > 8)
s->xrepeat -= 2;
if (s->yrepeat > 8)
s->yrepeat -= 2;
s->yvel--;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
int k = getangle(
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
wall[wall[wal].point2].x - wall[wal].x,
wall[wall[wal].point2].y - wall[wal].y);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
s->ang = ((k << 1) - s->ang) & 2047;
return true;
}
if (s->picnum == SHRINKSPARK)
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
if (wall[wal].picnum >= RRTILE3643 && wall[wal].picnum < RRTILE3643 + 3)
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
deletesprite(proj);
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
}
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
if (s->extra <= 0)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
s->x += sintable[(s->ang + 512) & 2047] >> 7;
s->y += sintable[s->ang & 2047] >> 7;
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
auto Owner = proj->GetOwner();
if (!isRRRA() || !Owner || (Owner->s.picnum != CHEER && Owner->s.picnum != CHEERSTAYPUT))
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
auto j = spawn(proj, CIRCLESTUCK);
- experimented a bit with optimizing the spawn function's use.
2020-10-24 07:05:54 +00:00
j->s.xrepeat = 8;
j->s.yrepeat = 8;
j->s.cstat = 16;
j->s.ang = (j->s.ang + 512) & 2047;
j->s.clipdist = mulscale7(s->xrepeat, tilesiz[s->picnum].x);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
deletesprite(proj);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
return true;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
if (wall[wal].overpicnum != MIRROR && wall[wal].picnum != MIRROR)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
s->extra -= 20;
s->yvel--;
}
int k = getangle(
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
wall[wall[wal].point2].x - wall[wal].x,
wall[wall[wal].point2].y - wall[wal].y);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
s->ang = ((k << 1) - s->ang) & 2047;
return true;
}
}
return false;
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
bool weaponhitsector(DDukeActor *proj, const vec3_t& oldpos)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
auto s = &proj->s;
setsprite(proj, oldpos);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
if (isRRRA() && proj->GetOwner() && proj->GetOwner()->s.picnum == MAMA)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
guts_r(proj, RABBITJIBA, 2, myconnectindex);
guts_r(proj, RABBITJIBB, 2, myconnectindex);
guts_r(proj, RABBITJIBC, 2, myconnectindex);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
}
if (s->zvel < 0)
{
if (sector[s->sectnum].ceilingstat & 1)
if (sector[s->sectnum].ceilingpal == 0)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
deletesprite(proj);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
return true;
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
fi.checkhitceiling(s->sectnum);
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
if (!isRRRA() && s->picnum == FREEZEBLAST)
{
- weaponcommon subfunctions.
2020-10-22 18:07:05 +00:00
bounce(proj);
ssp(proj, CLIPMASK1);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
s->extra >>= 1;
if (s->xrepeat > 8)
s->xrepeat -= 2;
if (s->yrepeat > 8)
s->yrepeat -= 2;
s->yvel--;
return true;
}
return false;
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- moveweapons.
2020-10-22 18:21:21 +00:00
static void weaponcommon_r(DDukeActor *proj)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- moveweapons.
2020-10-22 18:21:21 +00:00
auto s = &proj->s;
int k, p;
int ll;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
p = -1;
- revert most of e474ebc2b75514459ffeace8a1cfd298b9074512 and adjust player's angle/horizon in a way that's compatible with `cl_syncinput 0` and `cl_syncinput 1`. Previous attempts at leveraging `applylook()` and `sethorizon()` in different spots had pros and cons, but ultimately changing where these functions were called from was a net negative and had hard to diagnose issues. Maintaining two types of player input is considerable work. Lessons have been learned and will be beneficial when it comes time to re-doing the other games. Ideas from PR #98 for optimising RRRA vehicle experience while `cl_syncinput 0` is in use have been implemented here.
2020-08-05 07:53:22 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
if (s->picnum == RPG && sector[s->sectnum].lotag == 2)
{
k = s->xvel >> 1;
ll = s->zvel >> 1;
}
else if (isRRRA() && s->picnum == RPG2 && sector[s->sectnum].lotag == 2)
{
k = s->xvel >> 1;
ll = s->zvel >> 1;
}
else
{
k = s->xvel;
ll = s->zvel;
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
auto oldpos = s->pos;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- moveweapons.
2020-10-22 18:21:21 +00:00
getglobalz(proj);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
switch (s->picnum)
{
case RPG:
- moveweapons.
2020-10-22 18:21:21 +00:00
if (proj->picnum != BOSS2 && s->xrepeat >= 10 && sector[s->sectnum].lotag != 2)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- moveweapons.
2020-10-22 18:21:21 +00:00
spawn(proj, SMALLSMOKE)->s.z += (1 << 8);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
}
break;
case RPG2:
if (!isRRRA()) break;
- moveweapons.
2020-10-22 18:21:21 +00:00
chickenarrow(proj);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
break;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
case RRTILE1790:
if (!isRRRA()) break;
if (s->extra)
{
s->zvel = -(s->extra * 250);
s->extra--;
}
else
- moveweapons.
2020-10-22 18:21:21 +00:00
makeitfall(proj);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
if (s->xrepeat >= 10 && sector[s->sectnum].lotag != 2)
{
- moveweapons.
2020-10-22 18:21:21 +00:00
spawn(proj, SMALLSMOKE)->s.z += (1 << 8);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
}
break;
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- use the cleaned up movesprite interface in moveweapons.
2020-10-22 19:19:24 +00:00
Collision coll;
movesprite_ex(proj,
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
(k * (sintable[(s->ang + 512) & 2047])) >> 14,
- use the cleaned up movesprite interface in moveweapons.
2020-10-22 19:19:24 +00:00
(k * (sintable[s->ang & 2047])) >> 14, ll, CLIPMASK1, coll);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- moveweapons.
2020-10-22 18:21:21 +00:00
if ((s->picnum == RPG || (isRRRA() && isIn(s->picnum, RPG2, RRTILE1790))) && proj->temp_actor != nullptr)
if (FindDistance2D(s->x - proj->temp_actor->s.x, s->y - proj->temp_actor->s.y) < 256)
- use the cleaned up movesprite interface in moveweapons.
2020-10-22 19:19:24 +00:00
coll.setSprite(proj->temp_actor);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
if (s->sectnum < 0) // || (isRR() && sector[s->sectnum].filler == 800))
{
- moveweapons.
2020-10-22 18:21:21 +00:00
deletesprite(proj);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
return;
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- use the cleaned up movesprite interface in moveweapons.
2020-10-22 19:19:24 +00:00
if (coll.type != kHitSprite && s->picnum != FREEZEBLAST)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- moveweapons.
2020-10-22 18:21:21 +00:00
if (s->z < proj->ceilingz)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- use the cleaned up movesprite interface in moveweapons.
2020-10-22 19:19:24 +00:00
coll.setSector(s->sectnum);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
s->zvel = -1;
}
else
- moveweapons.
2020-10-22 18:21:21 +00:00
if (s->z > proj->floorz)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- use the cleaned up movesprite interface in moveweapons.
2020-10-22 19:19:24 +00:00
coll.setSector(s->sectnum);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
if (sector[s->sectnum].lotag != 1)
s->zvel = 1;
}
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
if (s->picnum == FIRELASER)
{
for (k = -3; k < 2; k++)
{
- moveweapons.
2020-10-22 18:21:21 +00:00
auto x = EGS(s->sectnum,
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
s->x + ((k * sintable[(s->ang + 512) & 2047]) >> 9),
s->y + ((k * sintable[s->ang & 2047]) >> 9),
s->z + ((k * ksgn(s->zvel)) * abs(s->zvel / 24)), FIRELASER, -40 + (k << 2),
- moveweapons.
2020-10-22 18:21:21 +00:00
s->xrepeat, s->yrepeat, 0, 0, 0, proj->GetOwner(), 5);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
- moveweapons.
2020-10-22 18:21:21 +00:00
x->s.cstat = 128;
x->s.pal = s->pal;
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
}
}
else if (s->picnum == SPIT) if (s->zvel < 6144)
s->zvel += gc - 112;
- use the cleaned up movesprite interface in moveweapons.
2020-10-22 19:19:24 +00:00
if (coll.type != 0)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- use the cleaned up movesprite interface in moveweapons.
2020-10-22 19:19:24 +00:00
if (coll.type == kHitSprite)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- use the cleaned up movesprite interface in moveweapons.
2020-10-22 19:19:24 +00:00
if (weaponhitsprite(proj, coll.actor, oldpos)) return;
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
}
- use the cleaned up movesprite interface in moveweapons.
2020-10-22 19:19:24 +00:00
else if (coll.type == kHitWall)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- use the cleaned up movesprite interface in moveweapons.
2020-10-22 19:19:24 +00:00
if (weaponhitwall(proj, coll.index, oldpos)) return;
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
}
- use the cleaned up movesprite interface in moveweapons.
2020-10-22 19:19:24 +00:00
else if (coll.type == kHitSector)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- moveweapons.
2020-10-22 18:21:21 +00:00
if (weaponhitsector(proj, oldpos)) return;
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
if (s->picnum != SPIT)
{
- use the cleaned up movesprite interface in moveweapons.
2020-10-22 19:19:24 +00:00
if (s->picnum == RPG) rpgexplode(proj, coll.type, oldpos, EXPLOSION2, -1, -1, RPG_EXPLODE);
else if (isRRRA() && s->picnum == RPG2) rpgexplode(proj, coll.type, oldpos, EXPLOSION2, -1, 150, 247);
else if (isRRRA() && s->picnum == RRTILE1790) rpgexplode(proj, coll.type, oldpos, EXPLOSION2, -1, 160, RPG_EXPLODE);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
else if (s->picnum != FREEZEBLAST && s->picnum != FIRELASER && s->picnum != SHRINKSPARK)
{
- moveweapons.
2020-10-22 18:21:21 +00:00
auto k = spawn(proj, 1441);
k->s.xrepeat = k->s.yrepeat = s->xrepeat >> 1;
- use the cleaned up movesprite interface in moveweapons.
2020-10-22 19:19:24 +00:00
if (coll.type == kHitSector)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
if (s->zvel < 0)
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
{
- moveweapons.
2020-10-22 18:21:21 +00:00
k->s.cstat |= 8;
k->s.z += (72 << 8);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
}
}
- moveweapons.
2020-10-22 18:21:21 +00:00
deletesprite(proj);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
return;
}
if ((s->picnum == RPG || (isRRRA() && s->picnum == RPG2)) && sector[s->sectnum].lotag == 2 && s->xrepeat >= 10 && rnd(184))
- moveweapons.
2020-10-22 18:21:21 +00:00
spawn(proj, WATERBUBBLE);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
void moveweapons_r(void)
{
- moveweapons.
2020-10-22 18:21:21 +00:00
DukeStatIterator it(STAT_PROJECTILE);
while (auto proj = it.Next())
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- moveweapons.
2020-10-22 18:21:21 +00:00
if (proj->s.sectnum < 0)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- moveweapons.
2020-10-22 18:21:21 +00:00
deletesprite(proj);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
continue;
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- moveweapons.
2020-10-22 18:21:21 +00:00
proj->bposx = proj->s.x;
proj->bposy = proj->s.y;
proj->bposz = proj->s.z;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- moveweapons.
2020-10-22 18:21:21 +00:00
switch (proj->s.picnum)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
case RADIUSEXPLOSION:
- moveweapons.
2020-10-22 18:21:21 +00:00
deletesprite(proj);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
continue;
case TONGUE:
- moveweapons.
2020-10-22 18:21:21 +00:00
movetongue(proj, TONGUE, INNERJAW);
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
continue;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
case FREEZEBLAST:
- moveweapons.
2020-10-22 18:21:21 +00:00
if (proj->s.yvel < 1 || proj->s.extra < 2 || (proj->s.xvel | proj->s.zvel) == 0)
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
- moveweapons.
2020-10-22 18:21:21 +00:00
auto star = spawn(proj, TRANSPORTERSTAR);
star->s.pal = 1;
star->s.xrepeat = 32;
star->s.yrepeat = 32;
deletesprite(proj);
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
continue;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
case RPG2:
case RRTILE1790:
if (!isRRRA()) continue;
case SHRINKSPARK:
case RPG:
case FIRELASER:
case SPIT:
case COOLEXPLOSION1:
case OWHIP:
case UWHIP:
- moveweapons.
2020-10-22 18:21:21 +00:00
weaponcommon_r(proj);
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
continue;
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
case SHOTSPARK1:
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
{
int x;
- moveweapons.
2020-10-22 18:21:21 +00:00
int p = findplayer(&proj->s, &x);
execute(proj, p, x);
- separated Duke and RR implementations because the more complex functions would become too messy otherwise.
2020-05-07 20:30:19 +00:00
continue;
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
- cleanup and consolidation of moveweapons_r.
2020-10-18 08:42:26 +00:00
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
}
}
- movetransports.
2020-05-07 22:03:51 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void movetransports_r(void)
{
char warpdir, warpspriteto;
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
short k, p, sect, sectlotag;
- movetransports.
2020-10-22 19:42:02 +00:00
int ll2, ll, onfloorz;
Collision coll;
- movetransports.
2020-05-07 22:03:51 +00:00
- fixed another one of those stupidly badly designed iterator loops. Fixes #176.
2020-08-14 19:49:12 +00:00
//Transporters
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
DukeStatIterator iti(STAT_TRANSPORT);
while (auto act = iti.Next())
- movetransports.
2020-05-07 22:03:51 +00:00
{
- movetransports.
2020-10-22 19:42:02 +00:00
auto spr = &act->s;
sect = spr->sectnum;
- use the new iterators in the movetransports functions. Also prefer pointers over array access.
2020-10-12 18:45:08 +00:00
sectlotag = sector[sect].lotag;
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
auto Owner = act->GetOwner();
if (Owner == act || Owner == nullptr)
- movetransports.
2020-05-07 22:03:51 +00:00
{
continue;
}
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
onfloorz = act->temp_data[4];
- movetransports.
2020-05-07 22:03:51 +00:00
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
if (act->temp_data[0] > 0) act->temp_data[0]--;
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
DukeSectIterator itj(sect);
while (auto act2 = itj.Next())
- movetransports.
2020-05-07 22:03:51 +00:00
{
- movetransports.
2020-10-22 19:42:02 +00:00
auto spr2 = &act2->s;
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
switch (spr2->statnum)
- movetransports.
2020-05-07 22:03:51 +00:00
{
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
case STAT_PLAYER: // Player
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
if (act2->GetOwner())
- movetransports.
2020-05-07 22:03:51 +00:00
{
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
p = spr2->yvel;
- movetransports.
2020-05-07 22:03:51 +00:00
ps[p].on_warping_sector = 1;
if (ps[p].transporter_hold == 0 && ps[p].jumping_counter == 0)
{
if (ps[p].on_ground && sectlotag == 0 && onfloorz && ps[p].jetpack_on == 0)
{
- movetransports.
2020-10-22 19:42:02 +00:00
spawn(act, TRANSPORTERBEAM);
S_PlayActorSound(TELEPORTER, act);
- movetransports.
2020-05-07 22:03:51 +00:00
for (k = connecthead; k >= 0; k = connectpoint2[k])// connectpoinhittype[i].temp_data[1][k])
- movetransports.
2020-10-22 19:42:02 +00:00
if (ps[k].cursectnum == Owner->s.sectnum)
- movetransports.
2020-05-07 22:03:51 +00:00
{
ps[k].frag_ps = p;
- movetransports.
2020-10-22 19:42:02 +00:00
ps[k].GetActor()->s.extra = 0;
- movetransports.
2020-05-07 22:03:51 +00:00
}
- movetransports.
2020-10-22 19:42:02 +00:00
ps[p].angle.ang = buildang(Owner->s.ang);
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
if (Owner->GetOwner() != Owner)
- movetransports.
2020-05-07 22:03:51 +00:00
{
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
act->temp_data[0] = 13;
- movetransports.
2020-10-22 19:42:02 +00:00
Owner->temp_data[0] = 13;
- movetransports.
2020-05-07 22:03:51 +00:00
ps[p].transporter_hold = 13;
}
- movetransports.
2020-10-22 19:42:02 +00:00
ps[p].bobposx = ps[p].oposx = ps[p].posx = Owner->s.x;
ps[p].bobposy = ps[p].oposy = ps[p].posy = Owner->s.y;
ps[p].oposz = ps[p].posz = Owner->s.z - (PHEIGHT - (4 << 8));
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
changespritesect(act2, Owner->s.sectnum);
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
ps[p].cursectnum = spr2->sectnum;
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
auto beam = spawn(Owner, TRANSPORTERBEAM);
S_PlayActorSound(TELEPORTER, beam);
- movetransports.
2020-05-07 22:03:51 +00:00
break;
}
}
else break;
- movetransports.
2020-10-22 19:42:02 +00:00
if (onfloorz == 0 && abs(spr->z - ps[p].posz) < 6144)
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if ((ps[p].jetpack_on == 0) || (ps[p].jetpack_on && PlayerInput(p, SB_JUMP)) ||
(ps[p].jetpack_on && PlayerInput(p, SB_CROUCH)))
- movetransports.
2020-05-07 22:03:51 +00:00
{
- movetransports.
2020-10-22 19:42:02 +00:00
ps[p].oposx = ps[p].posx += Owner->s.x - spr->x;
ps[p].oposy = ps[p].posy += Owner->s.y - spr->y;
- movetransports.
2020-05-07 22:03:51 +00:00
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP) || ps[p].jetpack_on < 11))
- movetransports.
2020-10-22 19:42:02 +00:00
ps[p].posz = Owner->s.z - 6144;
else ps[p].posz = Owner->s.z + 6144;
- movetransports.
2020-05-07 22:03:51 +00:00
ps[p].oposz = ps[p].posz;
- movetransports.
2020-10-22 19:42:02 +00:00
changespritesect(act2, Owner->s.sectnum);
ps[p].cursectnum = Owner->s.sectnum;
- movetransports.
2020-05-07 22:03:51 +00:00
break;
}
k = 0;
if (isRRRA())
{
if (onfloorz && sectlotag == 160 && ps[p].posz > (sector[sect].floorz - (48 << 8)))
{
k = 2;
ps[p].oposz = ps[p].posz =
- movetransports.
2020-10-22 19:42:02 +00:00
sector[Owner->s.sectnum].ceilingz + (7 << 8);
- movetransports.
2020-05-07 22:03:51 +00:00
}
if (onfloorz && sectlotag == 161 && ps[p].posz < (sector[sect].ceilingz + (6 << 8)))
{
k = 2;
- movetransports.
2020-10-22 19:42:02 +00:00
if (ps[p].GetActor()->s.extra <= 0) break;
- movetransports.
2020-05-07 22:03:51 +00:00
ps[p].oposz = ps[p].posz =
- movetransports.
2020-10-22 19:42:02 +00:00
sector[Owner->s.sectnum].floorz - (49 << 8);
- movetransports.
2020-05-07 22:03:51 +00:00
}
}
if ((onfloorz && sectlotag == ST_1_ABOVE_WATER && ps[p].posz > (sector[sect].floorz - (6 << 8))) ||
(onfloorz && sectlotag == ST_1_ABOVE_WATER && ps[p].OnMotorcycle))
{
if (ps[p].OnBoat) break;
k = 1;
if (screenpeek == p)
{
FX_StopAllSounds();
}
- movetransports.
2020-10-22 19:42:02 +00:00
S_PlayActorSound(DUKE_UNDERWATER, ps[p].GetActor());
- movetransports.
2020-05-07 22:03:51 +00:00
ps[p].oposz = ps[p].posz =
- movetransports.
2020-10-22 19:42:02 +00:00
sector[Owner->s.sectnum].ceilingz + (7 << 8);
- movetransports.
2020-05-07 22:03:51 +00:00
if (ps[p].OnMotorcycle)
ps[p].moto_underwater = 1;
}
if (onfloorz && sectlotag == ST_2_UNDERWATER && ps[p].posz < (sector[sect].ceilingz + (6 << 8)))
{
k = 1;
- movetransports.
2020-10-22 19:42:02 +00:00
if (ps[p].GetActor()->s.extra <= 0) break;
- movetransports.
2020-05-07 22:03:51 +00:00
if (screenpeek == p)
{
FX_StopAllSounds();
}
- movetransports.
2020-10-22 19:42:02 +00:00
S_PlayActorSound(DUKE_GASP, ps[p].GetActor());
- movetransports.
2020-05-07 22:03:51 +00:00
ps[p].oposz = ps[p].posz =
- movetransports.
2020-10-22 19:42:02 +00:00
sector[Owner->s.sectnum].floorz - (7 << 8);
- movetransports.
2020-05-07 22:03:51 +00:00
}
if (k == 1)
{
- movetransports.
2020-10-22 19:42:02 +00:00
ps[p].oposx = ps[p].posx += Owner->s.x - spr->x;
ps[p].oposy = ps[p].posy += Owner->s.y - spr->y;
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
if (Owner->GetOwner() != Owner)
- movetransports.
2020-05-07 22:03:51 +00:00
ps[p].transporter_hold = -2;
- movetransports.
2020-10-22 19:42:02 +00:00
ps[p].cursectnum = Owner->s.sectnum;
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
changespritesect(act2, Owner->s.sectnum);
- movetransports.
2020-05-07 22:03:51 +00:00
setpal(&ps[p]);
if ((krand() & 255) < 32)
- movetransports.
2020-10-22 19:42:02 +00:00
spawn(ps[p].GetActor(), WATERSPLASH2);
- movetransports.
2020-05-07 22:03:51 +00:00
}
else if (isRRRA() && k == 2)
{
- movetransports.
2020-10-22 19:42:02 +00:00
ps[p].oposx = ps[p].posx += Owner->s.x - spr->x;
ps[p].oposy = ps[p].posy += Owner->s.y - spr->y;
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
if (Owner->GetOwner() != Owner)
- movetransports.
2020-05-07 22:03:51 +00:00
ps[p].transporter_hold = -2;
- movetransports.
2020-10-22 19:42:02 +00:00
ps[p].cursectnum = Owner->s.sectnum;
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
changespritesect(act2, Owner->s.sectnum);
- movetransports.
2020-05-07 22:03:51 +00:00
}
}
break;
case STAT_ACTOR:
- movetransports.
2020-10-22 19:42:02 +00:00
if (spr->picnum == SHARK ||
(isRRRA() && (spr->picnum == CHEERBOAT || spr->picnum == HULKBOAT || spr->picnum == MINIONBOAT || spr->picnum == UFO1_RRRA)) ||
(!isRRRA() && (spr->picnum == UFO1_RR || spr->picnum == UFO2 || spr->picnum == UFO3 || spr->picnum == UFO4 || spr->picnum == UFO5))) continue;
- movetransports.
2020-05-07 22:03:51 +00:00
case STAT_PROJECTILE:
case STAT_MISC:
case STAT_DUMMYPLAYER:
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
ll = abs(spr2->zvel);
- movetransports.
2020-05-07 22:03:51 +00:00
if (isRRRA())
{
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
if (spr2->zvel >= 0)
- movetransports.
2020-05-07 22:03:51 +00:00
warpdir = 2;
else
warpdir = 1;
}
{
warpspriteto = 0;
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
if (ll && sectlotag == ST_2_UNDERWATER && spr2->z < (sector[sect].ceilingz + ll))
- movetransports.
2020-05-07 22:03:51 +00:00
warpspriteto = 1;
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
if (ll && sectlotag == ST_1_ABOVE_WATER && spr2->z > (sector[sect].floorz - ll))
if (!isRRRA() || (spr2->picnum != CHEERBOAT && spr2->picnum != HULKBOAT && spr2->picnum != MINIONBOAT))
- movetransports.
2020-05-07 22:03:51 +00:00
warpspriteto = 1;
if (isRRRA())
{
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
if (ll && sectlotag == 161 && spr2->z < (sector[sect].ceilingz + ll) && warpdir == 1)
- movetransports.
2020-05-07 22:03:51 +00:00
{
warpspriteto = 1;
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
ll2 = ll - abs(spr2->z - sector[sect].ceilingz);
- movetransports.
2020-05-07 22:03:51 +00:00
}
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
else if (sectlotag == 161 && spr2->z < (sector[sect].ceilingz + 1000) && warpdir == 1)
- movetransports.
2020-05-07 22:03:51 +00:00
{
warpspriteto = 1;
ll2 = 1;
}
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
if (ll && sectlotag == 160 && spr2->z > (sector[sect].floorz - ll) && warpdir == 2)
- movetransports.
2020-05-07 22:03:51 +00:00
{
warpspriteto = 1;
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
ll2 = ll - abs(sector[sect].floorz - spr2->z);
- movetransports.
2020-05-07 22:03:51 +00:00
}
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
else if (sectlotag == 160 && spr2->z > (sector[sect].floorz - 1000) && warpdir == 2)
- movetransports.
2020-05-07 22:03:51 +00:00
{
warpspriteto = 1;
ll2 = 1;
}
}
- movetransports.
2020-10-22 19:42:02 +00:00
if (sectlotag == 0 && (onfloorz || abs(spr2->z - spr->z) < 4096))
- movetransports.
2020-05-07 22:03:51 +00:00
{
- movetransports.
2020-10-22 19:42:02 +00:00
if (Owner->GetOwner() != Owner && onfloorz && act->temp_data[0] > 0 && spr2->statnum != 5)
- movetransports.
2020-05-07 22:03:51 +00:00
{
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
act->temp_data[0]++;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
continue;
- movetransports.
2020-05-07 22:03:51 +00:00
}
warpspriteto = 1;
}
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
if (warpspriteto) switch (spr2->picnum)
- movetransports.
2020-05-07 22:03:51 +00:00
{
case TRANSPORTERSTAR:
case TRANSPORTERBEAM:
case BULLETHOLE:
case WATERSPLASH2:
case BURNING:
case FIRE:
case MUD:
- fixed another one of those stupidly badly designed iterator loops. Fixes #176.
2020-08-14 19:49:12 +00:00
continue;
- movetransports.
2020-05-07 22:03:51 +00:00
case PLAYERONWATER:
if (sectlotag == ST_2_UNDERWATER)
{
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
spr2->cstat &= 32767;
- movetransports.
2020-05-07 22:03:51 +00:00
break;
}
default:
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
if (spr2->statnum == 5 && !(sectlotag == ST_1_ABOVE_WATER || sectlotag == ST_2_UNDERWATER || (isRRRA() && (sectlotag == 160 || sectlotag == 161))))
- movetransports.
2020-05-07 22:03:51 +00:00
break;
case WATERBUBBLE:
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
if (rnd(192) && spr2->picnum == WATERBUBBLE)
- movetransports.
2020-05-07 22:03:51 +00:00
break;
if (sectlotag > 0)
{
- movetransports.
2020-10-22 19:42:02 +00:00
auto k = spawn(act2, WATERSPLASH2);
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
if (sectlotag == 1 && spr2->statnum == 4)
- movetransports.
2020-05-07 22:03:51 +00:00
{
- movetransports.
2020-10-22 19:42:02 +00:00
k->s.xvel = spr2->xvel >> 1;
k->s.ang = spr2->ang;
- movetransports.
2020-05-07 22:03:51 +00:00
ssp(k, CLIPMASK0);
}
}
switch (sectlotag)
{
case ST_0_NO_EFFECT:
if (onfloorz)
{
- movetransports.
2020-10-22 19:42:02 +00:00
if (checkcursectnums(sect) == -1 && checkcursectnums(Owner->s.sectnum) == -1)
- movetransports.
2020-05-07 22:03:51 +00:00
{
- movetransports.
2020-10-22 19:42:02 +00:00
spr2->x += (Owner->s.x - spr->x);
spr2->y += (Owner->s.y - spr->y);
spr2->z -= spr->z - sector[Owner->s.sectnum].floorz;
spr2->ang = Owner->s.ang;
- movetransports.
2020-05-07 22:03:51 +00:00
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
act2->bposx = spr2->x;
act2->bposy = spr2->y;
act2->bposz = spr2->z;
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
auto beam = spawn(act, TRANSPORTERBEAM);
S_PlayActorSound(TELEPORTER, beam);
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
beam = spawn(Owner, TRANSPORTERBEAM);
S_PlayActorSound(TELEPORTER, beam);
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
if (Owner->GetOwner() != Owner)
- movetransports.
2020-05-07 22:03:51 +00:00
{
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
act->temp_data[0] = 13;
- movetransports.
2020-10-22 19:42:02 +00:00
Owner->temp_data[0] = 13;
- movetransports.
2020-05-07 22:03:51 +00:00
}
- movetransports.
2020-10-22 19:42:02 +00:00
changespritesect(act2, Owner->s.sectnum);
- movetransports.
2020-05-07 22:03:51 +00:00
}
}
else
{
- movetransports.
2020-10-22 19:42:02 +00:00
spr2->x += (Owner->s.x - spr->x);
spr2->y += (Owner->s.y - spr->y);
spr2->z = Owner->s.z + 4096;
- movetransports.
2020-05-07 22:03:51 +00:00
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
act2->bposx = spr2->x;
act2->bposy = spr2->y;
act2->bposz = spr2->z;
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
changespritesect(act2, Owner->s.sectnum);
- movetransports.
2020-05-07 22:03:51 +00:00
}
break;
case ST_1_ABOVE_WATER:
- movetransports.
2020-10-22 19:42:02 +00:00
spr2->x += (Owner->s.x - spr->x);
spr2->y += (Owner->s.y - spr->y);
spr2->z = sector[Owner->s.sectnum].ceilingz + ll;
- movetransports.
2020-05-07 22:03:51 +00:00
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
act2->bposx = spr2->x;
act2->bposy = spr2->y;
act2->bposz = spr2->z;
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
changespritesect(act2, Owner->s.sectnum);
- movetransports.
2020-05-07 22:03:51 +00:00
break;
case ST_2_UNDERWATER:
- movetransports.
2020-10-22 19:42:02 +00:00
spr2->x += (Owner->s.x - spr->x);
spr2->y += (Owner->s.y - spr->y);
spr2->z = sector[Owner->s.sectnum].floorz - ll;
- movetransports.
2020-05-07 22:03:51 +00:00
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
act2->bposx = spr2->x;
act2->bposy = spr2->y;
act2->bposz = spr2->z;
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
changespritesect(act2, Owner->s.sectnum);
- movetransports.
2020-05-07 22:03:51 +00:00
break;
case 160:
if (!isRRRA()) break;
- movetransports.
2020-10-22 19:42:02 +00:00
spr2->x += (Owner->s.x - spr->x);
spr2->y += (Owner->s.y - spr->y);
spr2->z = sector[Owner->s.sectnum].ceilingz + ll2;
- movetransports.
2020-05-07 22:03:51 +00:00
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
act2->bposx = spr2->x;
act2->bposy = spr2->y;
act2->bposz = spr2->z;
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
changespritesect(act2, Owner->s.sectnum);
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
movesprite_ex(act2, (spr2->xvel * sintable[(spr2->ang + 512) & 2047]) >> 14,
(spr2->xvel * sintable[spr2->ang & 2047]) >> 14, 0, CLIPMASK1, coll);
- movetransports.
2020-05-07 22:03:51 +00:00
break;
case 161:
if (!isRRRA()) break;
- movetransports.
2020-10-22 19:42:02 +00:00
spr2->x += (Owner->s.x - spr->x);
spr2->y += (Owner->s.y - spr->y);
spr2->z = sector[Owner->s.sectnum].floorz - ll2;
- movetransports.
2020-05-07 22:03:51 +00:00
- renamed variables in movetransports.
2020-11-01 13:56:23 +00:00
act2->bposx = spr2->x;
act2->bposy = spr2->y;
act2->bposz = spr2->z;
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
changespritesect(act2, Owner->s.sectnum);
- movetransports.
2020-05-07 22:03:51 +00:00
- movetransports.
2020-10-22 19:42:02 +00:00
movesprite_ex(act2, (spr2->xvel * sintable[(spr2->ang + 512) & 2047]) >> 14,
(spr2->xvel * sintable[spr2->ang & 2047]) >> 14, 0, CLIPMASK1, coll);
- movetransports.
2020-05-07 22:03:51 +00:00
break;
}
break;
}
}
break;
}
}
}
}
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static void rrra_specialstats()
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
int i, j;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
StatIterator it(117);
while ((i = it.NextIndex()) >= 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto s = &sprite[i];
if (s->hitag > 2)
s->hitag = 0;
if ((s->picnum == RRTILE8488 || s->picnum == RRTILE8490) && s->hitag != 2)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->hitag = 2;
s->extra = -100;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (s->hitag == 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->extra++;
if (s->extra >= 30)
s->hitag = 1;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
else if (s->hitag == 1)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->extra--;
if (s->extra <= -30)
s->hitag = 0;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
else if (s->hitag == 2)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->extra--;
if (s->extra <= -104)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
fi.spawn(i, s->lotag);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
deletesprite(i);
}
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
j = fi.movesprite(i, 0, 0, s->extra * 2, CLIPMASK0);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
it.Reset(118);
while ((i = it.NextIndex()) >= 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto s = &sprite[i];
if (s->hitag > 1)
s->hitag = 0;
if (s->hitag == 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->extra++;
if (s->extra >= 20)
s->hitag = 1;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
else if (s->hitag == 1)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->extra--;
if (s->extra <= -20)
s->hitag = 0;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
j = fi.movesprite(i, 0, 0, s->extra, CLIPMASK0);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
- safety commit
2020-05-14 07:07:07 +00:00
if (ps[screenpeek].MamaEnd > 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- safety commit
2020-05-14 07:07:07 +00:00
ps[screenpeek].MamaEnd--;
if (ps[screenpeek].MamaEnd == 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- WIP level transition refactored to a game independent event system.
2020-09-03 21:10:28 +00:00
CompleteLevel(nullptr);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
if (enemysizecheat > 0)
{
short ti;
for (ti = 0; ti < MAXSPRITES; ti++)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto tispr = &sprite[ti];
switch (tispr->picnum)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
//case 4049:
//case 4050:
case BILLYCOCK:
case BILLYRAY:
case BILLYRAYSTAYPUT:
case BRAYSNIPER:
case DOGRUN:
case LTH:
case HULKJUMP:
case HULK:
case HULKSTAYPUT:
case HEN:
case DRONE:
case PIG:
case MINION:
case MINIONSTAYPUT:
case UFO1_RRRA:
case UFO2:
case UFO3:
case UFO4:
case UFO5:
case COOT:
case COOTSTAYPUT:
case VIXEN:
case BIKERB:
case BIKERBV2:
case BIKER:
case MAKEOUT:
case CHEERB:
case CHEER:
case CHEERSTAYPUT:
case COOTPLAY:
case BILLYPLAY:
case MINIONBOAT:
case HULKBOAT:
case CHEERBOAT:
case RABBIT:
case MAMA:
if (enemysizecheat == 3)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
tispr->xrepeat = tispr->xrepeat << 1;
tispr->yrepeat = tispr->yrepeat << 1;
tispr->clipdist = mulscale7(tispr->xrepeat, tilesiz[tispr->picnum].x);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
else if (enemysizecheat == 2)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
tispr->xrepeat = tispr->xrepeat >> 1;
tispr->yrepeat = tispr->yrepeat >> 1;
tispr->clipdist = mulscale7(tispr->xrepeat, tilesiz[tispr->picnum].y);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
break;
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
enemysizecheat = 0;
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
it.Reset(121);
while ((i = it.NextIndex()) >= 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto s = &sprite[i];
s->extra++;
if (s->extra < 100)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (s->extra == 90)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum--;
if (s->picnum < PIG + 7)
s->picnum = PIG + 7;
s->extra = 1;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
fi.movesprite(i, 0, 0, -300, CLIPMASK0);
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (sector[s->sectnum].ceilingz + (4 << 8) > s->z)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = 0;
s->extra = 100;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
else if (s->extra == 200)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
setsprite(i, s->x, s->y, sector[s->sectnum].floorz - 10);
s->extra = 1;
s->picnum = PIG + 11;
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(i, TRANSPORTERSTAR);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
it.Reset(119);
while ((i = it.NextIndex()) >= 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto s = &sprite[i];
if (s->hitag > 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (s->extra == 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->hitag--;
s->extra = 150;
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(i, RABBIT);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
else
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->extra--;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
it.Reset(116);
while ((i = it.NextIndex()) >= 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto s = &sprite[i];
if (s->extra)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (s->extra == s->lotag)
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlaySound(183);
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->extra--;
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
j = fi.movesprite(i,
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
(s->hitag * sintable[(s->ang + 512) & 2047]) >> 14,
(s->hitag * sintable[s->ang & 2047]) >> 14,
s->hitag << 1, CLIPMASK0);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
if (j > 0)
{
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(PIPEBOMB_EXPLODE, i);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
deletesprite(i);
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (s->extra == 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlaySound(215);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
deletesprite(i);
earthquaketime = 32;
SetPlayerPal(&ps[myconnectindex], PalEntry(32, 32, 32, 48));
}
}
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
it.Reset(115);
while ((i = it.NextIndex()) >= 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto s = &sprite[i];
if (s->extra)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (s->picnum != RRTILE8162)
s->picnum = RRTILE8162;
s->extra--;
if (s->extra == 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
int rvar;
rvar = krand() & 127;
if (rvar < 96)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8162 + 3;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
else if (rvar < 112)
{
if (ps[screenpeek].SlotWin & 1)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8162 + 3;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
else
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8162 + 2;
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(i, BATTERYAMMO);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
ps[screenpeek].SlotWin |= 1;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(52, i);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
else if (rvar < 120)
{
if (ps[screenpeek].SlotWin & 2)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8162 + 3;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
else
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8162 + 6;
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(i, HEAVYHBOMB);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
ps[screenpeek].SlotWin |= 2;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(52, i);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
else if (rvar < 126)
{
if (ps[screenpeek].SlotWin & 4)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8162 + 3;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
else
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8162 + 5;
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(i, SIXPAK);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
ps[screenpeek].SlotWin |= 4;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(52, i);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
else
{
if (ps[screenpeek].SlotWin & 8)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8162 + 3;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
else
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8162 + 4;
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(i, ATOMICHEALTH);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
ps[screenpeek].SlotWin |= 8;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(52, i);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
}
}
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
it.Reset(122);
while ((i = it.NextIndex()) >= 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto s = &sprite[i];
if (s->extra)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (s->picnum != RRTILE8589)
s->picnum = RRTILE8589;
s->extra--;
if (s->extra == 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
int rvar;
rvar = krand() & 127;
if (rvar < 96)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8589 + 4;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
else if (rvar < 112)
{
if (ps[screenpeek].SlotWin & 1)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8589 + 4;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
else
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8589 + 5;
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(i, BATTERYAMMO);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
ps[screenpeek].SlotWin |= 1;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(342, i);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
else if (rvar < 120)
{
if (ps[screenpeek].SlotWin & 2)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8589 + 4;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
else
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8589 + 6;
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(i, HEAVYHBOMB);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
ps[screenpeek].SlotWin |= 2;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(342, i);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
else if (rvar < 126)
{
if (ps[screenpeek].SlotWin & 4)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8589 + 4;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
else
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8589 + 2;
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(i, SIXPAK);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
ps[screenpeek].SlotWin |= 4;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(342, i);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
else
{
if (ps[screenpeek].SlotWin & 8)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8589 + 4;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
else
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->picnum = RRTILE8589 + 3;
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(i, ATOMICHEALTH);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
ps[screenpeek].SlotWin |= 8;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(342, i);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
}
}
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
it.Reset(123);
while ((i = it.NextIndex()) >= 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto s = &sprite[i];
if (s->lotag == 5)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
if (!S_CheckSoundPlaying(330))
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(330, i);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void rr_specialstats()
{
int x;
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
int i, j, p, pi;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
unsigned short pst;
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
StatIterator it(107);
while ((i = it.NextIndex()) >= 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto s = &sprite[i];
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (s->hitag == 100)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->z += (4 << 8);
if (s->z >= sector[s->sectnum].floorz + 15168)
s->z = sector[s->sectnum].floorz + 15168;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (s->picnum == LUMBERBLADE)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->extra++;
if (s->extra == 192)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->hitag = 0;
s->z = sector[s->sectnum].floorz - 15168;
s->extra = 0;
s->picnum = RRTILE3410;
StatIterator itj(STAT_DEFAULT);
while ((j = itj.NextIndex()) >= 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto sprj = &sprite[j];
if (sprj->picnum == 128)
if (sprj->hitag == 999)
sprj->picnum = 127;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
}
}
if (chickenplant)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
it.Reset(106);
while ((i = it.NextIndex()) >= 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto s = &sprite[i];
switch (s->picnum)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
case RRTILE285:
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->lotag--;
if (s->lotag < 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
j = fi.spawn(i, RRTILE3190);
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
sprite[j].ang = s->ang;
s->lotag = 128;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
break;
case RRTILE286:
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->lotag--;
if (s->lotag < 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
j = fi.spawn(i, RRTILE3192);
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
sprite[j].ang = s->ang;
s->lotag = 256;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
break;
case RRTILE287:
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->lotag--;
if (s->lotag < 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- pass spawner as an actor pointer to 'lotsofstuff'. Allows doing this without using sprite indices.
2020-10-24 07:35:43 +00:00
lotsoffeathers_r(&hittype[i], (krand() & 3) + 4);
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->lotag = 84;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
break;
case RRTILE288:
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->lotag--;
if (s->lotag < 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
j = fi.spawn(i, RRTILE3132);
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->lotag = 96;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
if (!isRRRA()) S_PlayActorSound(472, j);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
break;
case RRTILE289:
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->lotag--;
if (s->lotag < 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
j = fi.spawn(i, RRTILE3120);
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
sprite[j].ang = s->ang;
s->lotag = 448;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
break;
case RRTILE290:
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->lotag--;
if (s->lotag < 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
j = fi.spawn(i, RRTILE3122);
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
sprite[j].ang = s->ang;
s->lotag = 64;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
break;
case RRTILE291:
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->lotag--;
if (s->lotag < 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
j = fi.spawn(i, RRTILE3123);
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
sprite[j].ang = s->ang;
s->lotag = 512;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
break;
case RRTILE292:
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->lotag--;
if (s->lotag < 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
j = fi.spawn(i, RRTILE3124);
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
sprite[j].ang = s->ang;
s->lotag = 224;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
break;
case RRTILE293:
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->lotag--;
if (s->lotag < 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- guts_d and guts_r.
2020-10-22 17:21:21 +00:00
guts_r(&hittype[i], JIBS1, 1, myconnectindex);
guts_r(&hittype[i], JIBS2, 1, myconnectindex);
guts_r(&hittype[i], JIBS3, 1, myconnectindex);
guts_r(&hittype[i], JIBS4, 1, myconnectindex);
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->lotag = 256;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
break;
}
}
}
- converted all stat iterators outside sector*.cpp.
2020-10-14 20:18:10 +00:00
it.Reset(STAT_BOWLING);
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
while ((i = it.NextIndex()) >= 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto s = &sprite[i];
if (s->picnum == RRTILE280)
if (s->lotag == 100)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
pst = pinsectorresetup(s->sectnum);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
if (pst)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->lotag = 0;
if (s->extra == 1)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
pst = checkpins(s->sectnum);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
if (!pst)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->extra = 2;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
if (s->extra == 2)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
s->extra = 0;
resetpins(s->sectnum);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
}
}
}
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
it.Reset(108);
while ((i = it.NextIndex()) >= 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto s = &sprite[i];
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
if (s->picnum == RRTILE296)
{
p = findplayer(s, &x);
if (x < 2047)
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
StatIterator itj(108);
while ((j = itj.NextIndex()) >= 0)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
auto sprj = &sprite[j];
if (sprj->picnum == RRTILE297)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
ps[p].angle.ang = buildang(sprj->ang);
ps[p].bobposx = ps[p].oposx = ps[p].posx = sprj->x;
ps[p].bobposy = ps[p].oposy = ps[p].posy = sprj->y;
ps[p].oposz = ps[p].posz = sprj->z - (36 << 8);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
pi = ps[p].i;
- rr_specialstats, rrra_specialstats and respawn_rrra. (These look a lot better now. :) )
2020-10-12 20:20:56 +00:00
changespritesect(pi, sprj->sectnum);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
ps[p].cursectnum = sprite[pi].sectnum;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(70, j);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
deletesprite(j);
}
}
}
}
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- heavyhbomb
2020-10-22 20:18:47 +00:00
static void heavyhbomb(DDukeActor *actor)
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
{
- heavyhbomb
2020-10-22 20:18:47 +00:00
auto s = &actor->s;
auto t = &actor->temp_data[0];
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
int sect = s->sectnum;
- heavyhbomb
2020-10-22 20:18:47 +00:00
int x, l;
auto Owner = actor->GetOwner();
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
if ((s->cstat & 32768))
{
t[2]--;
if (t[2] <= 0)
{
- heavyhbomb
2020-10-22 20:18:47 +00:00
S_PlayActorSound(TELEPORTER, actor);
spawn(actor, TRANSPORTERSTAR);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
s->cstat = 257;
}
return;
}
- heavyhbomb
2020-10-22 20:18:47 +00:00
int p = findplayer(&actor->s, &x);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
if (x < 1220) s->cstat &= ~257;
else s->cstat |= 257;
if (t[3] == 0)
{
- heavyhbomb
2020-10-22 20:18:47 +00:00
int j = fi.ifhitbyweapon(actor);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
if (j >= 0)
{
t[3] = 1;
t[4] = 0;
l = 0;
s->xvel = 0;
goto DETONATEB;
}
}
- heavyhbomb
2020-10-22 20:18:47 +00:00
makeitfall(actor);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
- heavyhbomb
2020-10-22 20:18:47 +00:00
if (sector[sect].lotag != 1 && (!isRRRA() || sector[sect].lotag != 160) && s->z >= actor->floorz - (FOURSLEIGHT) && s->yvel < 3)
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
{
- heavyhbomb
2020-10-22 20:18:47 +00:00
if (s->yvel > 0 || (s->yvel == 0 && actor->floorz == sector[sect].floorz))
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
{
if (s->picnum != CHEERBOMB)
- heavyhbomb
2020-10-22 20:18:47 +00:00
S_PlayActorSound(PIPEBOMB_BOUNCE, actor);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
else
{
t[3] = 1;
t[4] = 1;
l = 0;
goto DETONATEB;
}
}
s->zvel = -((4 - s->yvel) << 8);
if (sector[s->sectnum].lotag == 2)
s->zvel >>= 2;
s->yvel++;
}
- heavyhbomb
2020-10-22 20:18:47 +00:00
if (s->picnum != CHEERBOMB && s->z < actor->ceilingz + (16 << 8) && sector[sect].lotag != 2)
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
{
- heavyhbomb
2020-10-22 20:18:47 +00:00
s->z = actor->ceilingz + (16 << 8);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
s->zvel = 0;
}
- heavyhbomb
2020-10-22 20:18:47 +00:00
Collision coll;
movesprite_ex(actor,
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
(s->xvel * (sintable[(s->ang + 512) & 2047])) >> 14,
(s->xvel * (sintable[s->ang & 2047])) >> 14,
- heavyhbomb
2020-10-22 20:18:47 +00:00
s->zvel, CLIPMASK0, coll);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
- heavyhbomb
2020-10-22 20:18:47 +00:00
if (sector[s->sectnum].lotag == 1 && s->zvel == 0)
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
{
s->z += (32 << 8);
if (t[5] == 0)
{
t[5] = 1;
- heavyhbomb
2020-10-22 20:18:47 +00:00
spawn(actor, WATERSPLASH2);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
if (isRRRA() && s->picnum == MORTER)
s->xvel = 0;
}
}
else t[5] = 0;
- heavyhbomb
2020-10-22 20:18:47 +00:00
if (t[3] == 0 && s->picnum == MORTER && (coll.type || x < 844))
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
{
t[3] = 1;
t[4] = 0;
l = 0;
s->xvel = 0;
goto DETONATEB;
}
- heavyhbomb
2020-10-22 20:18:47 +00:00
if (t[3] == 0 && s->picnum == CHEERBOMB && (coll.type || x < 844))
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
{
t[3] = 1;
t[4] = 0;
l = 0;
s->xvel = 0;
goto DETONATEB;
}
- heavyhbomb
2020-10-22 20:18:47 +00:00
if (Owner && Owner->s.picnum == APLAYER)
l = Owner->PlayerIndex();
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
else l = -1;
if (s->xvel > 0)
{
s->xvel -= 5;
if (sector[sect].lotag == 2)
s->xvel -= 10;
if (s->xvel < 0)
s->xvel = 0;
if (s->xvel & 8) s->cstat ^= 4;
}
- heavyhbomb
2020-10-22 20:18:47 +00:00
if (coll.type == kHitWall)
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
{
- heavyhbomb
2020-10-22 20:18:47 +00:00
int j = coll.index;
fi.checkhitwall(actor->GetIndex(), j, s->x, s->y, s->z, s->picnum);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
int k = getangle(
wall[wall[j].point2].x - wall[j].x,
wall[wall[j].point2].y - wall[j].y);
if (s->picnum == CHEERBOMB)
{
t[3] = 1;
t[4] = 0;
l = 0;
s->xvel = 0;
goto DETONATEB;
}
s->ang = ((k << 1) - s->ang) & 2047;
s->xvel >>= 1;
}
DETONATEB:
if ((l >= 0 && ps[l].hbomb_on == 0) || t[3] == 1)
{
t[4]++;
if (t[4] == 2)
{
x = s->extra;
int m = 0;
switch (s->picnum)
{
- started sorting variables in globals.h and removed player.h after cleaning it out.
2020-07-19 20:34:59 +00:00
case TRIPBOMBSPRITE: m = tripbombblastradius; break; // powder keg
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
case HEAVYHBOMB: m = pipebombblastradius; break;
case HBOMBAMMO: m = pipebombblastradius; break;
case MORTER: m = morterblastradius; break;
case CHEERBOMB: m = morterblastradius; break;
}
if (sector[s->sectnum].lotag != 800)
{
- heavyhbomb
2020-10-22 20:18:47 +00:00
fi.hitradius(actor, m, x >> 2, x >> 1, x - (x >> 2), x);
spawn(actor, EXPLOSION2);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
if (s->picnum == CHEERBOMB)
- heavyhbomb
2020-10-22 20:18:47 +00:00
spawn(actor, BURNING);
S_PlayActorSound(PIPEBOMB_EXPLODE, actor);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
for (x = 0; x < 8; x++)
- heavyhbomb
2020-10-22 20:18:47 +00:00
RANDOMSCRAP(actor);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
}
}
if (s->yrepeat)
{
s->yrepeat = 0;
return;
}
if (t[4] > 20)
{
- heavyhbomb
2020-10-22 20:18:47 +00:00
deletesprite(actor);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
return;
}
if (s->picnum == CHEERBOMB)
{
- heavyhbomb
2020-10-22 20:18:47 +00:00
spawn(actor, BURNING);
deletesprite(actor);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
return;
}
}
else if (s->picnum == HEAVYHBOMB && x < 788 && t[0] > 7 && s->xvel == 0)
if (cansee(s->x, s->y, s->z - (8 << 8), s->sectnum, ps[p].posx, ps[p].posy, ps[p].posz, ps[p].cursectnum))
if (ps[p].ammo_amount[DYNAMITE_WEAPON] < max_ammo_amount[DYNAMITE_WEAPON])
if (s->pal == 0)
{
if (ud.coop >= 1)
{
- heavyhbomb
2020-10-22 20:18:47 +00:00
for (int j = 0; j < ps[p].weapreccnt; j++)
if (ps[p].weaprecs[j] == actor->GetIndex())
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
return;
if (ps[p].weapreccnt < 255)
- heavyhbomb
2020-10-22 20:18:47 +00:00
ps[p].weaprecs[ps[p].weapreccnt++] = actor->GetIndex();
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
}
addammo(DYNAMITE_WEAPON, &ps[p], 1);
addammo(CROSSBOW_WEAPON, &ps[p], 1);
- heavyhbomb
2020-10-22 20:18:47 +00:00
S_PlayActorSound(DUKE_GET, ps[p].GetActor());
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
- heavyhbomb
2020-10-22 20:18:47 +00:00
if (ps[p].gotweapon[DYNAMITE_WEAPON] == 0 || Owner == ps[p].GetActor())
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
fi.addweapon(&ps[p], DYNAMITE_WEAPON);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
- heavyhbomb
2020-10-22 20:18:47 +00:00
if (!Owner || Owner->s.picnum != APLAYER)
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
{
SetPlayerPal(&ps[p], PalEntry(32, 0, 32, 0));
}
- heavyhbomb
2020-10-22 20:18:47 +00:00
if (Owner && (Owner->picnum != HEAVYHBOMB || ud.respawn_items == 0 || Owner->s.picnum == APLAYER))
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
{
- heavyhbomb
2020-10-22 20:18:47 +00:00
if (s->picnum == HEAVYHBOMB && Owner->s.picnum != APLAYER && ud.coop)
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
return;
- heavyhbomb
2020-10-22 20:18:47 +00:00
deletesprite(actor);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
return;
}
else
{
t[2] = respawnitemtime;
- heavyhbomb
2020-10-22 20:18:47 +00:00
spawn(actor, RESPAWNMARKERRED);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
s->cstat = (short)32768;
}
}
if (t[0] < 8) t[0]++;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static int henstand(int i)
{
spritetype* s = &sprite[i];
auto t = &hittype[i].temp_data[0];
int sect = s->sectnum;
int j;
if (s->picnum == HENSTAND || s->picnum == HENSTAND + 1)
{
s->lotag--;
if (s->lotag == 0)
{
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(i, HEN);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
deletesprite(i);
return 1;
}
}
if (sector[s->sectnum].lotag == 900)
s->xvel = 0;
if (s->xvel)
{
makeitfall(i);
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
j = fi.movesprite(i,
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
(sintable[(s->ang + 512) & 2047] * s->xvel) >> 14,
(sintable[s->ang & 2047] * s->xvel) >> 14,
s->zvel, CLIPMASK0);
if (j & 49152)
{
if ((j & 49152) == 32768)
{
j &= (MAXWALLS - 1);
int k = getangle(
wall[wall[j].point2].x - wall[j].x,
wall[wall[j].point2].y - wall[j].y);
s->ang = ((k << 1) - s->ang) & 2047;
}
else if ((j & 49152) == 49152)
{
j &= (MAXSPRITES - 1);
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
fi.checkhitsprite(i, j);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
if (sprite[j].picnum == HEN)
{
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
int ns = fi.spawn(j, HENSTAND);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
deletesprite(j);
sprite[ns].xvel = 32;
sprite[ns].lotag = 40;
sprite[ns].ang = s->ang;
}
}
}
s->xvel--;
if (s->xvel < 0) s->xvel = 0;
s->cstat = 257;
if (s->picnum == RRTILE3440)
{
s->cstat |= 4 & s->xvel;
s->cstat |= 8 & s->xvel;
if (krand() & 1)
s->picnum = RRTILE3440 + 1;
}
else if (s->picnum == HENSTAND)
{
s->cstat |= 4 & s->xvel;
s->cstat |= 8 & s->xvel;
if (krand() & 1)
s->picnum = HENSTAND + 1;
if (!s->xvel)
return 2;//deletesprite(i); still needs to run a script but should not do on a deleted object
}
if (s->picnum == RRTILE3440 || (s->picnum == RRTILE3440 + 1 && !s->xvel))
{
return 2;//deletesprite(i); still needs to run a script but should not do on a deleted object
}
}
else if (sector[s->sectnum].lotag == 900)
{
if (s->picnum == BOWLINGBALL)
ballreturn(i);
deletesprite(i);
return 1;
}
return 0;
}
- moveexplosions
2020-05-09 18:27:06 +00:00
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
void moveactors_r(void)
{
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
int x;
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
int j, sect, p;
spritetype *s;
dojaildoor();
moveminecart();
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
if (isRRRA())
{
rrra_specialstats();
}
rr_specialstats();
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
StatIterator it(STAT_ACTOR);
int i;
while ((i = it.NextIndex()) >= 0)
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
{
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
bool deleteafterexecute = false; // taking a cue here from RedNukem to not run scripts on deleted sprites.
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
s = &sprite[i];
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
sect = s->sectnum;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
if( s->xrepeat == 0 || sect < 0 || sect >= MAXSECTORS)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
deletesprite(i);
continue;
}
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
auto t = &hittype[i].temp_data[0];
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
hittype[i].bposx = s->x;
hittype[i].bposy = s->y;
hittype[i].bposz = s->z;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
switch(s->picnum)
{
case RESPAWNMARKERRED:
case RESPAWNMARKERYELLOW:
case RESPAWNMARKERGREEN:
- respawnmarker, rat and queball.
2020-10-21 20:34:45 +00:00
if (!respawnmarker(&hittype[i], RESPAWNMARKERYELLOW, RESPAWNMARKERGREEN)) continue;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
break;
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
case RAT:
- respawnmarker, rat and queball.
2020-10-21 20:34:45 +00:00
if (!rat(&hittype[i], !isRRRA())) continue;
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
break;
case RRTILE3190:
case RRTILE3191:
case RRTILE3192:
if (!chickenplant)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
deletesprite(i);
continue;
}
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
if (sector[sprite[i].sectnum].lotag == 903)
makeitfall(i);
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
j = fi.movesprite(i,
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
(s->xvel*sintable[(s->ang+512)&2047])>>14,
(s->xvel*sintable[s->ang&2047])>>14,
s->zvel,CLIPMASK0);
switch (sector[sprite[i].sectnum].lotag)
{
case 901:
sprite[i].picnum = RRTILE3191;
break;
case 902:
sprite[i].picnum = RRTILE3192;
break;
case 903:
if (sprite[i].z >= sector[sprite[i].sectnum].floorz - (8<<8))
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
deletesprite(i);
continue;
}
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
break;
case 904:
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
deletesprite(i);
continue;
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
break;
}
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
if ((j & 32768) == 32768)
{
deletesprite(i);
continue;
}
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
break;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
case RRTILE3120:
case RRTILE3122:
case RRTILE3123:
case RRTILE3124:
if (!chickenplant)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
deletesprite(i);
continue;
}
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
makeitfall(i);
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
j = fi.movesprite(i,
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
(s->xvel*(sintable[(s->ang+512)&2047]))>>14,
(s->xvel*(sintable[s->ang&2047]))>>14,
s->zvel,CLIPMASK0);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
if ((j & 32768) == 32768)
{
deletesprite(i);
continue;
}
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
if (sector[s->sectnum].lotag == 903)
{
if (sprite[i].z >= sector[sprite[i].sectnum].floorz - (4<<8))
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
deletesprite(i);
continue;
}
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
}
else if (sector[s->sectnum].lotag == 904)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
deletesprite(i);
continue;
}
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
break;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
case RRTILE3132:
if (!chickenplant)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
deletesprite(i);
continue;
}
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
makeitfall(i);
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
j = fi.movesprite(i,
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
(s->xvel*sintable[(s->ang+512)&2047])>>14,
(s->xvel*sintable[s->ang&2047])>>14,
s->zvel,CLIPMASK0);
if (s->z >= sector[s->sectnum].floorz - (8<<8))
{
if (sector[s->sectnum].lotag == 1)
{
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
j = fi.spawn(i,WATERSPLASH2);
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
sprite[j].z = sector[sprite[j].sectnum].floorz;
}
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
deletesprite(i);
continue;
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
}
break;
case BOWLINGBALL:
if (s->xvel)
{
if(!S_CheckSoundPlaying(356))
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(356,i);
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
}
else
{
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(i,BOWLINGBALLSPRITE);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
deletesprite(i);
continue;
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
}
if (sector[s->sectnum].lotag == 900)
{
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_StopSound(356, -1);
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
}
case RRTILE3440:
case RRTILE3440+1:
case HENSTAND:
case HENSTAND+1:
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
{
int todo = henstand(i);
if (todo == 2) deleteafterexecute = true;
if (todo == 1) continue;
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
break;
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
}
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
case QUEBALL:
case STRIPEBALL:
- respawnmarker, rat and queball.
2020-10-21 20:34:45 +00:00
if (!queball(&hittype[i], POCKET, QUEBALL, STRIPEBALL)) continue;
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
break;
case FORCESPHERE:
- forcesphere and recon.
2020-10-21 20:59:56 +00:00
forcesphere(&hittype[i], FORCESPHERE);
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
continue;
case RECON:
case UFO1_RR:
case UFO2:
case UFO3:
case UFO4:
case UFO5:
- forcesphere and recon.
2020-10-21 20:59:56 +00:00
recon(&hittype[i], EXPLOSION2, FIRELASER, -1, -1, 457, 8, [](DDukeActor* i) ->int
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
{
- forcesphere and recon.
2020-10-21 20:59:56 +00:00
auto s = &i->s;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
if (isRRRA() && ufospawnsminion)
return MINION;
else if (s->picnum == UFO1_RR)
return HEN;
else if (s->picnum == UFO2)
return COOT;
else if (s->picnum == UFO3)
return COW;
else if (s->picnum == UFO4)
return PIG;
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
else if (s->picnum == UFO5)
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
return BILLYRAY;
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
else return -1;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
});
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
continue;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
case OOZ:
- ooz, reactor and camera.
2020-10-21 21:04:14 +00:00
ooz(&hittype[i]);
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
continue;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
case EMPTYBIKE:
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
if (!isRRRA()) break;
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
makeitfall(i);
getglobalz(i);
if (sector[sect].lotag == 1)
{
setsprite(i,s->x,s->y,hittype[i].floorz+(16<<8));
}
break;
case EMPTYBOAT:
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
if (!isRRRA()) break;
makeitfall(i);
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
getglobalz(i);
break;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
case TRIPBOMBSPRITE:
if (!isRRRA() || (sector[sect].lotag != 1 && sector[sect].lotag != 160))
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
if (s->xvel)
{
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
j = fi.movesprite(i,
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
(s->xvel*sintable[(s->ang+512)&2047])>>14,
(s->xvel*sintable[s->ang&2047])>>14,
s->zvel,CLIPMASK0);
s->xvel--;
}
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
break;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
case CHEERBOMB:
if (!isRRRA()) break;
case MORTER:
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
case HEAVYHBOMB:
- heavyhbomb
2020-10-22 20:18:47 +00:00
heavyhbomb(&hittype[i]);
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
continue;
case REACTORBURNT:
case REACTOR2BURNT:
continue;
case REACTOR:
case REACTOR2:
- ooz, reactor and camera.
2020-10-21 21:04:14 +00:00
reactor(&hittype[i], REACTOR, REACTOR2, REACTORBURNT, REACTOR2BURNT, REACTORSPARK, REACTOR2SPARK);
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
continue;
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- fixed mixed up tile numbers. For consistency all shared numbers now use the TILE_ prefix.
2020-05-14 19:42:11 +00:00
case CAMERA1:
- ooz, reactor and camera.
2020-10-21 21:04:14 +00:00
camera(&hittype[i]);
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
continue;
}
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
// #ifndef VOLOMEONE
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
if( ud.multimode < 2 && badguy(s) )
{
if( actor_tog == 1)
{
s->cstat = (short)32768;
continue;
}
else if(actor_tog == 2) s->cstat = 257;
}
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
// #endif
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
p = findplayer(s,&x);
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
execute(i,p,x);
- make moveactors work and RR weapon name cleanup. # Conflicts: # source/games/duke/src/sbar.cpp
2020-05-09 09:44:50 +00:00
if (deleteafterexecute) deletesprite(i);
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
}
moveactors plus backing code.
2020-05-08 22:34:48 +00:00
}
- moveexplosions
2020-05-09 18:27:06 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void moveexplosions_r(void) // STATNUM 5
{
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
int sect, p;
- moveexplosions
2020-05-09 18:27:06 +00:00
int x, * t;
spritetype* s;
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
StatIterator it(STAT_MISC);
int i;
while ((i = it.NextIndex()) >= 0)
- moveexplosions
2020-05-09 18:27:06 +00:00
{
t = &hittype[i].temp_data[0];
s = &sprite[i];
sect = s->sectnum;
if (sect < 0 || s->xrepeat == 0)
{
deletesprite(i);
continue;
}
hittype[i].bposx = s->x;
hittype[i].bposy = s->y;
hittype[i].bposz = s->z;
switch (s->picnum)
{
case SHOTGUNSPRITE:
if (sector[s->sectnum].lotag == 800)
if (s->z >= sector[s->sectnum].floorz - (8 << 8))
{
deletesprite(i);
continue;
}
break;
case NEON1:
case NEON2:
case NEON3:
case NEON4:
case NEON5:
case NEON6:
if ((global_random / (s->lotag + 1) & 31) > 4) s->shade = -127;
else s->shade = 127;
continue;
case BLOODSPLAT1:
case BLOODSPLAT2:
case BLOODSPLAT3:
case BLOODSPLAT4:
if (t[0] == 7 * 26) continue;
s->z += 16 + (krand() & 15);
t[0]++;
if ((t[0] % 9) == 0) s->yrepeat++;
continue;
case FORCESPHERE:
- forcesphere, watersplash2, frameeffect and money.
2020-10-21 21:11:06 +00:00
forcesphereexplode(&hittype[i]);
- moveexplosions
2020-05-09 18:27:06 +00:00
continue;
case MUD:
t[0]++;
if (t[0] == 1)
{
if (sector[sect].floorpicnum != 3073)
{
deletesprite(i);
continue;
}
if (S_CheckSoundPlaying(22))
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(22, i);
- moveexplosions
2020-05-09 18:27:06 +00:00
}
if (t[0] == 3)
{
t[0] = 0;
t[1]++;
}
if (t[1] == 5)
deletesprite(i);
continue;
case WATERSPLASH2:
- forcesphere, watersplash2, frameeffect and money.
2020-10-21 21:11:06 +00:00
watersplash2(&hittype[i]);
- moveexplosions
2020-05-09 18:27:06 +00:00
continue;
case FRAMEEFFECT1:
- forcesphere, watersplash2, frameeffect and money.
2020-10-21 21:11:06 +00:00
frameeffect1(&hittype[i]);
- moveexplosions
2020-05-09 18:27:06 +00:00
continue;
case INNERJAW:
case INNERJAW + 1:
p = findplayer(s, &x);
if (x < 512)
{
SetPlayerPal(&ps[p], PalEntry(32, 32, 0, 0));
sprite[ps[p].i].extra -= 4;
}
case COOLEXPLOSION1:
case FIRELASER:
case OWHIP:
case UWHIP:
if (s->extra != 999)
s->extra = 999;
else
{
deletesprite(i);
continue;
}
break;
case TONGUE:
deletesprite(i);
continue;
case MONEY + 1:
hittype[i].floorz = s->z = getflorzofslope(s->sectnum, s->x, s->y);
if (sector[s->sectnum].lotag == 800)
{
deletesprite(i);
continue;
}
break;
case MONEY:
- forcesphere, watersplash2, frameeffect and money.
2020-10-21 21:11:06 +00:00
if (!money(&hittype[i], BLOODPOOL)) continue;
- moveexplosions
2020-05-09 18:27:06 +00:00
if (sector[s->sectnum].lotag == 800)
if (s->z >= sector[s->sectnum].floorz - (8 << 8))
{
deletesprite(i);
continue;
}
break;
case RRTILE2460:
case RRTILE2465:
case BIKEJIBA:
case BIKEJIBB:
case BIKEJIBC:
case BIKERJIBA:
case BIKERJIBB:
case BIKERJIBC:
case BIKERJIBD:
case CHEERJIBA:
case CHEERJIBB:
case CHEERJIBC:
case CHEERJIBD:
case FBOATJIBA:
case FBOATJIBB:
case RABBITJIBA:
case RABBITJIBB:
case RABBITJIBC:
case MAMAJIBA:
case MAMAJIBB:
if (!isRRRA()) break;
case BILLYJIBA:
case BILLYJIBB:
case HULKJIBA:
case HULKJIBB:
case HULKJIBC:
case MINJIBA:
case MINJIBB:
case MINJIBC:
case COOTJIBA:
case COOTJIBB:
case COOTJIBC:
case JIBS1:
case JIBS2:
case JIBS3:
case JIBS4:
case JIBS5:
case JIBS6:
case DUKETORSO:
case DUKEGUN:
case DUKELEG:
- jibs, bloodpool, shell, glasspieces and scrap.
2020-10-21 21:18:24 +00:00
if (!jibs(&hittype[i], JIBS6, false, true, true, s->picnum == DUKELEG || s->picnum == DUKETORSO || s->picnum == DUKEGUN,
- moveexplosions
2020-05-09 18:27:06 +00:00
isRRRA() && (s->picnum == RRTILE2465 || s->picnum == RRTILE2560))) continue;
if (sector[s->sectnum].lotag == 800)
if (s->z >= sector[s->sectnum].floorz - (8 << 8))
{
deletesprite(i);
continue;
}
continue;
case BLOODPOOL:
- jibs, bloodpool, shell, glasspieces and scrap.
2020-10-21 21:18:24 +00:00
if (!bloodpool(&hittype[i], false, TIRE)) continue;
- moveexplosions
2020-05-09 18:27:06 +00:00
if (sector[s->sectnum].lotag == 800)
if (s->z >= sector[s->sectnum].floorz - (8 << 8))
{
deletesprite(i);
}
continue;
case BURNING:
case WATERBUBBLE:
case SMALLSMOKE:
case EXPLOSION2:
case EXPLOSION3:
case BLOOD:
case FORCERIPPLE:
case TRANSPORTERSTAR:
case TRANSPORTERBEAM:
p = findplayer(s, &x);
execute(i, p, x);
continue;
case SHELL:
case SHOTGUNSHELL:
- jibs, bloodpool, shell, glasspieces and scrap.
2020-10-21 21:18:24 +00:00
shell(&hittype[i], false);
- moveexplosions
2020-05-09 18:27:06 +00:00
continue;
case GLASSPIECES:
case GLASSPIECES + 1:
case GLASSPIECES + 2:
case POPCORN:
- jibs, bloodpool, shell, glasspieces and scrap.
2020-10-21 21:18:24 +00:00
glasspieces(&hittype[i]);
- moveexplosions
2020-05-09 18:27:06 +00:00
continue;
}
if (s->picnum >= SCRAP6 && s->picnum <= SCRAP5 + 3)
{
- jibs, bloodpool, shell, glasspieces and scrap.
2020-10-21 21:18:24 +00:00
scrap(&hittype[i], SCRAP1, SCRAP6);
- moveexplosions
2020-05-09 18:27:06 +00:00
}
}
}
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void moveeffectors_r(void) //STATNUM 3
{
int l, x, st, j, * t;
- shared SE25 code.
2020-10-21 22:59:42 +00:00
int sh, ns, pn;
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
short k;
spritetype* s;
sectortype* sc;
walltype* wal;
clearfriction();
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
StatIterator it(STAT_EFFECTOR);
int i;
while ((i = it.NextIndex()) >= 0)
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
{
s = &sprite[i];
sc = &sector[s->sectnum];
st = s->lotag;
sh = s->hitag;
t = &hittype[i].temp_data[0];
switch (st)
{
case SE_0_ROTATING_SECTOR:
- SE 0 and 1 handlers.
2020-10-21 21:39:12 +00:00
handle_se00(&hittype[i], -1);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_1_PIVOT: //Nothing for now used as the pivot
- SE 0 and 1 handlers.
2020-10-21 21:39:12 +00:00
handle_se01(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_6_SUBWAY:
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
{
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
k = sc->extra;
if (t[4] > 0)
{
t[4]--;
if (t[4] >= (k - (k >> 3)))
s->xvel -= (k >> 5);
if (t[4] > ((k >> 1) - 1) && t[4] < (k - (k >> 3)))
s->xvel = 0;
if (t[4] < (k >> 1))
s->xvel += (k >> 5);
if (t[4] < ((k >> 1) - (k >> 3)))
{
t[4] = 0;
s->xvel = k;
if ((!isRRRA() || lastlevel) && hulkspawn)
{
hulkspawn--;
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
ns = fi.spawn(i, HULK);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
sprite[ns].z = sector[sprite[ns].sectnum].ceilingz;
sprite[ns].pal = 33;
if (!hulkspawn)
{
ns = EGS(s->sectnum, s->x, s->y, sector[s->sectnum].ceilingz + 119428, 3677, -8, 16, 16, 0, 0, 0, i, 5);
sprite[ns].cstat = 514;
sprite[ns].pal = 7;
sprite[ns].xrepeat = 80;
sprite[ns].yrepeat = 255;
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
ns = fi.spawn(i, 296);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
sprite[ns].cstat = 0;
sprite[ns].cstat |= 32768;
sprite[ns].z = sector[s->sectnum].floorz - 6144;
deletesprite(i);
break;
}
}
}
}
else
{
s->xvel = k;
- all sector iterators in actors_d.cpp, actors_r.cpp and actors_lava.cpp.
2020-10-14 18:49:43 +00:00
SectIterator it(s->sectnum);
while ((j = it.NextIndex()) >= 0)
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
{
if (sprite[j].picnum == UFOBEAM)
if (ufospawn)
if (++ufocnt == 64)
{
ufocnt = 0;
ufospawn--;
if (!isRRRA())
{
switch (krand() & 3)
{
default:
case 0:
pn = UFO1_RR;
break;
case 1:
pn = UFO2;
break;
case 2:
pn = UFO3;
break;
case 3:
pn = UFO4;
break;
}
}
else pn = UFO1_RRRA;
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
ns = fi.spawn(i, pn);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
sprite[ns].z = sector[sprite[ns].sectnum].ceilingz;
}
}
}
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
StatIterator it(STAT_EFFECTOR);
while ((j = it.NextIndex()) >= 0)
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
{
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
auto sj = &sprite[j];
auto htj = &hittype[j];
if ((sj->lotag == 14) && (sh == sj->hitag) && (htj->temp_data[0] == t[0]))
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
{
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
sj->xvel = s->xvel;
- tabification of new sources and replacement of the CON instruction symbols. # Conflicts: # source/games/duke/src/zz_gamedef.cpp
2020-05-12 11:43:24 +00:00
// if( t[4] == 1 )
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
{
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
if (htj->temp_data[5] == 0)
htj->temp_data[5] = dist(&sprite[j], s);
x = sgn(dist(&sprite[j], s) - htj->temp_data[5]);
if (sj->extra)
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
x = -x;
s->xvel += x;
}
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
htj->temp_data[4] = t[4];
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
}
}
x = 0;
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
}
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
case SE_14_SUBWAY_CAR:
- handle_SE14 function signature and recordoldspritepos
2020-10-21 21:56:46 +00:00
handle_se14(&hittype[i], false, RPG, JIBS6);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_30_TWO_WAY_TRAIN:
- handle_se30.
2020-10-21 22:00:43 +00:00
handle_se30(&hittype[i], JIBS6);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_2_EARTHQUAKE:
- handle SE02-SE04.
2020-10-21 22:10:43 +00:00
handle_se02(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
//Flashing sector lights after reactor EXPLOSION2
case SE_3_RANDOM_LIGHTS_AFTER_SHOT_OUT:
- handle SE02-SE04.
2020-10-21 22:10:43 +00:00
handle_se03(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_4_RANDOM_LIGHTS:
- handle SE02-SE04.
2020-10-21 22:10:43 +00:00
handle_se04(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
//BOSS
case SE_5_BOSS:
- handle_se05, 08, 10.
2020-10-21 22:14:54 +00:00
handle_se05(&hittype[i], FIRELASER);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_8_UP_OPEN_DOOR_LIGHTS:
case SE_9_DOWN_OPEN_DOOR_LIGHTS:
- handle_se05, 08, 10.
2020-10-21 22:14:54 +00:00
handle_se08(&hittype[i], true);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_10_DOOR_AUTO_CLOSE:
- handle_se05, 08, 10.
2020-10-21 22:14:54 +00:00
handle_se10(&hittype[i], nullptr);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_11_SWINGING_DOOR:
- handle_se11-13.
2020-10-21 22:20:47 +00:00
handle_se11(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_12_LIGHT_SWITCH:
- handle_se11-13.
2020-10-21 22:20:47 +00:00
handle_se12(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_47_LIGHT_SWITCH:
- handle_se11-13.
2020-10-21 22:20:47 +00:00
if (isRRRA()) handle_se12(&hittype[i], 1);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_48_LIGHT_SWITCH:
- handle_se11-13.
2020-10-21 22:20:47 +00:00
if (isRRRA()) handle_se12(&hittype[i], 2);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_13_EXPLOSIVE:
- handle_se11-13.
2020-10-21 22:20:47 +00:00
handle_se13(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_15_SLIDING_DOOR:
- handle_se15-17.
2020-10-21 22:25:11 +00:00
handle_se15(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_16_REACTOR:
- handle_se15-17.
2020-10-21 22:25:11 +00:00
handle_se16(&hittype[i], REACTOR, REACTOR2);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_17_WARP_ELEVATOR:
- handle_se15-17.
2020-10-21 22:25:11 +00:00
handle_se17(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_18_INCREMENTAL_SECTOR_RISE_FALL:
- handle_se18+19
2020-10-21 22:30:22 +00:00
handle_se18(&hittype[i], true);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_19_EXPLOSION_LOWERS_CEILING:
- handle_se18+19
2020-10-21 22:30:22 +00:00
handle_se19(&hittype[i], BIGFORCE);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_20_STRETCH_BRIDGE:
- handle_se20-26.
2020-10-21 22:35:30 +00:00
handle_se20(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_21_DROP_FLOOR:
- handle_se20-26.
2020-10-21 22:35:30 +00:00
handle_se21(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_22_TEETH_DOOR:
- handle_se20-26.
2020-10-21 22:35:30 +00:00
handle_se22(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case 156:
if (!isRRRA()) break;
case SE_24_CONVEYOR:
case 34:
- all sector iterators in actors_d.cpp, actors_r.cpp and actors_lava.cpp.
2020-10-14 18:49:43 +00:00
{
- shared SE24 code.
2020-10-21 22:50:01 +00:00
static int16_t list1[] = { BLOODPOOL, PUKE, FOOTPRINTS, FOOTPRINTS2, FOOTPRINTS3, -1 };
static int16_t list2[] = { BOLT1, BOLT1 + 1,BOLT1 + 2, BOLT1 + 3, -1 };
handle_se24(&hittype[i], list1, list2, BULLETHOLE, -1, CRANE, 1);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
- all sector iterators in actors_d.cpp, actors_r.cpp and actors_lava.cpp.
2020-10-14 18:49:43 +00:00
}
- shared SE24 code.
2020-10-21 22:50:01 +00:00
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
case 35:
- the 5 remaining shared SE handlers.
2020-10-21 22:40:57 +00:00
handle_se35(&hittype[i], SMALLSMOKE, EXPLOSION2);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case 25: //PISTONS
if (t[4] == 0) break;
- shared SE25 code.
2020-10-21 22:59:42 +00:00
handle_se25(&hittype[i], 4, isRRRA() ? 371 : -1, isRRRA() ? 167 : -1);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case 26:
- handle_se20-26.
2020-10-21 22:35:30 +00:00
handle_se26(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case SE_27_DEMO_CAM:
- the 5 remaining shared SE handlers.
2020-10-21 22:40:57 +00:00
handle_se27(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case 29:
s->hitag += 64;
l = mulscale12((int)s->yvel, sintable[s->hitag & 2047]);
sc->floorz = s->z + l;
break;
case 31: // True Drop Floor
- shared SE31 code.
2020-10-21 23:04:13 +00:00
handle_se31(&hittype[i], false);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case 32: // True Drop Ceiling
- the 5 remaining shared SE handlers.
2020-10-21 22:40:57 +00:00
handle_se32(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case 33:
if (earthquaketime > 0 && (krand() & 7) == 0)
RANDOMSCRAP(s, i);
break;
case 36:
if (t[0])
{
if (t[0] == 1)
-'shoot' replaced. # Conflicts: # source/build/src/palette.cpp
2020-05-16 21:55:21 +00:00
fi.shoot(i, sc->extra);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
else if (t[0] == 26 * 5)
t[0] = 0;
t[0]++;
}
break;
case 128: //SE to control glass breakage
- the 5 remaining shared SE handlers.
2020-10-21 22:40:57 +00:00
handle_se128(&hittype[i]);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case 130:
- the 5 remaining shared SE handlers.
2020-10-21 22:40:57 +00:00
handle_se130(&hittype[i], 80, EXPLOSION2);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
case 131:
- the 5 remaining shared SE handlers.
2020-10-21 22:40:57 +00:00
handle_se130(&hittype[i], 40, EXPLOSION2);
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
break;
}
}
//Sloped sin-wave floors!
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
it.Reset(STAT_EFFECTOR);
while ((i = it.NextIndex()) >= 0)
- moveeffectors, actors.c complete.
2020-05-10 07:08:02 +00:00
{
s = &sprite[i];
if (s->lotag != 29) continue;
sc = &sector[s->sectnum];
if (sc->wallnum != 4) continue;
wal = &wall[sc->wallptr + 2];
alignflorslope(s->sectnum, wal->x, wal->y, sector[wal->nextsector].floorz);
}
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
- movement code of the VM transitioned
2020-05-13 22:04:14 +00:00
//---------------------------------------------------------------------------
//
// game specific part of makeitfall.
//
//---------------------------------------------------------------------------
- makeitfall
2020-10-21 23:11:38 +00:00
int adjustfall(DDukeActor *actor, int c)
- movement code of the VM transitioned
2020-05-13 22:04:14 +00:00
{
- makeitfall
2020-10-21 23:11:38 +00:00
if ((actor->s.picnum == BIKERB || actor->s.picnum == CHEERB) && c == gc)
- properly tabified everything.
2020-07-20 21:21:27 +00:00
c = gc>>2;
- makeitfall
2020-10-21 23:11:38 +00:00
else if (actor->s.picnum == BIKERBV2 && c == gc)
- properly tabified everything.
2020-07-20 21:21:27 +00:00
c = gc>>3;
- movement code of the VM transitioned
2020-05-13 22:04:14 +00:00
return c;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void move_r(int g_i, int g_p, int g_x)
{
auto g_sp = &sprite[g_i];
- Big cleanup.
2020-07-06 20:23:18 +00:00
auto g_t = hittype[g_i].temp_data;
- movement code of the VM transitioned
2020-05-13 22:04:14 +00:00
int l;
short a, goalang, angdif;
int daxvel;
a = g_sp->hitag;
if (a == -1) a = 0;
g_t[0]++;
if (a & face_player)
{
if (ps[g_p].newowner >= 0)
goalang = getangle(ps[g_p].oposx - g_sp->x, ps[g_p].oposy - g_sp->y);
else goalang = getangle(ps[g_p].posx - g_sp->x, ps[g_p].posy - g_sp->y);
angdif = getincangle(g_sp->ang, goalang) >> 2;
if (angdif > -8 && angdif < 0) angdif = 0;
g_sp->ang += angdif;
}
if (a & spin)
g_sp->ang += sintable[((g_t[0] << 3) & 2047)] >> 6;
if (a & face_player_slow)
{
if (ps[g_p].newowner >= 0)
goalang = getangle(ps[g_p].oposx - g_sp->x, ps[g_p].oposy - g_sp->y);
else goalang = getangle(ps[g_p].posx - g_sp->x, ps[g_p].posy - g_sp->y);
angdif = ksgn(getincangle(g_sp->ang, goalang)) << 5;
if (angdif > -32 && angdif < 0)
{
angdif = 0;
g_sp->ang = goalang;
}
g_sp->ang += angdif;
}
if (isRRRA())
{
if (a & antifaceplayerslow)
{
if (ps[g_p].newowner >= 0)
goalang = (getangle(ps[g_p].oposx - g_sp->x, ps[g_p].oposy - g_sp->y) + 1024) & 2047;
else goalang = (getangle(ps[g_p].posx - g_sp->x, ps[g_p].posy - g_sp->y) + 1024) & 2047;
angdif = ksgn(getincangle(g_sp->ang, goalang)) << 5;
if (angdif > -32 && angdif < 0)
{
angdif = 0;
g_sp->ang = goalang;
}
g_sp->ang += angdif;
}
if ((a & jumptoplayer) == jumptoplayer)
{
if (g_sp->picnum == CHEER)
{
if (g_t[0] < 16)
g_sp->zvel -= (sintable[(512 + (g_t[0] << 4)) & 2047] / 40);
}
else
{
if (g_t[0] < 16)
g_sp->zvel -= (sintable[(512 + (g_t[0] << 4)) & 2047] >> 5);
}
}
if (a & justjump1)
{
if (g_sp->picnum == RABBIT)
{
if (g_t[0] < 8)
g_sp->zvel -= (sintable[(512 + (g_t[0] << 4)) & 2047] / 30);
}
else if (g_sp->picnum == MAMA)
{
if (g_t[0] < 8)
g_sp->zvel -= (sintable[(512 + (g_t[0] << 4)) & 2047] / 35);
}
}
if (a & justjump2)
{
if (g_sp->picnum == RABBIT)
{
if (g_t[0] < 8)
g_sp->zvel -= (sintable[(512 + (g_t[0] << 4)) & 2047] / 24);
}
else if (g_sp->picnum == MAMA)
{
if (g_t[0] < 8)
g_sp->zvel -= (sintable[(512 + (g_t[0] << 4)) & 2047] / 28);
}
}
if (a & windang)
{
if (g_t[0] < 8)
g_sp->zvel -= (sintable[(512 + (g_t[0] << 4)) & 2047] / 24);
}
}
else if ((a & jumptoplayer) == jumptoplayer)
{
if (g_t[0] < 16)
g_sp->zvel -= (sintable[(512 + (g_t[0] << 4)) & 2047] >> 5);
}
if (a & face_player_smart)
{
- eliminated a few overlooked 'long's.
2020-10-02 20:14:20 +00:00
int newx, newy;
- movement code of the VM transitioned
2020-05-13 22:04:14 +00:00
newx = ps[g_p].posx + (ps[g_p].posxv / 768);
newy = ps[g_p].posy + (ps[g_p].posyv / 768);
goalang = getangle(newx - g_sp->x, newy - g_sp->y);
angdif = getincangle(g_sp->ang, goalang) >> 2;
if (angdif > -8 && angdif < 0) angdif = 0;
g_sp->ang += angdif;
}
if (g_t[1] == 0 || a == 0)
{
if ((badguy(g_sp) && g_sp->extra <= 0) || (hittype[g_i].bposx != g_sp->x) || (hittype[g_i].bposy != g_sp->y))
{
hittype[g_i].bposx = g_sp->x;
hittype[g_i].bposy = g_sp->y;
setsprite(g_i, g_sp->x, g_sp->y, g_sp->z);
}
if (badguy(g_sp) && g_sp->extra <= 0)
{
if (sector[g_sp->sectnum].ceilingstat & 1)
{
if (shadedsector[g_sp->sectnum] == 1)
{
g_sp->shade += (16 - g_sp->shade) >> 1;
}
else
{
g_sp->shade += (sector[g_sp->sectnum].ceilingshade - g_sp->shade) >> 1;
}
}
else
{
g_sp->shade += (sector[g_sp->sectnum].floorshade - g_sp->shade) >> 1;
}
}
return;
}
- use 4 byte entries for the script. We no longer store pointers in here.
2020-05-15 09:36:46 +00:00
auto moveptr = &ScriptCode[g_t[1]];
- movement code of the VM transitioned
2020-05-13 22:04:14 +00:00
if (a & geth) g_sp->xvel += (*moveptr - g_sp->xvel) >> 1;
if (a & getv) g_sp->zvel += ((*(moveptr + 1) << 4) - g_sp->zvel) >> 1;
if (a & dodgebullet)
- dodge, furthestcanseepoint, furthestangle.
2020-10-21 23:12:16 +00:00
dodge(&hittype[g_i]);
- movement code of the VM transitioned
2020-05-13 22:04:14 +00:00
if (g_sp->picnum != APLAYER)
- alterang
2020-10-22 14:40:48 +00:00
alterang(a, &hittype[g_i], g_p);
- movement code of the VM transitioned
2020-05-13 22:04:14 +00:00
if (g_sp->xvel > -6 && g_sp->xvel < 6) g_sp->xvel = 0;
a = badguy(g_sp);
if (g_sp->xvel || g_sp->zvel)
{
if (a)
{
if (g_sp->picnum == DRONE && g_sp->extra > 0)
{
if (g_sp->zvel > 0)
{
hittype[g_i].floorz = l = getflorzofslope(g_sp->sectnum, g_sp->x, g_sp->y);
if (isRRRA())
{
if (g_sp->z > (l - (28 << 8)))
g_sp->z = l - (28 << 8);
}
else
{
if (g_sp->z > (l - (30 << 8)))
g_sp->z = l - (30 << 8);
}
}
else
{
hittype[g_i].ceilingz = l = getceilzofslope(g_sp->sectnum, g_sp->x, g_sp->y);
if ((g_sp->z - l) < (50 << 8))
{
g_sp->z = l + (50 << 8);
g_sp->zvel = 0;
}
}
}
if (g_sp->zvel > 0 && hittype[g_i].floorz < g_sp->z)
g_sp->z = hittype[g_i].floorz;
if (g_sp->zvel < 0)
{
l = getceilzofslope(g_sp->sectnum, g_sp->x, g_sp->y);
if ((g_sp->z - l) < (66 << 8))
{
g_sp->z = l + (66 << 8);
g_sp->zvel >>= 1;
}
}
}
else if (g_sp->picnum == APLAYER)
if ((g_sp->z - hittype[g_i].ceilingz) < (32 << 8))
g_sp->z = hittype[g_i].ceilingz + (32 << 8);
daxvel = g_sp->xvel;
angdif = g_sp->ang;
if (a)
{
if (g_x < 960 && g_sp->xrepeat > 16)
{
daxvel = -(1024 - g_x);
angdif = getangle(ps[g_p].posx - g_sp->x, ps[g_p].posy - g_sp->y);
if (g_x < 512)
{
ps[g_p].posxv = 0;
ps[g_p].posyv = 0;
}
else
{
ps[g_p].posxv = mulscale(ps[g_p].posxv, dukefriction - 0x2000, 16);
ps[g_p].posyv = mulscale(ps[g_p].posyv, dukefriction - 0x2000, 16);
}
}
else if ((isRRRA() && g_sp->picnum != DRONE && g_sp->picnum != SHARK && g_sp->picnum != UFO1_RRRA) ||
(!isRRRA() && g_sp->picnum != DRONE && g_sp->picnum != SHARK && g_sp->picnum != UFO1_RR
&& g_sp->picnum != UFO2 && g_sp->picnum != UFO3 && g_sp->picnum != UFO4 && g_sp->picnum != UFO5))
{
if (hittype[g_i].bposz != g_sp->z || (ud.multimode < 2 && ud.player_skill < 2))
{
- made player.actorsqu a pointer and added the needed infrastructure for that.
2020-10-17 08:30:11 +00:00
if ((g_t[0] & 1) || ps[g_p].actorsqu == &hittype[g_i]) return;
- movement code of the VM transitioned
2020-05-13 22:04:14 +00:00
else daxvel <<= 1;
}
else
{
- made player.actorsqu a pointer and added the needed infrastructure for that.
2020-10-17 08:30:11 +00:00
if ((g_t[0] & 3) || ps[g_p].actorsqu == &hittype[g_i]) return;
- movement code of the VM transitioned
2020-05-13 22:04:14 +00:00
else daxvel <<= 2;
}
}
}
if (isRRRA())
{
if (sector[g_sp->sectnum].lotag != 1)
{
switch (g_sp->picnum)
{
case MINIONBOAT:
case HULKBOAT:
case CHEERBOAT:
daxvel >>= 1;
break;
}
}
else if (sector[g_sp->sectnum].lotag == 1)
{
switch (g_sp->picnum)
{
case BIKERB:
case BIKERBV2:
case CHEERB:
daxvel >>= 1;
break;
}
}
}
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
hittype[g_i].movflag = fi.movesprite(g_i,
- movement code of the VM transitioned
2020-05-13 22:04:14 +00:00
(daxvel * (sintable[(angdif + 512) & 2047])) >> 14,
(daxvel * (sintable[angdif & 2047])) >> 14, g_sp->zvel, CLIPMASK0);
}
if (a)
{
if (sector[g_sp->sectnum].ceilingstat & 1)
{
if (shadedsector[g_sp->sectnum] == 1)
{
g_sp->shade += (16 - g_sp->shade) >> 1;
}
else
{
g_sp->shade += (sector[g_sp->sectnum].ceilingshade - g_sp->shade) >> 1;
}
}
else g_sp->shade += (sector[g_sp->sectnum].floorshade - g_sp->shade) >> 1;
if (sector[g_sp->sectnum].floorpicnum == MIRROR)
deletesprite(g_i);
}
}
- safety commit
2020-05-14 07:07:07 +00:00
void fakebubbaspawn(int g_i, int g_p)
{
fakebubba_spawn++;
switch (fakebubba_spawn)
{
default:
break;
case 1:
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(g_i, PIG);
- safety commit
2020-05-14 07:07:07 +00:00
break;
case 2:
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(g_i, MINION);
- safety commit
2020-05-14 07:07:07 +00:00
break;
case 3:
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(g_i, CHEER);
- safety commit
2020-05-14 07:07:07 +00:00
break;
case 4:
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(g_i, VIXEN);
- safety commit
2020-05-14 07:07:07 +00:00
operateactivators(666, ps[g_p].i);
break;
}
}
//---------------------------------------------------------------------------
//
- doincrements # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-17 16:04:45 +00:00
// special checks in fall that only apply to RR.
- safety commit
2020-05-14 07:07:07 +00:00
//
//---------------------------------------------------------------------------
- renamed variables.
2020-11-01 09:49:50 +00:00
static int fallspecial(DDukeActor *actor, int playernum)
- safety commit
2020-05-14 07:07:07 +00:00
{
- renamed variables.
2020-11-01 09:49:50 +00:00
auto s = &actor->s;
- safety commit
2020-05-14 07:07:07 +00:00
int sphit = 0;
if (isRRRA())
{
- renamed variables.
2020-11-01 09:49:50 +00:00
if (sector[s->sectnum].lotag == 801)
- safety commit
2020-05-14 07:07:07 +00:00
{
- renamed variables.
2020-11-01 09:49:50 +00:00
if (s->picnum == ROCK)
- safety commit
2020-05-14 07:07:07 +00:00
{
- fall_common and its fallspecial subfunction.
2020-10-22 16:51:20 +00:00
spawn(actor, ROCK2);
spawn(actor, ROCK2);
addspritetodelete();
- safety commit
2020-05-14 07:07:07 +00:00
}
return 0;
}
- renamed variables.
2020-11-01 09:49:50 +00:00
else if (sector[s->sectnum].lotag == 802)
- safety commit
2020-05-14 07:07:07 +00:00
{
- renamed variables.
2020-11-01 09:49:50 +00:00
if (s->picnum != APLAYER && badguy(actor) && s->z == actor->floorz - FOURSLEIGHT)
- safety commit
2020-05-14 07:07:07 +00:00
{
- guts_d and guts_r.
2020-10-22 17:21:21 +00:00
fi.guts(actor, JIBS6, 5, playernum);
- fall_common and its fallspecial subfunction.
2020-10-22 16:51:20 +00:00
S_PlayActorSound(SQUISHED, actor);
addspritetodelete();
- safety commit
2020-05-14 07:07:07 +00:00
}
return 0;
}
- renamed variables.
2020-11-01 09:49:50 +00:00
else if (sector[s->sectnum].lotag == 803)
- safety commit
2020-05-14 07:07:07 +00:00
{
- renamed variables.
2020-11-01 09:49:50 +00:00
if (s->picnum == ROCK2)
- fall_common and its fallspecial subfunction.
2020-10-22 16:51:20 +00:00
addspritetodelete();
- safety commit
2020-05-14 07:07:07 +00:00
return 0;
}
}
- renamed variables.
2020-11-01 09:49:50 +00:00
if (sector[s->sectnum].lotag == 800)
- safety commit
2020-05-14 07:07:07 +00:00
{
- renamed variables.
2020-11-01 09:49:50 +00:00
if (s->picnum == 40)
- safety commit
2020-05-14 07:07:07 +00:00
{
- fall_common and its fallspecial subfunction.
2020-10-22 16:51:20 +00:00
addspritetodelete();
- safety commit
2020-05-14 07:07:07 +00:00
return 0;
}
- renamed variables.
2020-11-01 09:49:50 +00:00
if (s->picnum != APLAYER && (badguy(actor) || s->picnum == HEN || s->picnum == COW || s->picnum == PIG || s->picnum == DOGRUN || s->picnum == RABBIT) && (!isRRRA() || actor->spriteextra < 128))
- safety commit
2020-05-14 07:07:07 +00:00
{
- renamed variables.
2020-11-01 09:49:50 +00:00
s->z = actor->floorz - FOURSLEIGHT;
s->zvel = 8000;
s->extra = 0;
- fall_common and its fallspecial subfunction.
2020-10-22 16:51:20 +00:00
actor->spriteextra++;
- safety commit
2020-05-14 07:07:07 +00:00
sphit = 1;
}
- renamed variables.
2020-11-01 09:49:50 +00:00
else if (s->picnum != APLAYER)
- safety commit
2020-05-14 07:07:07 +00:00
{
- fall_common and its fallspecial subfunction.
2020-10-22 16:51:20 +00:00
if (!actor->spriteextra)
addspritetodelete();
- safety commit
2020-05-14 07:07:07 +00:00
return 0;
}
- fall_common and its fallspecial subfunction.
2020-10-22 16:51:20 +00:00
actor->picnum = SHOTSPARK1;
actor->extra = 1;
- safety commit
2020-05-14 07:07:07 +00:00
}
- renamed variables.
2020-11-01 09:49:50 +00:00
else if (isRRRA() && (sector[s->sectnum].floorpicnum == RRTILE7820 || sector[s->sectnum].floorpicnum == RRTILE7768))
- safety commit
2020-05-14 07:07:07 +00:00
{
- renamed variables.
2020-11-01 09:49:50 +00:00
if (s->picnum != MINION && s->pal != 19)
- safety commit
2020-05-14 07:07:07 +00:00
{
if ((krand() & 3) == 1)
{
- fall_common and its fallspecial subfunction.
2020-10-22 16:51:20 +00:00
actor->picnum = SHOTSPARK1;
actor->extra = 5;
- safety commit
2020-05-14 07:07:07 +00:00
}
}
}
return sphit;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void fall_r(int g_i, int g_p)
{
- fall_common and its fallspecial subfunction.
2020-10-22 16:51:20 +00:00
fall_common(&hittype[g_i], g_p, JIBS6, DRONE, BLOODPOOL, SHOTSPARK1, 69, 158, fallspecial);
- safety commit
2020-05-14 07:07:07 +00:00
}
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void destroyit(int g_i)
{
auto g_sp = &sprite[g_i];
spritetype* js;
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
int lotag, hitag;
int k, jj;
int wi, wj;
int spr;
int wallstart2, wallend2;
int sectnum;
int wallstart, wallend;
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
hitag = 0;
- all sector iterators in actors_d.cpp, actors_r.cpp and actors_lava.cpp.
2020-10-14 18:49:43 +00:00
SectIterator it1(g_sp->sectnum);
while ((k = it1.NextIndex()) >= 0)
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
{
- all sector iterators in actors_d.cpp, actors_r.cpp and actors_lava.cpp.
2020-10-14 18:49:43 +00:00
auto sj = &sprite[k];
if (sj->picnum == RRTILE63)
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
{
- all sector iterators in actors_d.cpp, actors_r.cpp and actors_lava.cpp.
2020-10-14 18:49:43 +00:00
lotag = sj->lotag;
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
spr = k;
- all sector iterators in actors_d.cpp, actors_r.cpp and actors_lava.cpp.
2020-10-14 18:49:43 +00:00
if (sj->hitag)
hitag = sj->hitag;
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
}
}
- replaced all stat iterators in actors_r.cpp.
2020-10-14 18:24:31 +00:00
StatIterator it(STAT_DESTRUCT);
while ((jj = it.NextIndex()) >= 0)
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
{
js = &sprite[jj];
if (hitag)
if (hitag == js->hitag)
{
- all sector iterators in actors_d.cpp, actors_r.cpp and actors_lava.cpp.
2020-10-14 18:49:43 +00:00
SectIterator it(js->sectnum);
while ((k = it.NextIndex()) >= 0)
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
{
if (sprite[k].picnum == DESTRUCTO)
{
hittype[k].picnum = SHOTSPARK1;
hittype[k].extra = 1;
}
}
}
if (sprite[spr].sectnum != js->sectnum)
if (lotag == js->lotag)
{
sectnum = sprite[spr].sectnum;
wallstart = sector[sectnum].wallptr;
wallend = wallstart + sector[sectnum].wallnum;
wallstart2 = sector[js->sectnum].wallptr;
wallend2 = wallstart2 + sector[js->sectnum].wallnum;
for (wi = wallstart, wj = wallstart2; wi < wallend; wi++, wj++)
{
wall[wi].picnum = wall[wj].picnum;
wall[wi].overpicnum = wall[wj].overpicnum;
wall[wi].shade = wall[wj].shade;
wall[wi].xrepeat = wall[wj].xrepeat;
wall[wi].yrepeat = wall[wj].yrepeat;
wall[wi].xpanning = wall[wj].xpanning;
wall[wi].ypanning = wall[wj].ypanning;
if (isRRRA() && wall[wi].nextwall != -1)
{
wall[wi].cstat = 0;
wall[wall[wi].nextwall].cstat = 0;
}
}
sector[sectnum].floorz = sector[js->sectnum].floorz;
sector[sectnum].ceilingz = sector[js->sectnum].ceilingz;
sector[sectnum].ceilingstat = sector[js->sectnum].ceilingstat;
sector[sectnum].floorstat = sector[js->sectnum].floorstat;
sector[sectnum].ceilingpicnum = sector[js->sectnum].ceilingpicnum;
sector[sectnum].ceilingheinum = sector[js->sectnum].ceilingheinum;
sector[sectnum].ceilingshade = sector[js->sectnum].ceilingshade;
sector[sectnum].ceilingpal = sector[js->sectnum].ceilingpal;
sector[sectnum].ceilingxpanning = sector[js->sectnum].ceilingxpanning;
sector[sectnum].ceilingypanning = sector[js->sectnum].ceilingypanning;
sector[sectnum].floorpicnum = sector[js->sectnum].floorpicnum;
sector[sectnum].floorheinum = sector[js->sectnum].floorheinum;
sector[sectnum].floorshade = sector[js->sectnum].floorshade;
sector[sectnum].floorpal = sector[js->sectnum].floorpal;
sector[sectnum].floorxpanning = sector[js->sectnum].floorxpanning;
sector[sectnum].floorypanning = sector[js->sectnum].floorypanning;
sector[sectnum].visibility = sector[js->sectnum].visibility;
- did some cleanup on the global variables.
2020-07-19 21:09:10 +00:00
sectorextra[sectnum] = sectorextra[js->sectnum]; // TRANSITIONAL: at least rename this.
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
sector[sectnum].lotag = sector[js->sectnum].lotag;
sector[sectnum].hitag = sector[js->sectnum].hitag;
sector[sectnum].extra = sector[js->sectnum].extra;
}
}
- all sector iterators in actors_d.cpp, actors_r.cpp and actors_lava.cpp.
2020-10-14 18:49:43 +00:00
it1.Reset(g_sp->sectnum);
while ((k = it.NextIndex()) >= 0)
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
{
switch (sprite[k].picnum)
{
case DESTRUCTO:
case RRTILE63:
case TORNADO:
- fixed mixed up tile numbers. For consistency all shared numbers now use the TILE_ prefix.
2020-05-14 19:42:11 +00:00
case APLAYER:
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
case COOT:
break;
default:
deletesprite(k);
break;
}
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void mamaspawn(int g_i)
{
if (mamaspawn_count)
{
mamaspawn_count--;
- spawn function transitioned.
2020-05-15 20:59:13 +00:00
fi.spawn(g_i, RABBIT);
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
}
}
- step 1.
2020-05-14 17:23:36 +00:00
bool spawnweapondebris_r(int picnum, int dnum)
{
return dnum == SCRAP1;
}
void respawnhitag_r(spritetype* g_sp)
{
switch (g_sp->picnum)
{
case FEM10:
case NAKED1:
case STATUE:
if (g_sp->yvel) fi.operaterespawns(g_sp->yvel);
break;
default:
if (g_sp->hitag >= 0) fi.operaterespawns(g_sp->hitag);
break;
}
}
void checktimetosleep_r(int g_i)
{
auto g_sp = &sprite[g_i];
if (g_sp->statnum == 6)
{
switch (g_sp->picnum)
{
case RUBBERCAN:
case EXPLODINGBARREL:
case WOODENHORSE:
case HORSEONSIDE:
case CANWITHSOMETHING:
case FIREBARREL:
case NUKEBARREL:
case NUKEBARRELDENTED:
case NUKEBARRELLEAKED:
case TRIPBOMB:
case EGG:
if (hittype[g_i].timetosleep > 1)
hittype[g_i].timetosleep--;
else if (hittype[g_i].timetosleep == 1)
changespritestat(g_i, 2);
break;
}
}
}
- a small bit more is gone.
2020-06-23 19:12:15 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void thunder(void);
void think_r(void)
{
thinktime.Reset();
thinktime.Clock();
- interpolation fix from EDuke: "Patch from Striker to improve sprite interpolation" Fixes #109
2020-09-11 20:54:52 +00:00
recordoldspritepos();
- a small bit more is gone.
2020-06-23 19:12:15 +00:00
movefta_r(); //ST 2
moveweapons_r(); //ST 4
movetransports_r(); //ST 9
moveplayers(); //ST 10
movefallers_r(); //ST 12
moveexplosions_r(); //ST 5
actortime.Reset();
actortime.Clock();
moveactors_r(); //ST 1
actortime.Unclock();
moveeffectors_r(); //ST 3
movestandables_r(); //ST 6
doanimations();
movefx(); //ST 11
if (numplayers < 2 && thunderon)
thunder();
thinktime.Unclock();
}
- reshuffling stuff.
2020-05-07 12:55:04 +00:00
END_DUKE_NS
Reference in a new issue Copy permalink