Commit graph

1108 commits

Author SHA1 Message Date
Mitchell Richters
bf7437c827 - SW: Remove ON pre-processor define and eliminate mytypes.h. 2021-12-30 09:58:46 +01:00
Mitchell Richters
3cf9450bd8 - SW: Remove OFF pre-processor define. 2021-12-30 09:58:45 +01:00
Mitchell Richters
ae49a55fce - SW: Replace the last few remaining TEST() macro uses and remove from mytypes.h. 2021-12-30 09:58:45 +01:00
Mitchell Richters
1439d5f268 - SW: Replace TEST\(([\w\-\>.()\[\]]+),\s?([\w\_\|\s]+)\) with ($1 & ($2)). 2021-12-30 09:58:45 +01:00
Mitchell Richters
48b0058d38 - SW: Replace TEST\(([\w\-\>.()]+),\s?(\w+)\) with ($1 & $2). 2021-12-30 09:58:45 +01:00
Mitchell Richters
5316e23737 - SW: Replace !TEST\(([\w\-\>.()\[\]]+),\s?([\w\_\|\s]+)\) with !($1 & ($2)) 2021-12-30 09:58:45 +01:00
Mitchell Richters
8df3966d08 - SW: Replace !TEST\(([\w\-\>.()\[\]]+),\s?(\w+)\) with !($1 & $2). 2021-12-30 09:58:44 +01:00
Christoph Oelckers
c8b5fa6556 - SW: fixed signed-ness issue with SP_TAG13 2021-12-30 09:58:14 +01:00
Christoph Oelckers
fb53f32603 - handle the remaining write accesses to ceilingz and floorz.
Everything is routed through the wrapper functions now.
2021-12-30 09:58:14 +01:00
Christoph Oelckers
c24aafd3d6 - SW: game.h cleanup
Turned almost all #defines into enums or inline functions, removed unused declarations and all leftover MONO_PRINT fragments elsewhere.
2021-12-30 09:58:13 +01:00
Christoph Oelckers
96396385e7 - more TEST() replacements.
This covers roughly half of the original use.
2021-12-30 09:58:13 +01:00
Christoph Oelckers
61564ab96a - one third of TEST(). 2021-12-30 09:58:13 +01:00
Christoph Oelckers
7727597bd7 - removed FLIP macro
was only used 3 times
2021-12-30 09:58:12 +01:00
Christoph Oelckers
08fcfb382c - the remaining RESET() calls. 2021-12-30 09:58:12 +01:00
Christoph Oelckers
e29d0f50cf - lots of RESET() flags replaced. 2021-12-30 09:58:12 +01:00
Christoph Oelckers
1ae7565a2a - SW macro cleanup. 2021-12-30 09:58:12 +01:00
Christoph Oelckers
d15c3aeff6 - got rid of the DIV2 macro. 2021-12-30 09:58:11 +01:00
Christoph Oelckers
387d65abb4 - the remaining SET()s.
These had to be done manually.
2021-12-30 09:58:11 +01:00
Christoph Oelckers
fe292fce0d - yet more SET flag replacements
90% done.
2021-12-30 09:58:11 +01:00
Christoph Oelckers
12ad85f6f8 - SW: turned flag #defines into enums. 2021-12-30 09:58:11 +01:00
Christoph Oelckers
92ed3fa728 - replaced more SET() macros.
This covers another 30-35%.
2021-12-30 09:58:11 +01:00
Christoph Oelckers
dc3f2473ba - quick search & replace on ~40% of SET( macros in SW. 2021-12-30 09:58:10 +01:00
Christoph Oelckers
745794a1f1 - where did that comma go? 2021-12-30 09:58:07 +01:00
Christoph Oelckers
34f14aa4c3 - added vector variants of FindDistance2D and FindDistance3D 2021-12-30 09:58:07 +01:00
Christoph Oelckers
29da39dda0 - added two FAFcansee variants that take shorter parameter lists for clearer code. 2021-12-30 09:58:06 +01:00
Christoph Oelckers
bf3f580d52 - deleted PLAYER::Actor()
Also made actor a regular pointer. Unlike the other ones this may not be prematurely nulled ever.
2021-12-30 09:58:06 +01:00
Christoph Oelckers
d340a7e80c - u() and USERp are gone. 2021-12-30 09:58:05 +01:00
Christoph Oelckers
26f93ab724 - the final u()'s. 2021-12-30 09:58:05 +01:00
Christoph Oelckers
cf88bcbecb - handle u-> in player.cpp 2021-12-30 09:58:05 +01:00
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
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