Christoph Oelckers
c288de920d
- Blood: don't abort the INI scanner if it finds a file with resource file index 0.
...
0 is also used for on-the-fly addition of data to the file system, so this must run through the entire directory to be safe.
2021-08-24 18:40:29 +02:00
Mitchell Richters
fd149e50ee
- Remove early return from GrpScan()
that was allowing addons to come through even if they weren't valid.
...
* Raze configured to only search $PROGDIR with a single `worldtour.grp` file would attempt to autoload even if its dependency CRC wasn't present. Attempted to re-arrange function but had mixed results. Removing this early return is what worked under all test cases.
2021-08-24 20:56:28 +10:00
Christoph Oelckers
90b7524706
- SW: fixed episode indexing resulting in bad display on the automap.
2021-08-24 09:57:36 +02: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
542f005565
- Blood: Fixed weapon switching while using Voodoo Doll playing its idle animation.
...
* Fixes #517 .
2021-08-24 07:25:52 +10:00
Christoph Oelckers
feb11a2f9a
- fixed one merge conflict that managed to slip through.
2021-08-23 19:24:56 +02:00
Christoph Oelckers
0e7c61dc33
- tabified code.
2021-08-23 19:21:41 +02:00
Christoph Oelckers
ac40e86ab2
- actSpawnSprite
...
# Conflicts:
# source/games/blood/src/actor.cpp
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:20:05 +02:00
Christoph Oelckers
ebdb4927cc
- got rid of a few sprite/xsprite references.
...
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:19:36 +02:00
Christoph Oelckers
2cfb4f908e
- actProcessSprites done.
...
# Conflicts:
# source/games/blood/src/actor.cpp
# Conflicts:
# source/games/blood/src/actor.cpp
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:18:22 +02:00
Christoph Oelckers
7faebdcbf1
- first two loops of actProcessSprites split off and redone.
...
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:15:18 +02:00
Christoph Oelckers
ddcb12a8b2
- MoveMissile + actExplodeSprite.
...
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:15:08 +02:00
Christoph Oelckers
29c2e68270
- tabified MoveDude
...
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:13:29 +02:00
Christoph Oelckers
8c01c363a9
- replaced remaining access to sprite[] and xsprite[] in processed code.
...
# Conflicts:
# source/games/blood/src/actor.cpp
# Conflicts:
# source/games/blood/src/actor.cpp
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:13:28 +02:00
Christoph Oelckers
c1d52f7393
- replaced all occurences of gDudeExtra and moved that struct into DBloodActor.
...
# Conflicts:
# source/games/blood/src/ai.cpp
2021-08-23 19:13:28 +02:00
Christoph Oelckers
4fed1debe4
- moveDude part 1.
2021-08-23 19:13:28 +02:00
Christoph Oelckers
3aa9d6f8be
- MoveThing.
...
# Conflicts:
# source/games/blood/src/actor.cpp
2021-08-23 19:12:58 +02:00
Christoph Oelckers
6d958135e0
- give TMap a proper move constructor and assignment operator.
2021-08-23 19:05:31 +02:00
carnivoroussociety
e74e581637
Fix issues with self collision on MoveMissile()
...
Only with new accurate clipmove() use
2021-08-23 18:40:38 +02: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
carnivoroussociety
2365be7c95
Add modern map kViewEffectSpotProgress support
...
Fix kViewEffectShowWeapon positional/angle offset for voodoo doll
2021-08-23 19:28:32 +10:00
Mitchell Richters
1d0924e45a
- Fix invocation name in FileSystem::GetLongName()
error output.
...
* Thanks to @Gaerzi for spotting this.
2021-08-23 18:55:42 +10:00
Mitchell Richters
a920fc5aef
- Add support for first
and last
keyword for defineqav
parser when process interpolate ignore
block.
2021-08-23 15:34:30 +10:00
Mitchell Richters
23be5ffe8c
- Add support for all
keyword for defineqav
parser when process interpolate ignore
block, and ensure the lowest value can't be below 0.
2021-08-23 15:06:04 +10:00
Mitchell Richters
e68b793852
- Add some extra safety to defineqav
parser to ensure some unsupported actions can't be performed.
2021-08-23 14:19:33 +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
ddc7b3d730
Merge branch 'master' into master
2021-08-23 11:40:05 +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
1ee6fd76c4
Merge branch 'blood-qavrework'
...
# Conflicts:
# source/core/gamecvars.cpp
# source/core/gamecvars.h
# source/games/blood/src/weapon.cpp
2021-08-23 11:02:09 +10:00
Mitchell Richters
d7450e12f0
- Blood: Re-add interpolated weapon QAVs in an externalised, disabled-by-default fashion.
2021-08-23 10:55:08 +10:00
Mitchell Richters
6975997ae3
- Blood: Remove weaponQAV[]
array entirely.
2021-08-23 10:49:47 +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
carnivoroussociety
72225c9b8c
Added various missing item/ammo types to common_game.h
...
Renamed kAmmoItemVoodooDoll->kItemAmmoVoodooDoll
Renamed kMissileFireballNapam->kMissileFireballNapalm
2021-08-22 17:49:02 +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
907e0974e9
- Add GetLongName()
method to FileSystem
class.
2021-08-22 15:03:28 +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
dd1e716082
- Blood: Extend backported voodoo doll fix from BloodGDX to always use kQAVVDIDLE2
when the player is moving. As kQAVVDIDLE2
has moving frames and is not a static idle animation, call it via StartQAV()
so that weaponTimer
is started.
2021-08-22 08:17:33 +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
Mitchell Richters
ba91590028
- Blood: Add interpolation repair for kQAVSHOTUP
(res_id: 50).
2021-08-22 07:55:14 +10:00
Mitchell Richters
e00f76b0aa
- Blood: Add interpolation repair for kQAVFLAR2FIR
(res_id: 48).
2021-08-22 07:55:11 +10:00
Mitchell Richters
e0bcd2d9e9
- Blood: Add interpolation repair for kQAVFLARDOWN
(res_id: 44).
2021-08-22 07:55:09 +10:00
Mitchell Richters
37f7bcde20
- Blood: Mark kQAVFLARFIR2
(res_id: 43) as being loopable.
2021-08-22 07:54:08 +10:00
Mitchell Richters
e70b395d76
- Blood: Add interpolation repair for kQAVFLARFIR2
(res_id: 43).
2021-08-22 07:53:38 +10:00
Mitchell Richters
dfa3a52fa8
- Blood: Add interpolation repair for kQAVFLARUP
(res_id: 41).
2021-08-22 07:53:35 +10:00
Mitchell Richters
7e3307eb33
- Blood: Add interpolation repair for kQAVREMTHRO
(res_id: 39).
2021-08-22 07:53:33 +10:00
Mitchell Richters
6d888bebd9
- Blood: Add interpolation repair for kQAVREMDROP
(res_id: 38).
2021-08-22 07:53:30 +10:00
Mitchell Richters
92c5a53074
- Blood: Mark kQAVREMIDLE1
(res_id: 36) and kQAVREMIDLE2
(res_id: 37) as being loopable.
2021-08-22 07:52:55 +10:00
Mitchell Richters
55b6453415
- Blood: Add interpolation repair for kQAVREMDOWN2
(res_id: 34).
2021-08-22 07:51:53 +10:00
Mitchell Richters
226ba1477a
- Blood: Add interpolation repair for kQAVREMDOWN1
(res_id: 33).
2021-08-22 07:51:50 +10:00
Mitchell Richters
3cc2a6a486
- Blood: Add interpolation repair for kQAVREMUP1
(res_id: 30) and kQAVREMUP2
(res_id: 31).
2021-08-22 07:51:44 +10:00
Mitchell Richters
679903b90f
- Blood: Add interpolation repair for kQAVPROXDOWN
(res_id: 26).
2021-08-22 07:51:40 +10:00
Mitchell Richters
34f31e535c
- Blood: Add interpolation repair for kQAVPROXUP
(res_id: 25).
2021-08-22 07:51:36 +10:00
Mitchell Richters
8944f2e57d
- Blood: Add interpolation repair for kQAVBUNTHRO
(res_id: 23).
2021-08-22 07:51:34 +10:00
Mitchell Richters
7f9f57e4e6
- Blood: Add interpolation repair for kQAVBUNDROP
(res_id: 22).
2021-08-22 07:51:30 +10:00
Mitchell Richters
54cdc8ffc3
- Blood: Add interpolation repair and properties for kQAVBUNFUSE
(res_id: 21).
2021-08-22 07:50:45 +10:00
Mitchell Richters
da95af0c04
- Blood: Add interpolation repair for kQAVBUNDOWN2
(res_id: 19).
2021-08-22 07:50:16 +10:00
Mitchell Richters
cb62692e37
- Blood: Add interpolation repair for kQAVBUNUP2
(res_id: 18).
2021-08-22 07:50:14 +10:00
Mitchell Richters
037fcfd446
- Blood: Add interpolation repair for kQAVBUNDOWN
(res_id: 17).
2021-08-22 07:50:10 +10:00
Mitchell Richters
33d63724f7
- Blood: Add interpolation repair for kQAVBUNUP
(res_id: 16).
2021-08-22 07:50:06 +10:00
Mitchell Richters
28cbec5704
- Blood: Add interpolation repair and properties for kQAVCANFIRE2
(res_id: 12).
2021-08-22 07:49:49 +10:00
Mitchell Richters
bcfcbf2666
- Blood: Add interpolation repair for kQAVCANDOWN
(res_id: 11).
2021-08-22 07:48:57 +10:00
Mitchell Richters
f5533374ca
- Blood: Disable interpolation for kQAVLITEFLAM
(res_id: 5).
2021-08-22 07:48:48 +10:00
Mitchell Richters
6d06f002bc
- Blood: Mark kQAVPFORK
(res_id: 2) as being loopable.
2021-08-22 07:47:42 +10:00
Mitchell Richters
e273b93d12
- Blood: Overhaul entire QAV interpolation setup in preparation to exposing to DEF parsing.
2021-08-21 21:25:33 +10:00