Commit graph

136 commits

Author SHA1 Message Date
Christoph Oelckers
33d5b54ce0 - use 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
c84d75b8bf - use inline access functions to read floorz/ceilingz. 2022-08-27 09:58:16 +02:00
Christoph Oelckers
0672572e63 - renamed sectortype::floorz and ceilingz as preparation for floatification 2022-08-27 09:47:48 +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
6a5384f39e - SW: eighth batch of spr.pos wraps. 2022-08-26 19:53:09 +02:00
Christoph Oelckers
212b9e8bab - SW: fourth batch of spr.pos wraps. 2022-08-26 19:53:08 +02:00
Christoph Oelckers
871f0c4ec6 - SW: first batch of spr.pos wraps. 2022-08-26 19:53:08 +02:00
Christoph Oelckers
84ca96c52c eliminated STATEp 2021-12-31 16:00:14 +01:00
Christoph Oelckers
8fb769649b - eliminated sectortype aliases. 2021-12-31 15:43:47 +01:00
Christoph Oelckers
c10fb1278a - moved the backup... methods to DCoreActor. 2021-12-30 17:10:08 +01:00
Christoph Oelckers
5498699faf - use DCoreActor::sector() wherever possible. 2021-12-30 16:51:56 +01:00
Mitchell Richters
9c1e54a148 - SW: Replace USER sz with pos.Z calls. 2021-12-30 20:40:29 +11:00
Mitchell Richters
48b0058d38 - SW: Replace TEST\(([\w\-\>.()]+),\s?(\w+)\) 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
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
fe292fce0d - yet more SET flag replacements
90% done.
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
6df854d612 - replaced one sprite inline with its actor variant. 2021-12-30 09:58:04 +01:00
Christoph Oelckers
5290939cbc - break.cpp sp cleanup.
Also a few needed renamings.
2021-12-30 09:57:35 +01:00
Christoph Oelckers
6c97912220 - SW: replace all u()'s in actor.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
Christoph Oelckers
92f2182e6e - SW: all s() in actor.cpp 2021-12-30 09:57:28 +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
Christoph Oelckers
d9d05e90b5 - globally replaced all occurences of '->s().' with '->spr.' 2021-12-30 09:57:00 +01:00
Christoph Oelckers
6cb260d916 - SW GC preparation commit noise. 2021-12-26 23:10:00 +01:00
Christoph Oelckers
588f88c9cc - migrated the actors to DObjects.
No GC yet, only the classes have been altered and some GC-related features been added.
Full switchover will require adding GC support to all data in the game.
2021-12-26 23:09:57 +01:00
Christoph Oelckers
1a7cc6d782 - FAFgetzrangepoint + ActorDrop 2021-12-26 23:08:53 +01:00
Christoph Oelckers
302016956f - sector parameters in SpawnActor calls. 2021-12-26 23:08:43 +01:00
Christoph Oelckers
e17da708e7 - lots of ->sectnum search & replace. 2021-12-26 23:08:43 +01:00
Christoph Oelckers
4d7b45b68e - SW: first batch of short handling. 2021-12-25 21:28:53 +01:00
Christoph Oelckers
7d2404ce76 - made sector a TArray. 2021-12-25 21:28:49 +01:00
Christoph Oelckers
bd43f49c29 - replaced half of the remaining SectUser accesses. 2021-12-25 21:28:46 +01:00
Christoph Oelckers
5cda292d98 - lots of search& replace actions.
This takes care of roughly 2/3 of the SectUser accesses.
2021-12-25 21:28:46 +01:00
Christoph Oelckers
4266edfa04 - SW: automatic ->sector() replacements (lots of them) 2021-12-25 21:28:46 +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
adf3133fdc - use sectnum and wallnum to get an index from pointers instead of subtracting the array base. 2021-11-29 00:56:26 +01:00
Christoph Oelckers
e12ae040de - collision code cleanup.
# Conflicts:
#	source/games/sw/src/game.h
#	source/games/sw/src/sprite.cpp

