Commit graph

3917 commits

Author SHA1 Message Date
Christoph Oelckers
730c9e65e4 - renamed all np-> in weapon.cpp 2021-12-30 09:57:42 +01:00
Christoph Oelckers
5eb958938d - renamed all np-> in sprite.cpp 2021-12-30 09:57:41 +01:00
Christoph Oelckers
b2d4375cde - renamed all np-> in jweapons.cpp 2021-12-30 09:57:41 +01:00
Christoph Oelckers
08a98c3955 - renamed all np-> in bunny.cpp 2021-12-30 09:57:41 +01:00
Christoph Oelckers
0175d27ffa - handle all 'np->' not referencing actorNew. 2021-12-30 09:57:41 +01:00
Christoph Oelckers
09294d7712 - deleted sp from _polymost.cpp 2021-12-30 09:57:41 +01:00
Christoph Oelckers
e1fdb6b7bf - deleted all exp variables from weapon.cpp. 2021-12-30 09:57:41 +01:00
Christoph Oelckers
b5261b9fe1 - renamed exp-> in weapon.cpp 2021-12-30 09:57:40 +01:00
Christoph Oelckers
4395de8fb1 - deleted all sp variables from weapon.cpp. 2021-12-30 09:57:40 +01:00
Christoph Oelckers
b488361639 - more macros in weapons.cpp converted into functions. 2021-12-30 09:57:40 +01:00
Christoph Oelckers
39640a4870 - handle most sp function parameters.
Also de-macrofied ANG2SPRITE and ANG2PLAYER.
2021-12-30 09:57:40 +01:00
Christoph Oelckers
d8b0cbd031 - renamed all sp-> in weapons.cpp. 2021-12-30 09:57:40 +01:00
Christoph Oelckers
17810bc6cd - the ones I missed. 2021-12-30 09:57:39 +01:00
Christoph Oelckers
a8d0e29a3b - handle parts of weapon.cpp where sp is not used for actor->s() 2021-12-30 09:57:39 +01:00
Christoph Oelckers
b2fd05d182 - stuff in InitSwordAttack + InitHeartAttack 2021-12-30 09:57:39 +01:00
Christoph Oelckers
270afb5d49 - sp-> renaming and cleanup in rooms.cpp 2021-12-30 09:57:39 +01:00
Christoph Oelckers
49cc2b3cad - quake.cpp plus SP_TAG13/14 cleanup 2021-12-30 09:57:39 +01:00
Christoph Oelckers
9aaaadefc3 - SpawnQuake 2021-12-30 09:57:39 +01:00
Christoph Oelckers
2b8b4f3fcc - QuakeViewChange 2021-12-30 09:57:38 +01:00
Christoph Oelckers
7419c2e65b - sp cleanup in sector.cpp 2021-12-30 09:57:38 +01:00
Christoph Oelckers
79a9278ff3 - rename sp-> in sector.cpp 2021-12-30 09:57:38 +01:00
Christoph Oelckers
212f07f7ff - sp cleanup in skull.cpp, sumo.cpp, zilla.cpp, zombie.cpp 2021-12-30 09:57:38 +01:00
Christoph Oelckers
926b4f8ba9 - sp cleanup of ripper.cpp, ripper2.cpp, serp.cpp, skel.cpp. 2021-12-30 09:57:38 +01:00
Christoph Oelckers
639613297d - globally replaced sp-> in several files.
No further cleanup yet.
2021-12-30 09:57:38 +01:00
Christoph Oelckers
dc7fecccd0 - globally replaced sp-> in spike.cpp 2021-12-30 09:57:37 +01:00
Christoph Oelckers
f58d4e2604 - globally replaced sp-> in skull.cpp 2021-12-30 09:57:37 +01:00
Christoph Oelckers
0d0d5366b1 - globally replaced sp-> in skel.cpp 2021-12-30 09:57:37 +01:00
Christoph Oelckers
bb4c0be15e - globally replaced sp-> in serp.cpp 2021-12-30 09:57:37 +01:00
Christoph Oelckers
f6c32b10d4 - globally replaced sp-> in ripper2.cpp 2021-12-30 09:57:37 +01:00
Christoph Oelckers
67d82f63be - globally replaced sp-> in ripper.cpp 2021-12-30 09:57:37 +01:00
Christoph Oelckers
ce6f6ff5d3 - globally replaced sp-> in _polymost.cpp 2021-12-30 09:57:37 +01:00
Christoph Oelckers
63fc668d57 - don't use auto when making local copies of TObjPtr. 2021-12-30 09:57:36 +01:00
Christoph Oelckers
1b1a81e2bc - sp in ninja.cpp. 2021-12-30 09:57:36 +01:00
Christoph Oelckers
a3b539da28 - sp cleanup in miscactr.cpp. 2021-12-30 09:57:36 +01:00
Christoph Oelckers
5f187a3efb - sp-> replacement in miscactr.cpp. 2021-12-30 09:57:36 +01:00
Christoph Oelckers
1d6b5e621d - sp cleanup in jweapon.cpp. 2021-12-30 09:57:36 +01:00
Christoph Oelckers
b3b6001248 - sp-> replacements in jweapon.cpp 2021-12-30 09:57:36 +01:00
Christoph Oelckers
aeed726b59 - deleted sp assignments in processed files. 2021-12-30 09:57:35 +01:00
Christoph Oelckers
aac44b27b1 - sp cleanup in bunny.cpp. 2021-12-30 09:57:35 +01:00
Christoph Oelckers
1d76336045 - handle bp in break.cpp 2021-12-30 09:57:35 +01:00
Christoph Oelckers
47b51efdc6 - turning TEST_BOOL into overloaded functions. 2021-12-30 09:57:35 +01:00
Christoph Oelckers
5290939cbc - break.cpp sp cleanup.
Also a few needed renamings.
2021-12-30 09:57:35 +01:00
Christoph Oelckers
06d33b8276 - partial conversion of SP_TAG3 to actors. 2021-12-30 09:57:35 +01:00
Christoph Oelckers
627a69570f - turned all SP_TAGx macros into functions so that they can be overloaded with actor variants. 2021-12-30 09:57:34 +01:00
Christoph Oelckers
397d9b0d84 - made SP_TAG2 a function with an actor parameter. 2021-12-30 09:57:34 +01:00
Christoph Oelckers
5be1bc4de7 - made SP_TAG1 a function with an actor parameter. 2021-12-30 09:57:34 +01:00
Christoph Oelckers
40050f5008 - replaced sp-> in several files. 2021-12-30 09:57:34 +01:00
Christoph Oelckers
42a525692d - fixed check on wrong actor in DoChemBomb. 2021-12-30 09:57:34 +01:00
Christoph Oelckers
514c3ffb10 - cameraactor in _polymost.cpp 2021-12-30 09:57:33 +01:00
Christoph Oelckers
4caee272ef - some non 'actor' sp replacements in weapon.cpp. 2021-12-30 09:57:33 +01:00
Christoph Oelckers
76809965ad - some sp replacements as preparation for replacing most of 'actor->s()'. 2021-12-30 09:57:33 +01:00
Christoph Oelckers
ca14c809f9 - cleaned up some random crap with loops and bad variable types I just randomly found. 2021-12-30 09:57:33 +01:00
Christoph Oelckers
7bbd4343a8 - renamed all shadowing variables in Duke. 2021-12-30 09:57:33 +01:00
Christoph Oelckers
032c597fa5 - renamed shadowing variables in Blood. 2021-12-30 09:57:32 +01:00
Mitchell Richters
0bb4ec7c33 - SW: Ensure pp in analyzesprites() is always initiated as the console player. 2021-12-30 09:57:32 +01:00
Mitchell Richters
95d270fbdd - Exhumed: Clean up local functions variables to prevent redefinition conflicts. 2021-12-30 09:57:31 +01:00
Mitchell Richters
c26b5d2303 - SW: Clean up local functions variables to prevent redefinition conflicts. 2021-12-30 09:57:31 +01:00
Mitchell Richters
36fc6ede8e - Blood: Repair actor variable collision in GetZRange() causing all kinds of weirdness. 2021-12-30 09:57:31 +01:00
Mitchell Richters
e15c887f90 - Duke: Fix bad setup in initcrane() following actor sprite pointer cleanups. 2021-12-30 09:57:31 +01:00
Christoph Oelckers
395a269feb - globally replaced ->u()->. 2021-12-30 09:57:30 +01:00
Christoph Oelckers
82b883e461 - SW: replaced u() in ai.cpp. 2021-12-30 09:57:30 +01:00
Christoph Oelckers
b55e46ec6d - ai.cpp cleanup. 2021-12-30 09:57:30 +01:00
Christoph Oelckers
ed8b4100f6 - SW: replace s() in ai.cpp.
Also a bit of inline cleanup to make it compile again.
2021-12-30 09:57:30 +01:00
Christoph Oelckers
8d5bffc280 - SW: some inline cleanup. 2021-12-30 09:57:29 +01:00
Christoph Oelckers
810ab29898 - SW: non 'actor' cases of s() in ai.cpp. 2021-12-30 09:57:29 +01:00
Christoph Oelckers
6c97912220 - SW: replace all u()'s in actor.cpp 2021-12-30 09:57:29 +01:00
Christoph Oelckers
fd78cb57c1 - fixed some bad flag replacements.
0x7fff is not ~CSTAT_SPRITE_BLOCK but ~CSTAT_SPRITE_INVISIBLE.
2021-12-30 09:57:29 +01:00
Christoph Oelckers
c9628e2034 - partial cleanup of SW's macro mess.
Renamed some functions to give them better names and converted more macros into functions or constants
2021-12-30 09:57:28 +01:00
Christoph Oelckers
394f06baa0 - SW: converted 1/3 of the #defines in names2.h into enums. 2021-12-30 09:57:28 +01:00
Christoph Oelckers
92f2182e6e - SW: all s() in actor.cpp 2021-12-30 09:57:28 +01:00
Christoph Oelckers
2718b3a5e3 - remaining s() in Exhumed 2021-12-30 09:57:28 +01:00
Christoph Oelckers
d4c01ce957 - remaining s() in queen.cpp. 2021-12-30 09:57:28 +01:00
Christoph Oelckers
4610fc6e99 - remaining s() in player.cpp. 2021-12-30 09:57:27 +01:00
Christoph Oelckers
d40da386a4 - remaining s() in object.cpp. 2021-12-30 09:57:27 +01:00
Christoph Oelckers
301350ef8c - remaining s() in move.cpp 2021-12-30 09:57:27 +01:00
Christoph Oelckers
7eaf669295 - remaining s() in bullet.cpp, grenade.cpp and gun.cpp. 2021-12-30 09:57:27 +01:00
Christoph Oelckers
cd6bb5305e - second batch of Exhumed's s(). 2021-12-30 09:57:27 +01:00
Christoph Oelckers
6f0e7e3784 - Exhumed: batch of several s(). 2021-12-30 09:57:27 +01:00
Christoph Oelckers
56bd9e7e27 - Exhumed: pActor->s() in spider.cpp 2021-12-30 09:57:26 +01:00
Christoph Oelckers
05d2b90418 - Exhumed: pActor->s() in anubis.cpp 2021-12-30 09:57:26 +01:00
Christoph Oelckers
046ff607dc - Exhumed: pActor->s() in wasp.cpp 2021-12-30 09:57:26 +01:00
Christoph Oelckers
eda75a38d2 - Exhumed: pActor->s() in snake.cpp 2021-12-30 09:57:26 +01:00
Christoph Oelckers
0fb92e3928 - Exhumed: pActor->s() in set.cpp 2021-12-30 09:57:26 +01:00
Christoph Oelckers
b34a4af15e - Exhumed: pActor->s() in scorp.cpp 2021-12-30 09:57:26 +01:00
Christoph Oelckers
013cf05042 - Exhumed: pActor->s() in runlist.cpp 2021-12-30 09:57:26 +01:00
Christoph Oelckers
318678b5a1 - Exhumed: pActor->s() in roach.cpp 2021-12-30 09:57:25 +01:00
Christoph Oelckers
a6c592b12c - Exhumed: pActor->s() in rex.cpp 2021-12-30 09:57:25 +01:00
Christoph Oelckers
b02feec2e8 - Exhumed: pActor->s() in rat.cpp 2021-12-30 09:57:25 +01:00
Christoph Oelckers
430a0263d5 - Exhumed: pActor->s() in ra.cpp 2021-12-30 09:57:25 +01:00
Christoph Oelckers
d162c36113 - Exhumed: pActor->s() in queen.cpp 2021-12-30 09:57:25 +01:00
Christoph Oelckers
b641da3959 - Exhumed: pActor->s() in player.cpp and view.cpp. 2021-12-30 09:57:25 +01:00
Christoph Oelckers
b6d04ffec0 - Exhumed: pActor->s() in object.cpp 2021-12-30 09:57:24 +01:00
Christoph Oelckers
dca478d284 - Exhumed: pActor->s() in mummy.cpp 2021-12-30 09:57:24 +01:00
Christoph Oelckers
23f274120c - Exhumed: pActor->s() in move.cpp 2021-12-30 09:57:24 +01:00
Christoph Oelckers
ca88e241e1 - Exhumed: pActor->s() in lion.cpp 2021-12-30 09:57:24 +01:00
Christoph Oelckers
5700b8ade6 - Exhumed: pActor->s() in lavadude.cpp 2021-12-30 09:57:24 +01:00
Christoph Oelckers
33918ac554 - Exhumed: pActor->s() in items.cpp 2021-12-30 09:57:24 +01:00
Christoph Oelckers
1d01a6cff7 - Exhumed: pActor->s() in init.cpp + lighting.cpp 2021-12-30 09:57:24 +01:00
Christoph Oelckers
613dd67578 - Exhumed: pActor->s() in grenade.cpp 2021-12-30 09:57:23 +01:00
Christoph Oelckers
79e6412ad5 - Exhumed: pActor->s() in fish.cpp 2021-12-30 09:57:23 +01:00
Christoph Oelckers
a7cebcafbb - Exhumed: pActor->s() in bullet.cpp 2021-12-30 09:57:23 +01:00
Christoph Oelckers
03759ef73b - Exhumed: pActor->s() in bubbles.cpp 2021-12-30 09:57:23 +01:00
Christoph Oelckers
89a1fcdfac - Exhumed: pActor->s() in anims.cpp 2021-12-30 09:57:23 +01:00
Christoph Oelckers
1bb7f3764d - handle all s() cases in Exhumed using pSprite but not pActor->s(). 2021-12-30 09:57:23 +01:00
Christoph Oelckers
3adbed4826 - t[] replacement in spawn code. 2021-12-30 09:57:22 +01:00
Christoph Oelckers
9b932b2d91 - t[] replacement in actors_d.cpp and actors_r.cpp. 2021-12-30 09:57:22 +01:00
Christoph Oelckers
8c35224fe1 - Duke: removed all t-pointers to temp_data in actors.cpp. 2021-12-30 09:57:22 +01:00
Christoph Oelckers
bd47f56a5c - x() is gone entirely. 2021-12-30 09:57:22 +01:00
Christoph Oelckers
e940fe1931 - the rest of nnexts.cpp 2021-12-30 09:57:22 +01:00
Christoph Oelckers
4177c31deb - next batch of nnexts.cpp 2021-12-30 09:57:22 +01:00
Christoph Oelckers
d3e4f591f2 - third x() batch in nnexts.cpp. 2021-12-30 09:57:21 +01:00
Christoph Oelckers
60382d9992 - all pXCond's. 2021-12-30 09:57:21 +01:00
Christoph Oelckers
fd234984f5 - first batch of x() in nnexts.cpp. 2021-12-30 09:57:21 +01:00
Christoph Oelckers
a291364606 - the big 'pXSprite = &actor->x()' replacement. 2021-12-30 09:57:21 +01:00
Christoph Oelckers
8d8e0550df - got rid of PLAYER::pXSprite.
Now the player references its actor through ONE pointer only.
2021-12-30 09:57:21 +01:00
Christoph Oelckers
b848a9c980 - some more. 2021-12-30 09:57:21 +01:00
Christoph Oelckers
0d5ea0f314 - handle most of PLAYER::pXSprite 2021-12-30 09:57:20 +01:00
Christoph Oelckers
aa3b930a4d - several x()'s in nnexts.cpp. 2021-12-30 09:57:20 +01:00
Christoph Oelckers
812a4ccd7b - handle sourceactor->x() in nnexts.cpp.
Almost exclusively done with search & replace.
2021-12-30 09:57:20 +01:00
Christoph Oelckers
5699488bea - get rid of spritetype in inactive code. (Search noise removal) 2021-12-30 09:57:20 +01:00
Christoph Oelckers
2254dacdf1 - forgot to save the last change. 2021-12-30 09:57:20 +01:00
Christoph Oelckers
5ad43256cc - the final s()'s in Blood. 2021-12-30 09:57:20 +01:00
Christoph Oelckers
582b83601d - targets in weapon.cpp, plus removal of the now redundant spritetype variants of IsTargetTeammate. 2021-12-30 09:57:19 +01:00
Christoph Oelckers
bf25428225 - upper/lower in CheckLink. 2021-12-30 09:57:19 +01:00
Christoph Oelckers
c67c6ed3da - the rest of triggers.cpp. 2021-12-30 09:57:19 +01:00
Christoph Oelckers
06d8db1470 - deal with the markers in triggers.cpp. 2021-12-30 09:57:19 +01:00
Christoph Oelckers
8d66c8468d - the remaining s()'s of nnexts.cpp. 2021-12-30 09:57:19 +01:00
Christoph Oelckers
46320aabac - third batch of nnexts.cpp. 2021-12-30 09:57:19 +01:00
Christoph Oelckers
b8bee4dfe5 - upper/lower stuff in nnexts.cpp. 2021-12-30 09:57:18 +01:00
Christoph Oelckers
929fd7be99 - another block in nnexts.cpp. 2021-12-30 09:57:18 +01:00
Christoph Oelckers
e460d90f37 - several s() in nnexts.cpp. 2021-12-30 09:57:18 +01:00
Christoph Oelckers
c4c6c1def1 - fix GCC warning. 2021-12-30 09:57:18 +01:00
Christoph Oelckers
6766a5922a - pass actors to calcChaseCamPos. 2021-12-30 09:57:18 +01:00
Christoph Oelckers
87894a5640 - deleted PLAYER::pSprite. 2021-12-30 09:57:18 +01:00
Christoph Oelckers
648537a96b - deal with most of PLAYER::pSprite. 2021-12-30 09:57:17 +01:00
Christoph Oelckers
f59af2cc2d - deal with most of PLAYER::pSprite in weapon.cpp. 2021-12-30 09:57:17 +01:00
Christoph Oelckers
b7ee813712 - global search & replace for many uses of PLAYER's pSprite pointer. 2021-12-30 09:57:17 +01:00
Christoph Oelckers
8dac94326a - s() stuff in player.cpp and gib.cpp 2021-12-30 09:57:17 +01:00
Christoph Oelckers
0a1184b388 - the last one in gameutil.cpp. 2021-12-30 09:57:17 +01:00
Christoph Oelckers
2f9848a459 - deal with pSource in nnexts.cpp. 2021-12-30 09:57:17 +01:00
Christoph Oelckers
5623832b17 - deleted the pSprite definitions from last commit. 2021-12-30 09:57:16 +01:00
Christoph Oelckers
6b8ec17017 - the ultimate 'replace pSprite-> with actor->spr. commit.
This takes care of the majority of s() uses in Blood with a single search&replace action after ensuring that pSprite never gets used for other things.
(There were two small functions in nnexts.cpp left that still did.)
2021-12-30 09:57:16 +01:00
Christoph Oelckers
1f11eb24dd - use actor pointers in preload.cpp 2021-12-30 09:57:16 +01:00
Christoph Oelckers
d8134c3fe8 - handle a few pSprite assignments which are not &actor->s(). 2021-12-30 09:57:16 +01:00
Christoph Oelckers
91214b5350 - xsprite in animatesprite.cpp. 2021-12-30 09:57:16 +01:00
Christoph Oelckers
773d7d118f - pXSprite in callback.cpp 2021-12-30 09:57:16 +01:00
Christoph Oelckers
a0b6873446 - handle s() in callback.cpp. 2021-12-30 09:57:15 +01:00
Christoph Oelckers
a1f6b363fb - asound.cpp, blood.cpp, db.cpp and parts of callback.cpp 2021-12-30 09:57:15 +01:00
Christoph Oelckers
ed0c27b240 - Duke: deleted unused spritetype* variants of badguy() and bossguy() 2021-12-30 09:57:15 +01:00
Christoph Oelckers
09634c4993 - use actors instead of sprites in the new renderer's API. 2021-12-30 09:57:15 +01:00
Christoph Oelckers
1f57322d56 - the last one in aiunicult.cpp which the search did not show. 2021-12-30 09:57:14 +01:00
Christoph Oelckers
627318c39b - handle pXSprite in aiunicult.cpp 2021-12-30 09:57:14 +01:00
Christoph Oelckers
be9d71ca6b - non-pXSprite x()'s in aiunicult.cpp. 2021-12-30 09:57:14 +01:00
Christoph Oelckers
49c43297cd - pXSprite in AI... code. 2021-12-30 09:57:14 +01:00
Christoph Oelckers
f678e55daa - pSprite in aiunicult.cpp. 2021-12-30 09:57:14 +01:00
Christoph Oelckers
ff0b8ac5a9 - handle the hitactor parts missed in the last commit. 2021-12-30 09:57:13 +01:00
Christoph Oelckers
b1bd8f3eef - non-pSprite occurences of s() in aiunicult.cpp. 2021-12-30 09:57:13 +01:00
Mitchell Richters
c01fab8c6c - Fix compilation. 2021-12-30 09:57:13 +01:00
Christoph Oelckers
d0143db8fe - got rid of sx() and sm() inlines. 2021-12-30 09:57:13 +01:00
Christoph Oelckers
f67e39450e - deal with a handful of s() uses that do not match the more common patterns. 2021-12-30 09:57:13 +01:00
Christoph Oelckers
723e22743e - handle all x() calls in AI code. 2021-12-30 09:57:12 +01:00
Christoph Oelckers
389933fe3a - missed two... 2021-12-30 09:57:12 +01:00
Christoph Oelckers
1ebdb81e13 - deleted the actor->s() calls in AI code. 2021-12-30 09:57:12 +01:00
Christoph Oelckers
e123e61f99 - quick replace of 'pSprite->' with 'actor->spr.' in AI files. 2021-12-30 09:57:12 +01:00
Christoph Oelckers
612167cbf1 - handle all non- "pSprite = actor->s();" calls of s() in Blood AI code. 2021-12-30 09:57:12 +01:00
Christoph Oelckers
bff3bbea73 - handle all target sprites in AI code. 2021-12-30 09:57:12 +01:00
Christoph Oelckers
18c32d8fe9 - eliminated all x() in ai.cpp. 2021-12-30 09:57:11 +01:00
Christoph Oelckers
9e6943ec83 - eliminated all s() in ai.cpp. 2021-12-30 09:57:11 +01:00
Christoph Oelckers
41e003c831 - the remaining x() in actor.cpp. 2021-12-30 09:57:11 +01:00
Christoph Oelckers
bc42978295 - x() in actor.cpp callbacks. 2021-12-30 09:57:11 +01:00
Christoph Oelckers
bd07313017 - almost the last x() in actor.cpp. 2021-12-30 09:57:11 +01:00
Christoph Oelckers
692a269d92 - still more x() in actor.cpp. 2021-12-30 09:57:11 +01:00
Christoph Oelckers
3f65aee70b - even more x() in actor.cpp. 2021-12-30 09:57:10 +01:00
Christoph Oelckers
3201f85ab9 - yet more x() in actor.cpp. 2021-12-30 09:57:10 +01:00
Christoph Oelckers
a1b2d4a21e - more x() in actor.cpp. 2021-12-30 09:57:10 +01:00
Christoph Oelckers
ffeb52198a - lots of ->x() calls removed in actor.cpp. 2021-12-30 09:57:10 +01:00
Christoph Oelckers
6e0128eb4c - handle the remaining uses of s() in actor.cpp 2021-12-30 09:57:10 +01:00
Christoph Oelckers
b91fe45fc3 - handled all pSprite-> in actor.cpp. 2021-12-30 09:57:10 +01:00
Christoph Oelckers
27e9894ece - handled all parts of actor.cpp which are not "pSprite = &actor->s();" 2021-12-30 09:57:10 +01:00
Christoph Oelckers
88c77ec71a - some pSprite2's plus CheckSector. 2021-12-30 09:57:09 +01:00
Christoph Oelckers
fbb8f1ee70 - pSprite replacements in blood/src/actor.cpp 2021-12-30 09:57:09 +01:00
Christoph Oelckers
a87948677a - globally replaced ->x(). with ->xspr. 2021-12-30 09:57:09 +01:00
Christoph Oelckers
a2fc415b30 - fixed Exhumed panning setup.
Converted it to floating point and removed the nonsensical & with the texture size that was clearing significant bits.
2021-12-30 09:57:09 +01:00
Mitchell Richters
6423684bfb - SW: Replace PLAYERstruct oposz with opos.Z calls. 2021-12-30 09:57:09 +01:00
Mitchell Richters
a2f2cc489a - SW: Replace PLAYERstruct oposy with opos.Y calls. 2021-12-30 09:57:08 +01:00
Mitchell Richters
ae50767c70 - SW: Replace PLAYERstruct oposx with opos.X calls. 2021-12-30 09:57:08 +01:00
Mitchell Richters
05a4ad4729 - SW: Replace PLAYERstruct posz with pos.Z calls and eliminate PLAYERstruct pos union. 2021-12-30 09:57:08 +01:00
Mitchell Richters
ae3369d2a3 - SW: Replace PLAYERstruct posy with pos.Y calls. 2021-12-30 09:57:08 +01:00
Mitchell Richters
3a0ee322ae - SW: Replace PLAYERstruct posx with pos.X calls. 2021-12-30 09:57:07 +01:00
Mitchell Richters
3adf81e4f9 - Duke: Replace player_struct oposz with opos.Z calls. 2021-12-30 09:57:07 +01:00
Mitchell Richters
111aa16e64 - Duke: Replace player_struct oposy with opos.Y calls. 2021-12-30 09:57:07 +01:00
Mitchell Richters
0e897c29b0 - Duke: Replace player_struct oposx with opos.X calls. 2021-12-30 09:57:07 +01:00
Mitchell Richters
dd0ff465b0 - Replace spritetypebase oz with opos.Z calls and eliminate spritetypebase opos union. 2021-12-30 09:57:07 +01:00
Mitchell Richters
a79b4b5ffc - Replace spritetypebase oy with opos.Y calls. 2021-12-30 09:57:06 +01:00
Mitchell Richters
e0fb92bb01 - Replace spritetypebase ox with opos.X calls. 2021-12-30 09:57:06 +01:00
Mitchell Richters
baf78848eb - Replace spritetypebase z with pos.Z calls and eliminate spritetypebase pos union. 2021-12-30 09:57:06 +01:00
Mitchell Richters
cecb8dc48e - Replace spritetypebase y with pos.Y calls. 2021-12-30 09:57:05 +01:00
Mitchell Richters
33ca55023f - Replace spritetypebase x with pos.X calls. 2021-12-30 09:57:05 +01:00
Mitchell Richters
09e00a69fe - Replace walltype y with pos.Y calls and eliminate walltype pos union. 2021-12-30 09:57:04 +01:00
Mitchell Richters
51b647da87 - Replace walltype x with pos.X calls. 2021-12-30 09:57:04 +01:00
Mitchell Richters
b2ab64bb62 - Capitalise vec3_t z variable. 2021-12-30 09:57:03 +01:00
Mitchell Richters
68e2691be7 - Capitalise vec3_t y variable. 2021-12-30 09:57:03 +01:00
Mitchell Richters
c549cc5276 - Capitalise vec3_t x variable. 2021-12-30 09:57:02 +01:00
Mitchell Richters
118ceb18ca - Capitalise vec2_t y variable. 2021-12-30 09:57:02 +01:00
Mitchell Richters
3c9cd926ba - Capitalise vec2_t x variable. 2021-12-30 09:57:02 +01:00
Christoph Oelckers
e0e6efe0a0 - Exhumed: fixed some sound source issues. 2021-12-30 09:57:01 +01:00
Christoph Oelckers
3221ecf800 - refactored xsprite use in aibat.cpp. 2021-12-30 09:57:01 +01:00
Christoph Oelckers
6f9484a9ee - fixed compilation on GCC.
error: operands to ?: have different types ‘std::nullptr_t’ and ‘TObjPtr<Duke3d::DDukeActor*>’
2021-12-30 09:57:01 +01:00
Christoph Oelckers
33a00869d8 - shortened the name of DBloodActor::xsprite to xspr. 2021-12-30 09:57:01 +01:00
Christoph Oelckers
f8171ac5d9 - eliminate pSprite pointers in aibat.cpp. 2021-12-30 09:57:01 +01:00
Christoph Oelckers
d9d05e90b5 - globally replaced all occurences of '->s().' with '->spr.' 2021-12-30 09:57:00 +01:00
Christoph Oelckers
1240818122 - getting rid of DDukeActor::s, final part. 2021-12-30 09:57:00 +01:00
Christoph Oelckers
f216857f55 - Getting rid of DDukeActor::s, part 1. 2021-12-30 09:57:00 +01:00
Christoph Oelckers
99507ed048 - spawn_d.cpp 2021-12-30 09:57:00 +01:00
Christoph Oelckers
df2fc596f9 - spawn.cpp 2021-12-30 09:56:59 +01:00
Christoph Oelckers
45a2b9766e - sectors_r.cpp 2021-12-30 09:56:59 +01:00
Christoph Oelckers
d532c496f1 - sectors_d.cpp 2021-12-30 09:56:59 +01:00
Christoph Oelckers
f816f2fb22 - ->s in non-gameplay files. 2021-12-30 09:56:59 +01:00
Christoph Oelckers
edf3fd0f82 - premap_r.cpp + dependencies. 2021-12-30 09:56:59 +01:00
Christoph Oelckers
1f40dfa411 - premap.cpp + premap_d.cpp 2021-12-30 09:56:59 +01:00
Christoph Oelckers
e76e28cdea - the rest of player_r.cpp 2021-12-30 09:56:58 +01:00
Christoph Oelckers
0768c9e8b6 - non 'actor' parts of player_r.cpp 2021-12-30 09:56:58 +01:00
Christoph Oelckers
de22c8ca26 - 's->' in player_d.cpp 2021-12-30 09:56:58 +01:00
Christoph Oelckers
6b675cc849 - non 'actor' parts of player_d.cpp 2021-12-30 09:56:58 +01:00
Christoph Oelckers
b55e04d455 - game_misc.cpp + gameexec.cpp. 2021-12-30 09:56:58 +01:00
Christoph Oelckers
a982c7e590 - player.cpp + noise.cpp. 2021-12-30 09:56:58 +01:00
Christoph Oelckers
c0ea208ba3 - animatesprites_d.cpp and animatesprites_r.cpp. 2021-12-30 09:56:57 +01:00
Christoph Oelckers
9eb7c536ab - the rest of actors_r.cpp 2021-12-30 09:56:57 +01:00
Christoph Oelckers
7d5cf6e631 - first third of actors_r.cpp 2021-12-30 09:56:57 +01:00
Christoph Oelckers
8ff53eae7d - second half of actors_d.cpp 2021-12-30 09:56:57 +01:00
Christoph Oelckers
f1e608685e - more parts of actor_d.cpp 2021-12-30 09:56:57 +01:00
Christoph Oelckers
b7a4c484e9 - large block of s = actor->s; in actors_d.cpp 2021-12-30 09:56:57 +01:00
Christoph Oelckers
44895411b9 - a large block of 'act->s' in actors_r.cpp. 2021-12-30 09:56:56 +01:00
Christoph Oelckers
8dcc128697 - deal with 'spri = actor->s;' 2021-12-30 09:56:56 +01:00
Christoph Oelckers
0df97f00ec - the remaining 's's in actor.cpp. 2021-12-30 09:56:56 +01:00
Christoph Oelckers
f5151e31a5 - globally replaced all 's->' with 'actor->spr.' in duke/src/actors.cpp. 2021-12-30 09:56:56 +01:00
Christoph Oelckers
55cb5aaac6 - global search & replace of ->s-> with ->spr.
This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-30 09:56:56 +01:00
Christoph Oelckers
0284ec1cb0 - replacement of DDukeActor::s and pointers to DCoreActor::spr, part 3. 2021-12-30 09:56:56 +01:00
Christoph Oelckers
0f7024e70e - replacement of DDukeActor::s and pointers to DCoreActor::spr, part 2. 2021-12-30 09:56:55 +01:00
Christoph Oelckers
997c12f67a - replacement of DDukeActor::s and pointers to DCoreActor::spr. 2021-12-30 09:56:55 +01:00
Christoph Oelckers
c16b090fbe - Exhumed: clear lasthitsect when starting a new level. 2021-12-30 09:56:55 +01:00
Christoph Oelckers
e42c3afbea - Exhumed: fixed trap setup.
Must clear the structure before the first return and iterate over the walls by reference, otherwise bad pointers will get copied.
2021-12-30 09:56:55 +01:00
Christoph Oelckers
6fd4d6d550 - ported slope sorite support from NBlood.
For Polymost only so far.
2021-12-30 09:56:54 +01:00
Christoph Oelckers
156369ac8a - Blood: don't crash when cultists accidentally target themselves. 2021-12-30 09:56:54 +01:00
Christoph Oelckers
785c7d4ceb - removed numsectors and numwalls entirely.
With Blood's Polymost mirror hack the risk of getting out of sync with the arrays was a genuine issue, so now only the array size counts.
2021-12-30 09:56:54 +01:00
Christoph Oelckers
df0c577cf4 - replaced most of numsectors, too. 2021-12-30 09:56:54 +01:00
Christoph Oelckers
f1c0298825 - replaced numwalls with wall.Size in several places. 2021-12-30 09:56:54 +01:00
Christoph Oelckers
65bc6e6aef - 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-30 09:56:53 +01:00
Christoph Oelckers
4904466fd6 - SW: forgot to enable the extended sector parts in CallbackSOsink.
That bit had somehow gone MiA.
2021-12-30 09:56:53 +01:00
Christoph Oelckers
b021aa9a02 - SW: don't try to render non-existent mirrors with Polymost.
We got a counter variable, WTF did this code not use it?
2021-12-30 09:56:53 +01:00
Christoph Oelckers
68c87db6ec - SW: fixed crash in Polymost with badly set up cameras. 2021-12-30 09:56:52 +01:00
Mitchell Richters
1e63c8305b - Fix build issues under GCC. 2021-12-30 09:56:51 +01:00
Christoph Oelckers
986fccfddc - use symbolic constants for all places where globalorientation is checked for the alignment bits. 2021-12-30 09:56:51 +01:00
Christoph Oelckers
5ff36f491e - fixed the remaining places where the compiler complained about cstat. 2021-12-30 09:56:51 +01:00
Christoph Oelckers
8b427e35c2 - stuff that needs FromInt 2021-12-30 09:56:51 +01:00
Christoph Oelckers
955996dddc - the rest of Blood's flags, part II 2021-12-30 09:56:50 +01:00
Christoph Oelckers
13186cec6d - the rest of Blood's flags. 2021-12-30 09:56:50 +01:00
Christoph Oelckers
092cb1e5a3 - second set of Blood flags. 2021-12-30 09:56:50 +01:00
Christoph Oelckers
3bc337264a - flags in blood's actor.cpp
plus a few others caught by search&replace.
2021-12-30 09:56:50 +01:00
Christoph Oelckers
8039d81467 - the remaining Exhumed flags. 2021-12-30 09:56:50 +01:00
Christoph Oelckers
988a91904a - a large of Exhumed flags, most search& replace plus a few local variable types. 2021-12-30 09:56:49 +01:00
Christoph Oelckers
2d648924e8 - the final Duke flags. 2021-12-30 09:56:49 +01:00
Christoph Oelckers
e02f4d8fd1 - randomFlip stuff.
To avoid casting from int to flags.
2021-12-30 09:56:49 +01:00
Christoph Oelckers
8f0f0e8816 - manual sprite flag replacements in Duke. 2021-12-30 09:56:49 +01:00
Christoph Oelckers
8e0b9f7ce6 - some automatic, some manual sprite flag replacements 2021-12-30 09:56:49 +01:00
Christoph Oelckers
ace01d02bc - alignment flags and a few leftovers. 2021-12-30 09:56:48 +01:00
Christoph Oelckers
82fb03e399 - another batch of search&replace, with smaller results. 2021-12-30 09:56:48 +01:00
Christoph Oelckers
c5ae454207 - another big batch of automatic replacements. 2021-12-30 09:56:48 +01:00
Christoph Oelckers
5b65e214e0 - global search & replace of the more frequent sprite flag patterns. 2021-12-30 09:56:48 +01:00
Christoph Oelckers
8f012d1beb - made wall flags type safe 2021-12-30 09:56:47 +01:00
Christoph Oelckers
8fab2e1020 - fix bad flag management in usePropertiesChanger
Not sure if this is 100% correct, but the old code definitely wasn't.
2021-12-30 09:56:47 +01:00
Christoph Oelckers
76e944053b - the (few) numeric flag literals in SW handled.
Virtually all of this was portal hackery.
2021-12-30 09:56:47 +01:00
Christoph Oelckers
d24b8d9ec8 - most wall flags in Blood. 2021-12-30 09:56:47 +01:00
Christoph Oelckers
1883aad7c2 - flag names in SetupGibWallState and TranslateSector 2021-12-30 09:56:47 +01:00
Christoph Oelckers
adbf5177a7 - flag combo stuff. 2021-12-30 09:56:46 +01:00
Christoph Oelckers
b263c3ac6b - wall and sprite flags in Duke, just simple cases. 2021-12-30 09:56:46 +01:00
Christoph Oelckers
6e32832428 - made sector ceiling/floor flags type safe.
- made sector flags type safe.
2021-12-30 09:56:46 +01:00
Christoph Oelckers
b0e3c6b5ec - some remaining sector flag stuff 2021-12-30 09:56:45 +01:00
Christoph Oelckers
d0a06ae961 - deal with most of CSTAT_SECTOR_SKY and CSTAT_SECTOR_SLOPE 2021-12-30 09:56:45 +01:00
Christoph Oelckers
98f0886b3d -Duke/RR: Automatic replacement for CSTAT_SPRITE_INVISIBLE and CSTAT_SPRITE_BLOCK_ALL 2021-12-30 09:56:45 +01:00
Christoph Oelckers
8d0013128e - Exhumed: use symbolic constant CSTAT_SPRITE_INVISIBLE 2021-12-30 09:56:45 +01:00
Christoph Oelckers
1edccf1423 - added slope setter methods to sectortype.
To make sure that setting the slope flags is always done properly. (Why are the flags even needed?)
As a nice side effect, this, plus use of other inlines made the align*slope functions implode into virtually nothing.
2021-12-30 09:53:56 +01:00
Christoph Oelckers
11f41a97d5 - made gotpic a FixedBitArray.
gets rid of some inline garbage.
2021-12-30 09:53:56 +01:00
Christoph Oelckers
5f18109371 - consolidated all getslope code into a single function.
This also caches a wall's length to avoid taking the square root every single time for a slope calculation.
2021-12-30 09:53:55 +01:00
Christoph Oelckers
bea394a734 - replace SW specific sector flags with the global ones. 2021-12-30 09:53:55 +01:00
Christoph Oelckers
dddf48fd3e - cleaned up and renamed buildtypes.h.
Content was reordered so that the file can contain the inlines belonging to the map data types that previously had to be stored elsewhere.
Also moved out of the Build folder because virtually everything in here can be traced to content available in Duke Nukem 3D's and Shadow Warrior's source releases.
2021-12-30 09:53:46 +01:00
Christoph Oelckers
4a5de6f56e - make sure that all changes of wall coordinates invalidate associated data.
walltype::move should be the preferred function to be used for this, otherwise walltype::moved needs to be called.
2021-12-30 09:53:11 +01:00
Mitchell Richters
95d60deecd - Rename remaining hw_sections*.* files to hw_sections.*. 2021-12-30 09:53:11 +01:00
Christoph Oelckers
46d7487a3b - SW: clear all pointer variables the player may still hold when terminating a level. 2021-12-30 09:53:10 +01:00
Christoph Oelckers
34bee8116c - SW: fixed uninitialized variable in FAFhitscan 2021-12-30 09:53:10 +01:00
Christoph Oelckers
d1f088a858 - SW/Exhumed fixed sound relinking on actor destruction.
This still passed the sprites instead of the actors. Moved the relinking code to DCoreActor::Destroy because it is the same for all games.
Also did a little bit of sound cleanup to ensure the sound backend does not hold stale actor pointers.
2021-12-30 09:53:10 +01:00
Christoph Oelckers
fc41a2bd85 - renamed sections2 and sections2PerSector.
No more need for a '2'.
2021-12-30 09:53:10 +01:00
Christoph Oelckers
f6d852b5a0 - removed the old section builder 2021-12-30 09:53:09 +01:00
Christoph Oelckers
bb9313454d - removed SectorGeometry class. 2021-12-30 09:53:09 +01:00
Christoph Oelckers
4364e68d05 - automap work to transition to new sections. 2021-12-30 09:53:08 +01:00
Christoph Oelckers
a733de618f - new section WIP. 2021-12-30 09:53:06 +01:00
Christoph Oelckers
6db1ba47c2 - SW: fixed some savegame issues:
* the saveable tables were initialized too late when reading in the actors.
* the abort messages for the saveables did not show. We need to use I_FatalError here, plus some actor list modifications to make this work.
2021-12-26 23:10:07 +01:00
Christoph Oelckers
ae622274bd - SW: clear pointer holding variables in TerminateLevel.
Some survive the level transition and would point to invalid data.
2021-12-26 23:10:07 +01:00
Christoph Oelckers
a4ff7e5bd4 - SW: added some null checks to the SO interpolation code.
It looks like this was able to access deleted sprites - by only checking for the index this never registered as a problem, but with pointers it does.
2021-12-26 23:10:07 +01:00
Mitchell Richters
4562a0ca97 - SW: Add some nullptr checks to some inlines to prevent noclip crashes. 2021-12-26 23:10:06 +01:00