Commit graph

1296 commits

Author SHA1 Message Date
Mitchell Richters
6f5f66ad35 - Duke/RR: Partially revert c9d875327850e839e3ad1f367ede15497d44fda3 by truncating p->MotoSpeed to integer when calculating xvel/yvel to preserve original vehicle feel. 2020-11-07 09:56:57 +11:00
Mitchell Richters
567738f3ad - Duke/RR: Tidy formatting of onMotorcycle(), onBoat(), onMotorcycleMove() and onBoatMove(). 2020-11-07 09:56:57 +11:00
Mitchell Richters
1545610501 - Duke/RR: Convert remaining vehicle function local ints to bools where appropriate. 2020-11-07 09:56:57 +11:00
Mitchell Richters
c223a50b29 - Duke/RR: Clean up vehicle turn left/right bools used in ticker functions. 2020-11-07 09:56:57 +11:00
Mitchell Richters
ad10ea4cb5 - Duke/RR: Initial implementation of scaled p->MotoSpeed controller input. 2020-11-07 09:56:57 +11:00
Mitchell Richters
578ded1db3 - Duke/RR: Promote p->MotoSpeed from short to double in prep for applying scaled controller input. 2020-11-07 09:56:57 +11:00
Mitchell Richters
c46ad10bb1 - Duke/RR: Clean up some disassembly variable names in vehicle so it's easier to understand what's going on. 2020-11-07 09:56:57 +11:00
Christoph Oelckers
94341e8582 - fixed missing null check in SetOwner and SetHitOwner. 2020-11-06 20:13:06 +01:00
Mitchell Richters
71be467065 - Duke: Fix missing ammo counter on modern HUD for WT's flamethrower.
* Fixes #156.
2020-11-06 22:07:11 +11:00
Mitchell Richters
c823e33bb3 - Duke/RR: Fix remaining issues with drug mode.
* Primary issue was call to `renderSetAspect()` within `setdrugmode()` wasn't mulscaling with `viewingrange`.
* Changed `setdrugmode()` to `getdrugmode()` to return `p->drug_aspect`. This is so `renderSetAspect()` needs to only be called from one place only.
2020-11-06 20:52:43 +11:00
Christoph Oelckers
d5ff87fa4f - RRRA: fixed vehicle collision with psychedelic cactuses.
This did not fully match the original source which had a critical difference here between RR and RRRA.
2020-11-05 14:31:55 +01:00
Christoph Oelckers
977223287e - cap the frame rate of RRRA's cactus drug mode.
This was running at full render speed.
2020-11-05 07:31:48 +01:00
Christoph Oelckers
d8e331ef0f - changed Duke/RR palette handling to only retrieve the currently active palette right before rendering.
Storing this in the player_struct is pointless and a relic from having to use real hardware palette switches.
With this now just being a translation index being passed to the backend it can be cheaply retrieved right when used and nowhere else.
Also making some changes to how RRRA's psychedelic cactus handles the projection. This fixes issues with occasionally passing a bad matrix.
2020-11-05 07:31:48 +01:00
Mitchell Richters
e8ccd9bc8c - Fix compilation. 2020-11-05 11:14:04 +11:00
Christoph Oelckers
60263ccad9 - fixed destroyit.
This caused parts of the exploding house in RRRA E1L5 not to disappear.
2020-11-04 21:53:56 +01:00
Christoph Oelckers
6729859e39 - fixed the crane.
Cannot take the special value out of the owner field. :(
2020-11-04 21:25:59 +01:00
Christoph Oelckers
721efae0d3 - fixed camera loop. 2020-11-04 20:44:12 +01:00
Christoph Oelckers
083454986b - made camsprite an actor variable. 2020-11-04 20:40:26 +01:00
Christoph Oelckers
25c93e65fc - more script ID wrappers for sectors. 2020-11-04 20:40:26 +01:00
Christoph Oelckers
aac5ab55a3 - movesprite cleanup. 2020-11-04 20:40:25 +01:00
Christoph Oelckers
7a95c1661e - wrap actor index storage in sector in the script index API. 2020-11-04 20:40:25 +01:00
Christoph Oelckers
471a25f819 - operaterespawns.
# Conflicts:
#	source/games/duke/src/sectors_d.cpp
#	source/games/duke/src/sectors_r.cpp
2020-11-04 20:40:25 +01:00
Christoph Oelckers
5cf288a05c - changed the trip bomb indexing to use a separate counter for robustness. 2020-11-04 20:40:25 +01:00
Christoph Oelckers
0eb10f0313 - newowner and related code. 2020-11-04 20:40:25 +01:00
Christoph Oelckers
c90e7d9b5f - almost the last owners 2020-11-04 20:40:08 +01:00
Christoph Oelckers
d0db810ab0 - ud.camerasprite -> actor. 2020-11-04 20:40:08 +01:00
Christoph Oelckers
212b99d0f3 - use owner wrappers in spawn code. 2020-11-04 20:40:08 +01:00
Christoph Oelckers
24cfd841f2 - lotsofglass - final function in spawn.cpp 2020-11-04 20:40:07 +01:00
Christoph Oelckers
4add2b5839 - two more 2020-11-04 20:40:07 +01:00
Christoph Oelckers
ac5ea2f1c9 - 3 more wrappers gone. 2020-11-04 20:40:07 +01:00
Christoph Oelckers
8f754d163d - removed inline wrappers that are not needed anymore.
# Conflicts:
#	source/games/duke/src/spawn_r.cpp
2020-11-04 20:40:07 +01:00
Christoph Oelckers
f3f0fd0a3a - ported the sound code to actors and removed the inline helpers. 2020-11-04 20:40:07 +01:00
Christoph Oelckers
4c3435bacf - moved some non-owner info out of the owner field.
This only handles items where both reading and writing can be located.
2020-11-04 20:40:07 +01:00
Christoph Oelckers
15fc884909 - owners in spawn.cpp 2020-11-04 20:40:06 +01:00
Christoph Oelckers
90511a97e7 - initcrane and spawneffector. 2020-11-04 20:40:06 +01:00
Christoph Oelckers
e2e24fc508 - spawn.cpp part 2.
(Beware of the crane! That one's hacky!)
2020-11-04 20:40:06 +01:00
Christoph Oelckers
edb991e47d - first part of spawn.cpp. 2020-11-04 20:40:06 +01:00
Christoph Oelckers
60977ef4dc - the spawn dispatcher is no longer used. 2020-11-04 20:40:06 +01:00
Christoph Oelckers
c54f17a6d5 - hittype in spawn code. 2020-11-04 20:40:05 +01:00
Christoph Oelckers
e427668373 - the remaining iterators in sectors_r.cpp 2020-11-04 20:39:43 +01:00
Christoph Oelckers
6a8dc8217f - 6 simple loops in sectors_r.cpp. 2020-11-04 20:39:43 +01:00
Christoph Oelckers
bb23d9131e - player.i, part 4. 2020-11-04 20:39:43 +01:00
Christoph Oelckers
d773601d81 - player.i, part 3 2020-11-04 20:39:43 +01:00
Christoph Oelckers
cc0a668da3 - player.i, part 2
# Conflicts:
#	source/games/duke/src/sectors_r.cpp
2020-11-04 20:39:43 +01:00
Christoph Oelckers
770897b8b9 - player.i, part 1 2020-11-04 20:39:42 +01:00
Christoph Oelckers
d5a74e4290 - handled several GetIndex calls. 2020-11-04 20:39:39 +01:00
Christoph Oelckers
64c83d166e - fixed a few parameters 2020-11-04 20:39:39 +01:00
Christoph Oelckers
eb5cd98d9a - fixed a few bad parameters. 2020-11-04 20:39:39 +01:00
Christoph Oelckers
a8212f0756 - crash fix in spawn and camera fix. 2020-11-04 20:25:02 +01:00
Christoph Oelckers
afd059d6a1 - the remaining loops in sectors_d.cpp 2020-11-04 19:55:18 +01:00
Christoph Oelckers
7c6ea9cff7 - activatebysector. 2020-11-04 19:55:17 +01:00
Christoph Oelckers
7aca51a6c4 - 6 more loops. 2020-11-04 19:55:17 +01:00
Christoph Oelckers
d8a7821b4f - cleaned up a few more loops. 2020-11-04 19:55:17 +01:00
Christoph Oelckers
618c739318 - spawninitdefault. 2020-11-04 19:55:17 +01:00
Christoph Oelckers
4d4cb2da9b - handle the cheap-ass ROR code. 2020-11-04 19:55:17 +01:00
Christoph Oelckers
10d4f92232 - use a dedicated variable to store the vehicle ammo for RRRA's bike and boat.
owner should be reserved for pointers.
2020-11-04 19:55:17 +01:00
Christoph Oelckers
803cf4aece - the last two loops in premap_r.cpp 2020-11-04 19:55:16 +01:00
Christoph Oelckers
a63c62bf7c - the geometry effect loop 2020-11-04 19:55:16 +01:00
Christoph Oelckers
9f3b74f4a2 - 3 loops in premap_r.cpp 2020-11-04 19:55:16 +01:00
Christoph Oelckers
8360ba99ff - fixed cacheit_r sector loop. 2020-11-04 19:55:16 +01:00
Christoph Oelckers
68f9037883 - pointer replacements. 2020-11-04 19:55:16 +01:00
Christoph Oelckers
86909c9068 - fixed cacheit_d sector loop. 2020-11-04 19:55:16 +01:00
Christoph Oelckers
2b0f56a94c - changed setsectinterpolate to receive a sector number, not a sprite number. 2020-11-04 19:55:16 +01:00
Christoph Oelckers
32fc9329de - another iterator.
This one's for init code that needs to iterate sprites in spawn order.
2020-11-04 19:55:15 +01:00
Christoph Oelckers
12ef8c4543 This completes player_r.cpp 2020-11-04 19:55:15 +01:00
Christoph Oelckers
34d0219d06 - nullptr fixes 2020-11-04 19:55:15 +01:00
Christoph Oelckers
36370b71e2 - wrapped neartag to return an actor. 2020-11-04 19:55:15 +01:00
Christoph Oelckers
bc6ae872ae - cleaned up the checkhitswitch interface to receive sprites as pointers. 2020-11-04 19:55:15 +01:00
Christoph Oelckers
3e7c8adc1e - checkhitswitch_r part 4 2020-11-04 19:55:15 +01:00
Christoph Oelckers
4ce19b74b0 - checkhitswitch_r part 3 2020-11-04 19:55:14 +01:00
Christoph Oelckers
e81b37b31a - checkhitswitch_r part 2 2020-11-04 19:55:14 +01:00
Christoph Oelckers
2a23dfa0a8 - checkhitswitch_r part 1 2020-11-04 19:55:14 +01:00
Christoph Oelckers
f13a8943ab - checkhitswitch_d part 2 2020-11-04 19:55:14 +01:00
Christoph Oelckers
f1ab8f03ef - checkhitswitch_d part 1 2020-11-04 19:55:14 +01:00
Christoph Oelckers
87e8801531 - handle the clipmove result in processinput. 2020-11-04 19:55:14 +01:00
Christoph Oelckers
419cf9af5e - processinput part 1. 2020-11-04 19:55:13 +01:00
Christoph Oelckers
ef2c773e02 - RR processweapon pass 1 2020-11-04 19:55:13 +01:00
Christoph Oelckers
d4dabee52d - OnMotorcycle/BoatHit. 2020-11-04 19:55:13 +01:00
Christoph Oelckers
454b2315d4 - use actors instead of indices for sound calls. 2020-11-04 19:55:13 +01:00
Christoph Oelckers
8d55138db0 - checkweapons_r. 2020-11-04 19:55:13 +01:00
Christoph Oelckers
635b53f78f - RR-movement + dummyplayersprite 2020-11-04 19:55:13 +01:00
Christoph Oelckers
60ec6b8c7d - handled the last remaining sprite references in player_d.cpp. 2020-11-04 19:55:12 +01:00
Christoph Oelckers
70e1b87160 - Duke underwater. 2020-11-04 19:55:12 +01:00
Christoph Oelckers
b302f2535f - player index and hittypes in player_d.cpp 2020-11-04 19:55:12 +01:00
Christoph Oelckers
f598c16e03 - use the script interface where needed.
Later the scripts should only see some token representing an actor, not an index.
2020-11-04 08:24:17 +01:00
Christoph Oelckers
773aa9976d - fixed compilation of release build. 2020-11-04 07:01:25 +01:00
Christoph Oelckers
29b08b2115 - access_spritenum 2020-11-03 22:49:17 +01:00
Christoph Oelckers
b891646c37 - all of player_w.cpp 2020-11-03 22:41:24 +01:00
Christoph Oelckers
be591e9cf9 - the last bit of shoot_d. 2020-11-03 22:41:24 +01:00
Christoph Oelckers
16089e56f0 - the rest of shoot_r. 2020-11-03 22:41:24 +01:00
Christoph Oelckers
47f77a97e4 - RR shootrpg and shootwhip. 2020-11-03 22:41:24 +01:00
Christoph Oelckers
aa6dd72688 - RR shootstuff 2020-11-03 22:41:23 +01:00
Christoph Oelckers
32a7c2349e - shoot interface transitioned/operateweapon mostly done. 2020-11-03 22:01:58 +01:00
Christoph Oelckers
513744aa56 - this was nonsense. atwith is a tile number, not a sprite index. 2020-11-03 21:51:17 +01:00
Christoph Oelckers
7e29be7569 - switched checkhitwall interface to actors. 2020-11-03 21:49:57 +01:00
Christoph Oelckers
4258c27248 - switched the checkhitsprite interface to actors. 2020-11-03 21:43:50 +01:00
Christoph Oelckers
30f4057451 - removed the remaining references to 'i' from checkhitsprite_d. 2020-11-03 21:43:50 +01:00
Christoph Oelckers
a31cb23be1 - checkhitsprite_r references to 'i' removed. 2020-11-03 21:43:49 +01:00
Christoph Oelckers
1ab13688a7 - RR shootweapon 2020-11-03 21:43:49 +01:00
Christoph Oelckers
51705e5a61 - RR shootmelee. 2020-11-03 21:43:49 +01:00
Christoph Oelckers
f276a5f443 - shootlaser and shootgrowspark 2020-11-03 21:43:49 +01:00
Christoph Oelckers
badf536fef - shootstuff and shootrpg. 2020-11-03 21:43:49 +01:00
Christoph Oelckers
ca78ed9b63 - shootweapon 2020-11-03 21:43:49 +01:00
Christoph Oelckers
617c2c2503 - replaced index for sound origin in checkhitsprite_r. 2020-11-03 21:43:48 +01:00
Christoph Oelckers
41f2fe5e06 - same for checkhitsprite_r. 2020-11-03 21:43:48 +01:00
Christoph Oelckers
4443234126 - replacing sprite[sn] in checkhitsprite_d. 2020-11-03 21:43:48 +01:00
Christoph Oelckers
faa4248c5c - lotsofglass wrapper and variable renaming in checkhitsprite_d. 2020-11-03 20:43:38 +01:00
Christoph Oelckers
17737eea85 - wrapped hitscan in a variant returning an actor. 2020-11-03 20:43:38 +01:00
Christoph Oelckers
768487584e - aim and all calling instances.
This also takes care of RR's chicken arrow storing an actor reference in lotag.
2020-11-03 20:42:03 +01:00
Christoph Oelckers
8268c1b538 - shootfireball, shootflamethrowerflame, shootknee 2020-11-03 20:21:53 +01:00
Christoph Oelckers
6ee856b8c1 - added missing 'break' to SE code.
This caused the car in RR's first level to go too fast.
2020-11-03 20:21:30 +01:00
Christoph Oelckers
3fdeedcae7 - player.cpp is free of array references, except one that's unavoidable for now. 2020-11-03 19:25:07 +01:00
Christoph Oelckers
79f850d126 - PlayerColorChanged, hits, hitasprite. 2020-11-03 19:21:44 +01:00
Christoph Oelckers
1fcd5eef47 - CON game access interface done. 2020-11-03 19:21:44 +01:00
Christoph Oelckers
f5cccb0df2 - actorflag, actorfella, automap, animateaccess, holoduke spawn, initreactor.
# Conflicts:
#	source/games/duke/src/game_misc.cpp
2020-11-03 19:21:43 +01:00
Christoph Oelckers
2db8ace275 - eliminated all array accesses in game_misc.cpp. 2020-11-03 19:21:43 +01:00
Christoph Oelckers
61013af910 - fixed three crashes found when testing WW2GI. 2020-11-03 19:21:43 +01:00
Christoph Oelckers
a514910aa4 - use an actor pointer in Get/SetGameVarID's parameters to weed out the ordering screwups. 2020-11-03 19:21:43 +01:00
Christoph Oelckers
de92287d0b - fixed the messed up parameter order of OnEvent.
This should serve as a textbook example why passing around indices is a very, very bad idea!
2020-11-03 19:21:42 +01:00
Christoph Oelckers
c1b5b17541 - removed a few references in animatesprites. 2020-11-03 19:21:42 +01:00
Christoph Oelckers
3ea6887c43 - replaced a bit more. 2020-11-03 19:21:42 +01:00
Christoph Oelckers
2c573a720b - starting at the bottom of player_r.cpp. 2020-11-03 19:21:42 +01:00
Christoph Oelckers
33f730baf3 - replaced "sprite[p->i]" globally. 2020-11-03 19:21:42 +01:00
Christoph Oelckers
b5309a6410 - some quick'n easy replacements. 2020-11-03 19:21:42 +01:00
Christoph Oelckers
cd70818d54 - added a few NULL checks. 2020-11-03 07:12:11 +01:00
Christoph Oelckers
b2497b346c - use GetActor() wrapper in hud weapon code. 2020-11-03 07:06:30 +01:00
Christoph Oelckers
f729f7d7a3 - renamed a few things in animatesprites.
This function will need special handling later, for now let's just reduce the work surface to a few pointers.
2020-11-03 07:06:30 +01:00
Christoph Oelckers
ac58dd8017 - execute. 2020-11-03 07:06:30 +01:00
Christoph Oelckers
8f815f9391 - LoadActor. 2020-11-03 07:06:29 +01:00
Christoph Oelckers
da9c4d90a2 - parse - part 7. 2020-11-03 07:06:29 +01:00
Christoph Oelckers
38817c3bee - parse - part 6. 2020-11-03 07:06:29 +01:00
Christoph Oelckers
aa3d1fdcad - parse - part 5. 2020-11-03 07:06:29 +01:00
Christoph Oelckers
7438b57f23 - parse - part 4. 2020-11-03 07:06:29 +01:00
Christoph Oelckers
59d9138b77 - parse - part 3. 2020-11-03 07:06:28 +01:00
Christoph Oelckers
65fc6dd3c7 - parse - part 2. 2020-11-03 07:06:28 +01:00
Christoph Oelckers
8bdeb66dcb - parse - part 1. 2020-11-03 07:06:28 +01:00
Christoph Oelckers
0fac102c26 - renamed variables in ifcansee. 2020-11-03 07:06:28 +01:00
Christoph Oelckers
83217ee620 - ifcansee. 2020-11-03 07:06:27 +01:00
Christoph Oelckers
83b47f60b3 - ifcanshoottarget. 2020-11-03 07:06:27 +01:00
Christoph Oelckers
ea9a8642b0 - doactor.
# Conflicts:
#	source/games/duke/src/gameexec.cpp
2020-11-03 07:06:27 +01:00
Christoph Oelckers
669fcc967f - cheats.cpp and ccmds.cpp handled.
# Conflicts:
#	source/games/duke/src/cheats.cpp
2020-11-03 07:06:27 +01:00
Christoph Oelckers
ad84c8149e - the rest of sectors.cpp 2020-11-03 07:06:27 +01:00
Christoph Oelckers
4236f800f6 - operateactivators and operatemasterswitches. 2020-11-03 07:06:26 +01:00
Christoph Oelckers
7635fc9ad6 - operatesectors. 2020-11-03 07:06:26 +01:00
Christoph Oelckers
326ca9e172 - handle_st28, 2020-11-03 07:06:26 +01:00
Christoph Oelckers
06695073d0 - handle_st27. 2020-11-03 07:06:26 +01:00
Christoph Oelckers
d4c53226d0 - handle_st25. 2020-11-03 07:06:26 +01:00
Christoph Oelckers
fd8ee214f5 - handle_st23. 2020-11-03 07:06:25 +01:00
Christoph Oelckers
e6507887d3 - handle_st20. 2020-11-03 07:06:25 +01:00
Christoph Oelckers
2afbbcb157 - handle_st29. 2020-11-03 07:06:25 +01:00