# Conflicts:
#	source/games/sw/src/game.h
2021-11-29 00:56:17 +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
7d99745cd6 - DoPlasmaFountain + InitPlasmaFountain 2021-11-29 00:56:08 +01:00
Christoph Oelckers
e32a1af7b2 - lots of PlaySound calls migrated to actors. 2021-11-29 00:55:36 +01:00
Christoph Oelckers
c15da92544 - add a Collision member to USER. 2021-11-29 00:55:12 +01:00
Christoph Oelckers
d5f1ec9ad7 - wrapped all assignments to USER::ret.
To allow more complex operations like filling a Collision struct and changing the calling code piece by piece.
2021-11-29 00:55:12 +01:00
Christoph Oelckers
c88524884c - made USER::flame an actor pointer. 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
64d77945f9 - DoFindGroundPoint
This removes the last SpriteNum occurence in actpr.cpp
2021-11-29 00:55:10 +01:00
Christoph Oelckers
06b4e8cf08 - cleanup. 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
3e1e5fb343 - a large batch of KillSprite calls. 2021-11-29 00:55:08 +01:00
Christoph Oelckers
740c5e1e56 - DoSuicide 2021-11-29 00:55:08 +01:00
Christoph Oelckers
400f822df3 - SpawnShrap callers
Function itself still needs work.
2021-11-29 00:55:08 +01:00
Christoph Oelckers
1db4be60f0 - UpdateSinglePlayKills 2021-11-29 00:55:08 +01:00
Christoph Oelckers
49d43727ba - SpawnBlood. 2021-11-29 00:55:07 +01:00
Christoph Oelckers
8d5243bd64 - most calls of SetState 2021-11-29 00:55:07 +01:00
Christoph Oelckers
771b4bcf43 - renamed ChangeState to ChangeSpriteState. 2021-11-29 00:55:07 +01:00
Christoph Oelckers
9602ee6c39 - most of change_sprite_stat. 2021-11-29 00:55:07 +01:00
Christoph Oelckers
119d4393db - Initial SetOwner WIP. 2021-11-29 00:55:06 +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
c7f6b7a8c2 - DoFall + DoBeginFall. 2021-11-29 00:55:03 +01:00
Christoph Oelckers
dc6ea40911 - DoFall 2021-11-29 00:55:02 +01:00
Christoph Oelckers
2a56479e3e - DoBeginJump 2021-11-29 00:55:02 +01:00
Christoph Oelckers
9375a64ccc - cleanup only. 2021-11-29 00:55:02 +01:00
Christoph Oelckers
9e438b4042 - DoActorBeginSlide 2021-11-29 00:55:02 +01:00
Christoph Oelckers
ad0ed0c377 - KeepActorOnFloor 2021-11-29 00:55:02 +01:00
Christoph Oelckers
2ba98dc03c - minor cleanup, DoDebrisCurrent, move_debris, DoGenerateSewerDebris 2021-11-29 00:55:01 +01:00
Christoph Oelckers
ee8f6460c1 - DoActorDie 2021-11-29 00:55:01 +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
e8f9afb174 - DoScaleSprite. 2021-10-30 17:30:03 +02: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
Mitchell Richters
9d64779da0 - SW: Replace all uses of NULL with nullptr. 2021-07-10 22:25:18 +10:00
Christoph Oelckers
fb21e39de5 - fixed remaining SW warnings. 2021-05-12 21:50:00 +02:00
Christoph Oelckers
03289f5097 - silenced some warnings. 2021-05-12 21:47:32 +02:00
Christoph Oelckers
c3e5cf322e - SW: cleaned up the depth variable handling in SECT_USER which was endian dependent, including the savegame handler 2021-04-22 00:03:17 +02:00
Christoph Oelckers
66e5b9ada7 - SW: save SectUser as JSON, also store in a managed array. 2021-04-22 00:03:16 +02:00
Christoph Oelckers
bbb53bc717 - refactored the main User array into something that's automatically managed. 2021-04-22 00:03:14 +02:00
Christoph Oelckers
fa8ca81460 - SW: added persistent copy of oz.
The door movement code uses oz for its position checks so we need a persistent version of it that survives uncontrolled changes from the engine side.
2021-02-28 12:35:34 +01:00
Christoph Oelckers
fc11f537f7 - project cleanup
* moved all games into the 'games' folder.
* fixed project to include all sources and move them to the proper folders.
2021-01-10 20:31:32 +01:00
Renamed from source/sw/src/actor.cpp (Browse further)