Commit graph

4104 commits

Author SHA1 Message Date
Christoph Oelckers
bfea02a192 - a few in player.cpp 2021-12-30 09:58:05 +01:00
Christoph Oelckers
cc161fe66a - deleted u variables in track.cpp 2021-12-30 09:58:05 +01:00
Christoph Oelckers
c544046fb3 - renamed u-> in track.cpp 2021-12-30 09:58:05 +01:00
Christoph Oelckers
055982f0db - smaller u in track.cpp 2021-12-30 09:58:04 +01:00
Christoph Oelckers
050d93a92c - deleted unused pointers and handled u() in the script interface. 2021-12-30 09:58:04 +01:00
Christoph Oelckers
6df854d612 - replaced one sprite inline with its actor variant. 2021-12-30 09:58:04 +01:00
Christoph Oelckers
4e7724ece2 - deleted all leftover SPRITEp stuff. 2021-12-30 09:58:04 +01:00
Christoph Oelckers
f1c60e4a52 - fixed SpawnFireballFlames and deleted leftover sprite pointers. 2021-12-30 09:58:04 +01:00
Christoph Oelckers
2543a46278 - deleted all u variables from weapon.cpp 2021-12-30 09:58:03 +01:00
Christoph Oelckers
8739ef9182 - renamed all u-> in weapon.cpp 2021-12-30 09:58:03 +01:00
Christoph Oelckers
3e79c917f2 - the last u in weapon.cpp that are not actor->u() 2021-12-30 09:58:03 +01:00
Christoph Oelckers
b522356120 - stuff that was missed. 2021-12-30 09:58:03 +01:00
Christoph Oelckers
85b687ba13 - all eu, which are expActor. 2021-12-30 09:58:03 +01:00
Christoph Oelckers
e16caa0c62 - eu, that are not expActor 2021-12-30 09:58:03 +01:00
Christoph Oelckers
7147d3c89e - several non-u users in weapon.cpp 2021-12-30 09:58:02 +01:00
Christoph Oelckers
9485816cf7 - deleted u variables from sprite.cpp. 2021-12-30 09:58:02 +01:00
Christoph Oelckers
b9a8647d73 - renamed u-> in sprite.cpp 2021-12-30 09:58:02 +01:00
Christoph Oelckers
02d8551330 - non "u = actor" Users in sprite.cpp 2021-12-30 09:58:02 +01:00
Christoph Oelckers
221f1dc69a - handle u-> in slidor.cpp 2021-12-30 09:58:02 +01:00
Christoph Oelckers
9f27e05fef - deleted u variables in sector.cpp 2021-12-30 09:58:02 +01:00
Christoph Oelckers
121ae62108 - renamed u-> in sector.cpp 2021-12-30 09:58:01 +01:00
Christoph Oelckers
65b9841666 - handle u-> in rotator.cpp 2021-12-30 09:58:01 +01:00
Christoph Oelckers
be1d53db56 - deleted u variables in vator.cpp 2021-12-30 09:58:01 +01:00
Christoph Oelckers
ab359844aa - renamed u-> in vator.cpp 2021-12-30 09:58:01 +01:00
Christoph Oelckers
2ef7fc9bc2 - handle u-> in zilla.cpp and zombie.cpp 2021-12-30 09:58:01 +01:00
Christoph Oelckers
936febd505 - deleted u variables in player.cpp 2021-12-30 09:58:01 +01:00
Christoph Oelckers
3e21dd40a7 - renamed u-> in half of player.cpp 2021-12-30 09:58:00 +01:00
Christoph Oelckers
bc15bdf92c - renaming stuff in player.cpp 2021-12-30 09:58:00 +01:00
Christoph Oelckers
b606d01ca8 - u-> in panel.cpp 2021-12-30 09:58:00 +01:00
Christoph Oelckers
d84c4b4f20 - u() in sumo.cpp 2021-12-30 09:58:00 +01:00
Christoph Oelckers
9b18316fd7 - delete u variables in spike.cpp 2021-12-30 09:58:00 +01:00
Christoph Oelckers
d95a22485b - rename u-> in spike.cpp 2021-12-30 09:58:00 +01:00
Christoph Oelckers
9df3400a91 - deleted u variables in skull.cpp 2021-12-30 09:58:00 +01:00
Christoph Oelckers
cbec67dbf5 - renamed u-> in skull.cpp 2021-12-30 09:57:59 +01:00
Christoph Oelckers
1da38cbc8e - u-> in skel.cpp 2021-12-30 09:57:59 +01:00
Christoph Oelckers
4aed4a6965 - u() in serp.cpp 2021-12-30 09:57:59 +01:00
Christoph Oelckers
0274fa5b4b - deleted u variables in ripper2.cpp 2021-12-30 09:57:59 +01:00
Christoph Oelckers
574deb2111 - renamed u-> in ripper2.cpp 2021-12-30 09:57:59 +01:00
Christoph Oelckers
401f1f8dbc - deleted u variables in ripper.cpp. 2021-12-30 09:57:59 +01:00
Christoph Oelckers
4691da132d - renamed u-> in ripper.cpp 2021-12-30 09:57:58 +01:00
Christoph Oelckers
d14907e847 - deleted u variables in ninja.cpp 2021-12-30 09:57:58 +01:00
Christoph Oelckers
8ab8d219b3 - renamed u-> in ninja.cpp 2021-12-30 09:57:58 +01:00
Christoph Oelckers
704a730a45 - non "u = actor" Users in ninja.cpp. 2021-12-30 09:57:58 +01:00
Christoph Oelckers
e8e85c5816 - deleted u variables in miscactr.cpp. 2021-12-30 09:57:58 +01:00
Christoph Oelckers
8ffa12442c - renamed u-> in miscactr.cpp 2021-12-30 09:57:58 +01:00
Christoph Oelckers
a1c5c06e27 - u() in lava.cpp, light.cpp and predict.cpp 2021-12-30 09:57:58 +01:00
Christoph Oelckers
78fa76678d - deleted u variables in jweapon.cpp 2021-12-30 09:57:57 +01:00
Christoph Oelckers
08244a70f3 - renamed u-> in jweapon.cpp 2021-12-30 09:57:57 +01:00
Christoph Oelckers
a023087e2d - handle non u = actor->u() cases in jweapon.cpp. 2021-12-30 09:57:57 +01:00
Christoph Oelckers
f59fa8b13e - deleted all wu variables. 2021-12-30 09:57:57 +01:00
Christoph Oelckers
dc60cd7689 - renamed all wu-> in weapon.cpp. 2021-12-30 09:57:57 +01:00
Christoph Oelckers
521ad37618 - handle wu-> in weapon.cpp which do not reference actorNew. 2021-12-30 09:57:57 +01:00
Christoph Oelckers
6b0e944e7b - deleted wu variables in jweapon.cpp 2021-12-30 09:57:56 +01:00
Christoph Oelckers
7be6bfeb0e - replacing wu-> in jweapon.cpp 2021-12-30 09:57:56 +01:00
Christoph Oelckers
4eb32d5b18 - renaming stuff 2021-12-30 09:57:56 +01:00
Christoph Oelckers
388b3062fd - u() in input.cpp, interpso.cpp and inv.cpp 2021-12-30 09:57:56 +01:00
Christoph Oelckers
41753240dd - deleted u in hornet.cpp 2021-12-30 09:57:56 +01:00
Christoph Oelckers
64598f6167 - renamed u-> in hornet.cpp 2021-12-30 09:57:56 +01:00
Christoph Oelckers
ff09079502 - deleted u in goro.cpp 2021-12-30 09:57:55 +01:00
Christoph Oelckers
89c9031486 - renamed u-> in goro.cpp 2021-12-30 09:57:55 +01:00
Christoph Oelckers
43e370f079 - deleted u in girlninj.cpp 2021-12-30 09:57:55 +01:00
Christoph Oelckers
dc5821d7c6 - renamed u-> in girlninj.cpp 2021-12-30 09:57:55 +01:00
Christoph Oelckers
a72732a7b1 - handle USERSAVE. 2021-12-30 09:57:55 +01:00
Christoph Oelckers
afe93f89af - deleted u in eel.cpp. 2021-12-30 09:57:55 +01:00
Christoph Oelckers
3908d4b1c6 - renamed u-> in eel.cpp. 2021-12-30 09:57:55 +01:00
Christoph Oelckers
5f281dfc29 - user() in draw.cpp. 2021-12-30 09:57:54 +01:00
Christoph Oelckers
42aa99d7f6 - deleted u in coolie.cpp. 2021-12-30 09:57:54 +01:00
Christoph Oelckers
9c68d14c74 - renamed u-> in coolie.cpp 2021-12-30 09:57:54 +01:00
Christoph Oelckers
fa59f90f92 - removed u variables in coolg.cpp 2021-12-30 09:57:54 +01:00
Christoph Oelckers
2458893528 - u-> in cheats.cpp and coolg.cpp 2021-12-30 09:57:54 +01:00
Christoph Oelckers
29d161dd67 - removed u variables in bunny.cpp 2021-12-30 09:57:54 +01:00
Christoph Oelckers
87100b1f50 renamed u-> in break.cpp and bunny.cpp 2021-12-30 09:57:53 +01:00
Christoph Oelckers
6597827458 - deleted all hu variables. 2021-12-30 09:57:53 +01:00
Christoph Oelckers
8fe11bd848 - replaced hu-> 2021-12-30 09:57:53 +01:00
Christoph Oelckers
91a355a82e - handle all hu = itActor.u(); 2021-12-30 09:57:53 +01:00
Christoph Oelckers
86704b264e - deleted nu variables. 2021-12-30 09:57:53 +01:00
Christoph Oelckers
d096eda3a9 - renamed all nu-> in weapon.cpp. 2021-12-30 09:57:52 +01:00
Christoph Oelckers
13e14553eb - renamed all nu-> outside weapon.cpp. 2021-12-30 09:57:52 +01:00
Christoph Oelckers
38224f05b7 - all nu not referring to actorNew->u() 2021-12-30 09:57:52 +01:00
Christoph Oelckers
b49e3201ae - several uses of tu and bu - almost all very minor stuff. 2021-12-30 09:57:52 +01:00
Christoph Oelckers
1ec6743f20 - replaced tu in bunny.cpp and draw.cpp 2021-12-30 09:57:52 +01:00
Christoph Oelckers
6dcc8761fe - replaced the last remaining s() calls in Blood's interface and deleted the method. 2021-12-30 09:57:51 +01:00
Christoph Oelckers
4dad58e557 - the final s() in SW. 2021-12-30 09:57:51 +01:00
Christoph Oelckers
6729dbd684 - almost done with s(). 2021-12-30 09:57:51 +01:00
Christoph Oelckers
11a59055a4 - 15 more s() from weapon.cpp. 2021-12-30 09:57:51 +01:00
Christoph Oelckers
f02c402036 - 12 more from weapon.cpp 2021-12-30 09:57:51 +01:00
Christoph Oelckers
bd3aaea3b2 - big macro mess cleanup. 2021-12-30 09:57:51 +01:00
Christoph Oelckers
297921204f - rename STD_RANDOM_RANGE 2021-12-30 09:57:50 +01:00
Christoph Oelckers
d957540258 - targeting stuff in weapon.cpp 2021-12-30 09:57:50 +01:00
Christoph Oelckers
85a814d379 - all of track.cpp and vis.cpp 2021-12-30 09:57:50 +01:00
Christoph Oelckers
dcb375a3c6 - all of sprite.cpp 2021-12-30 09:57:50 +01:00
Christoph Oelckers
b7c4ac55d1 - replaced all remaining sp = &actor->s(). 2021-12-30 09:57:50 +01:00
Christoph Oelckers
5643f9b7f7 - deleted dead sp variables. 2021-12-30 09:57:50 +01:00
Christoph Oelckers
8a2908bc30 - eliminated the remaining SP_* spritetype function variants. 2021-12-30 09:57:49 +01:00
Christoph Oelckers
8ffc87134d - track stuff 2021-12-30 09:57:49 +01:00
Christoph Oelckers
e782cc1c28 - deleted unused spritetype inlines. 2021-12-30 09:57:49 +01:00
Christoph Oelckers
7f07be0d6d - - sector, sound, track, rotator 2021-12-30 09:57:49 +01:00
Christoph Oelckers
d62a65b6e3 - do not use sprite pointers in sound code. 2021-12-30 09:57:49 +01:00
Christoph Oelckers
6df8f8a537 - handle all fsp = &actor->s(); 2021-12-30 09:57:48 +01:00
Christoph Oelckers
822c88c135 - handle all auto psp = &pp->Actor()->s(); 2021-12-30 09:57:48 +01:00
Christoph Oelckers
8b5955d3dd - the remaining s() in player.cpp 2021-12-30 09:57:48 +01:00
Christoph Oelckers
c7b80b80d8 - player warp functions. 2021-12-30 09:57:48 +01:00
Christoph Oelckers
188af0dbb3 - half of what's left of s() in player.cpp 2021-12-30 09:57:48 +01:00
Christoph Oelckers
959147c656 - smaller stuff 2021-12-30 09:57:48 +01:00
Christoph Oelckers
6d7337e41b - the rest of light.cpp 2021-12-30 09:57:47 +01:00
Christoph Oelckers
2aba992d63 - most of lights.cpp, including turning the helper macros into functions. 2021-12-30 09:57:47 +01:00
Christoph Oelckers
eba5d222c0 - the remaining s()'s in jweapon.cpp 2021-12-30 09:57:47 +01:00
Christoph Oelckers
571dccda76 - jsector.cpp 2021-12-30 09:57:47 +01:00
Christoph Oelckers
ce7465869f - vator.cpp cleanup. 2021-12-30 09:57:47 +01:00
Christoph Oelckers
35b4db39d7 - sp-> in vator.cpp 2021-12-30 09:57:47 +01:00
Christoph Oelckers
77308356ed - sprite.cpp 2021-12-30 09:57:47 +01:00
Christoph Oelckers
843239d085 - SpriteSetup and related functions. 2021-12-30 09:57:46 +01:00
Christoph Oelckers
0c48b4b2c2 - over/under stuff in weapon.cpp 2021-12-30 09:57:46 +01:00
Christoph Oelckers
47b4c55a5c - parts of sprite.cpp. 2021-12-30 09:57:46 +01:00
Christoph Oelckers
83a7b3ef1c - parts of jsector.cpp 2021-12-30 09:57:46 +01:00
Christoph Oelckers
967385a87c - rotator.cpp, slidor.cpp and a few single ones elsewhere. 2021-12-30 09:57:46 +01:00
Christoph Oelckers
8e8f59caa1 - refactored GetSpriteZOfMiddle (and all s() close by) 2021-12-30 09:57:45 +01:00
Christoph Oelckers
123e19e355 - the rest of draw.cpp 2021-12-30 09:57:45 +01:00
Christoph Oelckers
9cdf4db648 - the remaining sp-> in draw.cpp 2021-12-30 09:57:45 +01:00
Christoph Oelckers
3b26c634db - parts of draw.cpp. 2021-12-30 09:57:45 +01:00
Christoph Oelckers
c61e4de409 - WarpCopySprite 2021-12-30 09:57:45 +01:00
Christoph Oelckers
dce8531c48 - all sp in player.cpp 2021-12-30 09:57:45 +01:00
Christoph Oelckers
c5af361564 - renamed sp-> in player.cpp. 2021-12-30 09:57:44 +01:00
Christoph Oelckers
f488b9220c - deal with sp in player.cpp that do not use &actor->s() 2021-12-30 09:57:44 +01:00
Christoph Oelckers
ffb97eb261 - all s() from bunny.cpp + copysect.cpp. 2021-12-30 09:57:44 +01:00
Christoph Oelckers
9ad23631f5 - several s(). 2021-12-30 09:57:44 +01:00
Christoph Oelckers
1e938e2b44 - deleted redundant sprite inlines.
All calls have been transitioned to actors.
2021-12-30 09:57:44 +01:00
Christoph Oelckers
8a1c602dc8 - 10 more s(). 2021-12-30 09:57:43 +01:00
Christoph Oelckers
bdf29cf01e - hs = &itActor->s(); 2021-12-30 09:57:43 +01:00
Christoph Oelckers
6ce1f57b5e - deleted all wp variables. 2021-12-30 09:57:43 +01:00
Christoph Oelckers
cc3c477992 - renamed all wp in jweapon.cpp and weapon.cpp 2021-12-30 09:57:43 +01:00
Christoph Oelckers
cd7f13c4ba - all wp not referencing actorNew. 2021-12-30 09:57:43 +01:00
Christoph Oelckers
2398073529 - getting rid of wall variables named wp. 2021-12-30 09:57:43 +01:00
Christoph Oelckers
7bea7cdae1 - handle all wp referencing actor->s(). 2021-12-30 09:57:42 +01:00
Christoph Oelckers
1afb985291 - renamed all wp referencing weapActor. 2021-12-30 09:57:42 +01:00
Christoph Oelckers
33c8668325 - deleted all np variables. 2021-12-30 09:57:42 +01:00
Christoph Oelckers
14ba7d24d2 - renamed all remaining np-> 2021-12-30 09:57:42 +01:00
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