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
Christoph Oelckers
9e14b168bb
- addressed more shadowed variables in common code.
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
Christoph Oelckers
ca9d73ffee
- renamed some shadowing variables in common code.
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
a611fdb152
- Allow variable redefinition warnings for entire project.
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
a1900253e5
- Fix GCC warning warning: "/*" within comment [-Wcomment]
.
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
0ebd7532b8
- don't use s() in other getters.
2021-12-30 09:57:30 +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
d84556d829
- fixed broken getzrange setup.
...
When adding support for slope sprites an assignment to daz2 got lost.
2021-12-30 09:57:29 +01:00
Christoph Oelckers
3992dfae84
- fixed: When merging clip nodes the redundant one needs to be deleted with RemoveRange.
...
Calling Free is not enough.
2021-12-30 09:57:29 +01:00
Christoph Oelckers
b00f197be3
- fixed: RemoveClipRange did not shorten the range if it had to split it up.
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
40a307650d
- the really final parts of the shared code using s() cleaned up.
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
f602cf3806
- deal with s() in shared code.
...
clip.cpp was left alone, except for the actual call.
2021-12-30 09:57:14 +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