Commit graph

152 commits

Author SHA1 Message Date
Christoph Oelckers
55ade2eda4 - use int_hitpos() access function where applicable 2022-10-05 18:10:44 +02:00
Christoph Oelckers
296b5d7edd - renamed HitInfo::hitpos 2022-10-05 18:03:41 +02:00
Christoph Oelckers
086c699df0 - use float coords for spawning some SW actors. 2022-10-05 18:01:57 +02:00
Christoph Oelckers
6381015229 - set_int_ang in SW, part 1. 2022-10-04 23:56:44 +02:00
Christoph Oelckers
f54e4b8a9a - more int_ang() 2022-10-04 23:56:43 +02:00
Christoph Oelckers
735b9a8fed - renamed ang to __int_angle 2022-10-04 23:56:42 +02:00
Christoph Oelckers
e732e2f947 - SW: replaced spr.pos globally (except two functions)
# Conflicts:
#	source/games/sw/src/_polymost.cpp
2022-08-26 19:53:09 +02:00
Christoph Oelckers
871f0c4ec6 - SW: first batch of spr.pos wraps. 2022-08-26 19:53:08 +02:00
Christoph Oelckers
e302c45a0b Revert "- added two FAFcansee variants that take shorter parameter lists for clearer code."
This reverts commit 29da39dda0.

