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

2882 lines
67 KiB
C++
Raw Normal View History

- the beginning of sector.cpp The math backend functions have been moved out of Build because they originally have a good license. # Conflicts: # source/build/src/mdsprite.cpp # source/build/src/polymost.cpp
2020-05-10 10:42:47 +00:00
//-------------------------------------------------------------------------
/*
Copyright (C) 1996, 2003 - 3D Realms Entertainment
Copyright (C) 2017-2019 Nuke.YKT
- copyright
2020-05-13 14:19:39 +00:00
Copyright (C) 2020 - Christoph Oelckers
- the beginning of sector.cpp The math backend functions have been moved out of Build because they originally have a good license. # Conflicts: # source/build/src/mdsprite.cpp # source/build/src/polymost.cpp
2020-05-10 10:42:47 +00:00
This file is part of Duke Nukem 3D version 1.5 - Atomic Edition
Duke Nukem 3D is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Original Source: 1996 - Todd Replogle
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
*/
//-------------------------------------------------------------------------
- Replace every line that just contains spaces or tabs with an empty line feed in all files except 3rd party libraries.
2021-12-30 09:30:21 +00:00
- the beginning of sector.cpp The math backend functions have been moved out of Build because they originally have a good license. # Conflicts: # source/build/src/mdsprite.cpp # source/build/src/polymost.cpp
2020-05-10 10:42:47 +00:00
#include "ns.h"
#include "global.h"
- renamed a few headers.
2020-06-24 19:21:02 +00:00
#include "sounds.h"
- got rid of the dynamic tilemap. Most tile access is in game specific code, the remaining code only accesses 51 tiles
2020-07-03 21:56:14 +00:00
#include "names_r.h"
- another safety commit.
2020-07-07 15:56:20 +00:00
#include "mapinfo.h"
- migrated EGS and deletesprite to new actor interface. Inline wrappers for old code exist. The backupplayer inline was moved into player.cpp because that's the only place it gets used.
2020-10-21 17:14:41 +00:00
#include "dukeactor.h"
- add back the missing secret hint notification calls for Duke/RR.
2020-12-01 11:52:49 +00:00
#include "secrets.h"
- the beginning of sector.cpp The math backend functions have been moved out of Build because they originally have a good license. # Conflicts: # source/build/src/mdsprite.cpp # source/build/src/polymost.cpp
2020-05-10 10:42:47 +00:00
// PRIMITIVE
BEGIN_DUKE_NS
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
bool isadoorwall_r(int dapic)
{
- 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(dapic)
{
case DOORTILE1:
case DOORTILE2:
case DOORTILE3:
case DOORTILE4:
case DOORTILE5:
case DOORTILE6:
case DOORTILE7:
case DOORTILE8:
case DOORTILE9:
case DOORTILE10:
case DOORTILE11:
case DOORTILE12:
case DOORTILE14:
case DOORTILE15:
case DOORTILE16:
case DOORTILE17:
case DOORTILE18:
case DOORTILE19:
case DOORTILE20:
case DOORTILE21:
case DOORTILE22:
case RRTILE1856:
case RRTILE1877:
return 1;
}
return 0;
- the beginning of sector.cpp The math backend functions have been moved out of Build because they originally have a good license. # Conflicts: # source/build/src/mdsprite.cpp # source/build/src/polymost.cpp
2020-05-10 10:42:47 +00:00
}
bool isablockdoor(int dapic)
{
- 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 (dapic)
{
case RRTILE1792:
case RRTILE1801:
case RRTILE1805:
case RRTILE1807:
case RRTILE1808:
case RRTILE1812:
case RRTILE1821:
case RRTILE1826:
case RRTILE1850:
case RRTILE1851:
case RRTILE1856:
case RRTILE1877:
case RRTILE1938:
case RRTILE1942:
case RRTILE1944:
case RRTILE1945:
case RRTILE1951:
case RRTILE1961:
case RRTILE1964:
case RRTILE1985:
case RRTILE1995:
case RRTILE2022:
case RRTILE2052:
case RRTILE2053:
case RRTILE2060:
case RRTILE2074:
case RRTILE2132:
case RRTILE2136:
case RRTILE2139:
case RRTILE2150:
case RRTILE2178:
case RRTILE2186:
case RRTILE2319:
case RRTILE2321:
case RRTILE2326:
case RRTILE2329:
case RRTILE2578:
case RRTILE2581:
case RRTILE2610:
case RRTILE2613:
case RRTILE2621:
case RRTILE2622:
case RRTILE2676:
case RRTILE2732:
case RRTILE2831:
case RRTILE2832:
case RRTILE2842:
case RRTILE2940:
case RRTILE2970:
case RRTILE3083:
case RRTILE3100:
case RRTILE3155:
case RRTILE3195:
case RRTILE3232:
case RRTILE3600:
case RRTILE3631:
case RRTILE3635:
case RRTILE3637:
case RRTILE3643+2:
case RRTILE3643+3:
case RRTILE3647:
case RRTILE3652:
case RRTILE3653:
case RRTILE3671:
case RRTILE3673:
case RRTILE3684:
case RRTILE3708:
case RRTILE3714:
case RRTILE3716:
case RRTILE3723:
case RRTILE3725:
case RRTILE3737:
case RRTILE3754:
case RRTILE3762:
case RRTILE3763:
case RRTILE3764:
case RRTILE3765:
case RRTILE3767:
case RRTILE3793:
case RRTILE3814:
case RRTILE3815:
case RRTILE3819:
case RRTILE3827:
case RRTILE3837:
- the beginning of sector.cpp The math backend functions have been moved out of Build because they originally have a good license. # Conflicts: # source/build/src/mdsprite.cpp # source/build/src/polymost.cpp
2020-05-10 10:42:47 +00:00
return true;
- Replace every line that just contains spaces or tabs with an empty line feed in all files except 3rd party libraries.
2021-12-30 09:30:21 +00:00
- 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 RRTILE1996:
case RRTILE2382:
case RRTILE2961:
case RRTILE3804:
case RRTILE7430:
case RRTILE7467:
case RRTILE7469:
case RRTILE7470:
case RRTILE7475:
case RRTILE7566:
case RRTILE7576:
case RRTILE7716:
case RRTILE8063:
case RRTILE8067:
case RRTILE8076:
case RRTILE8106:
case RRTILE8379:
case RRTILE8380:
case RRTILE8565:
case RRTILE8605:
return isRRRA();
}
return false;
- the beginning of sector.cpp The math backend functions have been moved out of Build because they originally have a good license. # Conflicts: # source/build/src/mdsprite.cpp # source/build/src/polymost.cpp
2020-05-10 10:42:47 +00:00
}
20% of sector.cpp # Conflicts: # source/games/duke/src/zz_sector.cpp
2020-05-10 14:53:09 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void animatewalls_r(void)
{
- animatewalls_r
2021-11-17 22:06:28 +00:00
int t;
- 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 (isRRRA() &&ps[screenpeek].sea_sick_stat == 1)
{
- removed the now redundant wall() and sector() interator helper functions. With both wall and sector now being TArrays they are not needed anymore.
2021-12-21 08:23:39 +00:00
for (auto& wal : wall)
- 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
{
- animatewalls_r
2021-11-17 22:06:28 +00:00
if (wal.picnum == RRTILE7873)
wal.addxpan(6);
else if (wal.picnum == RRTILE7870)
wal.addxpan(6);
- 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
}
}
- animatewalls_r
2021-11-17 22:06:28 +00:00
for (int p = 0; p < numanimwalls; p++)
- 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
{
- store wall pointers in animwall
2021-11-17 23:30:37 +00:00
auto wal = animwall[p].wall;
- animatewalls_r
2021-11-17 22:06:28 +00:00
int j = wal->picnum;
- 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 (j)
{
case SCREENBREAK1:
case SCREENBREAK2:
case SCREENBREAK3:
case SCREENBREAK4:
case SCREENBREAK5:
case SCREENBREAK9:
case SCREENBREAK10:
case SCREENBREAK11:
case SCREENBREAK12:
case SCREENBREAK13:
if ((krand() & 255) < 16)
{
- animatewalls_r
2021-11-17 22:06:28 +00:00
animwall[p].tag = wal->picnum;
wal->picnum = SCREENBREAK6;
- 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 SCREENBREAK6:
case SCREENBREAK7:
case SCREENBREAK8:
if (animwall[p].tag >= 0)
- animatewalls_r
2021-11-17 22:06:28 +00:00
wal->picnum = animwall[p].tag;
- 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
{
- animatewalls_r
2021-11-17 22:06:28 +00:00
wal->picnum++;
if (wal->picnum == (SCREENBREAK6 + 3))
wal->picnum = SCREENBREAK6;
- 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;
}
- wall and sprite flags in Duke, just simple cases.
2021-12-18 14:11:21 +00:00
if (wal->cstat & CSTAT_WALL_MASKED)
- animatewalls_r
2021-11-17 22:06:28 +00:00
switch (wal->overpicnum)
- 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 W_FORCEFIELD:
case W_FORCEFIELD + 1:
case W_FORCEFIELD + 2:
t = animwall[p].tag;
- wall and sprite flags in Duke, just simple cases.
2021-12-18 14:11:21 +00:00
if (wal->cstat & CSTAT_WALL_ANY_EXCEPT_BLOCK)
- 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
{
- animatewalls_r
2021-11-17 22:06:28 +00:00
wal->addxpan(-t / 4096.f); // bcos(t, -12);
wal->addypan(-t / 4096.f); // bsin(t, -12);
- 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
- animatewalls_r
2021-11-17 22:06:28 +00:00
if (wal->extra == 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
{
- animatewalls_r
2021-11-17 22:06:28 +00:00
wal->extra = 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
animwall[p].tag = 0;
}
else
animwall[p].tag += 128;
if (animwall[p].tag < (128 << 4))
{
if (animwall[p].tag & 128)
- animatewalls_r
2021-11-17 22:06:28 +00:00
wal->overpicnum = W_FORCEFIELD;
else wal->overpicnum = W_FORCEFIELD + 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
}
else
{
if ((krand() & 255) < 32)
animwall[p].tag = 128 << (krand() & 3);
- animatewalls_r
2021-11-17 22:06:28 +00:00
else wal->overpicnum = W_FORCEFIELD + 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
}
}
break;
}
}
20% of sector.cpp # Conflicts: # source/games/duke/src/zz_sector.cpp
2020-05-10 14:53:09 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void operaterespawns_r(int low)
{
- operaterespawns. # Conflicts: # source/games/duke/src/sectors_d.cpp # source/games/duke/src/sectors_r.cpp
2020-10-23 18:49:52 +00:00
DukeStatIterator it(STAT_FX);
while (auto act = it.Next())
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (act->spr.lotag == low) switch (act->spr.picnum)
- 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 RESPAWN:
- first part of spawn.cpp.
2020-11-02 20:21:52 +00:00
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (badguypic(act->spr.hitag) && ud.monsters_off) 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
- operaterespawns. # Conflicts: # source/games/duke/src/sectors_d.cpp # source/games/duke/src/sectors_r.cpp
2020-10-23 18:49:52 +00:00
auto star = spawn(act, TRANSPORTERSTAR);
- Duke: first batch of refactoring writes to spr.pos.
2022-01-30 17:12:07 +00:00
if (star) star->add_int_z(-(32 << 8));
- 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
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
act->spr.extra = 66 - 12; // Just a way to killit
- 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;
- first part of spawn.cpp.
2020-11-02 20:21:52 +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 RRTILE7424:
if (isRRRA() && !ud.monsters_off)
- moved some common utilities into the backend.
2021-11-26 20:52:01 +00:00
ChangeActorStat(act, 119);
- 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;
}
}
20% of sector.cpp # Conflicts: # source/games/duke/src/zz_sector.cpp
2020-05-10 14:53:09 +00:00
}
- the beginning of sector.cpp The math backend functions have been moved out of Build because they originally have a good license. # Conflicts: # source/build/src/mdsprite.cpp # source/build/src/polymost.cpp
2020-05-10 10:42:47 +00:00
checkhitswitch intentionally not merged because this is too messy.
2020-05-10 16:05:36 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- fixed a few parameters
2020-11-02 18:53:04 +00:00
void operateforcefields_r(DDukeActor* act, int low)
checkhitswitch intentionally not merged because this is too messy.
2020-05-10 16:05:36 +00:00
{
- fixed a few parameters
2020-11-02 18:53:04 +00:00
operateforcefields_common(act, low, { BIGFORCE });
checkhitswitch intentionally not merged because this is too messy.
2020-05-10 16:05:36 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- use pointers for checkhitswitch and took separated clearcameras to a new functions to make this free of gotos.
2021-11-17 23:16:53 +00:00
bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
checkhitswitch intentionally not merged because this is too messy.
2020-05-10 16:05:36 +00:00
{
- fixed some messed up conditionals in RR's switch code. Fixes #166
2020-08-11 22:31:04 +00:00
uint8_t switchpal;
- checkhitswitch_r
2021-11-17 22:10:25 +00:00
int lotag, hitag, picnum, correctdips, numdips;
- 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 sx, sy;
- use pointers for checkhitswitch and took separated clearcameras to a new functions to make this free of gotos.
2021-11-17 23:16:53 +00:00
if (wwal == nullptr && act == nullptr) return 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
correctdips = 1;
numdips = 0;
- cleaned up the checkhitswitch interface to receive sprites as pointers.
2020-10-26 06:30:34 +00:00
if (act)
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
lotag = act->spr.lotag;
- checkhitswitch_r part 1
2020-10-26 05:55:16 +00:00
if (lotag == 0) return 0;
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
hitag = act->spr.hitag;
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
sx = act->int_pos().X;
sy = act->int_pos().Y;
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
picnum = act->spr.picnum;
switchpal = act->spr.pal;
- 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
{
- checkhitswitch_r
2021-11-17 22:10:25 +00:00
lotag = wwal->lotag;
- checkhitswitch_r part 1
2020-10-26 05:55:16 +00:00
if (lotag == 0) return 0;
- checkhitswitch_r
2021-11-17 22:10:25 +00:00
hitag = wwal->hitag;
-use an access function for reading wall positions so that we have a non-modifiable value wherever this is possible.
2022-01-27 16:41:10 +00:00
sx = wwal->wall_int_pos().X;
sy = wwal->wall_int_pos().Y;
- checkhitswitch_r
2021-11-17 22:10:25 +00:00
picnum = wwal->picnum;
switchpal = wwal->pal;
- 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 (picnum)
{
case DIPSWITCH:
case DIPSWITCH + 1:
case TECHSWITCH:
case TECHSWITCH + 1:
case ALIENSWITCH:
case ALIENSWITCH + 1:
break;
case ACCESSSWITCH:
case ACCESSSWITCH2:
if (ps[snum].access_incs == 0)
{
if (switchpal == 0)
{
if (ps[snum].keys[1])
ps[snum].access_incs = 1;
else
{
FTA(70, &ps[snum]);
- cleaned up the checkhitswitch interface to receive sprites as pointers.
2020-10-26 06:30:34 +00:00
if (isRRRA()) S_PlayActorSound(99, act? act : ps[snum].GetActor());
- 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 (switchpal == 21)
{
if (ps[snum].keys[2])
ps[snum].access_incs = 1;
else
{
FTA(71, &ps[snum]);
- cleaned up the checkhitswitch interface to receive sprites as pointers.
2020-10-26 06:30:34 +00:00
if (isRRRA()) S_PlayActorSound(99, act ? act : ps[snum].GetActor());
- 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 (switchpal == 23)
{
if (ps[snum].keys[3])
ps[snum].access_incs = 1;
else
{
FTA(72, &ps[snum]);
- cleaned up the checkhitswitch interface to receive sprites as pointers.
2020-10-26 06:30:34 +00:00
if (isRRRA()) S_PlayActorSound(99, act ? act : ps[snum].GetActor());
- 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 (ps[snum].access_incs == 1)
{
- cleaned up the checkhitswitch interface to receive sprites as pointers.
2020-10-26 06:30:34 +00:00
if (!act)
- make access_wallnum a pointer
2021-11-17 23:20:39 +00:00
ps[snum].access_wall = wwal;
- 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
- access_spritenum
2020-10-25 05:34:25 +00:00
ps[snum].access_spritenum = act;
- 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
}
return 0;
}
- fixed some messed up conditionals in RR's switch code. Fixes #166
2020-08-11 22:31:04 +00:00
goto goOn1;
- 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 MULTISWITCH2:
case MULTISWITCH2 + 1:
case MULTISWITCH2 + 2:
case MULTISWITCH2 + 3:
case RRTILE8464:
case RRTILE8660:
- fixed some messed up conditionals in RR's switch code. Fixes #166
2020-08-11 22:31:04 +00:00
if (!isRRRA()) break;
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
[[fallthrough]];
- 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 DIPSWITCH2:
case DIPSWITCH2 + 1:
case DIPSWITCH3:
case DIPSWITCH3 + 1:
case MULTISWITCH:
case MULTISWITCH + 1:
case MULTISWITCH + 2:
case MULTISWITCH + 3:
case PULLSWITCH:
case PULLSWITCH + 1:
case HANDSWITCH:
case HANDSWITCH + 1:
case SLOTDOOR:
case SLOTDOOR + 1:
case LIGHTSWITCH:
case LIGHTSWITCH + 1:
case SPACELIGHTSWITCH:
case SPACELIGHTSWITCH + 1:
case SPACEDOORSWITCH:
case SPACEDOORSWITCH + 1:
case FRANKENSTINESWITCH:
case FRANKENSTINESWITCH + 1:
case LIGHTSWITCH2:
case LIGHTSWITCH2 + 1:
case POWERSWITCH1:
case POWERSWITCH1 + 1:
case LOCKSWITCH1:
case LOCKSWITCH1 + 1:
case POWERSWITCH2:
case POWERSWITCH2 + 1:
case NUKEBUTTON:
case NUKEBUTTON + 1:
case RRTILE2214:
case RRTILE2697:
case RRTILE2697 + 1:
case RRTILE2707:
case RRTILE2707 + 1:
- fixed some messed up conditionals in RR's switch code. Fixes #166
2020-08-11 22:31:04 +00:00
goOn1:
- 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 (check_activator_motion(lotag)) return 0;
break;
default:
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
if (fi.isadoorwall(picnum) == 0) return 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
break;
}
- checkhitswitch_r part 3
2020-10-26 06:02:36 +00:00
DukeStatIterator it(STAT_DEFAULT);
while (auto other = it.Next())
- 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (lotag == other->spr.lotag) switch (other->spr.picnum)
- 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 DIPSWITCH:
case TECHSWITCH:
case ALIENSWITCH:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (act && act == other) other->spr.picnum++;
else if (other->spr.hitag == 0) correctdips++;
- 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
numdips++;
break;
case TECHSWITCH + 1:
case DIPSWITCH + 1:
case ALIENSWITCH + 1:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (act && act == other) other->spr.picnum--;
else if (other->spr.hitag == 1) correctdips++;
- 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
numdips++;
break;
case MULTISWITCH:
case MULTISWITCH + 1:
case MULTISWITCH + 2:
case MULTISWITCH + 3:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
other->spr.picnum++;
if (other->spr.picnum > (MULTISWITCH + 3))
other->spr.picnum = MULTISWITCH;
- 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 MULTISWITCH2:
case MULTISWITCH2 + 1:
case MULTISWITCH2 + 2:
case MULTISWITCH2 + 3:
if (!isRRRA()) break;
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
other->spr.picnum++;
if (other->spr.picnum > (MULTISWITCH2 + 3))
other->spr.picnum = MULTISWITCH2;
- 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 RRTILE2214:
- another safety commit.
2020-07-07 15:56:20 +00:00
//if (ud.level_numbe r > 6) ud.level_numbe r = 0; ??? Looks like some leftover garbage.
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
other->spr.picnum++;
- 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 RRTILE8660:
if (!isRRRA()) break;
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
[[fallthrough]];
- 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 ACCESSSWITCH:
case ACCESSSWITCH2:
case SLOTDOOR:
case LIGHTSWITCH:
case SPACELIGHTSWITCH:
case SPACEDOORSWITCH:
case FRANKENSTINESWITCH:
case LIGHTSWITCH2:
case POWERSWITCH1:
case LOCKSWITCH1:
case POWERSWITCH2:
case HANDSWITCH:
case PULLSWITCH:
case DIPSWITCH2:
case DIPSWITCH3:
case NUKEBUTTON:
case RRTILE2697:
case RRTILE2707:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (other->spr.picnum == DIPSWITCH3)
if (other->spr.hitag == 999)
- 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
{
- checkhitswitch_r part 4
2020-10-26 06:10:45 +00:00
DukeStatIterator it1(107);
while (auto other2 = it1.Next())
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (other2->spr.picnum == RRTILE3410)
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
other2->spr.picnum++;
other2->spr.hitag = 100;
other2->spr.extra = 0;
- checkhitswitch_r part 4
2020-10-26 06:10:45 +00:00
S_PlayActorSound(474, other2);
- 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
}
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
else if (other2->spr.picnum == RRTILE295)
- checkhitswitch_r part 4
2020-10-26 06:10:45 +00:00
deletesprite(other2);
- 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
}
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
other->spr.picnum++;
- 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;
}
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (other->spr.picnum == NUKEBUTTON)
- 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
chickenplant = 0;
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (other->spr.picnum == RRTILE8660)
- 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
{
BellTime = 132;
- wrapped neartag to return an actor.
2020-10-27 05:35:11 +00:00
BellSprite = other;
- 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
}
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
other->spr.picnum++;
- 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 PULLSWITCH + 1:
case HANDSWITCH + 1:
case LIGHTSWITCH2 + 1:
case POWERSWITCH1 + 1:
case LOCKSWITCH1 + 1:
case POWERSWITCH2 + 1:
case SLOTDOOR + 1:
case LIGHTSWITCH + 1:
case SPACELIGHTSWITCH + 1:
case SPACEDOORSWITCH + 1:
case FRANKENSTINESWITCH + 1:
case DIPSWITCH2 + 1:
case DIPSWITCH3 + 1:
case NUKEBUTTON + 1:
case RRTILE2697 + 1:
case RRTILE2707 + 1:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (other->spr.picnum == NUKEBUTTON + 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
chickenplant = 1;
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (other->spr.hitag != 999)
other->spr.picnum--;
- 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;
}
}
- removed the now redundant wall() and sector() interator helper functions. With both wall and sector now being TArrays they are not needed anymore.
2021-12-21 08:23:39 +00:00
for (auto& wal : wall)
- 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
{
- checkhitswitch_r
2021-11-17 22:10:25 +00:00
if (lotag == wal.lotag)
switch (wal.picnum)
- 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 DIPSWITCH:
case TECHSWITCH:
case ALIENSWITCH:
- checkhitswitch_r
2021-11-17 22:10:25 +00:00
if (!act && &wal == wwal) wal.picnum++;
else if (wal.hitag == 0) correctdips++;
- 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
numdips++;
break;
case DIPSWITCH + 1:
case TECHSWITCH + 1:
case ALIENSWITCH + 1:
- checkhitswitch_r
2021-11-17 22:10:25 +00:00
if (!act && &wal == wwal) wal.picnum--;
else if (wal.hitag == 1) correctdips++;
- 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
numdips++;
break;
case MULTISWITCH:
case MULTISWITCH + 1:
case MULTISWITCH + 2:
case MULTISWITCH + 3:
- checkhitswitch_r
2021-11-17 22:10:25 +00:00
wal.picnum++;
if (wal.picnum > (MULTISWITCH + 3))
wal.picnum = MULTISWITCH;
- 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 MULTISWITCH2:
case MULTISWITCH2 + 1:
case MULTISWITCH2 + 2:
case MULTISWITCH2 + 3:
if (!isRRRA()) break;
- checkhitswitch_r
2021-11-17 22:10:25 +00:00
wal.picnum++;
if (wal.picnum > (MULTISWITCH2 + 3))
wal.picnum = MULTISWITCH2;
- 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 RRTILE8660:
if (!isRRRA()) break;
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
[[fallthrough]];
- 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 ACCESSSWITCH:
case ACCESSSWITCH2:
case SLOTDOOR:
case LIGHTSWITCH:
case SPACELIGHTSWITCH:
case SPACEDOORSWITCH:
case LIGHTSWITCH2:
case POWERSWITCH1:
case LOCKSWITCH1:
case POWERSWITCH2:
case PULLSWITCH:
case HANDSWITCH:
case DIPSWITCH2:
case DIPSWITCH3:
case RRTILE2697:
case RRTILE2707:
- checkhitswitch_r
2021-11-17 22:10:25 +00:00
wal.picnum++;
- 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 HANDSWITCH + 1:
case PULLSWITCH + 1:
case LIGHTSWITCH2 + 1:
case POWERSWITCH1 + 1:
case LOCKSWITCH1 + 1:
case POWERSWITCH2 + 1:
case SLOTDOOR + 1:
case LIGHTSWITCH + 1:
case SPACELIGHTSWITCH + 1:
case SPACEDOORSWITCH + 1:
case DIPSWITCH2 + 1:
case DIPSWITCH3 + 1:
case RRTILE2697 + 1:
case RRTILE2707 + 1:
- checkhitswitch_r
2021-11-17 22:10:25 +00:00
wal.picnum--;
- 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;
}
}
- addressed most unused/uninitialized variable warnings from MSVC.
2021-11-14 14:03:50 +00:00
if (lotag == -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
{
- another safety commit.
2020-07-07 15:56:20 +00:00
setnextmap(false);
- 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
}
- another batch of utility use
2022-02-05 11:05:29 +00:00
vec3_t v = { sx, sy, ps[snum].player_int_pos().Z };
- 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 (picnum)
{
default:
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
if (fi.isadoorwall(picnum) == 0) break;
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
[[fallthrough]];
- 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 DIPSWITCH:
case DIPSWITCH + 1:
case TECHSWITCH:
case TECHSWITCH + 1:
case ALIENSWITCH:
case ALIENSWITCH + 1:
if (picnum == DIPSWITCH || picnum == DIPSWITCH + 1 ||
picnum == ALIENSWITCH || picnum == ALIENSWITCH + 1 ||
picnum == TECHSWITCH || picnum == TECHSWITCH + 1)
{
if (picnum == ALIENSWITCH || picnum == ALIENSWITCH + 1)
{
- cleaned up the checkhitswitch interface to receive sprites as pointers.
2020-10-26 06:30:34 +00:00
if (act)
- Duke: refactored sound API to receive its position by reference.
2022-01-30 22:20:00 +00:00
S_PlaySound3D(ALIEN_SWITCH1, act, v);
else S_PlaySound3D(ALIEN_SWITCH1, ps[snum].GetActor(), v);
- 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
{
- cleaned up the checkhitswitch interface to receive sprites as pointers.
2020-10-26 06:30:34 +00:00
if (act)
- Duke: refactored sound API to receive its position by reference.
2022-01-30 22:20:00 +00:00
S_PlaySound3D(SWITCH_ON, act, v);
else S_PlaySound3D(SWITCH_ON, ps[snum].GetActor(), v);
- 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 (numdips != correctdips) break;
- Duke: refactored sound API to receive its position by reference.
2022-01-30 22:20:00 +00:00
S_PlaySound3D(END_OF_LEVEL_WARN, ps[snum].GetActor(), v);
- 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
}
- fixed some messed up conditionals in RR's switch code. Fixes #166
2020-08-11 22:31:04 +00:00
goto goOn2;
- 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 MULTISWITCH2:
case MULTISWITCH2 + 1:
case MULTISWITCH2 + 2:
case MULTISWITCH2 + 3:
case RRTILE8464:
case RRTILE8660:
if (!isRRRA()) break;
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
[[fallthrough]];
- 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 DIPSWITCH2:
case DIPSWITCH2 + 1:
case DIPSWITCH3:
case DIPSWITCH3 + 1:
case MULTISWITCH:
case MULTISWITCH + 1:
case MULTISWITCH + 2:
case MULTISWITCH + 3:
case ACCESSSWITCH:
case ACCESSSWITCH2:
case SLOTDOOR:
case SLOTDOOR + 1:
case LIGHTSWITCH:
case LIGHTSWITCH + 1:
case SPACELIGHTSWITCH:
case SPACELIGHTSWITCH + 1:
case SPACEDOORSWITCH:
case SPACEDOORSWITCH + 1:
case FRANKENSTINESWITCH:
case FRANKENSTINESWITCH + 1:
case LIGHTSWITCH2:
case LIGHTSWITCH2 + 1:
case POWERSWITCH1:
case POWERSWITCH1 + 1:
case LOCKSWITCH1:
case LOCKSWITCH1 + 1:
case POWERSWITCH2:
case POWERSWITCH2 + 1:
case HANDSWITCH:
case HANDSWITCH + 1:
case PULLSWITCH:
case PULLSWITCH + 1:
case RRTILE2697:
case RRTILE2697 + 1:
case RRTILE2707:
case RRTILE2707 + 1:
- fixed some messed up conditionals in RR's switch code. Fixes #166
2020-08-11 22:31:04 +00:00
goOn2:
- 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 (isRRRA())
{
- cleaned up the checkhitswitch interface to receive sprites as pointers.
2020-10-26 06:30:34 +00:00
if (picnum == RRTILE8660 && act)
- 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
{
BellTime = 132;
- cleaned up the checkhitswitch interface to receive sprites as pointers.
2020-10-26 06:30:34 +00:00
BellSprite = act;
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
act->spr.picnum++;
- 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 (picnum == RRTILE8464)
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
act->spr.picnum = act->spr.picnum + 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
if (hitag == 10001)
{
if (ps[snum].SeaSick == 0)
ps[snum].SeaSick = 350;
- fixed a few bad parameters.
2020-11-02 18:54:20 +00:00
operateactivators(668, snum);
- 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
operatemasterswitches(668);
- checkhitswitch_r part 1
2020-10-26 05:55:16 +00:00
S_PlayActorSound(328, ps[snum].GetActor());
- 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
return 1;
}
}
else if (hitag == 10000)
{
if (picnum == MULTISWITCH || picnum == (MULTISWITCH + 1) ||
picnum == (MULTISWITCH + 2) || picnum == (MULTISWITCH + 3) ||
picnum == MULTISWITCH2 || picnum == (MULTISWITCH2 + 1) ||
picnum == (MULTISWITCH2 + 2) || picnum == (MULTISWITCH2 + 3))
{
- cleaned up the checkhitswitch interface to receive sprites as pointers.
2020-10-26 06:30:34 +00:00
DDukeActor* switches[3];
int switchcount = 0, j;
- Duke: refactored sound API to receive its position by reference.
2022-01-30 22:20:00 +00:00
S_PlaySound3D(SWITCH_ON, act, v);
- renamed all shadowing variables in Duke.
2021-12-24 09:53:27 +00:00
DukeSpriteIterator itr;
while (auto actt = itr.Next())
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
int jpn = actt->spr.picnum;
int jht = actt->spr.hitag;
- 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 ((jpn == MULTISWITCH || jpn == MULTISWITCH2) && jht == 10000)
{
- renamed a few disassembly variables.
2020-10-24 05:48:51 +00:00
if (switchcount < 3)
- 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
{
- cleaned up the checkhitswitch interface to receive sprites as pointers.
2020-10-26 06:30:34 +00:00
switches[switchcount] = actt;
- renamed a few disassembly variables.
2020-10-24 05:48:51 +00:00
switchcount++;
- 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
}
}
}
- renamed a few disassembly variables.
2020-10-24 05:48:51 +00:00
if (switchcount == 3)
- 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
{
- Duke: replaced DukeLinearSpriteIterator and explicit loops over the sprite[] array.
2021-12-04 12:02:38 +00:00
// This once was a linear search over sprites[] so bring things back in order, just to be safe.
if (switches[0]->GetIndex() > switches[1]->GetIndex()) std::swap(switches[0], switches[1]);
if (switches[0]->GetIndex() > switches[2]->GetIndex()) std::swap(switches[0], switches[2]);
if (switches[1]->GetIndex() > switches[2]->GetIndex()) std::swap(switches[1], switches[2]);
- Duke: refactored sound API to receive its position by reference.
2022-01-30 22:20:00 +00:00
S_PlaySound3D(78, act, v);
- renamed a few disassembly variables.
2020-10-24 05:48:51 +00:00
for (j = 0; j < switchcount; j++)
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
switches[j]->spr.hitag = 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
if (picnum >= MULTISWITCH2)
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
switches[j]->spr.picnum = MULTISWITCH2 + 3;
- 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
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
switches[j]->spr.picnum = MULTISWITCH + 3;
- use pointers for checkhitswitch and took separated clearcameras to a new functions to make this free of gotos.
2021-11-17 23:16:53 +00:00
checkhitswitch_r(snum, nullptr, switches[j]);
- 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
}
}
return 1;
}
}
}
if (picnum == MULTISWITCH || picnum == (MULTISWITCH + 1) ||
picnum == (MULTISWITCH + 2) || picnum == (MULTISWITCH + 3))
lotag += picnum - MULTISWITCH;
if (isRRRA())
{
if (picnum == MULTISWITCH2 || picnum == (MULTISWITCH2 + 1) ||
picnum == (MULTISWITCH2 + 2) || picnum == (MULTISWITCH2 + 3))
lotag += picnum - MULTISWITCH2;
}
- renamed all shadowing variables in Duke.
2021-12-24 09:53:27 +00:00
DukeStatIterator itr(STAT_EFFECTOR);
while (auto other = itr.Next())
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (other->spr.hitag == lotag)
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
switch (other->spr.lotag)
- 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 46:
- fixed some messed up conditionals in RR's switch code. Fixes #166
2020-08-11 22:31:04 +00:00
case SE_47_LIGHT_SWITCH:
case SE_48_LIGHT_SWITCH:
- 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 (!isRRRA()) break;
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
[[fallthrough]];
- fixed some messed up conditionals in RR's switch code. Fixes #166
2020-08-11 22:31:04 +00:00
case SE_12_LIGHT_SWITCH:
- renamed DDukeActor::getSector.
2021-11-20 23:33:17 +00:00
other->sector()->floorpal = 0;
- checkhitswitch_r part 3
2020-10-26 06:02:36 +00:00
other->temp_data[0]++;
if (other->temp_data[0] == 2)
other->temp_data[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
break;
- fixed some messed up conditionals in RR's switch code. Fixes #166
2020-08-11 22:31:04 +00:00
case SE_24_CONVEYOR:
case SE_34:
case SE_25_PISTON:
- checkhitswitch_r part 3
2020-10-26 06:02:36 +00:00
other->temp_data[4] = !other->temp_data[4];
if (other->temp_data[4])
- 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
FTA(15, &ps[snum]);
else FTA(2, &ps[snum]);
break;
- fixed some messed up conditionals in RR's switch code. Fixes #166
2020-08-11 22:31:04 +00:00
case SE_21_DROP_FLOOR:
- 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
FTA(2, &ps[screenpeek]);
break;
}
}
}
operateactivators(lotag, snum);
- fixed a few parameters
2020-11-02 18:53:04 +00:00
fi.operateforcefields(ps[snum].GetActor(), lotag);
- 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
operatemasterswitches(lotag);
if (picnum == DIPSWITCH || picnum == DIPSWITCH + 1 ||
picnum == ALIENSWITCH || picnum == ALIENSWITCH + 1 ||
picnum == TECHSWITCH || picnum == TECHSWITCH + 1) return 1;
- safety commit. # Conflicts: # source/games/duke/src/zz_sbar.cpp
2020-05-14 10:14:03 +00:00
if (hitag == 0 && fi.isadoorwall(picnum) == 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
{
- cleaned up the checkhitswitch interface to receive sprites as pointers.
2020-10-26 06:30:34 +00:00
if (act)
- Duke: refactored sound API to receive its position by reference.
2022-01-30 22:20:00 +00:00
S_PlaySound3D(SWITCH_ON, act, v);
else S_PlaySound3D(SWITCH_ON, ps[snum].GetActor(), v);
- 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 (hitag != 0)
{
auto flags = S_GetUserFlags(hitag);
- cleaned up the checkhitswitch interface to receive sprites as pointers.
2020-10-26 06:30:34 +00:00
if (act && (flags & SF_TALK) == 0)
- Duke: refactored sound API to receive its position by reference.
2022-01-30 22:20:00 +00:00
S_PlaySound3D(hitag, act, v);
- 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
- checkhitswitch_r part 1
2020-10-26 05:55:16 +00:00
S_PlayActorSound(hitag, ps[snum].GetActor());
- 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
}
return 1;
}
return 0;
checkhitswitch intentionally not merged because this is too messy.
2020-05-10 16:05:36 +00:00
}
- the beginning of sector.cpp The math backend functions have been moved out of Build because they originally have a good license. # Conflicts: # source/build/src/mdsprite.cpp # source/build/src/polymost.cpp
2020-05-10 10:42:47 +00:00
- more sector stuff.
2020-05-10 18:59:38 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- operatesectors and activatebysector.
2021-11-18 17:51:19 +00:00
void activatebysector_r(sectortype* sect, DDukeActor* activator)
- more sector stuff.
2020-05-10 18:59:38 +00:00
{
- activatebysector.
2020-11-02 18:28:59 +00:00
DukeSectIterator it(sect);
while (auto act = it.Next())
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (act->spr.picnum == ACTIVATOR)
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
operateactivators(act->spr.lotag, -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
// return;
}
}
- operatesectors and activatebysector.
2021-11-18 17:51:19 +00:00
if (sect->lotag != 22)
- activatebysector.
2020-11-02 18:28:59 +00:00
operatesectors(sect, activator);
- more sector stuff.
2020-05-10 18:59:38 +00:00
}
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- lotsofpopcorn
2021-11-17 23:40:40 +00:00
static void lotsofpopcorn(DDukeActor *actor, walltype* wal, int n)
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
{
- lotsofpopcorn + dofurniture
2021-11-17 22:24:37 +00:00
int j, z;
- operatesectors and activatebysector.
2021-11-18 17:51:19 +00:00
int a;
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
- operatesectors and activatebysector.
2021-11-18 17:51:19 +00:00
sectortype* sect = nullptr;
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
- lotsofpopcorn
2021-11-17 23:40:40 +00:00
if (wal == nullptr)
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
{
for (j = n - 1; j >= 0; j--)
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
a = actor->spr.ang - 256 + (krand() & 511) + 1024;
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
EGS(actor->sector(), actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, POPCORN, -32, 36, 36, a, 32 + (krand() & 63), 1024 - (krand() & 1023), actor, 5);
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
}
return;
}
j = n + 1;
-use an access function for reading wall positions so that we have a non-modifiable value wherever this is possible.
2022-01-27 16:41:10 +00:00
int x1 = wal->wall_int_pos().X;
int y1 = wal->wall_int_pos().Y;
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
- lotsofpopcorn + dofurniture
2021-11-17 22:24:37 +00:00
auto delta = wal->delta();
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
- Capitalise `vec2_t` `x` variable.
2021-12-22 09:26:51 +00:00
x1 -= Sgn(delta.X);
- Capitalise `vec2_t` `y` variable.
2021-12-22 09:28:51 +00:00
y1 += Sgn(delta.Y);
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
- Capitalise `vec2_t` `x` variable.
2021-12-22 09:26:51 +00:00
delta.X /= j;
- Capitalise `vec2_t` `y` variable.
2021-12-22 09:28:51 +00:00
delta.Y /= j;
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
for (j = n; j > 0; j--)
{
- Capitalise `vec2_t` `x` variable.
2021-12-22 09:26:51 +00:00
x1 += delta.X;
- Capitalise `vec2_t` `y` variable.
2021-12-22 09:28:51 +00:00
y1 += delta.Y;
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
updatesector(x1, y1, &sect);
- operatesectors and activatebysector.
2021-11-18 17:51:19 +00:00
if (sect)
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
{
- use inline access functions to read floorz/ceilingz.
2022-02-02 23:46:04 +00:00
z = sect->int_floorz() - (krand() & (abs(sect->int_ceilingz() - sect->int_floorz())));
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
if (z < -(32 << 8) || z >(32 << 8))
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
z = actor->int_pos().Z - (32 << 8) + (krand() & ((64 << 8) - 1));
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
a = actor->spr.ang - 1024;
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
EGS(actor->sector(), x1, y1, z, POPCORN, -32, 36, 36, a, 32 + (krand() & 63), -(krand() & 1023), actor, 5);
- spawnglass functions and fta_sounds.
2020-05-16 10:47:01 +00:00
}
}
}
- more sector stuff.
2020-05-10 18:59:38 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- change wall parameter of checkhitwall.
2021-11-17 22:49:49 +00:00
void checkhitwall_r(DDukeActor* spr, walltype* wal, int x, int y, int z, int atwith)
- more sector stuff.
2020-05-10 18:59:38 +00:00
{
- preparations in the map loader for dynamically sized data storage. This also consolidates these parts for Blood with the other games.
2021-11-15 23:30:01 +00:00
int j;
- made updatesector receive a 32 bit int pointer and deprecated the 16 bit variant.
2021-11-06 14:53:16 +00:00
int sn = -1, darkestwall;
- 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
- new explosion flags
2022-01-20 07:31:08 +00:00
if (wal->overpicnum == MIRROR && gs.actorinfo[atwith].flags2 & SFLAG2_BREAKMIRRORS)
- 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
{
- new explosion flags
2022-01-20 07:31:08 +00:00
lotsofglass(spr, wal, 70);
wal->cstat &= ~CSTAT_WALL_MASKED;
wal->overpicnum = MIRRORBROKE;
wal->portalflags = 0;
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
return;
- 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
}
- wall and sprite flags in Duke, just simple cases.
2021-12-18 14:11:21 +00:00
if (((wal->cstat & CSTAT_WALL_MASKED) || wal->overpicnum == BIGFORCE) && wal->twoSided())
- use inline access functions to read floorz/ceilingz.
2022-02-02 23:46:04 +00:00
if (wal->nextSector()->int_floorz() > z)
if (wal->nextSector()->int_floorz() - wal->nextSector()->int_ceilingz())
- 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 (wal->overpicnum)
{
case FANSPRITE:
wal->overpicnum = FANSPRITEBROKE;
- wall and sprite flags in Duke, just simple cases.
2021-12-18 14:11:21 +00:00
wal->cstat &= ~(CSTAT_WALL_BLOCK | CSTAT_WALL_BLOCK_HITSCAN);
— Duke: use twoSided utility where appropriate.
2021-11-21 07:42:36 +00:00
if (wal->twoSided())
- 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
{
- quick global wall[] replacements.
2021-11-07 07:46:15 +00:00
wal->nextWall()->overpicnum = FANSPRITEBROKE;
- wall and sprite flags in Duke, just simple cases.
2021-12-18 14:11:21 +00:00
wal->nextWall()->cstat &= ~(CSTAT_WALL_BLOCK | CSTAT_WALL_BLOCK_HITSCAN);
- 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
}
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(VENT_BUST, spr);
S_PlayActorSound(GLASS_BREAKING, spr);
- 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
return;
case RRTILE1973:
- switched checkhitwall interface to actors.
2020-10-24 05:22:44 +00:00
{
- lots of EGS calls.
2021-11-18 18:04:00 +00:00
sectortype* sptr = nullptr;
updatesector(x, y, &sptr);
if (sptr == nullptr) return;
- 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
wal->overpicnum = GLASS2;
- lotsofpopcorn
2021-11-17 23:40:40 +00:00
lotsofpopcorn(spr, wal, 64);
- 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
wal->cstat = 0;
— Duke: use twoSided utility where appropriate.
2021-11-21 07:42:36 +00:00
if (wal->twoSided())
- quick global wall[] replacements.
2021-11-07 07:46:15 +00:00
wal->nextWall()->cstat = 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
- lots of EGS calls.
2021-11-18 18:04:00 +00:00
auto spawned = EGS(sptr, x, y, z, SECTOREFFECTOR, 0, 0, 0, ps[0].angle.ang.asbuild(), 0, 0, spr, 3);
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
if (spawned)
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
spawned->spr.lotag = SE_128_GLASS_BREAKING;
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
spawned->temp_walls[0] = wal;
S_PlayActorSound(GLASS_BREAKING, spawned);
}
- 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
return;
- switched checkhitwall interface to actors.
2020-10-24 05:22:44 +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 GLASS:
- switched checkhitwall interface to actors.
2020-10-24 05:22:44 +00:00
{
- lots of EGS calls.
2021-11-18 18:04:00 +00:00
sectortype* sptr = nullptr;
updatesector(x, y, &sptr);
if (sptr == nullptr) return;
- 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
wal->overpicnum = GLASS2;
- lotsofcolourglass
2021-11-17 23:38:20 +00:00
lotsofglass(spr, wal, 10);
- 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
wal->cstat = 0;
— Duke: use twoSided utility where appropriate.
2021-11-21 07:42:36 +00:00
if (wal->twoSided())
- quick global wall[] replacements.
2021-11-07 07:46:15 +00:00
wal->nextWall()->cstat = 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
- lots of EGS calls.
2021-11-18 18:04:00 +00:00
auto spawned = EGS(sptr, x, y, z, SECTOREFFECTOR, 0, 0, 0, ps[0].angle.ang.asbuild(), 0, 0, spr, 3);
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
if (spawned)
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
spawned->spr.lotag = SE_128_GLASS_BREAKING;
- Duke/RR: guard all calls to EGS with a null pointer check. Spawning sprites into the void will crash the engine so these must be blocked which requires a failure check here. With this pressing fire while in the void no longer crashes the game - it won't fire anything, either, though.
2021-11-19 08:47:17 +00:00
spawned->temp_data[1] = 2;
spawned->temp_walls[0] = wal;
S_PlayActorSound(GLASS_BREAKING, spawned);
}
- 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
return;
- switched checkhitwall interface to actors.
2020-10-24 05:22:44 +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 STAINGLASS1:
updatesector(x, y, &sn); if (sn < 0) return;
- lotsofcolourglass
2021-11-17 23:38:20 +00:00
lotsofcolourglass(spr, wal, 80);
- 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
wal->cstat = 0;
— Duke: use twoSided utility where appropriate.
2021-11-21 07:42:36 +00:00
if (wal->twoSided())
- quick global wall[] replacements.
2021-11-07 07:46:15 +00:00
wal->nextWall()->cstat = 0;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(VENT_BUST, spr);
S_PlayActorSound(GLASS_BREAKING, spr);
- 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
return;
}
switch (wal->picnum)
{
case RRTILE8464:
if (isRRRA()) break;
break;
case RRTILE3643:
case RRTILE3643 + 1:
case RRTILE3643 + 2:
case RRTILE3643 + 3:
{
— Duke: use twoSided utility where appropriate.
2021-11-21 07:42:36 +00:00
auto sect = wal->nextWall()->nextSector();
- 6 simple loops in sectors_r.cpp.
2020-11-02 19:33:44 +00:00
DukeSectIterator it(sect);
while (auto act = it.Next())
- 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (act->spr.lotag == 6)
- 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
{
- 6 simple loops in sectors_r.cpp.
2020-11-02 19:33:44 +00:00
act->spriteextra++;
if (act->spriteextra == 25)
- 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
{
- use actor->sector() to initialize iterators.
2021-11-20 23:41:52 +00:00
for(auto& wl : wallsofsector(act->sector()))
- the final walls What is left now of wall[] and wallnum() needs to remain.
2021-11-17 23:42:52 +00:00
{
— Duke: use twoSided utility where appropriate.
2021-11-21 07:42:36 +00:00
if (wl.twoSided()) wl.nextSector()->lotag = 0;
- the final walls What is left now of wall[] and wallnum() needs to remain.
2021-11-17 23:42:52 +00:00
}
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
act->sector()->lotag = 0;
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
S_StopSound(act->spr.lotag);
- 6 simple loops in sectors_r.cpp.
2020-11-02 19:33:44 +00:00
S_PlayActorSound(400, act);
deletesprite(act);
- 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
}
}
}
return;
}
case RRTILE7555:
if (!isRRRA()) break;
wal->picnum = SBMOVE;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE7441:
if (!isRRRA()) break;
wal->picnum = RRTILE5016;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE7559:
if (!isRRRA()) break;
wal->picnum = RRTILE5017;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE7433:
if (!isRRRA()) break;
wal->picnum = RRTILE5018;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE7557:
if (!isRRRA()) break;
wal->picnum = RRTILE5019;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE7553:
if (!isRRRA()) break;
wal->picnum = RRTILE5020;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE7552:
if (!isRRRA()) break;
wal->picnum = RRTILE5021;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE7568:
if (!isRRRA()) break;
wal->picnum = RRTILE5022;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE7540:
if (!isRRRA()) break;
wal->picnum = RRTILE5023;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE7558:
if (!isRRRA()) break;
wal->picnum = RRTILE5024;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE7554:
if (!isRRRA()) break;
wal->picnum = RRTILE5025;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE7579:
if (!isRRRA()) break;
wal->picnum = RRTILE5026;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE7561:
if (!isRRRA()) break;
wal->picnum = RRTILE5027;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE7580:
if (!isRRRA()) break;
wal->picnum = RRTILE5037;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE8227:
if (!isRRRA()) break;
wal->picnum = RRTILE5070;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE8503:
if (!isRRRA()) break;
wal->picnum = RRTILE5079;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE8567:
case RRTILE8568:
case RRTILE8569:
case RRTILE8570:
case RRTILE8571:
if (!isRRRA()) break;
wal->picnum = RRTILE5082;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE7859:
if (!isRRRA()) break;
wal->picnum = RRTILE5081;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE8496:
if (!isRRRA()) break;
wal->picnum = RRTILE5061;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE8617:
if (!isRRRA()) break;
if (numplayers < 2)
{
wal->picnum = RRTILE8618;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(47, spr);
- 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
}
return;
case RRTILE8620:
if (!isRRRA()) break;
wal->picnum = RRTILE8621;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(47, spr);
- 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
return;
case RRTILE8622:
if (!isRRRA()) break;
wal->picnum = RRTILE8623;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(495, spr);
- 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
return;
case RRTILE7657:
if (!isRRRA()) break;
wal->picnum = RRTILE7659;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case RRTILE8497:
if (!isRRRA()) break;
wal->picnum = RRTILE5076;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(495, spr);
- 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
return;
case RRTILE7533:
if (!isRRRA()) break;
wal->picnum = RRTILE5035;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(495, spr);
- 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
return;
case COLAMACHINE:
case VENDMACHINE:
- pass wall pointer to breakwall
2021-11-17 23:32:46 +00:00
breakwall(wal->picnum + 2, spr, wal);
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_BREAKING, spr);
- 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
return;
case OJ:
case SCREENBREAK6:
case SCREENBREAK7:
case SCREENBREAK8:
- lotsofcolourglass
2021-11-17 23:38:20 +00:00
lotsofglass(spr, wal, 30);
- 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
wal->picnum = W_SCREENBREAK + (krand() % (isRRRA() ? 2 : 3));
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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
return;
case ATM:
wal->picnum = ATMBROKE;
- switched checkhitwall interface to actors.
2020-10-24 05:22:44 +00:00
fi.lotsofmoney(spr, 1 + (krand() & 7));
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
- 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 WALLLIGHT1:
case WALLLIGHT3:
case WALLLIGHT4:
case TECHLIGHT2:
case TECHLIGHT4:
case RRTILE1814:
case RRTILE1939:
case RRTILE1986:
case RRTILE1988:
case RRTILE2123:
case RRTILE2125:
case RRTILE2636:
case RRTILE2878:
case RRTILE2898:
case RRTILE3200:
case RRTILE3202:
case RRTILE3204:
case RRTILE3206:
case RRTILE3208:
if (rnd(128))
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, spr);
else S_PlayActorSound(GLASS_BREAKING, spr);
- lotsofcolourglass
2021-11-17 23:38:20 +00:00
lotsofglass(spr, wal, 30);
- 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 (wal->picnum == RRTILE1814)
wal->picnum = RRTILE1817;
if (wal->picnum == RRTILE1986)
wal->picnum = RRTILE1987;
if (wal->picnum == RRTILE1939)
wal->picnum = RRTILE2004;
if (wal->picnum == RRTILE1988)
wal->picnum = RRTILE2005;
if (wal->picnum == RRTILE2898)
wal->picnum = RRTILE2899;
if (wal->picnum == RRTILE2878)
wal->picnum = RRTILE2879;
if (wal->picnum == RRTILE2123)
wal->picnum = RRTILE2124;
if (wal->picnum == RRTILE2125)
wal->picnum = RRTILE2126;
if (wal->picnum == RRTILE3200)
wal->picnum = RRTILE3201;
if (wal->picnum == RRTILE3202)
wal->picnum = RRTILE3203;
if (wal->picnum == RRTILE3204)
wal->picnum = RRTILE3205;
if (wal->picnum == RRTILE3206)
wal->picnum = RRTILE3207;
if (wal->picnum == RRTILE3208)
wal->picnum = RRTILE3209;
if (wal->picnum == RRTILE2636)
wal->picnum = RRTILE2637;
if (wal->picnum == WALLLIGHT1)
wal->picnum = WALLLIGHTBUST1;
if (wal->picnum == WALLLIGHT3)
wal->picnum = WALLLIGHTBUST3;
if (wal->picnum == WALLLIGHT4)
wal->picnum = WALLLIGHTBUST4;
if (wal->picnum == TECHLIGHT2)
wal->picnum = TECHLIGHTBUST2;
if (wal->picnum == TECHLIGHT4)
wal->picnum = TECHLIGHTBUST4;
if (!wal->lotag) return;
— Duke: use twoSided utility where appropriate.
2021-11-21 07:42:36 +00:00
if (!wal->twoSided()) return;
- 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
darkestwall = 0;
— Duke: use twoSided utility where appropriate.
2021-11-21 07:42:36 +00:00
for (auto& wl : wallsofsector(wal->nextSector()))
- a few more Enough of this - Duke is clearly clean of bad storage now
2021-11-17 23:50:33 +00:00
if (wl.shade > darkestwall)
darkestwall = wl.shade;
- 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
j = krand() & 1;
- 6 simple loops in sectors_r.cpp.
2020-11-02 19:33:44 +00:00
DukeStatIterator it(STAT_EFFECTOR);
while (auto act = it.Next())
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (act->spr.hitag == wal->lotag && act->spr.lotag == 3)
- 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
{
- 6 simple loops in sectors_r.cpp.
2020-11-02 19:33:44 +00:00
act->temp_data[2] = j;
act->temp_data[3] = darkestwall;
act->temp_data[4] = 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
}
}
break;
}
- more sector stuff.
2020-05-10 18:59:38 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- remove C-style struct parameters.
2022-02-07 10:04:19 +00:00
void checkplayerhurt_r(player_struct* p, const Collision &coll)
- more sector stuff.
2020-05-10 18:59:38 +00:00
{
- handle the clipmove result in processinput.
2020-10-25 07:50:03 +00:00
if (coll.type == kHitSprite)
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
switch (coll.actor()->spr.picnum)
- 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 RRTILE2430:
case RRTILE2431:
case RRTILE2432:
case RRTILE2443:
case RRTILE2446:
case RRTILE2451:
case RRTILE2455:
if (isRRRA() && p->hurt_delay2 < 8)
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
p->GetActor()->spr.extra -= 2;
- 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->hurt_delay2 = 16;
SetPlayerPal(p, PalEntry(32, 32, 0, 0));
- handle the clipmove result in processinput.
2020-10-25 07:50:03 +00:00
S_PlayActorSound(DUKE_LONGTERM_PAIN, p->GetActor());
- 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 CACTUS:
if (!isRRRA() && p->hurt_delay < 8)
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
p->GetActor()->spr.extra -= 5;
- 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->hurt_delay = 16;
SetPlayerPal(p, PalEntry(32, 32, 0, 0));
- player.i, part 2 # Conflicts: # source/games/duke/src/sectors_r.cpp
2020-11-02 19:23:30 +00:00
S_PlayActorSound(DUKE_LONGTERM_PAIN, p->GetActor());
- 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;
}
return;
}
- handle the clipmove result in processinput.
2020-10-25 07:50:03 +00:00
if (coll.type != kHitWall) return;
- made Collision derive from a common base class and refactored clipmove to a single engine-side entry point. Done for Doom so far.
2021-11-26 12:41:15 +00:00
auto wal = coll.hitWall;
- 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 (p->hurt_delay > 0) p->hurt_delay--;
- flag combo stuff.
2021-12-18 14:16:31 +00:00
else if (wal->cstat & (CSTAT_WALL_BLOCK | CSTAT_WALL_ALIGN_BOTTOM | CSTAT_WALL_MASKED | CSTAT_WALL_BLOCK_HITSCAN)) switch (wal->overpicnum)
- 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 BIGFORCE:
p->hurt_delay = 26;
- change wall parameter of checkhitwall.
2021-11-17 22:49:49 +00:00
fi.checkhitwall(p->GetActor(), wal,
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
p->player_int_pos().X + p->angle.ang.bcos(-9),
p->player_int_pos().Y + p->angle.ang.bsin(-9),
p->player_int_pos().Z, -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
break;
}
- more sector stuff.
2020-05-10 18:59:38 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- checkhitceiling + ceilingglass are sector[] free.
2021-11-18 16:55:08 +00:00
bool checkhitceiling_r(sectortype* sectp)
- more sector stuff.
2020-05-10 18:59:38 +00:00
{
- Duke/RR: checked the rest of the code for shorts and replaced most local ones with ints.
2021-11-07 13:55:28 +00:00
int j;
- 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
- Duke: a large batch of quick'n easy sector[] replacements with pointers.
2021-11-06 22:05:25 +00:00
switch (sectp->ceilingpicnum)
- 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 WALLLIGHT1:
case WALLLIGHT3:
case WALLLIGHT4:
case TECHLIGHT2:
case TECHLIGHT4:
case RRTILE1939:
case RRTILE1986:
case RRTILE1988:
case RRTILE2123:
case RRTILE2125:
case RRTILE2878:
case RRTILE2898:
- checkhitceiling + ceilingglass are sector[] free.
2021-11-18 16:55:08 +00:00
ceilingglass(ps[myconnectindex].GetActor(), sectp, 10);
- player.i, part 2 # Conflicts: # source/games/duke/src/sectors_r.cpp
2020-11-02 19:23:30 +00:00
S_PlayActorSound(GLASS_BREAKING, ps[screenpeek].GetActor());
- 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
- Duke: a large batch of quick'n easy sector[] replacements with pointers.
2021-11-06 22:05:25 +00:00
if (sectp->ceilingpicnum == WALLLIGHT1)
sectp->ceilingpicnum = WALLLIGHTBUST1;
- 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
- Duke: a large batch of quick'n easy sector[] replacements with pointers.
2021-11-06 22:05:25 +00:00
if (sectp->ceilingpicnum == WALLLIGHT3)
sectp->ceilingpicnum = WALLLIGHTBUST3;
- 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
- Duke: a large batch of quick'n easy sector[] replacements with pointers.
2021-11-06 22:05:25 +00:00
if (sectp->ceilingpicnum == WALLLIGHT4)
sectp->ceilingpicnum = WALLLIGHTBUST4;
- 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
- Duke: a large batch of quick'n easy sector[] replacements with pointers.
2021-11-06 22:05:25 +00:00
if (sectp->ceilingpicnum == TECHLIGHT2)
sectp->ceilingpicnum = TECHLIGHTBUST2;
- 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
- Duke: a large batch of quick'n easy sector[] replacements with pointers.
2021-11-06 22:05:25 +00:00
if (sectp->ceilingpicnum == TECHLIGHT4)
sectp->ceilingpicnum = TECHLIGHTBUST4;
- 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
- Duke: a large batch of quick'n easy sector[] replacements with pointers.
2021-11-06 22:05:25 +00:00
if (sectp->ceilingpicnum == RRTILE1986)
sectp->ceilingpicnum = RRTILE1987;
- 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
- Duke: a large batch of quick'n easy sector[] replacements with pointers.
2021-11-06 22:05:25 +00:00
if (sectp->ceilingpicnum == RRTILE1939)
sectp->ceilingpicnum = RRTILE2004;
- 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
- Duke: a large batch of quick'n easy sector[] replacements with pointers.
2021-11-06 22:05:25 +00:00
if (sectp->ceilingpicnum == RRTILE1988)
sectp->ceilingpicnum = RRTILE2005;
- 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
- Duke: a large batch of quick'n easy sector[] replacements with pointers.
2021-11-06 22:05:25 +00:00
if (sectp->ceilingpicnum == RRTILE2898)
sectp->ceilingpicnum = RRTILE2899;
- 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
- Duke: a large batch of quick'n easy sector[] replacements with pointers.
2021-11-06 22:05:25 +00:00
if (sectp->ceilingpicnum == RRTILE2878)
sectp->ceilingpicnum = RRTILE2879;
- 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
- Duke: a large batch of quick'n easy sector[] replacements with pointers.
2021-11-06 22:05:25 +00:00
if (sectp->ceilingpicnum == RRTILE2123)
sectp->ceilingpicnum = RRTILE2124;
- 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
- Duke: a large batch of quick'n easy sector[] replacements with pointers.
2021-11-06 22:05:25 +00:00
if (sectp->ceilingpicnum == RRTILE2125)
sectp->ceilingpicnum = RRTILE2126;
- 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
- Duke: a large batch of quick'n easy sector[] replacements with pointers.
2021-11-06 22:05:25 +00:00
if (!sectp->hitag)
- 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
{
- checkhitceiling + ceilingglass are sector[] free.
2021-11-18 16:55:08 +00:00
DukeSectIterator it(sectp);
- 6 simple loops in sectors_r.cpp.
2020-11-02 19:33:44 +00:00
while (auto act1 = it.Next())
- 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (act1->spr.picnum == SECTOREFFECTOR && (act1->spr.lotag == 12 || (isRRRA() && (act1->spr.lotag == 47 || act1->spr.lotag == 48))))
- 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
{
- renamed all shadowing variables in Duke.
2021-12-24 09:53:27 +00:00
DukeStatIterator itr(STAT_EFFECTOR);
while (auto act2 = itr.Next())
- 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (act2->spr.hitag == act1->spr.hitag)
- 6 simple loops in sectors_r.cpp.
2020-11-02 19:33:44 +00:00
act2->temp_data[3] = 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
}
break;
}
}
}
j = krand() & 1;
- 6 simple loops in sectors_r.cpp.
2020-11-02 19:33:44 +00:00
DukeStatIterator it(STAT_EFFECTOR);
while (auto act1 = it.Next())
- 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (act1->spr.hitag == (sectp->hitag) && act1->spr.lotag == 3)
- 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
{
- 6 simple loops in sectors_r.cpp.
2020-11-02 19:33:44 +00:00
act1->temp_data[2] = j;
act1->temp_data[4] = 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
}
}
return 1;
}
return 0;
- more sector stuff.
2020-05-10 18:59:38 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
void checkhitsprite_r(DDukeActor* targ, DDukeActor* proj)
- more sector stuff.
2020-05-10 18:59:38 +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
int j, k, p;
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (isRRRA()) switch (targ->spr.picnum)
- 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 RRTILE8464:
break;
case RRTILE8487:
case RRTILE8489:
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(471, targ);
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum++;
- 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 RRTILE7638:
case RRTILE7644:
case RRTILE7646:
case RRTILE7650:
case RRTILE7653:
case RRTILE7655:
case RRTILE7691:
case RRTILE7876:
case RRTILE7881:
case RRTILE7883:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum++;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(VENT_BUST, targ);
- 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 RRTILE7879:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum++;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(495, targ);
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
fi.hitradius(targ, 10, 0, 0, 1, 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
break;
case RRTILE7648:
case RRTILE7694:
case RRTILE7700:
case RRTILE7702:
case RRTILE7711:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum++;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(47, targ);
- 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 RRTILE7636:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum += 3;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(VENT_BUST, targ);
- 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 RRTILE7875:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum += 3;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(VENT_BUST, targ);
- 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 RRTILE7640:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum += 2;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(VENT_BUST, targ);
- 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 RRTILE7595:
case RRTILE7704:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE7705;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(495, targ);
- 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 RRTILE8579:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5014;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE7441:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5016;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE7534:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5029;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE7545:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5030;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE7547:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5031;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE7574:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5032;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE7575:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5033;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE7578:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5034;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE7478:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5035;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8525:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5036;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8537:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5062;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8215:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5064;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8216:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5065;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8217:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5066;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8218:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5067;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8220:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5068;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8221:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5069;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8312:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5071;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(472, targ);
- 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 RRTILE8395:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5072;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8423:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5073;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE3462:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5074;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 UWHIP:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5075;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8608:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5083;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8609:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5084;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8567:
case RRTILE8568:
case RRTILE8569:
case RRTILE8570:
case RRTILE8571:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5082;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8640:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5085;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8611:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5086;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 TECHLIGHTBUST2:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = TECHLIGHTBUST4;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8497:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5076;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8162:
case RRTILE8163:
case RRTILE8164:
case RRTILE8165:
case RRTILE8166:
case RRTILE8167:
case RRTILE8168:
- moved some common utilities into the backend.
2021-11-26 20:52:01 +00:00
ChangeActorStat(targ, STAT_MISC);
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5063;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8589:
case RRTILE8590:
case RRTILE8591:
case RRTILE8592:
case RRTILE8593:
case RRTILE8594:
case RRTILE8595:
- moved some common utilities into the backend.
2021-11-26 20:52:01 +00:00
ChangeActorStat(targ, STAT_MISC);
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE8588;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE3497:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5076;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE3498:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5077;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE3499:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5078;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8503:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5079;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE7901:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5080;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE7696:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE7697;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(DUKE_SHUCKS, targ);
- 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 RRTILE7806:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5043;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE7885:
case RRTILE7890:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5045;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(495, targ);
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
fi.hitradius(targ, 10, 0, 0, 1, 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
break;
case RRTILE7886:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5046;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(495, targ);
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
fi.hitradius(targ, 10, 0, 0, 1, 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
break;
case RRTILE7887:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5044;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
fi.hitradius(targ, 10, 0, 0, 1, 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
break;
case RRTILE7900:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5047;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE7906:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5048;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE7912:
case RRTILE7913:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5049;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8047:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5050;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8596:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE8598;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8059:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5051;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8060:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5052;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8222:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5053;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8223:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5054;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8224:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5055;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8370:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5056;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8371:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5057;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8372:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5058;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8373:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5059;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8396:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5038;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8397:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5039;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8398:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5040;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8399:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5041;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8385:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE8386;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8387:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE8388;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8389:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE8390;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8391:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE8392;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE7553:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5035;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8475:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5075;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8498:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5077;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8499:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5078;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE2445:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE2450;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE2123:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE2124;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_BREAKING, targ);
- lotsofcolourglass
2021-11-17 23:38:20 +00:00
lotsofglass(targ, nullptr, 10);
- 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 RRTILE3773:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE8651;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_BREAKING, targ);
- lotsofcolourglass
2021-11-17 23:38:20 +00:00
lotsofglass(targ, nullptr, 10);
- 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 RRTILE7533:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5035;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(495, targ);
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
fi.hitradius(targ, 10, 0, 0, 1, 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
break;
case RRTILE8394:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5072;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(495, targ);
- 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 RRTILE8461:
case RRTILE8462:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE5074;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8679:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE8680;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(DUKE_SHUCKS, targ);
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
fi.hitradius(targ, 10, 0, 0, 1, 1);
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (targ->spr.lotag != 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
{
- the remaining iterators in sectors_r.cpp
2020-11-02 19:42:20 +00:00
DukeSpriteIterator it;
while (auto act = it.Next())
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (act->spr.picnum == RRTILE8679 && act->spr.pal == 4)
- 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (act->spr.lotag == targ->spr.lotag)
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
act->spr.picnum = RRTILE8680;
- 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 RRTILE3584:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE8681;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(495, targ);
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
fi.hitradius(targ, 250, 0, 0, 1, 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
break;
case RRTILE8682:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE8683;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 RRTILE8099:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (targ->spr.lotag == 5)
- 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.lotag = 0;
targ->spr.picnum = RRTILE5087;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(340, targ);
- the remaining iterators in sectors_r.cpp
2020-11-02 19:42:20 +00:00
DukeSpriteIterator it;
while (auto act = it.Next())
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (act->spr.picnum == RRTILE8094)
act->spr.picnum = RRTILE5088;
- 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 RRTILE2431:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (targ->spr.pal != 4)
- 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE2451;
if (targ->spr.lotag != 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
{
- the remaining iterators in sectors_r.cpp
2020-11-02 19:42:20 +00:00
DukeSpriteIterator it;
while (auto act = it.Next())
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (act->spr.picnum == RRTILE2431 && act->spr.pal == 4)
- 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (targ->spr.lotag == act->spr.lotag)
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
act->spr.picnum = RRTILE2451;
- 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 RRTILE2443:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (targ->spr.pal != 19)
targ->spr.picnum = RRTILE2455;
- 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 RRTILE2455:
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(SQUISHED, targ);
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
fi.guts(targ, RRTILE2465, 3, myconnectindex);
deletesprite(targ);
- 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 RRTILE2451:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (targ->spr.pal != 4)
- 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
{
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(SQUISHED, targ);
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (targ->spr.lotag != 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
{
- the remaining iterators in sectors_r.cpp
2020-11-02 19:42:20 +00:00
DukeSpriteIterator it;
while (auto act = it.Next())
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (act->spr.picnum == RRTILE2451 && act->spr.pal == 4)
- 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (targ->spr.lotag == act->spr.lotag)
- 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
{
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
fi.guts(targ, RRTILE2460, 12, myconnectindex);
fi.guts(targ, RRTILE2465, 3, myconnectindex);
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
act->spr.xrepeat = 0;
act->spr.yrepeat = 0;
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.xrepeat = 0;
targ->spr.yrepeat = 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
}
}
}
}
else
{
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
fi.guts(targ, RRTILE2460, 12, myconnectindex);
fi.guts(targ, RRTILE2465, 3, myconnectindex);
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.xrepeat = 0;
targ->spr.yrepeat = 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
}
}
break;
case RRTILE2437:
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(439, targ);
- 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;
}
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
switch (targ->spr.picnum)
- 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 RRTILE3114:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE3117;
- 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 RRTILE2876:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE2990;
- 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 RRTILE3152:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE3218;
- 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 RRTILE3153:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE3219;
- 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 RRTILE2030:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE2034;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_BREAKING, targ);
- lotsofcolourglass
2021-11-17 23:38:20 +00:00
lotsofglass(targ, nullptr, 10);
- 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 RRTILE2893:
case RRTILE2915:
case RRTILE3115:
case RRTILE3171:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
switch (targ->spr.picnum)
- 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 RRTILE2915:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE2977;
- 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 RRTILE2893:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE2978;
- 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 RRTILE3115:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE3116;
- 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 RRTILE3171:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = RRTILE3216;
- 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;
}
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_BREAKING, targ);
- lotsofcolourglass
2021-11-17 23:38:20 +00:00
lotsofglass(targ, nullptr, 10);
- 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 RRTILE2156:
case RRTILE2158:
case RRTILE2160:
case RRTILE2175:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum++;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_BREAKING, targ);
- lotsofcolourglass
2021-11-17 23:38:20 +00:00
lotsofglass(targ, nullptr, 10);
- 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 RRTILE2137:
case RRTILE2151:
case RRTILE2152:
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_BREAKING, targ);
- lotsofcolourglass
2021-11-17 23:38:20 +00:00
lotsofglass(targ, nullptr, 10);
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum++;
- 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
for (k = 0; k < 6; k++)
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
EGS(targ->sector(), targ->int_pos().X, targ->int_pos().Y, targ->int_pos().Z - (8 << 8), SCRAP6 + (krand() & 15), -8, 48, 48, krand() & 2047, (krand() & 63) + 64, -(krand() & 4095) - (targ->spr.zvel >> 2), targ, 5);
- 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:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
proj->spr.xvel = (targ->spr.xvel >> 1) + (targ->spr.xvel >> 2);
proj->spr.ang -= (krand() & 16);
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(355, targ);
- 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 STRIPEBALL:
case QUEBALL:
- RR: fixed the bowling lane lights. Tiles had not been made writable. Also renamed a few bowling related things.
2021-06-09 21:53:05 +00:00
case BOWLINGPIN:
case BOWLINGPIN + 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 HENSTAND:
case HENSTAND + 1:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (proj->spr.picnum == QUEBALL || proj->spr.picnum == STRIPEBALL)
- 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
proj->spr.xvel = (targ->spr.xvel >> 1) + (targ->spr.xvel >> 2);
proj->spr.ang -= (targ->spr.ang << 1) + 1024;
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
targ->spr.ang = getangle(targ->int_pos().X - proj->int_pos().X, targ->int_pos().Y - proj->int_pos().Y) - 512;
- 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_CheckSoundPlaying(POOLBALLHIT) < 2)
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(POOLBALLHIT, targ);
- 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
}
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
else if (proj->spr.picnum == BOWLINGPIN || proj->spr.picnum == BOWLINGPIN + 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
proj->spr.xvel = (targ->spr.xvel >> 1) + (targ->spr.xvel >> 2);
proj->spr.ang -= ((targ->spr.ang << 1) + krand()) & 64;
targ->spr.ang = (targ->spr.ang + krand()) & 16;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(355, targ);
- 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
}
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
else if (proj->spr.picnum == HENSTAND || proj->spr.picnum == HENSTAND + 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
proj->spr.xvel = (targ->spr.xvel >> 1) + (targ->spr.xvel >> 2);
proj->spr.ang -= ((targ->spr.ang << 1) + krand()) & 16;
targ->spr.ang = (targ->spr.ang + krand()) & 16;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(355, targ);
- 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 (krand() & 3)
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.xvel = 164;
targ->spr.ang = proj->spr.ang;
- 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 TREE1:
case TREE2:
case TIRE:
case BOX:
- flammable flags.
2022-01-26 23:41:33 +00:00
if (actorflag(proj, SFLAG_INFLAME))
- 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
{
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
if (targ->temp_data[0] == 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL;
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
targ->temp_data[0] = 1;
spawn(targ, BURNING);
- 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 CACTUS:
// case CACTUSBROKE:
- flammable flags.
2022-01-26 23:41:33 +00:00
if (actorflag(proj, SFLAG_INFLAME))
- 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
{
for (k = 0; k < 64; k++)
{
- Duke: renamed all spr.pos This was pure search&replace with no other code edits.
2022-01-31 18:21:49 +00:00
auto spawned = EGS(targ->sector(), targ->int_pos().X, targ->int_pos().Y, targ->int_pos().Z - (krand() % (48 << 8)), SCRAP6 + (krand() & 3), -8, 48, 48, krand() & 2047, (krand() & 63) + 64, -(krand() & 4095) - (targ->spr.zvel >> 2), targ, 5);
- renamed all shadowing variables in Duke.
2021-12-24 09:53:27 +00:00
if (spawned) spawned->spr.pal = 8;
- 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
}
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (targ->spr.picnum == CACTUS)
targ->spr.picnum = CACTUSBROKE;
targ->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL;
- 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 deletesprite(i);
}
break;
case FANSPRITE:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = FANSPRITEBROKE;
targ->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
for (j = 0; j < 16; j++) RANDOMSCRAP(targ);
- 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 WATERFOUNTAIN:
case WATERFOUNTAIN + 1:
case WATERFOUNTAIN + 2:
case WATERFOUNTAIN + 3:
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
spawn(targ, TOILETWATER);
- 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 SATELITE:
case FUELPOD:
case SOLARPANNEL:
case ANTENNA:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (gs.actorinfo[SHOTSPARK1].scriptaddress && proj->spr.extra != ScriptCode[gs.actorinfo[SHOTSPARK1].scriptaddress])
- 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
{
for (j = 0; j < 15; j++)
- use inline access functions to read floorz/ceilingz.
2022-02-02 23:46:04 +00:00
EGS(targ->sector(), targ->int_pos().X, targ->int_pos().Y, targ->sector()->int_floorz() - (12 << 8) - (j << 9), SCRAP1 + (krand() & 15), -8, 64, 64,
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
krand() & 2047, (krand() & 127) + 64, -(krand() & 511) - 256, targ, 5);
spawn(targ, EXPLOSION2);
deletesprite(targ);
- 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 RRTILE1824:
if (!isRRRA()) break;
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
[[fallthrough]];
- 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 BOTTLE1:
case BOTTLE2:
case BOTTLE3:
case BOTTLE4:
case BOTTLE5:
case BOTTLE6:
case BOTTLE8:
case BOTTLE10:
case BOTTLE11:
case BOTTLE12:
case BOTTLE13:
case BOTTLE14:
case BOTTLE15:
case BOTTLE16:
case BOTTLE17:
case BOTTLE18:
case BOTTLE19:
case DOMELITE:
case SUSHIPLATE1:
case SUSHIPLATE2:
case SUSHIPLATE3:
case SUSHIPLATE4:
case SUSHIPLATE5:
case WAITTOBESEATED:
case VASE:
case STATUEFLASH:
case STATUE:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (targ->spr.picnum == BOTTLE10)
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
fi.lotsofmoney(targ, 4 + (krand() & 3));
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
else if (targ->spr.picnum == STATUE || targ->spr.picnum == STATUEFLASH)
- 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
{
- lotsofcolourglass
2021-11-17 23:38:20 +00:00
lotsofcolourglass(targ, nullptr, 40);
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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
}
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
else if (targ->spr.picnum == VASE)
- lotsofcolourglass
2021-11-17 23:38:20 +00:00
lotsofglass(targ, nullptr, 40);
- 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
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_BREAKING, targ);
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.ang = krand() & 2047;
- lotsofcolourglass
2021-11-17 23:38:20 +00:00
lotsofglass(targ, nullptr, 8);
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
deletesprite(targ);
- 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 RRTILE2654:
case RRTILE2656:
case RRTILE3172:
if (!isRRRA()) break;
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
[[fallthrough]];
- 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 BOTTLE7:
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_BREAKING, targ);
- lotsofcolourglass
2021-11-17 23:38:20 +00:00
lotsofglass(targ, nullptr, 10);
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
deletesprite(targ);
- 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:
- 6 simple loops in sectors_r.cpp.
2020-11-02 19:33:44 +00:00
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.xrepeat = 0;
- 6 simple loops in sectors_r.cpp.
2020-11-02 19:33:44 +00:00
auto Owner = targ->GetOwner();
if (Owner)
{
Owner->temp_data[0] = 32;
Owner->temp_data[1] = !Owner->temp_data[1];
Owner->temp_data[2] ++;
}
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
spawn(targ, EXPLOSION2);
- 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;
- 6 simple loops in sectors_r.cpp.
2020-11-02 19:33:44 +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 TOILET:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = TOILETBROKE;
if(krand() & 1) targ->spr.cstat |= CSTAT_SPRITE_XFLIP;
targ->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL;
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
spawn(targ, TOILETWATER);
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_BREAKING, targ);
- 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 STALL:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = STALLBROKE;
if (krand() & 1) targ->spr.cstat |= CSTAT_SPRITE_XFLIP;
targ->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL;
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
spawn(targ, TOILETWATER);
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 HYDRENT:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = BROKEFIREHYDRENT;
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
spawn(targ, TOILETWATER);
- 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
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
- 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 GRATE1:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = BGRATE1;
targ->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(VENT_BUST, targ);
- 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 CIRCLEPANNEL:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = CIRCLEPANNELBROKE;
targ->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL;
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(VENT_BUST, targ);
- 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 PIPE1:
case PIPE2:
case PIPE3:
case PIPE4:
case PIPE5:
case PIPE6:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
switch (targ->spr.picnum)
- 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
case PIPE1:targ->spr.picnum = PIPE1B; break;
case PIPE2:targ->spr.picnum = PIPE2B; break;
case PIPE3:targ->spr.picnum = PIPE3B; break;
case PIPE4:targ->spr.picnum = PIPE4B; break;
case PIPE5:targ->spr.picnum = PIPE5B; break;
case PIPE6:targ->spr.picnum = PIPE6B; 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
}
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
{
- renamed all shadowing variables in Duke.
2021-12-24 09:53:27 +00:00
auto spawned = spawn(targ, STEAM);
- use inline access functions to read floorz/ceilingz.
2022-02-02 23:46:04 +00:00
if (spawned) spawned->set_int_z(targ->sector()->int_floorz() - (32 << 8));
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +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
break;
case CHAIR1:
case CHAIR2:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
targ->spr.picnum = BROKENCHAIR;
targ->spr.cstat = 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
break;
case CHAIR3:
case MOVIECAMERA:
case SCALE:
case VACUUM:
case CAMERALIGHT:
case IVUNIT:
case POT1:
case POT2:
case POT3:
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
S_PlayActorSound(GLASS_HEAVYBREAK, targ);
for (j = 0; j < 16; j++) RANDOMSCRAP(targ);
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
deletesprite(targ);
- 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 PLAYERONWATER:
- replaced index for sound origin in checkhitsprite_r.
2020-10-24 04:28:41 +00:00
targ = targ->GetOwner();
if (!targ) break;
- Duke: added [[fallthrough]] annotations wherever needed.
2021-11-14 11:25:25 +00:00
[[fallthrough]];
- 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:
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if ((targ->spr.cstat & CSTAT_SPRITE_ALIGNMENT_WALL) && targ->spr.hitag == 0 && targ->spr.lotag == 0 && targ->spr.statnum == 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
break;
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if ((proj->spr.picnum == SHRINKSPARK || proj->spr.picnum == FREEZEBLAST || proj->GetOwner() != targ) && targ->spr.statnum != 4)
- 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
{
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
if (badguy(targ) == 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (proj->spr.picnum == RPG) proj->spr.extra <<= 1;
else if (isRRRA() && proj->spr.picnum == RPG2) proj->spr.extra <<= 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
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if ((targ->spr.picnum != DRONE))
if (proj->spr.picnum != FREEZEBLAST)
//if (actortype[targ->spr.picnum] == 0) //TRANSITIONAL. Cannot be done right with EDuke mess backing the engine.
- 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
{
- handled several GetIndex calls.
2020-11-02 19:00:15 +00:00
auto spawned = spawn(proj, JIBS6);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +00:00
if (spawned)
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (proj->spr.pal == 6)
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
spawned->spr.pal = 6;
- some simple replacements.
2022-02-07 07:47:18 +00:00
spawned->spr.pos.Z += 4;
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
spawned->spr.xvel = 16;
spawned->spr.xrepeat = spawned->spr.yrepeat = 24;
spawned->spr.ang += 32 - (krand() & 63);
- Duke/RR: added null checks to all spawn() calls
2021-11-19 11:32:12 +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
}
- the remaining iterators in sectors_r.cpp
2020-11-02 19:42:20 +00:00
auto Owner = proj->GetOwner();
- 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
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (Owner && Owner->spr.picnum == APLAYER && targ->spr.picnum != DRONE)
- the remaining iterators in sectors_r.cpp
2020-11-02 19:42:20 +00:00
if (ps[Owner->PlayerIndex()].curr_weapon == SHOTGUN_WEAPON)
- 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
{
- shoot interface transitioned/operateweapon mostly done.
2020-10-24 05:34:39 +00:00
fi.shoot(targ, BLOODSPLAT3);
fi.shoot(targ, BLOODSPLAT1);
fi.shoot(targ, BLOODSPLAT2);
fi.shoot(targ, BLOODSPLAT4);
- 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
}
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (targ->spr.statnum == 2)
- 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
{
- moved some common utilities into the backend.
2021-11-26 20:52:01 +00:00
ChangeActorStat(targ, 1);
- checkhitsprite_r references to 'i' removed.
2020-10-24 05:04:29 +00:00
targ->timetosleep = SLEEPTIME;
- 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
}
}
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (targ->spr.statnum != 2)
- 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (proj->spr.picnum == FREEZEBLAST && ((targ->spr.picnum == APLAYER && targ->spr.pal == 1) || (gs.freezerhurtowner == 0 && proj->GetOwner() == targ)))
- 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
return;
- renamed DDukeActor::picnum to attackertype. This one having the same name here as spritetype::picnum is just confusing as hell and badly describes this variable's function.
2021-12-27 22:52:16 +00:00
targ->attackertype = proj->spr.picnum;
- exported DukeActor's native member variables. This includes renaming two native ones because they shared the same name with members of spritetype.
2022-01-23 23:10:25 +00:00
targ->hitextra += proj->spr.extra;
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (targ->spr.picnum != COW)
- exported DukeActor's native member variables. This includes renaming two native ones because they shared the same name with members of spritetype.
2022-01-23 23:10:25 +00:00
targ->hitang = proj->spr.ang;
- ud.camerasprite -> actor.
2020-11-02 22:53:55 +00:00
targ->SetHitOwner(proj->GetOwner());
- 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
}
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
if (targ->spr.statnum == 10)
- 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
{
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
p = targ->spr.yvel;
- newowner and related code.
2020-11-02 23:20:51 +00:00
if (ps[p].newOwner != nullptr)
- 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
{
- newowner and related code.
2020-11-02 23:20:51 +00:00
ps[p].newOwner = nullptr;
- another batch of utility use
2022-02-05 11:05:29 +00:00
ps[p].restorexyz();
- 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
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
updatesector(ps[p].player_int_pos().X, ps[p].player_int_pos().Y, &ps[p].cursector);
- 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
- the remaining iterators in sectors_r.cpp
2020-11-02 19:42:20 +00:00
DukeStatIterator it(STAT_EFFECTOR);
while (auto act = it.Next())
- 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
{
- fix the camera. - camera flag added
2022-01-21 00:04:08 +00:00
if (actorflag(act, SFLAG2_CAMERA)) act->spr.yvel = 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
}
}
- the remaining iterators in sectors_r.cpp
2020-11-02 19:42:20 +00:00
auto Owner = targ->GetHitOwner();
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (!Owner || Owner->spr.picnum != APLAYER)
- 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.player_skill >= 3)
- sectors_r.cpp
2021-12-21 20:43:41 +00:00
proj->spr.extra += (proj->spr.extra >> 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
}
}
break;
}
- more sector stuff.
2020-05-10 18:59:38 +00:00
}
- the rest of sector.cpp, except for the input function.
2020-05-10 20:20:49 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void checksectors_r(int snum)
{
- addressed most unused/uninitialized variable warnings from MSVC.
2021-11-14 14:03:50 +00:00
int oldz;
- remove C-style struct parameters.
2022-02-07 10:04:19 +00:00
player_struct* p;
- hitawall
2021-11-17 23:04:36 +00:00
walltype* hitscanwall;
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
HitInfo near;
- 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 = &ps[snum];
- player.i, part 2 # Conflicts: # source/games/duke/src/sectors_r.cpp
2020-11-02 19:23:30 +00:00
auto pact = p->GetActor();
- 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
- Duke/RR: added all checks needed for not letting Duke crash with noclip when not accepting -1 as a valid sector pointer. All places that were causing a crash are now guared by calling 'insector()'.
2021-11-19 07:58:31 +00:00
if (!p->insector()) return;
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
switch (p->cursector->lotag)
- 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 32767:
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
p->cursector->lotag = 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
FTA(9, p);
p->secret_rooms++;
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
SECRET_Trigger(sectnum(p->cursector));
- 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
return;
case -1:
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
p->cursector->lotag = 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
if (!isRRRA() || !RRRA_ExitedLevel)
{
- another safety commit.
2020-07-07 15:56:20 +00:00
setnextmap(false);
- 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
RRRA_ExitedLevel = 1;
}
return;
case -2:
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
p->cursector->lotag = 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
p->timebeforeexit = 26 * 8;
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
p->customexitsound = p->cursector->hitag;
- 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
return;
default:
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
if (p->cursector->lotag >= 10000)
- 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 (snum == screenpeek || ud.coop == 1)
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
S_PlayActorSound(p->cursector->lotag - 10000, pact);
p->cursector->lotag = 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
}
break;
}
//After this point the the player effects the map with space
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (chatmodeon || p->GetActor()->spr.extra <= 0) return;
- 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
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (ud.cashman && PlayerInput(snum, SB_OPEN))
- fixed a few parameters
2020-11-02 18:53:04 +00:00
fi.lotsofmoney(p->GetActor(), 2);
- 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
- converted the remaining input bits. Looks like it is working in all games except Blood (not that it surprises me that it's Blood again which has issues...)
2020-08-29 11:32:14 +00:00
if (!(PlayerInput(snum, SB_OPEN)))
- 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->toggle_key_flag = 0;
else if (!p->toggle_key_flag)
{
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
near.hitActor = nullptr;
- 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->toggle_key_flag = 1;
- hitawall
2021-11-17 23:04:36 +00:00
hitscanwall = nullptr;
- 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
hitawall(p, &hitscanwall);
- hitawall
2021-11-17 23:04:36 +00:00
if (hitscanwall != nullptr)
- 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
{
- checksectors*
2021-11-17 22:40:10 +00:00
if (isRRRA())
{
- hitawall
2021-11-17 23:04:36 +00:00
if (hitscanwall->overpicnum == MIRROR && snum == screenpeek)
- checksectors*
2021-11-17 22:40:10 +00:00
if (numplayers == 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
{
- checksectors*
2021-11-17 22:40:10 +00:00
if (S_CheckActorSoundPlaying(pact, 27) == 0 && S_CheckActorSoundPlaying(pact, 28) == 0 && S_CheckActorSoundPlaying(pact, 29) == 0
&& S_CheckActorSoundPlaying(pact, 257) == 0 && S_CheckActorSoundPlaying(pact, 258) == 0)
{
int snd = krand() % 5;
if (snd == 0)
S_PlayActorSound(27, pact);
else if (snd == 1)
S_PlayActorSound(28, pact);
else if (snd == 2)
S_PlayActorSound(29, pact);
else if (snd == 3)
S_PlayActorSound(257, pact);
else if (snd == 4)
S_PlayActorSound(258, pact);
}
return;
- 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
}
- checksectors*
2021-11-17 22:40:10 +00:00
}
else
{
- hitawall
2021-11-17 23:04:36 +00:00
if (hitscanwall->overpicnum == MIRROR)
if (hitscanwall->lotag > 0 && S_CheckActorSoundPlaying(pact, hitscanwall->lotag) == 0 && snum == screenpeek)
- checksectors*
2021-11-17 22:40:10 +00:00
{
- hitawall
2021-11-17 23:04:36 +00:00
S_PlayActorSound(hitscanwall->lotag, pact);
- checksectors*
2021-11-17 22:40:10 +00:00
return;
}
}
- Replace every line that just contains spaces or tabs with an empty line feed in all files except 3rd party libraries.
2021-12-30 09:30:21 +00:00
- wall and sprite flags in Duke, just simple cases.
2021-12-18 14:11:21 +00:00
if ((hitscanwall->cstat & CSTAT_WALL_MASKED))
- hitawall
2021-11-17 23:04:36 +00:00
if (hitscanwall->lotag)
- 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
return;
- Replace every line that just contains spaces or tabs with an empty line feed in all files except 3rd party libraries.
2021-12-30 09:30:21 +00:00
- 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 (isRRRA())
{
if (p->OnMotorcycle)
{
if (p->MotoSpeed < 20)
{
OffMotorcycle(p);
return;
}
return;
}
if (p->OnBoat)
{
if (p->MotoSpeed < 20)
{
OffBoat(p);
return;
}
return;
}
- another batch of utility use
2022-02-05 11:05:29 +00:00
neartag(p->player_int_pos(), p->GetActor()->sector(), p->angle.oang.asbuild(), near , 1280, 3);
- 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
}
- newowner and related code.
2020-11-02 23:20:51 +00:00
if (p->newOwner != nullptr)
- another batch of utility use
2022-02-05 11:05:29 +00:00
neartag({ p->player_int_opos().X, p->player_int_opos().Y, p->player_int_opos().Z }, p->GetActor()->sector(), p->angle.oang.asbuild(), near, 1280L, 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
else
{
- another batch of utility use
2022-02-05 11:05:29 +00:00
neartag(p->player_int_pos(), p->GetActor()->sector(), p->angle.oang.asbuild(), near, 1280, 1);
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (near.actor() == nullptr && near.hitWall == nullptr && near.hitSector == nullptr)
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
neartag({ p->player_int_pos().X, p->player_int_pos().Y, p->player_int_pos().Z + (8 << 8) }, p->GetActor()->sector(), p->angle.oang.asbuild(), near, 1280, 1);
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (near.actor() == nullptr && near.hitWall == nullptr && near.hitSector == nullptr)
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
neartag({ p->player_int_pos().X, p->player_int_pos().Y, p->player_int_pos().Z + (16 << 8) }, p->GetActor()->sector(), p->angle.oang.asbuild(), near, 1280, 1);
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (near.actor() == nullptr && near.hitWall == nullptr && near.hitSector == nullptr)
- 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
{
- use wrapper functions for pos/opos where possible.
2022-02-04 17:11:44 +00:00
neartag({ p->player_int_pos().X, p->player_int_pos().Y, p->player_int_pos().Z + (16 << 8) }, p->GetActor()->sector(), p->angle.oang.asbuild(), near, 1280, 3);
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (near.actor() != nullptr)
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
switch (near.actor()->spr.picnum)
- 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 FEM10:
case NAKED1:
case STATUE:
case TOUGHGAL:
return;
case COW:
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
near.actor()->spriteextra = 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
return;
}
}
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
near.clearObj();
- 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
}
}
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (p->newOwner == nullptr && near.actor() == nullptr && near.hitWall == nullptr && near.hitSector == nullptr)
- renamed DDukeActor::getSector.
2021-11-20 23:33:17 +00:00
if (isanunderoperator(p->GetActor()->sector()->lotag))
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
near.hitSector = p->GetActor()->sector();
- 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
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (near.hitSector && (near.hitSector->lotag & 16384))
- 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
return;
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (near.actor() == nullptr && near.hitWall == nullptr)
replaced cursectnum with a cursector pointer
2021-11-21 07:56:39 +00:00
if (p->cursector->lotag == 2)
- 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
{
- PlayerColorChanged, hits, hitasprite.
2020-10-23 17:33:54 +00:00
DDukeActor* hit;
oldz = hitasprite(p->GetActor(), &hit);
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (hit) near.hitActor = hit;
if (oldz > 1280) near.hitActor = nullptr;
- 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
}
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
auto const neartagsprite = near.actor();
- nullptr fixes
2020-10-27 06:00:39 +00:00
if (neartagsprite != nullptr)
- 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
{
- use pointers for checkhitswitch and took separated clearcameras to a new functions to make this free of gotos.
2021-11-17 23:16:53 +00:00
if (fi.checkhitswitch(snum, nullptr, neartagsprite)) return;
- 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
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
switch (neartagsprite->spr.picnum)
- 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 RRTILE8448:
if (!isRRRA()) return;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
if (!S_CheckActorSoundPlaying(neartagsprite, 340))
S_PlayActorSound(340, neartagsprite);
- 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
return;
case RRTILE8704:
if (!isRRRA()) return;
if (numplayers == 1)
{
// This is from RedneckGDX - the version in RR Reconstruction looked like broken nonsense.
- wrapped neartag to return an actor.
2020-10-27 05:35:11 +00:00
if (S_CheckActorSoundPlaying(neartagsprite, 445) || sound445done != 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
{
- wrapped neartag to return an actor.
2020-10-27 05:35:11 +00:00
if (!S_CheckActorSoundPlaying(neartagsprite, 445) && !S_CheckActorSoundPlaying(neartagsprite, 446) &&
!S_CheckActorSoundPlaying(neartagsprite, 447) && sound445done != 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
{
if ((krand() % 2) == 1)
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(446, neartagsprite);
- 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
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(447, neartagsprite);
- 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
{
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(445, neartagsprite);
- make sure that the static time counters in the input code do not accumulate while not in use. The one for holding the turn key needs to be reset any time there is no turning and everything needs to be cleared when the input state is cleared. And all need to check for the case where the static state is not set yet.
2020-07-18 11:27:24 +00:00
sound445done = 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
}
}
return;
case EMPTYBIKE:
if (!isRRRA()) return;
- nullptr fixes
2020-10-27 06:00:39 +00:00
OnMotorcycle(p, neartagsprite);
- 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
return;
case EMPTYBOAT:
if (!isRRRA()) return;
- wrapped neartag to return an actor.
2020-10-27 05:35:11 +00:00
OnBoat(p, neartagsprite);
- 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
return;
case RRTILE8164:
case RRTILE8165:
case RRTILE8166:
case RRTILE8167:
case RRTILE8168:
case RRTILE8591:
case RRTILE8592:
case RRTILE8593:
case RRTILE8594:
case RRTILE8595:
if (!isRRRA()) return;
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
neartagsprite->spr.extra = 60;
- cleaned up the sound system interface to have consistent naming and no aliases.
2020-07-25 07:32:54 +00:00
S_PlayActorSound(235, neartagsprite);
- 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
return;
case TOILET:
case STALL:
case RRTILE2121:
case RRTILE2122:
if (p->last_pissed_time == 0)
{
- player.i, part 2 # Conflicts: # source/games/duke/src/sectors_r.cpp
2020-11-02 19:23:30 +00:00
S_PlayActorSound(435, pact);
- 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->last_pissed_time = 26 * 220;
p->transporter_hold = 29 * 2;
if (p->holster_weapon == 0)
{
p->holster_weapon = 1;
p->weapon_pos = -1;
}
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (p->GetActor()->spr.extra <= (gs.max_player_health - (gs.max_player_health / 10)))
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
p->GetActor()->spr.extra += gs.max_player_health / 10;
p->last_extra = p->GetActor()->spr.extra;
- 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
}
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
else if (p->GetActor()->spr.extra < gs.max_player_health)
p->GetActor()->spr.extra = gs.max_player_health;
- 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
}
- player.i, part 2 # Conflicts: # source/games/duke/src/sectors_r.cpp
2020-11-02 19:23:30 +00:00
else if (S_CheckActorSoundPlaying(pact, DUKE_GRUNT) == 0)
S_PlayActorSound(DUKE_GRUNT, pact);
- 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
return;
case WATERFOUNTAIN:
- wrapped neartag to return an actor.
2020-10-27 05:35:11 +00:00
if (neartagsprite->temp_data[0] != 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
{
- wrapped neartag to return an actor.
2020-10-27 05:35:11 +00:00
neartagsprite->temp_data[0] = 1;
neartagsprite->SetOwner(p->GetActor());
- 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
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (p->GetActor()->spr.extra < gs.max_player_health)
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
p->GetActor()->spr.extra++;
- player.i, part 2 # Conflicts: # source/games/duke/src/sectors_r.cpp
2020-11-02 19:23:30 +00:00
S_PlayActorSound(DUKE_DRINKING, pact);
- 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
}
}
return;
case PLUG:
- player.i, part 2 # Conflicts: # source/games/duke/src/sectors_r.cpp
2020-11-02 19:23:30 +00:00
S_PlayActorSound(SHORT_CIRCUIT, pact);
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
p->GetActor()->spr.extra -= 2 + (krand() & 3);
- 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
SetPlayerPal(p, PalEntry(32, 48, 48, 64));
break;
}
}
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 20:51:05 +00:00
if (!PlayerInput(snum, SB_OPEN)) return;
- 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
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (near.hitWall == nullptr && near.hitSector == nullptr && near.actor() == nullptr)
- PlayerColorChanged, hits, hitasprite.
2020-10-23 17:33:54 +00:00
if (abs(hits(p->GetActor())) < 512)
- 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 ((krand() & 255) < 16)
- player.i, part 2 # Conflicts: # source/games/duke/src/sectors_r.cpp
2020-11-02 19:23:30 +00:00
S_PlayActorSound(DUKE_SEARCH2, pact);
else S_PlayActorSound(DUKE_SEARCH, pact);
- 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
return;
}
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (near.hitWall)
- 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
{
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (near.hitWall->lotag > 0 && fi.isadoorwall(near.hitWall->picnum))
- 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
{
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (hitscanwall == near.hitWall || hitscanwall == nullptr)
fi.checkhitswitch(snum, near.hitWall, nullptr);
- 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
return;
}
}
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (near.hitSector && (near.hitSector->lotag & 16384) == 0 && isanearoperator(near.hitSector->lotag))
- 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
{
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
DukeSectIterator it(near.hitSector);
- the remaining iterators in sectors_r.cpp
2020-11-02 19:42:20 +00:00
while (auto act = it.Next())
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (act->spr.picnum == ACTIVATOR || act->spr.picnum == MASTERSWITCH)
- 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
return;
}
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (haskey(near.hitSector, snum))
operatesectors(near.hitSector, p->GetActor());
- 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
{
- added null pointer checks to locked door sound checks in RR. This originally accessed undefined memory when no sprite was involved. Fixes #157
2020-11-07 09:23:31 +00:00
if (neartagsprite && neartagsprite->spriteextra > 3)
- player.i, part 2 # Conflicts: # source/games/duke/src/sectors_r.cpp
2020-11-02 19:23:30 +00:00
S_PlayActorSound(99, pact);
- 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
- player.i, part 2 # Conflicts: # source/games/duke/src/sectors_r.cpp
2020-11-02 19:23:30 +00:00
S_PlayActorSound(419, pact);
- 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
FTA(41, p);
}
}
- renamed DDukeActor::getSector.
2021-11-20 23:33:17 +00:00
else if ((p->GetActor()->sector()->lotag & 16384) == 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
{
- renamed DDukeActor::getSector.
2021-11-20 23:33:17 +00:00
if (isanunderoperator(p->GetActor()->sector()->lotag))
- 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
{
- use insector and sector pointer initialization for iterator
2021-11-21 00:04:16 +00:00
DukeSectIterator it(p->GetActor()->sector());
- the remaining iterators in sectors_r.cpp
2020-11-02 19:42:20 +00:00
while (auto act = it.Next())
- 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
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (act->spr.picnum == ACTIVATOR || act->spr.picnum == MASTERSWITCH)
- the remaining iterators in sectors_r.cpp
2020-11-02 19:42:20 +00:00
return;
- 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
}
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
if (haskey(near.hitSector, snum))
- use DCoreActor::sector() wherever possible.
2021-12-30 15:51:56 +00:00
operatesectors(p->GetActor()->sector(), p->GetActor());
- 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
{
- added null pointer checks to locked door sound checks in RR. This originally accessed undefined memory when no sprite was involved. Fixes #157
2020-11-07 09:23:31 +00:00
if (neartagsprite && neartagsprite->spriteextra > 3)
- player.i, part 2 # Conflicts: # source/games/duke/src/sectors_r.cpp
2020-11-02 19:23:30 +00:00
S_PlayActorSound(99, pact);
- 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
- player.i, part 2 # Conflicts: # source/games/duke/src/sectors_r.cpp
2020-11-02 19:23:30 +00:00
S_PlayActorSound(419, pact);
- 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
FTA(41, p);
}
}
- adapted neartag in Duke.
2021-11-26 17:59:28 +00:00
else fi.checkhitswitch(snum, near.hitWall, nullptr);
- 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
}
}
- the rest of sector.cpp, except for the input function.
2020-05-10 20:20:49 +00:00
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- the final walls What is left now of wall[] and wallnum() needs to remain.
2021-11-17 23:42:52 +00:00
void dofurniture(walltype* wlwal, sectortype* sectp, int snum)
- the rest of sector.cpp, except for the input function.
2020-05-10 20:20:49 +00:00
{
— Duke: use twoSided utility where appropriate.
2021-11-21 07:42:36 +00:00
assert(wlwal->twoSided());
auto nextsect = wlwal->nextSector();
- doFurniture floatified and inside rewritten as a floating point algorithm that works without bit masking.
2022-01-29 08:29:01 +00:00
double movestep = min(sectp->hitag * maptoworld, 1.);
if (movestep == 0) movestep = 4 * maptoworld;
double max_x = INT32_MIN, max_y = INT32_MIN, min_x = INT32_MAX, min_y = INT32_MAX;
- fixed dofurniture
2022-01-30 11:45:56 +00:00
for (auto& wal : wallsofsector(nextsect))
- 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
{
- doFurniture floatified and inside rewritten as a floating point algorithm that works without bit masking.
2022-01-29 08:29:01 +00:00
double x = wal.pos.X;
double y = wal.pos.Y;
- 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 (x > max_x)
max_x = x;
if (y > max_y)
max_y = y;
if (x < min_x)
min_x = x;
if (y < min_y)
min_y = y;
}
- doFurniture floatified and inside rewritten as a floating point algorithm that works without bit masking.
2022-01-29 08:29:01 +00:00
double margin = movestep + maptoworld;
max_x += margin;
max_y += margin;
min_x -= margin;
min_y -= margin;
int pos_ok = 1;
if (!inside(max_x, max_y, sectp) ||
!inside(max_x, min_y, sectp) ||
!inside(min_x, min_y, sectp) ||
!inside(min_x, max_y, sectp))
pos_ok = 0;
- RR: interpolate moving furniture.
2022-01-04 16:12:15 +00:00
for (auto& wal : wallsofsector(nextsect))
{
switch (wlwal->lotag)
{
case 42:
case 41:
case 40:
case 43:
vertexscan(&wal, [=](walltype* w)
{
- Duke: Fix bad interp check in RR's `dofurniture()`.
2022-01-04 23:03:33 +00:00
StartInterpolation(w, wlwal->lotag == 41 || wlwal->lotag == 43 ? Interp_Wall_X : Interp_Wall_Y);
- RR: interpolate moving furniture.
2022-01-04 16:12:15 +00:00
});
break;
}
}
- doFurniture floatified and inside rewritten as a floating point algorithm that works without bit masking.
2022-01-29 08:29:01 +00:00
if (pos_ok)
- 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
{
- player.i, part 2 # Conflicts: # source/games/duke/src/sectors_r.cpp
2020-11-02 19:23:30 +00:00
if (S_CheckActorSoundPlaying(ps[snum].GetActor(), 389) == 0)
S_PlayActorSound(389, ps[snum].GetActor());
- lotsofpopcorn + dofurniture
2021-11-17 22:24:37 +00:00
for(auto& wal : wallsofsector(nextsect))
- 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
{
- doFurniture floatified and inside rewritten as a floating point algorithm that works without bit masking.
2022-01-29 08:29:01 +00:00
auto vec = wal.pos;
- checksectors*
2021-11-17 22:40:10 +00:00
switch (wlwal->lotag)
- 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 42:
- doFurniture floatified and inside rewritten as a floating point algorithm that works without bit masking.
2022-01-29 08:29:01 +00:00
vec.Y += movestep;
dragpoint(&wal, vec);
- 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 41:
- doFurniture floatified and inside rewritten as a floating point algorithm that works without bit masking.
2022-01-29 08:29:01 +00:00
vec.X -= movestep;
dragpoint(&wal, vec);
- 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 40:
- doFurniture floatified and inside rewritten as a floating point algorithm that works without bit masking.
2022-01-29 08:29:01 +00:00
vec.Y -= movestep;
dragpoint(&wal, vec);
- 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 43:
- doFurniture floatified and inside rewritten as a floating point algorithm that works without bit masking.
2022-01-29 08:29:01 +00:00
vec.X += movestep;
dragpoint(&wal, vec);
- 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;
}
}
}
else
{
- fixed dofurniture
2022-01-30 11:45:56 +00:00
movestep -= 2 * maptoworld;
- lotsofpopcorn + dofurniture
2021-11-17 22:24:37 +00:00
for(auto& wal : wallsofsector(nextsect))
- 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
{
- doFurniture floatified and inside rewritten as a floating point algorithm that works without bit masking.
2022-01-29 08:29:01 +00:00
auto vec = wal.pos;
- checksectors*
2021-11-17 22:40:10 +00:00
switch (wlwal->lotag)
- 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 42:
- fixed dofurniture
2022-01-30 11:45:56 +00:00
vec.Y -= movestep;
- doFurniture floatified and inside rewritten as a floating point algorithm that works without bit masking.
2022-01-29 08:29:01 +00:00
dragpoint(&wal, vec);
- 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 41:
- fixed dofurniture
2022-01-30 11:45:56 +00:00
vec.X += movestep;
- doFurniture floatified and inside rewritten as a floating point algorithm that works without bit masking.
2022-01-29 08:29:01 +00:00
dragpoint(&wal, vec);
- 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 40:
- fixed dofurniture
2022-01-30 11:45:56 +00:00
vec.Y += movestep;
- doFurniture floatified and inside rewritten as a floating point algorithm that works without bit masking.
2022-01-29 08:29:01 +00:00
dragpoint(&wal, vec);
- 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 43:
- fixed dofurniture
2022-01-30 11:45:56 +00:00
vec.X -= movestep;
- doFurniture floatified and inside rewritten as a floating point algorithm that works without bit masking.
2022-01-29 08:29:01 +00:00
dragpoint(&wal, vec);
- 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;
}
}
}
- the rest of sector.cpp, except for the input function.
2020-05-10 20:20:49 +00:00
}
- safety commit
2020-05-14 07:07:07 +00:00
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
- the rest of Duke’s sectnum, except RR's geo hack
2021-11-21 08:08:05 +00:00
void tearitup(sectortype* sect)
- safety commit
2020-05-14 07:07:07 +00:00
{
- 6 simple loops in sectors_r.cpp.
2020-11-02 19:33:44 +00:00
DukeSectIterator it(sect);
while (auto act = it.Next())
- safety commit
2020-05-14 07:07:07 +00:00
{
- global search & replace of ->s-> with ->spr. This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-21 17:19:45 +00:00
if (act->spr.picnum == DESTRUCTO)
- safety commit
2020-05-14 07:07:07 +00:00
{
- renamed DDukeActor::picnum to attackertype. This one having the same name here as spritetype::picnum is just confusing as hell and badly describes this variable's function.
2021-12-27 22:52:16 +00:00
act->attackertype = SHOTSPARK1;
- exported DukeActor's native member variables. This includes renaming two native ones because they shared the same name with members of spritetype.
2022-01-23 23:10:25 +00:00
act->hitextra = 1;
- safety commit
2020-05-14 07:07:07 +00:00
}
}
}
- the beginning of sector.cpp The math backend functions have been moved out of Build because they originally have a good license. # Conflicts: # source/build/src/mdsprite.cpp # source/build/src/polymost.cpp
2020-05-10 10:42:47 +00:00
END_DUKE_NS
Reference in a new issue Copy permalink