Commit graph

451 commits

Author SHA1 Message Date
Mitchell Richters
5515830e2b - SW: Replace PLAYERstruct yvect with vect.Y calls. 2021-12-31 00:19:33 +11:00
Mitchell Richters
f2497d7d08 - SW: Replace PLAYERstruct xvect with vect.X calls. 2021-12-31 00:19:33 +11:00
Mitchell Richters
9c1e54a148 - SW: Replace USER sz with pos.Z calls. 2021-12-30 20:40:29 +11:00
Mitchell Richters
0d70d26625 - SW: Replace USER sy with pos.Y calls. 2021-12-30 20:31:09 +11:00
Mitchell Richters
fcf18c8c63 - SW: Replace USER sx with pos.X calls. 2021-12-30 20:31:09 +11:00
Mitchell Richters
9bbb54fe2e - Replace every line that just contains spaces or tabs with an empty line feed in all files except 3rd party libraries. 2021-12-30 20:30:21 +11:00
Mitchell Richters
1b077251e3 - SW: Use BIT() inline in a few places that were changed in "- SW: Replace the last few remaining TEST() macro uses and remove from mytypes.h."
Originally, `BIT()` was going to be dropped in a subsequent commit but we've elected not to.
2021-12-30 20:14:01 +11: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
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
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
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
26f93ab724 - the final u()'s. 2021-12-30 09:58:05 +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
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
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
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
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
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
8a2908bc30 - eliminated the remaining SP_* spritetype function variants. 2021-12-30 09:57:49 +01:00
Christoph Oelckers
822c88c135 - handle all auto psp = &pp->Actor()->s(); 2021-12-30 09:57:48 +01:00
Christoph Oelckers
0c48b4b2c2 - over/under stuff in weapon.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
9ad23631f5 - several s(). 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
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
730c9e65e4 - renamed all np-> in weapon.cpp 2021-12-30 09:57:42 +01:00
Christoph Oelckers
0175d27ffa - handle all 'np->' not referencing actorNew. 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
63fc668d57 - don't use auto when making local copies of TObjPtr. 2021-12-30 09:57:36 +01:00
Christoph Oelckers
397d9b0d84 - made SP_TAG2 a function with an actor parameter. 2021-12-30 09:57:34 +01:00
Christoph Oelckers
4caee272ef - some non 'actor' sp replacements in weapon.cpp. 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
Mitchell Richters
c26b5d2303 - SW: Clean up local functions variables to prevent redefinition conflicts. 2021-12-30 09:57:31 +01:00
Christoph Oelckers
395a269feb - globally replaced ->u()->. 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
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
f67e39450e - deal with a handful of s() uses that do not match the more common patterns. 2021-12-30 09:57:13 +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
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
Christoph Oelckers
d9d05e90b5 - globally replaced all occurences of '->s().' with '->spr.' 2021-12-30 09:57:00 +01:00