Commit graph

91 commits

Author SHA1 Message Date
Christoph Oelckers
fb95f0fff7 - store an actual actor pointer in PLAYER.
# Conflicts:
#	source/games/blood/src/player.cpp
2021-11-29 00:54:58 +01:00
Christoph Oelckers
7204b8e026 - deal with QAV::nIndex.
This was totally redundant. Since the player already gets passed as 'Data', we can just make that pointer a PLAYER type and use it instead to retrieve the playing actor for sound purposes.
2021-11-29 00:53:56 +01:00
Mitch Richters
1bb0c04e61 Revert "- Blood: Add mechanism to be able to force QAV interpolation based on picnum for testing purposes and not for end-user usage."
This reverts commit 276c000f9f.

* This was added for testing/debugging etc but it really doesn't work unless the QAV is built for it. As such, just get rid of it.
2021-11-06 17:32:55 +11:00
Mitchell Richters
726edc199e - Blood: Add SetQAV() static function to abstract away from directly setting the player's weaponQav variable to allow us to properly reset the framerate QAV timer values to 0 as well. 2021-08-28 16:43:17 +10:00
Mitchell Richters
656ec8ef06 - Blood: Apply a slightly better fix for the akimbo shotgun animation kQAV2SHOTF2 (res_id: 61).
* The issue here is that `pPlayer->weaponTimer` reaches 0 before the animation plays out. This is because the QAV timer has its own ticrate independent of the game's timer.
* A workaround like this is still the best approach for now as its not easily possible to remove `weaponTimer` within the game without messing up the trigger system that runs at ticrate.
2021-08-27 22:18:57 +10:00
Mitchell Richters
6d06f063f6 - Blood: Directly use the incoming loopable bool from gi->AddQAVInterpProps() in the QAVInterpProps struct.
* During the initial implementation, there were more flags than this single one. I don't foresee any further flags coming so lets go for cleaner code.
2021-08-26 11:20:26 +10:00
Mitchell Richters
5a32000d1e - Blood: Interpolate the alpha and shade values when interpolating QAVs. 2021-08-24 10:07:58 +10:00
Mitchell Richters
b1fa923f02 - Blood: Re-organise QAVInterpProps struct so that when statically declaring forcedinterpdata, only the required value needs passing. 2021-08-24 10:06:54 +10:00
Mitchell Richters
4ffd02b1e1 - Blood: Declare qavGetInterpType() as static within qav.cpp. 2021-08-23 21:00:45 +10:00
Mitchell Richters
276c000f9f - Blood: Add mechanism to be able to force QAV interpolation based on picnum for testing purposes and not for end-user usage. 2021-08-23 20:54:30 +10:00
Mitchell Richters
62e1fdf709 - Blood: Fix handling of QAVs defined as loopable while interpolating. 2021-08-23 12:05:13 +10:00
Mitchell Richters
ebdc9c31f2 - Blood: Ensure new QAV timer doesn't process while game is paused. 2021-08-23 11:05:08 +10:00
Mitchell Richters
5bfdd74844 - Blood: Revert "- Blood: Ensure looped QAVs interpolate using last frame in the array." 2021-08-23 09:32:00 +10:00
Mitchell Richters
916241dcdb - Blood: Implement defineqav DEF parser with hookup to game-side code. 2021-08-23 09:00:47 +10:00
Mitchell Richters
da78160cd1 - Blood: Revert code to dump out QAVs to disk and remove all hard-coded interpolation repairs. 2021-08-22 21:20:15 +10:00
Mitchell Richters
499e400cdb - Blood: Add command-line switch to dump repaired QAVs back out to disk so that they can be included in raze.pk3.
* This required restoring the original struct temporarily to ensure contents dumped to disk were 1:1 with how they came in.
2021-08-22 15:22:58 +10:00
Mitchell Richters
a681aad281 - Blood: Add interpolation repair and properties for kQAVLITEFLAM (res_id: 5). 2021-08-22 15:03:20 +10:00
Mitchell Richters
6256de8013 - Blood: Extend interpolation repair for kQAVBUNUP (res_id: 16) to add missing tile in first frame. 2021-08-22 11:23:29 +10:00
Mitchell Richters
2edbd3447c - Blood: Extend interpolation properties for kQAVBUNFUSE (res_id: 21) to stop interpolating all tiles after frame 6 and not just tile index 4. 2021-08-22 10:55:01 +10:00
Mitchell Richters
7e8ec89a68 - Blood: Add interpolation repair for kQAVSTAFDOWN (res_id: 119). 2021-08-22 08:18:17 +10:00
Mitchell Richters
a03848d1f8 - Blood: Add interpolation repair for kQAVSTAFIRE4 (res_id: 116). 2021-08-22 08:18:14 +10:00
Mitchell Richters
fb084734e3 - Blood: Add interpolation repair for kQAVVDSPEL1 (res_id: 110). 2021-08-22 08:18:00 +10:00
Mitchell Richters
0172373650 - Blood: Add interpolation repair for kQAVVDDOWN (res_id: 109). 2021-08-22 08:17:50 +10:00
Mitchell Richters
95878bcea1 - Blood: Add interpolation repair for kQAVVDFIRE4 (res_id: 106) and kQAVVDFIRE5 (res_id: 107). 2021-08-22 08:17:47 +10:00
Mitchell Richters
d34fd124b7 - Blood: Add interpolation repair for kQAVVDFIRE3 (res_id: 105). 2021-08-22 08:17:44 +10:00
Mitchell Richters
a3a2cd8da8 - Blood: Add interpolation repair for kQAVVDFIRE1 (res_id: 103) and kQAVVDFIRE2 (res_id: 104). 2021-08-22 08:17:37 +10:00
Mitchell Richters
cd092153eb - Blood: Mark kQAVVDIDLE2 (res_id: 102) as being loopable. 2021-08-22 08:17:14 +10:00
Mitchell Richters
803e9f8a04 - Blood: Add interpolation repair for kQAVVDIDLE2 (res_id: 102). 2021-08-22 08:16:41 +10:00
Mitchell Richters
1fd66681d2 - Blood: Add interpolation repair for kQAVVDUP (res_id: 100). 2021-08-22 08:15:53 +10:00
Mitchell Richters
3a656c91cb - Blood: Mark kQAVNAPFIRE (res_id: 91) as being loopable. 2021-08-22 08:15:43 +10:00
Mitchell Richters
d4fe734afa - Blood: Add interpolation repair for kQAVNAPUP (res_id: 89). 2021-08-22 08:14:47 +10:00
Mitchell Richters
99ab8fa726 - Blood: Add interpolation repair for kQAV2SGUNPRE (res_id: 86). Thanks again to @Phredreeke for the tiles with overlays baked in for this to work properly. 2021-08-22 08:14:45 +10:00
Mitchell Richters
ed92ec9af9 - Blood: Add interpolation repair for kQAV2SGUNALT (res_id: 85). Thanks again to @Phredreeke for the tiles with overlays baked in for this to work properly. 2021-08-22 08:14:42 +10:00
Mitchell Richters
b2637050e8 - Blood: Mark kQAV2SGUNFIR (res_id: 84) as being loopable. 2021-08-22 08:14:33 +10:00
Mitchell Richters
22e348613f - Blood: Add interpolation repair for kQAV2SGUNFIR (res_id: 84). Thanks to @Phredreeke for the tiles with overlays baked in for this to work properly. 2021-08-22 08:14:05 +10:00
Mitchell Richters
073f0d953f - Blood: Add interpolation repair for kQAV2SGUNUP (res_id: 82). 2021-08-22 08:14:03 +10:00
Mitchell Richters
7bbf478859 - Blood: Add interpolation repair for kQAVSGUNPOST (res_id: 80). Thanks again to @Phredreeke for the tiles with overlays baked in for this to work properly. 2021-08-22 08:14:00 +10:00
Mitchell Richters
df3bc4d90a - Blood: Add interpolation repair for kQAVSGUNPRE (res_id: 79). Thanks again to @Phredreeke for the tiles with overlays baked in for this to work properly. 2021-08-22 08:13:58 +10:00
Mitchell Richters
1033049b8c - Blood: Add interpolation repair for kQAVSGUNFIR4 (res_id: 78). Thanks again to @Phredreeke for the tiles with overlays baked in for this to work properly. 2021-08-22 08:13:49 +10:00
Mitchell Richters
1f6bfd7693 - Blood: Mark kQAVSGUNFIR1 (res_id: 77) as being loopable. 2021-08-22 07:58:40 +10:00
Mitchell Richters
2ff1bdfd7d - Blood: Add interpolation repair for kQAVSGUNFIR1 (res_id: 77). Thanks to @Phredreeke for the tiles with overlays baked in for this to work properly. 2021-08-22 07:58:14 +10:00
Mitchell Richters
5160b7649c - Blood: Add interpolation repair for kQAVSGUNIDL1 (res_id: 75). 2021-08-22 07:58:11 +10:00
Mitchell Richters
7eca7ea166 - Blood: Add interpolation repair for kQAVSGUNUP (res_id: 74). 2021-08-22 07:58:09 +10:00
Mitchell Richters
df5185038f - Blood: Mark kQAV2TOMALT (res_id: 73) as being loopable. 2021-08-22 07:57:57 +10:00
Mitchell Richters
c46c52a724 - Blood: Add interpolation properties for kQAV2TOMFIRE (res_id: 71). 2021-08-22 07:57:57 +10:00
Mitchell Richters
c6c7ae76d6 - Blood: Mark kQAVTOMSPRED (res_id: 67) as being loopable. 2021-08-22 07:57:01 +10:00
Mitchell Richters
6998772487 - Blood: Add interpolation properties for kQAVTOMFIRE (res_id: 66). 2021-08-22 07:56:23 +10:00
Mitchell Richters
3cd868c9f9 - Blood: Add interpolation repair for kQAV2SHOTFIR (res_id: 62). 2021-08-22 07:55:57 +10:00
Mitchell Richters
cdff574ef6 - Blood: Add interpolation repair for kQAV2SHOTF2 (res_id: 61). 2021-08-22 07:55:54 +10:00
Mitchell Richters
bfa509e45e - Blood: Add interpolation properties for kQAVSHOTL1 (res_id: 57). 2021-08-22 07:55:42 +10:00