Something in here was wrong, so back to the start with it.
The positive effect was too small anyway.
2022-01-02 17:35:12 +01:00
Mitchell Richters
1c0ba71c69 - SW: Eliminated ANIMATORp typedef. 2022-01-01 09:09:41 +11:00
Christoph Oelckers
d1be430fbf - eliminated PLAYERp 2021-12-31 15:59:11 +01:00
Christoph Oelckers
5498699faf - use DCoreActor::sector() wherever possible. 2021-12-30 16:51:56 +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
61564ab96a - one third of TEST(). 2021-12-30 09:58:13 +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
dc3f2473ba - quick search & replace on ~40% of SET( macros in SW. 2021-12-30 09:58:10 +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
63fc668d57 - don't use auto when making local copies of TObjPtr. 2021-12-30 09:57:36 +01:00
Christoph Oelckers
5290939cbc - break.cpp sp cleanup.
Also a few needed renamings.
2021-12-30 09:57:35 +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
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
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
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
Mitchell Richters
0c6e55d1b8 - Silence all the -Wuninitialized and -Wmaybe-uninitialized warnings relating to HitInfo objects passed through to functions by reference. 2021-12-26 23:09:50 +01:00
Christoph Oelckers
729076b79d - adapted neartag in SW and Exhumed. 2021-12-26 23:09:42 +01:00
Christoph Oelckers
91e2391911 - adapted neartag in Duke. 2021-12-26 23:09:42 +01:00
Christoph Oelckers
30f36e4871 - use backend's collision struct in SW. 2021-12-26 23:08:58 +01:00
Christoph Oelckers
a5ccd2ccd2 - adapted FAFhitscan to the new backend API.
Lots of search & replace to change the names of the HitInfo struct, no manual edits outside of FAFhitscan.
2021-12-26 23:08:57 +01:00
Christoph Oelckers
104e80e34a - NEAR_TAG_LIST, also deleted useless OperateWall code. 2021-12-26 23:08:55 +01:00
Christoph Oelckers
db95dc95d1 - FAF_Sector + SpawnQuake 2021-12-26 23:08:54 +01:00
Christoph Oelckers
98c3d57b73 - ->sectnum in ai.cpp and draw.cpp. 2021-12-26 23:08:54 +01:00
Christoph Oelckers
1457cf2c0d - track stuff 2021-12-26 23:08:53 +01:00
Christoph Oelckers
1a7c70cbbd - use pointers in FAFHitscan 2021-12-26 23:08:51 +01:00
Christoph Oelckers
f495097663 - first step of replacing hitinfo.hitsect with a pointer.
This takes care of easy to handle common patterns
2021-12-26 23:08:50 +01:00
Christoph Oelckers
eb82f60981 - FAFcansee. 2021-12-26 23:08:42 +01:00
Christoph Oelckers
0a0cc85407 - renamed HITINFO fields. 2021-12-26 23:08:41 +01:00
Christoph Oelckers
6a9b377724 SW de-shortification 2021-12-25 21:28:53 +01:00
Christoph Oelckers
4d7b45b68e - SW: first batch of short handling. 2021-12-25 21:28:53 +01:00
Christoph Oelckers
a5fac26a90 - DIVx macro removal.
Only DIV2 left because there are too many calls to quickly remove them.
2021-12-25 21:28:45 +01:00
Christoph Oelckers
a073ef65e7 - low level move functions now return a Collision struct.
# Conflicts:
#	source/games/sw/src/sprite.cpp
2021-11-29 00:56:09 +01:00
Christoph Oelckers
606ce997ac - cleanup of collision maintenance.
u->ret is gone, and for clearing the collision info the proper utilities are being called now.
2021-11-29 00:56:09 +01:00
Christoph Oelckers
da1e97469e - FAFhitscan migration to HITINFO. 2021-11-29 00:55:52 +01:00
Christoph Oelckers
b878bf8aac - SW: renamed all unsigned chars to uint8_t
Also deletes some unused declarations
2021-11-29 00:55:43 +01:00
Christoph Oelckers
1e00a4ff18 - second batch of sector.cpp 2021-11-29 00:55:34 +01:00
Christoph Oelckers
01abe7b2ac - addressed most unused/uninitialized variable warnings from MSVC. 2021-11-29 00:55:30 +01:00
Christoph Oelckers
e94785e571 - cleanup. 2021-11-29 00:55:22 +01:00
Christoph Oelckers
4231119717 - owner stuff 2021-11-29 00:55:15 +01:00
Christoph Oelckers
bd47d61615 - replaced some changespritesect with ChangeActorSect. 2021-11-29 00:55:13 +01:00
Christoph Oelckers
a48b45143e - ActorFindTrack 2021-11-29 00:55:13 +01:00
Christoph Oelckers
b3558d8925 - eliminated SetEnemy(In)active.
Both were only used once, so they are now inlined.
2021-11-29 00:55:13 +01:00
Christoph Oelckers
6c867e23ee - PlayerTakeDamage 2021-11-29 00:55:12 +01:00
Christoph Oelckers
98fe147d7a - PlaySpriteSound. 2021-11-29 00:55:12 +01:00
Christoph Oelckers
af81a9e175 - DropAhead, DoActorActionDecide and ai.cpp cleanup. 2021-11-29 00:55:11 +01:00
Christoph Oelckers
c88524884c - made USER::flame an actor pointer. 2021-11-29 00:55:11 +01:00
Christoph Oelckers
6db11ff2d5 - removed DebugMoveHit. 2021-11-29 00:55:11 +01:00
Christoph Oelckers
84b83ad9b8 - replaced hi_sp with an actor pointer. 2021-11-29 00:55:10 +01:00
Christoph Oelckers
c0c27dfd1a - replaced lo_sp with an actor pointer, both in USER and PLAYER. 2021-11-29 00:55:10 +01:00
Christoph Oelckers
02031c77d0 - first large batch of NewStateGroup calls. 2021-11-29 00:55:09 +01:00
Christoph Oelckers
d98fe4af73 - renamed NewStateGroup.
As refactoring aid.
2021-11-29 00:55:09 +01:00
Christoph Oelckers
fdcff8002d - move_actor 2021-11-29 00:55:09 +01:00
Christoph Oelckers
ae874275ec - iterator in DoActorPickClosePlayer 2021-11-29 00:55:06 +01:00
Christoph Oelckers
c0a72c7243 - FindNewAngle and move_scan 2021-11-29 00:55:06 +01:00
Christoph Oelckers
34d0c12b60 - removed all references to tgt_sp from ai.cpp, plus a few others found with search&replace. 2021-11-29 00:55:06 +01:00
Christoph Oelckers
b8b90d2825 - track functions in ai.cpp plus some cleanup. 2021-11-29 00:55:06 +01:00
Christoph Oelckers
b0a59bf665 - CloseRangeDist + DoSectorOperate 2021-11-29 00:55:05 +01:00
Christoph Oelckers
4d12bbbb56 - GetPlayerSpriteNum 2021-11-29 00:55:05 +01:00
Christoph Oelckers
602048b41d - more simple tgt_sp replacements. 2021-11-29 00:55:05 +01:00
Christoph Oelckers
76f0724d24 - global search & replace for all occurences of tgt_sp where it is only used to access a field in the sprite. 2021-11-29 00:55:05 +01:00
Christoph Oelckers
697d4f2253 - replaced USER::tgt_sp with an actor pointer.
Most access is still through a wrapper.
2021-11-29 00:55:04 +01:00
Christoph Oelckers
d819d5c862 - DoActorPickClosePlayer 2021-11-29 00:55:04 +01:00
Christoph Oelckers
125159772d - CanHitPlayer 2021-11-29 00:55:04 +01:00
Christoph Oelckers
ceb3ac2e5b - CanSeePlayer 2021-11-29 00:55:04 +01:00
Christoph Oelckers
a2dee7681a - DoActorNoise 2021-11-29 00:55:04 +01:00
Christoph Oelckers
3dbd002319 - DoActorSetSpeed + ActorFlaming. 2021-11-29 00:55:03 +01:00
Christoph Oelckers
ec9ab56ece - use collision struct in ActorMoveHitReact 2021-11-29 00:55:03 +01:00
Christoph Oelckers
077c4f19a7 - ActorMoveHitReact + DebugMoveHit 2021-11-29 00:55:03 +01:00
Christoph Oelckers
8f19dc12d8 - SW: code/data pointer saving cleanup.
* a large number of code pointer records were removed because none of these functions ever gets assigned to a pointer
* instead of looking up entries by index, do it by name. This is far less fragile and will survive deeper refactoring. The old storage by table index will break as soon as a single entry gets removed.

Since the old savegames got broken due to this problem recently it was a good time to change the setup.
2021-11-11 23:28:28 +01:00
Christoph Oelckers
509124c1dd - redid SW action interface to use a separate wrapper class from USER.
Turned out that not all sprites in the world have a USER, so we need something different to wrap the game's sprite data.
2021-10-29 20:55:31 +02:00
Christoph Oelckers
e241e7dc52 - SW: changed Animator interface to use USERp parameters. 2021-10-28 23:37:07 +02:00
Christoph Oelckers
2af688dd62 - replaced RANDOM_RANGE macro with direct calls to RandomRange 2021-10-10 11:47:19 +02:00
Christoph Oelckers
3220a6d786 - some SW cleanup 2021-10-10 11:47:19 +02:00
Mitchell Richters
9d64779da0 - SW: Replace all uses of NULL with nullptr. 2021-07-10 22:25:18 +10:00