Commit graph

367 commits

Author SHA1 Message Date
Christoph Oelckers
bb3a141c42 - fixed last commit. 2021-10-28 23:16:03 +02:00
Christoph Oelckers
7e191fb29b - fixed damage amount in the runlist dispatcher. 2021-10-28 23:04:50 +02:00
Christoph Oelckers
91ecda2fcb - cleaned up the run list interface.
Due to serialization concerns it still isn't optimal, though, because we cannot get rid of the index table yet.
2021-10-28 18:57:50 +02:00
Christoph Oelckers
791240786d - use a wrapper function to check for the radial damage event. 2021-10-28 18:43:54 +02:00
Christoph Oelckers
7a65cc46d0 - moved AI wrappers out of the main sources.
This is mainly to reduce commit noise for what follows. These functions will soon be deleted.
2021-10-28 18:39:49 +02:00
Christoph Oelckers
3842936012 - feebtag. 2021-10-28 14:25:28 +02:00
Christoph Oelckers
07ad50d97c - sound API 2021-10-28 14:23:31 +02:00
Christoph Oelckers
97b4116f28 - run list API 2021-10-28 14:23:15 +02:00
Christoph Oelckers
4197a7ed84 - BlockInfo 2021-10-28 14:08:53 +02:00
Christoph Oelckers
3a5ea07951 - some smaller changes. 2021-10-28 14:06:36 +02:00
Christoph Oelckers
ee03eb1b3d - movement and elevators. 2021-10-28 13:54:36 +02:00
Christoph Oelckers
9cfd682c9e - eliminated Player::nSprite. 2021-10-28 13:54:09 +02:00
Christoph Oelckers
076a995c6e - besttarget and Player::nTarget. 2021-10-28 13:51:32 +02:00
Christoph Oelckers
8e13bb6e35 - RestartPlayer, plus wrapper removal. 2021-10-28 13:43:39 +02:00
Christoph Oelckers
2195bc0b76 - got rid of several inline wrappers. 2021-10-28 10:51:12 +02:00
Christoph Oelckers
2b8893762c - movesprite family mostly done. 2021-10-28 10:46:16 +02:00
Christoph Oelckers
30541b09a4 - PlotCourseToSprite, FindPlayer and GetUpAngle. 2021-10-28 09:57:35 +02:00
Christoph Oelckers
49c1163a33 - eliminated AngleChase inline. 2021-10-28 09:54:10 +02:00
Christoph Oelckers
be19dbb2ce - nDoppleSprite 2021-10-28 09:47:29 +02:00
Christoph Oelckers
eae1d589ec - playerFloorSprite 2021-10-28 09:25:13 +02:00
Christoph Oelckers
1e10cef556 - PostProcess 2021-10-28 09:21:49 +02:00
Christoph Oelckers
9d642e18e7 - BuildDrip / ProcessTrailSprite 2021-10-28 08:51:50 +02:00
Christoph Oelckers
e6c7e5bc18 - radial stuff. 2021-10-28 08:32:08 +02:00
Christoph Oelckers
df9d1b1ceb - the rest of object.cpp 2021-10-27 23:04:33 +02:00
Christoph Oelckers
b59cb67f05 - Object, part 1. 2021-10-27 23:03:59 +02:00
Christoph Oelckers
d3e55739c7 - energy blocks. 2021-10-27 23:02:56 +02:00
Christoph Oelckers
51202cba78 - nFinaleSpr. 2021-10-27 20:58:13 +02:00
Christoph Oelckers
b480bb3634 - BuildSpark 2021-10-27 20:56:43 +02:00
Christoph Oelckers
56d0f41a36 - BuildTrap 2021-10-27 20:56:43 +02:00
Christoph Oelckers
11912486de - moved all loose player related arrays into the Player struct. 2021-10-27 20:56:42 +02:00
Christoph Oelckers
c01c9122de - slideData cleanup. 2021-10-27 20:56:42 +02:00
Christoph Oelckers
73d415369d - AddFlow API cleanup. 2021-10-27 20:56:42 +02:00
Christoph Oelckers
6bf6ac5b34 - Flashes 2021-10-27 20:56:42 +02:00
Christoph Oelckers
a4306d9bab - renamed some fields. 2021-10-27 20:56:42 +02:00
Christoph Oelckers
ca6724a3f5 - make nNetStartSprite an actor array. 2021-10-27 20:56:42 +02:00
Christoph Oelckers
1591d6fbdb - Regenerates.
MP only so not really relevant - the code looked broken anyway.
2021-10-27 20:56:41 +02:00
Christoph Oelckers
2f511b3cff - UseItem + subfunctions. 2021-10-27 20:56:41 +02:00
Christoph Oelckers
d04d92fd49 - destroyItemAnim, other replacements in AIPlayer::Tick 2021-10-27 20:56:41 +02:00
Christoph Oelckers
587cd09e8e - BuildItemAnim 2021-10-27 20:56:41 +02:00
Christoph Oelckers
6a1423d92f - sprite[] in gun.cpp. 2021-10-27 20:56:41 +02:00
Christoph Oelckers
9ef4f0fa99 - Gravity function. 2021-10-27 20:56:41 +02:00
Christoph Oelckers
5234481370 - fixed bad actor conversion. 2021-10-27 20:56:30 +02:00
Christoph Oelckers
14ccb74aac - for radial damage the 'other' actor is always undefined. 2021-10-27 16:12:56 +02:00
Christoph Oelckers
f60d20b50a - handle the grenade. 2021-10-27 15:46:18 +02:00
Christoph Oelckers
525ea72bfa - use pointers for grenades. 2021-10-27 00:37:17 +02:00
Christoph Oelckers
6b3aa44211 - first pass over grenade.cpp.
Mainly field renaming.
2021-10-27 00:37:17 +02:00
Christoph Oelckers
c9d391634d - some missing queen bits. 2021-10-27 00:37:17 +02:00
Christoph Oelckers
2a28908b1a - pass radial damage inflictor through event struct 2021-10-27 00:30:57 +02:00
Christoph Oelckers
a09f2d8a51 - migrated deletesprite calls in spawn function. 2021-10-27 00:25:00 +02:00
Christoph Oelckers
6d3f9ca0d6 - migrated a few functions to use actors. 2021-10-27 00:24:28 +02:00
Christoph Oelckers
345667f945 - handle the remaining old-style iterators. 2021-10-27 00:18:23 +02:00
Christoph Oelckers
2397bf48f2 - fixed uninitialized ObjectList.
This needs to clear each entry each time it is allocated for use.
The object where this frequently caused problems is the drum being spawned by the Anubis drummers.
2021-10-26 23:52:21 +02:00
Christoph Oelckers
75b8a0579e - elevator stuff. 2021-10-26 22:08:26 +02:00
Christoph Oelckers
c59ec14ba4 - fixed wasp event dispatcher to pass along the damage amount. 2021-10-26 21:55:59 +02:00
Christoph Oelckers
331ba71473 - BuildCreatureChunk wrapper. 2021-10-26 21:15:07 +02:00
Christoph Oelckers
70a7656619 - handle the queen itself. 2021-10-26 21:10:51 +02:00
Christoph Oelckers
52ab800548 - QueenAngleChase. 2021-10-26 20:52:25 +02:00
Christoph Oelckers
ae271b272a - made QueenEgg use actor pointers. 2021-10-26 20:13:03 +02:00
Christoph Oelckers
47929972c0 - replaced sprite indices in QueenHead. 2021-10-26 19:55:20 +02:00
Christoph Oelckers
839292ac91 - renamed fields in the queen structs to match DExhumedActor. 2021-10-26 18:50:46 +02:00
Christoph Oelckers
3971c8ffd2 - fixed compilation 2021-10-26 08:13:23 +02:00
Christoph Oelckers
ae786bff98 - removed the last references to sprite[] in bullet.cpp. 2021-10-25 23:16:35 +02:00
Christoph Oelckers
99e189fa2b - IgniteSprite 2021-10-25 23:15:59 +02:00
Christoph Oelckers
c1598185f7 - parameter cleanup of BuildBullet. 2021-10-25 23:09:01 +02:00
Christoph Oelckers
eece69fbbd - renamed variables in BuildBullet and removed unused parameters. 2021-10-25 23:07:58 +02:00
Christoph Oelckers
fa657e23a3 - bullet.cpp, enemy pointer. 2021-10-25 23:07:42 +02:00
Christoph Oelckers
3d35ceecb0 - bullet.cpp, first part. 2021-10-25 22:24:20 +02:00
Christoph Oelckers
bf1f87eff9 - converted Ra. 2021-10-25 21:19:32 +02:00
Christoph Oelckers
d023f9633a - converted the snake 2021-10-25 21:09:33 +02:00
Christoph Oelckers
4980e0ea41 - refactor Set to use actors. 2021-10-25 19:02:44 +02:00
Christoph Oelckers
48a5448f94 - access SetList through a pointer. 2021-10-25 18:57:10 +02:00
Christoph Oelckers
0b37c9afec - did the bubbles. 2021-10-25 17:52:31 +02:00
Christoph Oelckers
5cc1a8934e - refactored Anim to use actors. 2021-10-24 21:50:03 +02:00
Christoph Oelckers
3b0df0e9b4 - renamed fields in Anim to match DExhumedActor. 2021-10-24 20:14:36 +02:00
Christoph Oelckers
e8e0294929 - access AnimList through a pointer. 2021-10-24 20:06:46 +02:00
Christoph Oelckers
43e849ca40 - BuildSplash and BuildExplosion. 2021-10-24 19:18:11 +02:00
Christoph Oelckers
a7b71c724e - use the actor variant of BuildAnim wherever trivially doable. 2021-10-24 19:12:06 +02:00
Christoph Oelckers
5ff8852d12 - refactor the wasp to use actors. 2021-10-24 18:35:13 +02:00
Christoph Oelckers
a46a8c21a3 - access WaspList through a pointer. 2021-10-24 13:15:40 +02:00
Christoph Oelckers
2c8da6fe72 - refactor the spider to use actors. 2021-10-24 13:06:41 +02:00
Christoph Oelckers
6821fef5e1 - refactor scorpion to use actors. 2021-10-24 12:22:32 +02:00
Christoph Oelckers
6903404718 - access scorpion through a pointer. 2021-10-24 12:20:26 +02:00
Christoph Oelckers
937e71cfbb - refactor Roach to use actors. 2021-10-24 12:11:33 +02:00
Christoph Oelckers
3a051b8acb - access RoachList through a pointer. 2021-10-24 12:10:18 +02:00
Christoph Oelckers
f0f0ca020b - refactor rex to use actors. 2021-10-24 10:59:45 +02:00
Christoph Oelckers
1cf616c7ba - access RexList through a pointer. 2021-10-24 10:58:27 +02:00
Christoph Oelckers
54fc724b25 - fixed bad initialization of local variable.
Probably went unnoticed because it is in an unlikely code path.
2021-10-24 08:24:02 +02:00
Christoph Oelckers
5d0ee1478c - fixed bad pointer comparison.
MSVC did not catch this, only GCC 11 and Clang errored out on this one. :(
2021-10-24 08:21:54 +02:00
Christoph Oelckers
e88627b72a - refactor the rat to use actors. 2021-10-23 21:57:13 +02:00
Christoph Oelckers
9c8fda9a4d - access RatList through a pointer. 2021-10-23 21:50:57 +02:00
Christoph Oelckers
cd97fdaa30 - refactor the mummy to use actors. 2021-10-23 20:49:03 +02:00
Christoph Oelckers
fab0fff1fe - access LionList through a pointer. 2021-10-23 20:06:48 +02:00
Christoph Oelckers
cd2c796574 - refactor the lion to use actors. 2021-10-23 19:37:04 +02:00
Christoph Oelckers
3de4bc29c1 - access LionList through a pointer. 2021-10-23 19:31:53 +02:00
Christoph Oelckers
77525cecf0 - refactor the lava dude to use actors. 2021-10-23 18:51:52 +02:00
Christoph Oelckers
f12faa9279 - access LavaList through a pointer. 2021-10-23 18:41:05 +02:00
Christoph Oelckers
657e5ef6be - refactor the fish to use actors. 2021-10-23 13:02:43 +02:00
Christoph Oelckers
f8cab790d4 - access FishList through a pointer.
To make the following commmit more readably.
2021-10-23 12:33:33 +02:00
Christoph Oelckers
5d7d4ce496 - fixed radial damage for actors. 2021-10-22 23:57:46 +02:00
Christoph Oelckers
0ac449ab95 - refactored Anubis.
This now stores its data in the actor, not a static array.
2021-10-22 22:09:02 +02:00
Christoph Oelckers
fa8edc7493 - quick replacement of some sprite[] accesses. 2021-10-22 22:05:02 +02:00
Christoph Oelckers
944b7b8776 - DeleteActor implementation. 2021-10-22 22:04:44 +02:00
Christoph Oelckers
491c27caa6 - fixed runlist handling for actor targets. 2021-10-22 22:04:04 +02:00
Christoph Oelckers
51ee9cf6c6 - fixed bad interpolation setup in AddFlow, plus some variable renaming. 2021-10-22 21:55:51 +02:00
Christoph Oelckers
4ee3505dde - Exhumed: fixed return value of BuildTrap 2021-10-22 08:06:24 +02:00
Christoph Oelckers
6e919f2364 - Exhumed: fixed handling of torch messages for localization 2021-10-19 21:49:02 +02:00
Christoph Oelckers
2cece35902 Replaced sprite[] in some smaller functions 2021-10-19 21:49:02 +02:00
Christoph Oelckers
5a9978a27b - extended the run list to handle actor targets.
Also renamed fields to be more descriptive.
2021-10-17 16:22:25 +02:00
Christoph Oelckers
1b8d3f9a89 - Exhumed: some inlines for upcoming actor refactoring. 2021-10-17 15:21:29 +02:00
Christoph Oelckers
33261db902 - some quick sprite[] replacements. 2021-10-16 15:36:34 +02:00
Christoph Oelckers
3419d6a901 - fixed compilation. 2021-10-16 15:36:34 +02:00
Christoph Oelckers
1839634d79 - small stuff 2021-10-16 15:36:33 +02:00
Christoph Oelckers
b1d15811c5 - make nBodygunSprite an actor array. 2021-10-16 15:36:33 +02:00
Christoph Oelckers
fe9ddabd35 - made nChunkSprite an actor array
# Conflicts:
#	source/games/exhumed/src/move.cpp
2021-10-16 15:36:33 +02:00
Christoph Oelckers
c2467dc47b - made nBodySprite an actor array.
# Conflicts:
#	source/games/exhumed/src/aistuff.h
#	source/games/exhumed/src/player.cpp

# Conflicts:
#	source/games/exhumed/src/aistuff.h
#	source/games/exhumed/src/player.cpp
2021-10-16 15:36:33 +02:00
Christoph Oelckers
dbe4aa3515 - renamed disassembly variables in bubbles.cpp.
# Conflicts:
#	source/games/exhumed/src/bubbles.cpp
#	source/games/exhumed/src/exhumedactor.h
2021-10-16 15:36:33 +02:00
Christoph Oelckers
0d0326f8c1 - argument of BelowNear 2021-10-16 15:36:32 +02:00
Christoph Oelckers
9badd2e78b - converted switches to classes. 2021-10-16 15:36:32 +02:00
Christoph Oelckers
601d358b49 - converted FuncWasp to a class. 2021-10-16 15:36:32 +02:00
Christoph Oelckers
8d7f37066f - converted FuncSpider to a class 2021-10-16 15:36:32 +02:00
Christoph Oelckers
5a424bdd06 - converted FuncSnake to a class. 2021-10-16 15:36:32 +02:00
Christoph Oelckers
61df236588 - converted FuncSet/FuncSoul to a class. 2021-10-16 15:36:32 +02:00
Christoph Oelckers
d77a5208f3 - converted FuncScorp to a class. 2021-10-16 15:36:31 +02:00
Christoph Oelckers
5418c4326f - converted FuncRoach to a class. 2021-10-16 15:36:31 +02:00
Christoph Oelckers
25de6fe4c5 - converted FuncRex to a class. 2021-10-16 15:36:31 +02:00
Christoph Oelckers
89d98ddf34 - fixed the rat.
- converted FuncRat to a class.
2021-10-16 15:36:11 +02:00
Christoph Oelckers
39ca524185 - converted FuncRa to a class. 2021-10-15 22:57:53 +02:00
Christoph Oelckers
335ebe9272 - converted queen funcs to classes 2021-10-15 22:55:03 +02:00
Christoph Oelckers
93b0a35927 - converted FuncPlayer into a class 2021-10-15 22:19:07 +02:00
Christoph Oelckers
f13e1f2127 - converted all FuncObjects to classes. 2021-10-15 22:14:14 +02:00
Christoph Oelckers
3bda4d5b07 - converted FuncMummy into a class 2021-10-15 22:02:06 +02:00
Christoph Oelckers
008825fe32 - converted FuncCreatureChunk into a class. 2021-10-15 21:58:07 +02:00
Christoph Oelckers
b772200dd4 - converted FuncLion into a class 2021-10-15 21:29:24 +02:00
Christoph Oelckers
45e7b7c4d5 - converted FuncLavaDude(Limb) into classes 2021-10-15 21:25:53 +02:00
Christoph Oelckers
e73725a40e - converted FuncGrenade into a class. 2021-10-15 21:20:28 +02:00
Christoph Oelckers
cdc7fba8a0 - converted AIFish(Limb) into classes 2021-10-15 21:17:25 +02:00
Christoph Oelckers
8f9e9de4b4 - converted FuncBullets into a class. 2021-10-15 21:11:01 +02:00
Christoph Oelckers
832b394561 - converted FuncBubble into a class. 2021-10-15 21:07:58 +02:00
Christoph Oelckers
0fc490bf40 - converted FuncAnubis into a class. 2021-10-15 21:07:33 +02:00
Christoph Oelckers
ce78b23fb6 - converted FuncAnim into a class 2021-10-15 21:06:53 +02:00
Christoph Oelckers
d130a43aa0 - preparations for cleaning up Exhumed's event dispatcher. 2021-10-15 18:51:22 +02:00
Christoph Oelckers
b725adc426 - Exhumed: split up the message word for event messages. 2021-10-15 18:49:35 +02:00
Christoph Oelckers
2ee7be0382 - Exhumed: split up the value parameter of the run list. 2021-10-15 18:37:39 +02:00
Christoph Oelckers
719081824a - exhumedactor.h added. 2021-10-15 00:18:37 +02:00
Christoph Oelckers
6f8a5ee2d2 - Exhumed: replaced a large amount of sprite array accesses with pointers.
No logic changes, this is mainly search & replace.
2021-10-10 11:47:18 +02:00
Christoph Oelckers
10b0bba53e - fixed warnings in Exhumed. 2021-10-08 19:24:45 +02:00
Christoph Oelckers
d466ea155f - Exhumed: Avoid masking bits into the sector index as well.
# Conflicts:
#	source/games/exhumed/src/player.cpp
2021-09-12 18:28:47 +02:00
Christoph Oelckers
9991e6665c - Exhumed: Avoid masking sound flags into the sprite index.
This put a hard 4096 sprites limit into the engine. It's also a blocker for refactoring.
2021-09-12 18:27:30 +02:00
Christoph Oelckers
d82b7ff51c - Exhumed: renamed disassembly variable. 2021-09-12 18:27:30 +02:00
Christoph Oelckers
f7a475aa94 - Exhumed: fixed sound origin in DoRegenerates.
Should be the actual sprite, not the table index...

# Conflicts:
#	source/games/exhumed/src/items.cpp
2021-09-12 18:27:17 +02:00