Commit graph

4089 commits

Author SHA1 Message Date
Christoph Oelckers
03c9ef6d20 - SetGunQuake 2021-11-29 00:56:16 +01:00
Christoph Oelckers
2f1e23a654 - replaced PLAYER::PlayerSprite with PLAYER::actor
# Conflicts:
#	source/games/sw/src/save.cpp
2021-11-29 00:56:15 +01:00
Christoph Oelckers
5b10e9f2d5 - got rid of SpriteP pointers in PLAYER and USER. 2021-11-29 00:56:15 +01:00
Christoph Oelckers
8d95b9cb98 - got rid of the PlaySound variant taking a sprite pointer. 2021-11-29 00:56:15 +01:00
Christoph Oelckers
580b7002fb - PlaySound calls in DoGet. 2021-11-29 00:56:15 +01:00
Christoph Oelckers
6f8480ebc3 - KillGet... functions. 2021-11-29 00:56:15 +01:00
Christoph Oelckers
95b7949f7d - minor sprite.cpp cleanup. 2021-11-29 00:56:14 +01:00
Christoph Oelckers
cb477d4ab7 - ActorSpawn cleanup. 2021-11-29 00:56:14 +01:00
Christoph Oelckers
d8ea4db5b2 - Got rid of SpawnSprite. 2021-11-29 00:56:14 +01:00
Christoph Oelckers
a57af58d4c - get rid of KillSprite. 2021-11-29 00:56:14 +01:00
Christoph Oelckers
431103032f - SpriteOverlapZ 2021-11-29 00:56:14 +01:00
Christoph Oelckers
66e61d799d - handle the remaining SectIterators. 2021-11-29 00:56:14 +01:00
Christoph Oelckers
df5d980f79 - handle all remaining StatIterators. 2021-11-29 00:56:13 +01:00
Christoph Oelckers
69223af7b0 - SpriteControl and subfunctions. 2021-11-29 00:56:13 +01:00
Christoph Oelckers
591a3f623d - dead code removal. 2021-11-29 00:56:13 +01:00
Christoph Oelckers
79dcd2c178 - iterators in CollectPortals 2021-11-29 00:56:13 +01:00
Christoph Oelckers
8df851c3e3 - unsaved bits. 2021-11-29 00:56:13 +01:00
Christoph Oelckers
f8105dc92b - track.cpp complete. 2021-11-29 00:56:12 +01:00
Christoph Oelckers
4796ebc73c - track setup code 2021-11-29 00:56:12 +01:00
Christoph Oelckers
92c497ac29 - TrackSetup 2021-11-29 00:56:12 +01:00
Christoph Oelckers
c34f0ab210 - SectorObjectSetupBounds
Note: Do proper checks on crashing mapping errors. Asserts are insufficient for these!
2021-11-29 00:56:12 +01:00
Christoph Oelckers
41f8c6f4af - owner fixes in weapons.cpp.
# Conflicts:
#	source/games/sw/src/game.h

# Conflicts:
#	source/games/sw/src/game.h
#	source/games/sw/src/weapon.cpp
2021-11-29 00:56:12 +01:00
Christoph Oelckers
e908e4ff44 - final bit of weapon.cpp cleanup. 2021-11-29 00:56:12 +01:00
Christoph Oelckers
31f4a7464a - finishing up with DoDamage. 2021-11-29 00:56:11 +01:00
Christoph Oelckers
487e2b7a1e - ActorHealth + ActorPain 2021-11-29 00:56:11 +01:00
Christoph Oelckers
93ad08a167 - ActorStdMissile + ActorDamageSlide
# Conflicts:
#	source/games/sw/src/weapon.cpp
2021-11-29 00:56:11 +01:00
Christoph Oelckers
2c39177c07 - ActorChooseDeath 2021-11-29 00:56:11 +01:00
Christoph Oelckers
604731bc08 - GetDamage
# Conflicts:
#	source/games/sw/src/weapon.cpp
2021-11-29 00:56:11 +01:00
Christoph Oelckers
2b4ed0eaf3 - PlayerCheckDeath 2021-11-29 00:56:10 +01:00
Christoph Oelckers
14b3a68e8c - DoDamage API.
# Conflicts:
#	source/games/sw/src/weapon.cpp
2021-11-29 00:56:10 +01:00
Christoph Oelckers
f8eac8c8eb - SpriteOverlap 2021-11-29 00:56:10 +01:00
Christoph Oelckers
2c4862b220 - DoDamageTest + DoHitscanDamage + DoFlamesDamageTest 2021-11-29 00:56:10 +01:00
Christoph Oelckers
ddd6f881f0 - DoExpDamageTest + DoMineExpMine 2021-11-29 00:56:10 +01:00
Christoph Oelckers
15e7e784c5 - did the internal movement helpers. 2021-11-29 00:56:09 +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
606ce997ac - cleanup of collision maintenance.
u->ret is gone, and for clearing the collision info the proper utilities are being called now.
2021-11-29 00:56:09 +01:00
Christoph Oelckers
5f32bc17ef - WeaponMoveHit 2021-11-29 00:56:09 +01:00
Christoph Oelckers
edf84c6fbc - DoStar, DoCrossBolt, DoPlasmaDone 2021-11-29 00:56:09 +01:00
Christoph Oelckers
f516a538d4 - Seekers + BlurExtend. 2021-11-29 00:56:08 +01:00
Christoph Oelckers
7d99745cd6 - DoPlasmaFountain + InitPlasmaFountain 2021-11-29 00:56:08 +01:00
Christoph Oelckers
f888375e2a - several u->ret replaced. 2021-11-29 00:56:08 +01:00
Christoph Oelckers
05a812f066 - DoPlasma, DoCoolgFire, DoEelFire. 2021-11-29 00:56:08 +01:00
Christoph Oelckers
0377f3348c - DoGrenade 2021-11-29 00:56:08 +01:00
Christoph Oelckers
45c2129ac4 - DoVulcanBoulder 2021-11-29 00:56:07 +01:00
Christoph Oelckers
c015e6691a - DoMineStuck + subfunctions. 2021-11-29 00:56:07 +01:00
Christoph Oelckers
01609b8e9f - DoMine 2021-11-29 00:56:07 +01:00
Christoph Oelckers
4d5569d785 - several very simple functions. 2021-11-29 00:56:07 +01:00
Christoph Oelckers
a0fd5bef66 - DoLaserStart, DoRail, DoRailStart, DoRocket 2021-11-29 00:56:07 +01:00
Christoph Oelckers
35579a9f08 - SpawnExoZAdjust arguments. 2021-11-29 00:56:06 +01:00
Christoph Oelckers
dd528c5eab - DoMicroMini, SpawnExtraMicroMini, DoMicro, DoUziBullet, DoBoltSeeker 2021-11-29 00:56:06 +01:00
Christoph Oelckers
acc9a09db9 - DoElectro, DoLavaBoulder, DoSpear, SpawnCoolieExp.
# Conflicts:
#	source/games/sw/src/weapon.cpp
2021-11-29 00:56:06 +01:00
Christoph Oelckers
151306d763 - SpawnFireballFlames
# Conflicts:
#	source/games/sw/src/weapon.cpp
#	source/games/sw/src/weapon.h
2021-11-29 00:56:06 +01:00
Christoph Oelckers
b863901037 - Spawn*flames 2021-11-29 00:56:06 +01:00
Christoph Oelckers
e56b055e2e - Spawn(Goro)FireballExp 2021-11-29 00:56:06 +01:00
Christoph Oelckers
818bdc3b03 - WeaponMoveHit plus some smaller functions. 2021-11-29 00:56:05 +01:00
Christoph Oelckers
8af0455f92 - VehicleMoveHit 2021-11-29 00:56:05 +01:00
Christoph Oelckers
57fc6ce53a - several smaller Shrap functions. 2021-11-29 00:56:05 +01:00
Christoph Oelckers
10b18d8a9b - SpawnShrap 2021-11-29 00:56:05 +01:00
Christoph Oelckers
e523c78269 - MissileHitMatch 2021-11-29 00:56:04 +01:00
Christoph Oelckers
4568564150 - SpawnTankShellExp, SpawnBunnyExp, SpawnBoltExp 2021-11-29 00:56:04 +01:00
Christoph Oelckers
3a16ac673c - SpawnNuclearExp 2021-11-29 00:56:04 +01:00
Christoph Oelckers
2480beebcf - owner checks in PlayerTakeDamage 2021-11-29 00:56:04 +01:00
Christoph Oelckers
f0c670603e - DoNapalm, DoBloodWorm 2021-11-29 00:56:04 +01:00
Christoph Oelckers
a96cffc4ef - SpawnTracerExp + SpawnMicroExp. 2021-11-29 00:56:03 +01:00
Christoph Oelckers
a40fca5398 - SpawnBigGunFlames 2021-11-29 00:56:03 +01:00
Christoph Oelckers
120a14a9a7 - SpawnGrenadeSecondaryExp 2021-11-29 00:56:03 +01:00
Christoph Oelckers
f3037a0b0c - SpawnGrenadeExp
# Conflicts:
#	source/games/sw/src/weapon.h
2021-11-29 00:56:03 +01:00
Christoph Oelckers
28c07b6b3c - more explosions. 2021-11-29 00:56:03 +01:00
Christoph Oelckers
aa8b217f07 - SpawnMeteorExp 2021-11-29 00:56:02 +01:00
Christoph Oelckers
28e10656b2 - DoFireball + SpawnLittleExp 2021-11-29 00:56:02 +01:00
Christoph Oelckers
cbf8d2324a - DoFindGround(Point) 2021-11-29 00:56:02 +01:00
Christoph Oelckers
6a25b4a560 - getzrange wrappers.
# Conflicts:
#	source/games/sw/src/game.h
2021-11-29 00:56:02 +01:00
Christoph Oelckers
057de89b9b - u->ret cleanup. 2021-11-29 00:56:02 +01:00
Christoph Oelckers
f8a74df87e - Mirvs and Meteors. 2021-11-29 00:56:01 +01:00
Christoph Oelckers
6f0c477e85 - getting rid of COVERinsertsprite, plus cleanup. 2021-11-29 00:56:01 +01:00
Christoph Oelckers
e2c5b33ae1 - MissileSetPos
This removes a lot of GetSpriteIndex references. :)
2021-11-29 00:56:01 +01:00
Christoph Oelckers
6a31b93434 - ring stuff 2021-11-29 00:56:01 +01:00
Christoph Oelckers
512bc7ddbb - InitLavaThrow + InitVulcanBoulder + InitSerpRing. 2021-11-29 00:56:01 +01:00
Christoph Oelckers
79ff267391 - Napalm stuff 2021-11-29 00:56:00 +01:00
Christoph Oelckers
ac277a8ecc - MIRVs. 2021-11-29 00:56:00 +01:00
Christoph Oelckers
78e45e889a - InitSwordAttack 2021-11-29 00:56:00 +01:00
Christoph Oelckers
74b94f4bf3 - InitFistAttack. 2021-11-29 00:56:00 +01:00
Christoph Oelckers
d72bcfec97 - WeaponAutoAimZvel 2021-11-29 00:56:00 +01:00
Christoph Oelckers
674e4b9499 - AimHitscanToTarget, WeaponHitscanShootFeet, InitStar 2021-11-29 00:56:00 +01:00
Christoph Oelckers
d94ed87e43 - WeaponAutoAim 2021-11-29 00:55:59 +01:00
Christoph Oelckers
ee8eb238d2 - TestMissileSetPos 2021-11-29 00:55:59 +01:00
Christoph Oelckers
7f031f06ef - HelpMissileLateral.
# Conflicts:
#	source/games/sw/src/weapon.cpp
2021-11-29 00:55:59 +01:00
Christoph Oelckers
514baa9a8f - InitHeartAttack plus some cleanup. 2021-11-29 00:55:59 +01:00
Christoph Oelckers
aec3b40e7b - ContinueHitscan 2021-11-29 00:55:59 +01:00
Christoph Oelckers
105ef08384 - Init(Bunny)Rocket 2021-11-29 00:55:58 +01:00
Christoph Oelckers
0690a5c035 - InitShotgun + InitLaser
InitLaser is unused but fully functional, so let's keep it for modding.
2021-11-29 00:55:58 +01:00
Christoph Oelckers
3b49b053d7 - Init(Zilla)Rail 2021-11-29 00:55:58 +01:00
Christoph Oelckers
35d6f7efd5 - Init(Enemy)Nuke 2021-11-29 00:55:58 +01:00
Christoph Oelckers
7436c17469 - InitMicro 2021-11-29 00:55:58 +01:00
Christoph Oelckers
ecc2da58d5 - 4 more damage functions. 2021-11-29 00:55:57 +01:00
Christoph Oelckers
290482ffb1 - several damage functions. 2021-11-29 00:55:57 +01:00
Christoph Oelckers
a662f8b076 - InitSerpSpell + SpawnDemonFist 2021-11-29 00:55:57 +01:00
Christoph Oelckers
3cd05147e5 - InitEnemyRocket + InitSerpMonstSpell 2021-11-29 00:55:57 +01:00
Christoph Oelckers
63870b6077 - InitEnemyRail, InitZillaRocket, InitEnemyStar 2021-11-29 00:55:57 +01:00
Christoph Oelckers
289856a1fc - InitEnemyCrossbow, InitSkelSpell, InitCoolgFire 2021-11-29 00:55:56 +01:00
Christoph Oelckers
f66dcd8d53 - fixed deletion of FAF_COPY actors.
This called the wrong function.
2021-11-29 00:55:56 +01:00
Christoph Oelckers
845cf124e1 - drips and eels. 2021-11-29 00:55:56 +01:00
Christoph Oelckers
84e99a377d - Init*Trap. 2021-11-29 00:55:56 +01:00
Christoph Oelckers
6e922b2851 - InitTracerUzi 2021-11-29 00:55:56 +01:00
Christoph Oelckers
e8791001e4 - InitTracerTurret + InitTracerAutoTurret 2021-11-29 00:55:55 +01:00
Christoph Oelckers
70adfe43bf - BulletHitSprite 2021-11-29 00:55:55 +01:00
Christoph Oelckers
ff60bf0430 - MissileWaterAdjust
# Conflicts:
#	source/games/sw/src/weapon.cpp
2021-11-29 00:55:55 +01:00
Christoph Oelckers
81131f7a71 - HitscanSpriteAdjust 2021-11-29 00:55:55 +01:00
Christoph Oelckers
9c0a5312eb - InitUzi 2021-11-29 00:55:55 +01:00
Christoph Oelckers
c053b46a6d - removed the disabled and mostly non-functional code for the EMP gun (secondary fire of railgun) 2021-11-29 00:55:54 +01:00
Christoph Oelckers
5900ac7db4 - InitTankShell + InitEMP. 2021-11-29 00:55:54 +01:00
Christoph Oelckers
a25bdf2354 - InitTurretMicro 2021-11-29 00:55:54 +01:00
Christoph Oelckers
4141b5d609 - InitTurretRocket + InitTurretFireball 2021-11-29 00:55:54 +01:00
Christoph Oelckers
6e7892c326 - InitTurretRail + InitTurretLaser 2021-11-29 00:55:54 +01:00
Christoph Oelckers
9eb1f9963a - InitSobjMachineGun 2021-11-29 00:55:53 +01:00
Christoph Oelckers
60d5490654 - Init SobjGun 2021-11-29 00:55:53 +01:00
Christoph Oelckers
2c0a597f06 - WeaponAutoAimHitscan
# Conflicts:
#	source/games/sw/src/weapon.cpp
2021-11-29 00:55:53 +01:00
Christoph Oelckers
9d0056f8c7 - Spawn*Sparks functions. 2021-11-29 00:55:53 +01:00
Christoph Oelckers
ddd682aee6 - InitTurretMgun 2021-11-29 00:55:53 +01:00
Christoph Oelckers
da1e97469e - FAFhitscan migration to HITINFO. 2021-11-29 00:55:52 +01:00
Christoph Oelckers
63f9330f53 - InitEnemyUzi 2021-11-29 00:55:52 +01:00
Christoph Oelckers
614757cda4 - InitGrenade 2021-11-29 00:55:52 +01:00
Christoph Oelckers
2515a663cd - InitSpriteGrenade 2021-11-29 00:55:52 +01:00
Christoph Oelckers
7d352d2387 - InitMine 2021-11-29 00:55:52 +01:00
Christoph Oelckers
1491b9ef95 - InitEnemyMine 2021-11-29 00:55:51 +01:00
Christoph Oelckers
f9ea4874ed - InitFireball 2021-11-29 00:55:51 +01:00
Christoph Oelckers
a42e44d662 - InitEnemyFireball 2021-11-29 00:55:51 +01:00
Christoph Oelckers
1b02c9e533 - WarpToUnderwater + WarpToSurface 2021-11-29 00:55:51 +01:00
Christoph Oelckers
5264c6540c - SpriteWarpToUnderwater + SpriteWarpToSurface 2021-11-29 00:55:51 +01:00
Christoph Oelckers
130028fa82 - SpawnSplash(XY)
# Conflicts:
#	source/games/sw/src/weapon.cpp
2021-11-29 00:55:50 +01:00
Christoph Oelckers
7411e7e9ba - MissileHitDiveArea 2021-11-29 00:55:50 +01:00
Christoph Oelckers
f438773af9 - internal cleanup of some spawn functions. 2021-11-29 00:55:50 +01:00
Christoph Oelckers
96ebfe808c - turned some macros into functions. 2021-11-29 00:55:50 +01:00
Christoph Oelckers
64e812bd33 - TestDontStick. 2021-11-29 00:55:50 +01:00
Christoph Oelckers
dfb5d07459 - QueueHole 2021-11-29 00:55:49 +01:00
Christoph Oelckers
83d0930a2e - QueueFootPrint + QueuefloorBlood. 2021-11-29 00:55:49 +01:00
Christoph Oelckers
01d2967378 - QueueWallBlood. 2021-11-29 00:55:49 +01:00
Christoph Oelckers
deddd7d514 - it is not necessary to clear the owner of a freshly spawned actor.
They are always spawned owner-less.
2021-11-29 00:55:49 +01:00
Christoph Oelckers
9cefc351a1 - bloody stuff. 2021-11-29 00:55:49 +01:00
Christoph Oelckers
2455c197bf - DoShrapVelocity + SlopeBounce. 2021-11-29 00:55:48 +01:00
Christoph Oelckers
0d45e50ea6 - QueueGeneric + ShrapKillSprite. 2021-11-29 00:55:48 +01:00
Christoph Oelckers
95d3095f8d - DoItemFly 2021-11-29 00:55:48 +01:00
Christoph Oelckers
c14fb9e93f - QueueLoWangs 2021-11-29 00:55:48 +01:00
Christoph Oelckers
58749b2770 - NewStateGroup wrappers replaced. 2021-11-29 00:55:48 +01:00
Christoph Oelckers
a85a1e497f - ActorCoughItem. 2021-11-29 00:55:47 +01:00
Christoph Oelckers
cd8e8e4f67 - removed index based version of SpawnUser. 2021-11-29 00:55:47 +01:00
Christoph Oelckers
3a3c6a4395 - IconDefault 2021-11-29 00:55:47 +01:00
Christoph Oelckers
947f5f1d78 - ItemSpotClear. 2021-11-29 00:55:47 +01:00
Christoph Oelckers
374d0524d2 - first pass over SpawnItemsMatch.
This was purely search & replace.
2021-11-29 00:55:47 +01:00
Christoph Oelckers
6489c60905 - lots of search & replace, plus a few fixes on ActorSpawn. 2021-11-29 00:55:46 +01:00
Christoph Oelckers
d49ae699f8 - ChangeSpriteState + change_sprite_stat. 2021-11-29 00:55:46 +01:00
Christoph Oelckers
e41f49d46d KillSprite internals. 2021-11-29 00:55:46 +01:00
Christoph Oelckers
b705ff3b97 - WallBounce 2021-11-29 00:55:46 +01:00
Christoph Oelckers
300e6df6c3 - MissileHitDiveArea calls. 2021-11-29 00:55:46 +01:00
Christoph Oelckers
0b3b30170c - DoActorZRange parameters. 2021-11-29 00:55:45 +01:00
Christoph Oelckers
7111b2470c - SW: use BFSSearch in TraverseBreakableWalls 2021-11-29 00:55:45 +01:00
Christoph Oelckers
3e558c2295 - use BFSSearch for PreMapCombineFloors. 2021-11-29 00:55:44 +01:00
Christoph Oelckers
1b3b8ab7cc - use wallsofsector in PreMapCombineFloors 2021-11-29 00:55:44 +01:00
Christoph Oelckers
6fc43287b3 - redid Exhumed's BelowNear function.
Use BFSSearch, only run one iteration of the search and only run the search if the result is actually used.
2021-11-29 00:55:44 +01:00
Christoph Oelckers
12c26976f0 - GetClosestSpriteSectors: replace distance calculation with proper math.
No need to sample multiple points along the wall if we can just properly calculate the actual distance. :)
2021-11-29 00:55:44 +01:00
Christoph Oelckers
d2f0934726 - Blood: cleaned up GetClosestSpriteSectors
using BFSSearch now and avoiding pointless loop to avoid setting the checked bit.
The entire outcome was just as if the bit was never checked inside the loop, so do just that when not running in compatibility mode.
This simplifies the remaining code quite a lot because it now just needs to run over all walls with no special case considered.
2021-11-29 00:55:44 +01:00
Christoph Oelckers
1bbbeb8f4c - Blood: reworked GetClosestSpriteSectors to use dynamic arrays, deleted unused GetClosestSectors.
# Conflicts:
#	source/games/blood/src/aibeast.cpp

# Conflicts:
#	source/games/blood/src/aibeast.cpp
#	source/games/blood/src/gameutil.h
2021-11-29 00:55:43 +01:00
Christoph Oelckers
269f2580b9 - obsolete prototypes in Exhumed 2021-11-29 00:55:43 +01:00
Christoph Oelckers
1d9d70613f - char review in SW 2021-11-29 00:55:43 +01:00
Christoph Oelckers
b878bf8aac - SW: renamed all unsigned chars to uint8_t
Also deletes some unused declarations
2021-11-29 00:55:43 +01:00
Christoph Oelckers
4f493d3de1 - Exhumed: made all nPlayer variables ints
This looks safe
2021-11-29 00:55:43 +01:00
Christoph Oelckers
b9b4f1e037 - shorts replaced in Exhumed
only a small part, the easy stuff
2021-11-29 00:55:42 +01:00
Christoph Oelckers
d63b6cda37 - exhumed: made all nAngle variables full ints 2021-11-29 00:55:42 +01:00
Christoph Oelckers
28eca1a023 ‚char‘ review in Blood - part 2 2021-11-29 00:55:42 +01:00
Christoph Oelckers
5422bff683 ‚char‘ review in Blood - part 1 2021-11-29 00:55:42 +01:00
Christoph Oelckers
53998c9cb7 - Blood: remove unneeded replacement functions.
changespritesect is the only one called from the engine.
2021-11-29 00:55:42 +01:00
Christoph Oelckers
e9c79292ff - Blood: use wider integer types for a few more things
Mainly removing shorts from all function signatures, except the engine replace interface, replacing them either with int or bool, depending on the use case.
2021-11-29 00:55:41 +01:00
Christoph Oelckers
b685163ab1 - Blood: extend all 16 bit fields holding sector or wall indices to 32 bit. 2021-11-29 00:55:41 +01:00
Christoph Oelckers
499dc9953b - reduction of 'short' noise in Blood.
Mainly using int16_t for deliberately sized struct fields, auto for temporary saves of global data and making several local variables full int.
This changes nothing substantial.
2021-11-29 00:55:41 +01:00
Christoph Oelckers
345d9c87b6 - RR: no more wall[] in actors_r.cpp 2021-11-29 00:55:41 +01:00
Christoph Oelckers
00edd16834 - Duke: get rid of the remaining wall[] references in actors_d.cpp 2021-11-29 00:55:41 +01:00
Christoph Oelckers
e0260bc709 - Duke/RR: weaponhitwall cleaned up (both variants) 2021-11-29 00:55:40 +01:00
Christoph Oelckers
5bb805663e - Duke/RR: cleaned up the rest of hitradius* as well
Using wallsofsector iterator plus defining local variables more locally.
2021-11-29 00:55:40 +01:00
Christoph Oelckers
63985ce6be - Duke/RR: redo the supremely ugly code to access the third point in hitradius* 2021-11-29 00:55:40 +01:00
Christoph Oelckers
68d653efe9 - made the same changes to hitradius_r
Also had to do some reformatting to get rid of the goto in there.
2021-11-29 00:55:40 +01:00
Christoph Oelckers
821f341e03 - use BFSSearch in hitradius_d 2021-11-29 00:55:39 +01:00
Christoph Oelckers
ad030d7e23 - Duke: SE20 + SE128 are wall-free
Also use symbolic constantfor SE_128 to make it easier to find.
2021-11-29 00:55:39 +01:00
Christoph Oelckers
010162261e - Duke: use utilities in handle_se19 2021-11-29 00:55:39 +01:00
Christoph Oelckers
312bf5bf95 - Duke: use wall utilities in bounce and queball 2021-11-29 00:55:39 +01:00
Christoph Oelckers
58a091067f - use provided sector/wall iterators in cacheit functions 2021-11-29 00:55:39 +01:00
Christoph Oelckers
aadbca8e5d - zombie.cpp. 2021-11-29 00:55:38 +01:00
Christoph Oelckers
95c92153ad - zilla.cpp 2021-11-29 00:55:38 +01:00
Christoph Oelckers
e98e1a6fea - warp.cpp 2021-11-29 00:55:38 +01:00
Christoph Oelckers
21af63dfcc - wallmove.cpp 2021-11-29 00:55:38 +01:00
Christoph Oelckers
10ea8b0fb5 - vator.cpp 2021-11-29 00:55:38 +01:00
Christoph Oelckers
2c94259603 - BossSpriteNum 2021-11-29 00:55:37 +01:00
Christoph Oelckers
36067baedd - owner cleanup. 2021-11-29 00:55:37 +01:00
Christoph Oelckers
411c814dc3 - vis.cpp 2021-11-29 00:55:37 +01:00
Christoph Oelckers
02bdba71fc - spike.cpp. 2021-11-29 00:55:37 +01:00
Christoph Oelckers
e2e697e9bb - do better owner checks in weapon code.
Due to poor data clearing logic there is a chance that the owner of a sprite is 0 if invalid, but this code never properly checked all conditions before accessing the owner's user's ID.
2021-11-29 00:55:37 +01:00
Christoph Oelckers
cb31127df5 - removed Set3DSoundOwner entirely. 2021-11-29 00:55:36 +01:00
Christoph Oelckers
0df721f331 - sumo.cpp + associated code elsewhere. 2021-11-29 00:55:36 +01:00
Christoph Oelckers
e32a1af7b2 - lots of PlaySound calls migrated to actors. 2021-11-29 00:55:36 +01:00
Christoph Oelckers
e6c625f6e8 - second part of slidor.cpp. 2021-11-29 00:55:36 +01:00
Christoph Oelckers
2397e4c2a5 - one third of slidor.cpp 2021-11-29 00:55:35 +01:00
Christoph Oelckers
dfc557e0ec - StarQueue 2021-11-29 00:55:35 +01:00
Christoph Oelckers
bd161f155c - skull.cpp 2021-11-29 00:55:35 +01:00
Christoph Oelckers
a728555ec7 - skel.cpp 2021-11-29 00:55:35 +01:00
Christoph Oelckers
07f61e061e - serp.cpp 2021-11-29 00:55:35 +01:00
Christoph Oelckers
7704042df4 - the rest of sector.cpp. 2021-11-29 00:55:35 +01:00
Christoph Oelckers
98c1684c13 - OperateSprite 2021-11-29 00:55:34 +01:00
Christoph Oelckers
1e00a4ff18 - second batch of sector.cpp 2021-11-29 00:55:34 +01:00
Christoph Oelckers
2b8ea7ae1b - first half of sector.cpp.
Mostly iterators replaced.
2021-11-29 00:55:34 +01:00
Christoph Oelckers
edf8ba0aa1 - cleanup pass on sector.cpp.
No functional changes here.
2021-11-29 00:55:34 +01:00
Christoph Oelckers
cfebfbca8a - rest of rotator.cpp. 2021-11-29 00:55:34 +01:00
Christoph Oelckers
1388794032 - first half of rotator.cpp. 2021-11-29 00:55:34 +01:00
Christoph Oelckers
0a18edfdad - iterators in rooms.cpp. 2021-11-29 00:55:33 +01:00
Christoph Oelckers
6b92ee1ee6 - InitPlayerSprite 2021-11-29 00:55:33 +01:00
Christoph Oelckers
eb3131df97 - cleanup
mostly redundant comments.
2021-11-29 00:55:33 +01:00
Christoph Oelckers
da683ddf7a - ripper2.cpp 2021-11-29 00:55:33 +01:00
Christoph Oelckers
3ed3029345 -some overlooked User’s. 2021-11-29 00:55:32 +01:00
Christoph Oelckers
82b4385ede - ripper.cpp 2021-11-29 00:55:32 +01:00
Christoph Oelckers
4661f6d7c5 - iterators in quake.cpp 2021-11-29 00:55:32 +01:00
Christoph Oelckers
0e629eb322 - sop.match_event_sprite 2021-11-29 00:55:32 +01:00
Christoph Oelckers
04657ab559 - QueueWallBlood callers. 2021-11-29 00:55:32 +01:00
Christoph Oelckers
2fdc2ec00f - small stuff 2021-11-29 00:55:32 +01:00
Christoph Oelckers
2fe71a65a8 - added a few fallthrough annotations that were missed last time. 2021-11-29 00:55:31 +01:00
Christoph Oelckers
74fce3bf58 - sector object sprite list 2021-11-29 00:55:31 +01:00
Mitch Richters
2a7d0e6fe3 - gi->AddExcludedEpisode(): Pass FString variable through as reference instead of by value. 2021-11-29 00:55:31 +01:00
Mitch Richters
974ca7bd1d - Remove a lot of reference values on primitive data types from Blood's QAV interpolation system. Also use move assignments on the ignoredata TMap when we're adding it to the game-side after processing it. 2021-11-29 00:55:31 +01:00
Christoph Oelckers
78e0719eca - SW: removed unused SpawnUnderSplash function. 2021-11-29 00:55:30 +01:00
Christoph Oelckers
01abe7b2ac - addressed most unused/uninitialized variable warnings from MSVC. 2021-11-29 00:55:30 +01:00
Christoph Oelckers
c6bd5c04c7 - fixed most warnings GCC pointed out in game code. 2021-11-29 00:55:29 +01:00
Christoph Oelckers
f7fdc5af41 - address several warnings reported by GCC 11. 2021-11-29 00:55:29 +01:00
Christoph Oelckers
dcccb0d653 - Duke: added [[fallthrough]] annotations wherever needed. 2021-11-29 00:55:29 +01:00
Christoph Oelckers
910a51b290 - proper actor handling in all of SOP interpolation 2021-11-29 00:55:28 +01:00
Christoph Oelckers
e4e164a07f - use a dedicated type for SOP angle interpolation
This allows reusing the already existing pointer.
2021-11-29 00:55:28 +01:00
Christoph Oelckers
e75258f57b - SOP spriteofang
Still needs work
2021-11-29 00:55:28 +01:00
Christoph Oelckers
5078750569 - sprite indices in mirrors converted to actor pointers 2021-11-29 00:55:28 +01:00
Christoph Oelckers
1152ec0b54 - use actor pointers in animation system. 2021-11-29 00:55:28 +01:00
Christoph Oelckers
826b514571 - removed a few pointless or unused macros. 2021-11-29 00:55:27 +01:00
Christoph Oelckers
1011f10c0b - SpriteP fully replaced in player.cpp 2021-11-29 00:55:27 +01:00
Christoph Oelckers
a583a9cb14 - some smaller changes in various places. 2021-11-29 00:55:27 +01:00
Christoph Oelckers
bc584f6ff6 - the rest pf player.cpp 2021-11-29 00:55:27 +01:00
Christoph Oelckers
ba4b5bbbcb - PLAYER::Killer 2021-11-29 00:55:27 +01:00
Christoph Oelckers
f2058933ed - DoPlayerBeginDie 2021-11-29 00:55:26 +01:00
Christoph Oelckers
c40fc488e5 - SpawnBubble. 2021-11-29 00:55:26 +01:00
Christoph Oelckers
d3302d6cf9 - minor changes in multiple functions in player.cpp 2021-11-29 00:55:26 +01:00
Christoph Oelckers
7d7000f6ab - FindNearSprite + PLAYER::remote_sprite. 2021-11-29 00:55:26 +01:00
Christoph Oelckers
0e37e0904e - sop::sp_child. 2021-11-29 00:55:26 +01:00
Christoph Oelckers
b6c741892e - player movement functions. 2021-11-29 00:55:25 +01:00
Christoph Oelckers
89ef1c0961 - DoPlayerZRange + DoPlayerSlide. 2021-11-29 00:55:25 +01:00
Christoph Oelckers
48b1ce0c62 - savegame compatibility. 2021-11-29 00:55:25 +01:00
Christoph Oelckers
02671dbe2f - PlayerUnderSprite. 2021-11-29 00:55:25 +01:00
Christoph Oelckers
dd684f36a4 - a few player functions. 2021-11-29 00:55:25 +01:00
Christoph Oelckers
448e57c86c - PickEnemyTarget
prioritized to get rid of some recent mess.
2021-11-29 00:55:24 +01:00
Christoph Oelckers
8780be4ee4 - WpnGoal + sprite_num. 2021-11-29 00:55:24 +01:00
Christoph Oelckers
8336f689dd - DoPickTarget. 2021-11-29 00:55:24 +01:00
Christoph Oelckers
f4d813b0c7 - reformatting function headers + deletion of unused code in player.cpp. 2021-11-29 00:55:24 +01:00
Christoph Oelckers
4ab13dcbea - player.cpp global search & replace. 2021-11-29 00:55:24 +01:00
Christoph Oelckers
8ac0eed08a - panel.cpp 2021-11-29 00:55:23 +01:00
Christoph Oelckers
b4d298874a - most of ninja.cpp, except the player stuff. 2021-11-29 00:55:23 +01:00
Christoph Oelckers
5eca574bba - got rid of some rarely used macros. 2021-11-29 00:55:23 +01:00
Christoph Oelckers
d10919704a - miscactr.cpp
Mostly done with search & replace.
2021-11-29 00:55:23 +01:00
Christoph Oelckers
ac8df2f9f6 - light.cpp 2021-11-29 00:55:23 +01:00
Christoph Oelckers
65da74538c - ActorFollowTrack. 2021-11-29 00:55:23 +01:00
Christoph Oelckers
69c97a88d3 - lava.cpp 2021-11-29 00:55:22 +01:00
Christoph Oelckers
e7dcd279af - PickJumpMaxSpeed. 2021-11-29 00:55:22 +01:00
Christoph Oelckers
f09cf97822 - ScaleSpriteVector 2021-11-29 00:55:22 +01:00
Christoph Oelckers
e94785e571 - cleanup. 2021-11-29 00:55:22 +01:00
Christoph Oelckers
7012a77685 - InitShell / SpawnShell 2021-11-29 00:55:21 +01:00
Christoph Oelckers
aef68363b4 - FlagOwner refactoring.
Only those parts which use it as a sprite index, seveal actors recycle it as a general purpose variable.
2021-11-29 00:55:21 +01:00
Christoph Oelckers
e9fc342c93 - flag stuff. 2021-11-29 00:55:21 +01:00
Christoph Oelckers
3e91ac6417 - InitBloodSpray 2021-11-29 00:55:21 +01:00
Christoph Oelckers
5efb63b780 - InitCaltrops + InitPhosphorus 2021-11-29 00:55:21 +01:00
Christoph Oelckers
0b77a73976 - InitFlashBomb + PlayerInitCaltrops 2021-11-29 00:55:20 +01:00
Christoph Oelckers
3d04e332fc - InitChemBomb + PlayerInitFlashBomb 2021-11-29 00:55:20 +01:00
Christoph Oelckers
0e1e29d768 - ChemBomb stuff. 2021-11-29 00:55:20 +01:00
Christoph Oelckers
93fde48abb - SpawnRadiationCloud 2021-11-29 00:55:20 +01:00
Christoph Oelckers
5aaa0ce971 - collision stuff in jweapon.cpp migrated to Collision struct. 2021-11-29 00:55:20 +01:00
Christoph Oelckers
9872f7e5d1 - DoCaltrops 2021-11-29 00:55:20 +01:00
Christoph Oelckers
3e45549fe7 - DoChemBomb 2021-11-29 00:55:19 +01:00
Christoph Oelckers
f21cb1f3f6 - DoPhosphorus 2021-11-29 00:55:19 +01:00
Christoph Oelckers
3717a38779 - DoBloodSpray 2021-11-29 00:55:19 +01:00
Christoph Oelckers
e3e9e4030e - splash functions. 2021-11-29 00:55:19 +01:00
Christoph Oelckers
cf8aaf7ff2 - JS_ProcessEchoSpot + UnlockKeyLock 2021-11-29 00:55:19 +01:00
Christoph Oelckers
f401d4bb44 - SW: don't spawn sprites to play wall sounds.
This function isn't really necessary because we got a sound playing variant that takes a world coordinate, which is far more practical here. Worse, this was leaking sprites.
2021-11-29 00:55:19 +01:00
Christoph Oelckers
a7cde2fd96 - SpriteP in inv.cpp. 2021-11-29 00:55:18 +01:00
Christoph Oelckers
babdae682f - input.cpp cleanup. 2021-11-29 00:55:18 +01:00
Christoph Oelckers
928b5d2ee8 - SW: un-flag mirrors that got smashed.
The new renderer cannot check tilenums.
2021-11-29 00:55:18 +01:00
Christoph Oelckers
141428f583 - goro.cpp + hornet.cpp. 2021-11-29 00:55:18 +01:00
Christoph Oelckers
0437d92f3e - girlninj.cpp 2021-11-29 00:55:18 +01:00
Christoph Oelckers
711f8123a1 - game.cpp. 2021-11-29 00:55:18 +01:00
Christoph Oelckers
0f60e3b4ec - eel.cpp. 2021-11-29 00:55:17 +01:00
Christoph Oelckers
e192f4d40f - rest of draw.cpp.
This file is very messy...
2021-11-29 00:55:17 +01:00
Christoph Oelckers
919a08448e - first half pf draw.cpp 2021-11-29 00:55:17 +01:00
Christoph Oelckers
32fa3c52ea - copysect.cpp iterators. 2021-11-29 00:55:17 +01:00
Christoph Oelckers
f41d68b376 - coolie.cpp 2021-11-29 00:55:17 +01:00
Christoph Oelckers
ef23f69072 - EnemyDefaults. 2021-11-29 00:55:16 +01:00
Christoph Oelckers
7b778f692b - leftover SpriteNum's in coolg.cpp. 2021-11-29 00:55:16 +01:00
Christoph Oelckers
cde4b1f19e - cache, cheats, colormap and enums. 2021-11-29 00:55:16 +01:00
Christoph Oelckers
f5c7ccd6af - bunny.cpp 2021-11-29 00:55:16 +01:00
Mitch Richters
ec0203b89b - Duke: Don't truncate fistzoom to integer in animatefist(). 2021-11-29 00:55:16 +01:00
Christoph Oelckers
4231119717 - owner stuff 2021-11-29 00:55:15 +01:00
Christoph Oelckers
a69a45523f - HitBreakSprite 2021-11-29 00:55:15 +01:00
Christoph Oelckers
aa13619087 - SpawnBreakFlames 2021-11-29 00:55:15 +01:00
Christoph Oelckers
8daa825aa1 - SpriteQueueDelete + DeleteNoSoundOwner. 2021-11-29 00:55:15 +01:00
Christoph Oelckers
6628ec9459 - DriveCrush 2021-11-29 00:55:14 +01:00
Christoph Oelckers
68e95eb292 - most of break.cpp. 2021-11-29 00:55:14 +01:00
Christoph Oelckers
13f0b08aeb - AutoBreakWall and SpawnShrap cleanup. 2021-11-29 00:55:14 +01:00
Christoph Oelckers
d63ac59fa0 - FindBreakSpriteMatch 2021-11-29 00:55:14 +01:00
Christoph Oelckers
6a4049e33c - SetupSpriteForBreak, extra sprite flags as enum 2021-11-29 00:55:14 +01:00
Christoph Oelckers
5bf77ddb2b - make breakflags an enum. 2021-11-29 00:55:13 +01:00
Christoph Oelckers
de12433809 - USER::Attach and SetAttach. 2021-11-29 00:55:13 +01:00
Christoph Oelckers
bd47d61615 - replaced some changespritesect with ChangeActorSect. 2021-11-29 00:55:13 +01:00
Christoph Oelckers
a48b45143e - ActorFindTrack 2021-11-29 00:55:13 +01:00
Christoph Oelckers
b3558d8925 - eliminated SetEnemy(In)active.
Both were only used once, so they are now inlined.
2021-11-29 00:55:13 +01:00
Christoph Oelckers
6c867e23ee - PlayerTakeDamage 2021-11-29 00:55:12 +01:00
Christoph Oelckers
98fe147d7a - PlaySpriteSound. 2021-11-29 00:55:12 +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
af81a9e175 - DropAhead, DoActorActionDecide and ai.cpp cleanup. 2021-11-29 00:55:11 +01:00
Christoph Oelckers
c88524884c - made USER::flame an actor pointer. 2021-11-29 00:55:11 +01:00
Christoph Oelckers
6db11ff2d5 - removed DebugMoveHit. 2021-11-29 00:55:11 +01:00
Christoph Oelckers
0de816d308 - replaced tgt_sp wrapper. 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
d60d3cd307 - second large batch of NewStateGroup calls. 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
5062dc6aa8 - a second large batch of KillSprite calls. 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
7fc9ad1edb - Coolie ghost function interface. 2021-11-29 00:55:06 +01:00
Christoph Oelckers
119d4393db - Initial SetOwner WIP. 2021-11-29 00:55:06 +01:00
Christoph Oelckers
ae874275ec - iterator in DoActorPickClosePlayer 2021-11-29 00:55:06 +01:00
Christoph Oelckers
c0a72c7243 - FindNewAngle and move_scan 2021-11-29 00:55:06 +01:00
Christoph Oelckers
34d0c12b60 - removed all references to tgt_sp from ai.cpp, plus a few others found with search&replace. 2021-11-29 00:55:06 +01:00
Christoph Oelckers
b8b90d2825 - track functions in ai.cpp plus some cleanup. 2021-11-29 00:55:06 +01:00
Christoph Oelckers
b0a59bf665 - CloseRangeDist + DoSectorOperate 2021-11-29 00:55:05 +01:00
Christoph Oelckers
4d12bbbb56 - GetPlayerSpriteNum 2021-11-29 00:55:05 +01:00
Christoph Oelckers
602048b41d - more simple tgt_sp replacements. 2021-11-29 00:55:05 +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
d819d5c862 - DoActorPickClosePlayer 2021-11-29 00:55:04 +01:00
Christoph Oelckers
125159772d - CanHitPlayer 2021-11-29 00:55:04 +01:00
Christoph Oelckers
ceb3ac2e5b - CanSeePlayer 2021-11-29 00:55:04 +01:00
Christoph Oelckers
a2dee7681a - DoActorNoise 2021-11-29 00:55:04 +01:00
Christoph Oelckers
3dbd002319 - DoActorSetSpeed + ActorFlaming. 2021-11-29 00:55:03 +01:00
Christoph Oelckers
ec9ab56ece - use collision struct in ActorMoveHitReact 2021-11-29 00:55:03 +01:00
Christoph Oelckers
2a897c0582 - SW hit code abstraction. 2021-11-29 00:55:03 +01:00
Christoph Oelckers
077c4f19a7 - ActorMoveHitReact + DebugMoveHit 2021-11-29 00:55:03 +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
Mitch Richters
5d07c768b2 - SW: Tidy up use of cl_nomeleeblur use within panel code. 2021-11-29 00:55:01 +01:00
Mitch Richters
e491d15ff9 - Move InputScale() out of inputstate.cpp and into i_time.cpp as I_GetInputFrac() to make it available to GZDoom for potential future requirements.
* As part of this, feed the output of `I_GetInputFrac()` to `gi->GetInput()` instead of having each game's virtual override calling it locally.
2021-11-29 00:55:01 +01:00
Christoph Oelckers
08bc31e6e2 - use GetIndex function where appropriate. 2021-11-29 00:55:00 +01:00
Christoph Oelckers
ad95033c64 - removed temporary workaround 2021-11-29 00:55:00 +01:00
Christoph Oelckers
40b22a90e9 - Blood: cleaned out some crutches needed to deal with the broken vanilla savegame code.
Raze has fixed its savegame format so that it can fully restore a game session from it.
As a result, nnExtInitModernStuff was never called with 'saveload' set to true and none of this code ever executed.
2021-11-29 00:55:00 +01:00
Christoph Oelckers
b6d00667de - something insignificant that was missed. 2021-11-29 00:55:00 +01:00
Christoph Oelckers
433764fd91 - mark all places using a sprite index that needs addressing with a GetSpriteIndex function. 2021-11-29 00:55:00 +01:00
Christoph Oelckers
c40266625b - moved gInterpolateSprite into DBloodActor 2021-11-29 00:55:00 +01:00
Christoph Oelckers
bac40ddb05 - viewBackupSpriteLoc calls 2021-11-29 00:54:59 +01:00
Christoph Oelckers
98a3564ee6 - use GetIndex for error messages and deleted several unused index variables. 2021-11-29 00:54:59 +01:00
Christoph Oelckers
21a208e59e - eliminated most references to spritetype::extra
This was all places that could have been done earlier but had been overlooked.
2021-11-29 00:54:59 +01:00
Christoph Oelckers
3d63c44aae - GCC warned about this. 2021-11-29 00:54:59 +01:00
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
812b18e49a - some xsprite cleanup 2021-11-29 00:54:58 +01:00
Christoph Oelckers
3e452994d8 - handle all of gUpper/gLowerLink.
This completes the removal of all access to the global arrays outside of setup code.
2021-11-29 00:54:58 +01:00
Christoph Oelckers
5b9152abfd - eliminated the last access to playerActors in trigger.cpp and made AimTargets a pointer array. 2021-11-29 00:54:58 +01:00
Christoph Oelckers
6dd7cbe8fa - GetCrushedSpriteExtents and leftover bloodActors references. 2021-11-29 00:54:58 +01:00
Christoph Oelckers
d2bc254e03 - the rest of triggers.cpp. 2021-11-29 00:54:57 +01:00
Christoph Oelckers
9349e7bcb1 - several simple functions.
Also two fixes involving trTriggerSprite.
2021-11-29 00:54:57 +01:00
Christoph Oelckers
0ae664e9ca - SetSpriteState 2021-11-29 00:53:57 +01:00
Christoph Oelckers
7e8fc3fe65 - target in UpdateAimVector, teslaHit. 2021-11-29 00:53:56 +01:00
Christoph Oelckers
7d1c81626e - changed all naked Stat/SectIterator loops to use the Blood... variants. 2021-11-29 00:53:56 +01:00
Christoph Oelckers
9016256ac2 - savegame hackery for sequences. 2021-11-29 00:53:56 +01:00
Christoph Oelckers
4e1e9ca0c9 - proper actor managements in SEQINST. 2021-11-29 00:53:56 +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
Christoph Oelckers
70cd4d9466 - minor sprite[] stuff. 2021-11-29 00:53:55 +01:00
Christoph Oelckers
8f974dc1d8 - the remaining functions of player.cpp. 2021-11-29 00:53:55 +01:00
Christoph Oelckers
fddc213fa8 - made PLAYER::fragger an actor pointer. 2021-11-29 00:53:55 +01:00
Christoph Oelckers
abee5c5eaa - parameters in Pickup functions, getting rid of all (x)sprite[] references in player.cpp. 2021-11-29 00:53:55 +01:00
Christoph Oelckers
07e88e36f6 - ActionScan cleanup plus smaller bits in player.cpp
# Conflicts:
#	source/games/blood/src/player.cpp
2021-11-29 00:53:55 +01:00
Christoph Oelckers
e95936efd6 - made PLAYER::used2 an actor array and renamed it to match its purpose.
Note: Renaming this for savegames is fine, as it's not relevant in singleplayer.
2021-11-29 00:53:54 +01:00
Christoph Oelckers
165b2f29ff - removed last remaining accesses to sprite[] and xsprite[] from nnexts.cpp. 2021-11-29 00:53:54 +01:00
Christoph Oelckers
85c4b96177 - removed all access to sprite[] from mirrors.cpp. 2021-11-29 00:53:54 +01:00
Christoph Oelckers
826fd7ddb2 - optimized vector math. 2021-11-29 00:53:54 +01:00
Christoph Oelckers
50f9b67598 - removed all sprite[] references from gameutil.cpp. 2021-11-29 00:53:54 +01:00
Christoph Oelckers
7a2c661ff9 - GetZRange 2021-11-29 00:53:54 +01:00
Christoph Oelckers
626deed960 - VectorScan 2021-11-29 00:53:53 +01:00
Christoph Oelckers
0466186440 - HitScan 2021-11-29 00:53:53 +01:00
Christoph Oelckers
c2916259d7 - CheckProximity
# Conflicts:
#	source/games/blood/src/aibeast.cpp
2021-11-29 00:53:53 +01:00
Christoph Oelckers
db75e4d2bf - moved basePath into XSECTOR.
# Conflicts:
#	source/games/blood/src/nnexts.cpp
2021-11-29 00:53:53 +01:00
Christoph Oelckers
0d2da892e8 - made marker0 and marker1 actor pointers. 2021-11-29 00:53:52 +01:00
Christoph Oelckers
f4b900c540 - moved velocity data into DBloodActor. 2021-11-29 00:53:52 +01:00
Christoph Oelckers
6a8f59e991 - removed remaining direct access to the velocity arrays. 2021-11-29 00:53:52 +01:00
Christoph Oelckers
ff9a86b7b4 - proper way to get player actor. 2021-11-29 00:53:52 +01:00
Christoph Oelckers
1cb98593f1 - removed compatible savegame handling for SPRITEHIT.
This does not need to be preserved, unlike the other refactored global arrays.
2021-11-29 00:53:51 +01:00
Christoph Oelckers
54f70ec1bb - moved baseSprite into DBloodActor. 2021-11-29 00:53:51 +01:00
Christoph Oelckers
14ace49c3e - owner stuff.
This reduces the number of direct references to spritetype.owner by half in the Blood code.
2021-11-29 00:53:51 +01:00
Christoph Oelckers
3b1ba88a41 - gib stuff. 2021-11-29 00:53:51 +01:00
Christoph Oelckers
344e7e840e - remove leftover index dependencies for sprite events. 2021-11-29 00:53:51 +01:00
Christoph Oelckers
245581e00d - cleanup 2021-11-29 00:53:50 +01:00
Christoph Oelckers
b2de1e5209 - added BloodSpriteIterator and BloodLinearSpriteIterator to get rid of explicit loops over the sprite array. 2021-11-29 00:53:50 +01:00
Christoph Oelckers
484d016172 - cleaned up burn code. 2021-11-29 00:53:50 +01:00
Christoph Oelckers
c0b013ac0c - moved gSpriteHit into DBloodActor. 2021-11-29 00:53:50 +01:00
Christoph Oelckers
c34c9deb4e - deleted old condPush variant. 2021-11-29 00:53:50 +01:00
Christoph Oelckers
be0e2a9b93 - todo markers 2021-11-29 00:53:49 +01:00
Christoph Oelckers
3e9bcacc22 - condUpdateObjectIndex + nnExtTriggerObject 2021-11-29 00:53:49 +01:00
Christoph Oelckers
9965245449 - condCheckSprite 2021-11-29 00:53:49 +01:00
Christoph Oelckers
0ff9afde61 - condCheckPlayer + condCheckDude 2021-11-29 00:53:49 +01:00
Christoph Oelckers
9205556b4e - condCheckSector + condCheckWall 2021-11-29 00:53:49 +01:00
Christoph Oelckers
f6e7c5f440 - condCheckMixed + condCheckGame. 2021-11-29 00:53:48 +01:00
Christoph Oelckers
69395383a4 - fix condPush
- better abstraction of the condition storage.

Hiding targetX/Y as much as possible for easier refactoring later.
2021-11-29 00:53:48 +01:00
Christoph Oelckers
f84e2343ca - formatting only. 2021-11-29 00:53:48 +01:00
Christoph Oelckers
9062eb5996 - condError 2021-11-29 00:53:48 +01:00
Christoph Oelckers
fb4fcef2c2 - cleanup 2021-11-29 00:53:48 +01:00
Christoph Oelckers
aef95b52bc - the remaining functions in nnexts.cpp 2021-11-29 00:53:47 +01:00
Christoph Oelckers
ca13a35ccf - formatting
# Conflicts:
#	source/games/blood/src/nnexts.cpp
2021-11-29 00:53:47 +01:00
Christoph Oelckers
cc4309f7eb - aiPatrolThink + aiPatrolFlagsMgr 2021-11-29 00:53:47 +01:00
Christoph Oelckers
9004b102fe - formatting 2021-11-29 00:53:47 +01:00
Christoph Oelckers
a67da5003a - made voodooTarget a pointer and removed most direct references to target_i. 2021-11-29 00:53:47 +01:00
Christoph Oelckers
bf424b6439 - aiPatrolSearchTargets 2021-11-29 00:53:46 +01:00
Christoph Oelckers
c2ff8b0941 - formatting 2021-11-29 00:53:46 +01:00
Christoph Oelckers
a1d01d5419 - spritesTouching, readyForCrit 2021-11-29 00:53:46 +01:00
Christoph Oelckers
5ff17fec35 - patrolalarm 2021-11-29 00:53:46 +01:00
Christoph Oelckers
ffdb976f5b - marker stuff. 2021-11-29 00:53:46 +01:00
Christoph Oelckers
af7164c91d - partial rework of aiPatrolSetMarker 2021-11-29 00:53:45 +01:00
Christoph Oelckers
f8a4ecc90f - findNextMarker + markerIsNode 2021-11-29 00:53:45 +01:00
Christoph Oelckers
a76f2feb63 - aiPatrolStop API changed to actors. 2021-11-29 00:53:45 +01:00
Christoph Oelckers
7175439496 - aiPatrolStop cleaned up. 2021-11-29 00:53:45 +01:00
Christoph Oelckers
5c1b2bee37 - minor cleanup. 2021-11-29 00:53:45 +01:00
Christoph Oelckers
e11f118d3c - formatting 2021-11-29 00:53:45 +01:00
Christoph Oelckers
2f5be23171 - validate actors before processing them in the event queue. 2021-11-29 00:53:44 +01:00
Christoph Oelckers
118b3e1d70 - all calls to CheckSpriteSect/Stat handled. 2021-11-29 00:53:44 +01:00
Christoph Oelckers
48073a2cd6 - sanitized the abuse of using XSPRITE's target field to pass along some info with explosions.
This is neither safe nor future proof, so now it uses a separate variable.
2021-11-29 00:53:44 +01:00
Christoph Oelckers
146de69169 - some more patrol code. 2021-11-29 00:53:44 +01:00
Christoph Oelckers
4ae32fb223 - first part of patrol code. 2021-11-29 00:53:44 +01:00
Christoph Oelckers
2044f591f2 - formatting and cleanup. 2021-11-29 00:53:43 +01:00
Christoph Oelckers
3928407eae - several is...() functions. 2021-11-29 00:53:43 +01:00
Christoph Oelckers
49879af921 - usePictureChanger 2021-11-29 00:53:43 +01:00
Christoph Oelckers
088fa6690c - reformatting only. 2021-11-29 00:53:43 +01:00
Christoph Oelckers
94ae3c22d5 - final part and cleanup of useTargetChanger. 2021-11-29 00:53:43 +01:00
Christoph Oelckers
6c465dff3c - the fourth block 2021-11-29 00:53:42 +01:00
Christoph Oelckers
dc4c632b08 - the third block. 2021-11-29 00:53:42 +01:00
Christoph Oelckers
ff29570675 - second block. 2021-11-29 00:53:42 +01:00
Christoph Oelckers
c3a1e8f46b - targetactor in the first block of useTargetChanger 2021-11-29 00:53:42 +01:00
Christoph Oelckers
17bd466801 - first pass over useTargetChanger
using 'actor' wherever easily doable.
2021-11-29 00:53:42 +01:00
Christoph Oelckers
d59f78a5f0 - formatting only 2021-11-29 00:53:41 +01:00
Christoph Oelckers
a60617c688 - more use* functions. 2021-11-29 00:53:41 +01:00
Christoph Oelckers
c54dd079fb - formatting only. 2021-11-29 00:53:41 +01:00
Christoph Oelckers
e3b8980ecd - sprite2sectorSlope + useSlopeChanger 2021-11-29 00:53:41 +01:00
Christoph Oelckers
b7465ab67b - spriteGetSlope/spriteSetSlope take spritetype pointer arguments. 2021-11-29 00:53:41 +01:00
Christoph Oelckers
c32ff483a9 - formatting only 2021-11-29 00:53:41 +01:00
Christoph Oelckers
ca131f2dcf - fixed a few oversights. 2021-11-29 00:53:40 +01:00
Christoph Oelckers
c2f6084988 - merged genDudeExtra into DBloodActor. 2021-11-29 00:53:40 +01:00
Christoph Oelckers
017bcb056f - useIncDecGen + setDataValueOfObject 2021-11-29 00:53:40 +01:00
Christoph Oelckers
ab41ac9e05 - formatting only. 2021-11-29 00:53:40 +01:00
Christoph Oelckers
239faad4c5 - useSoundGen 2021-11-29 00:53:39 +01:00
Christoph Oelckers
a8ee9b3969 - useUniMissileGen 2021-11-29 00:53:39 +01:00
Christoph Oelckers
c65c936d27 - useCondition + 2021-11-29 00:53:39 +01:00
Christoph Oelckers
24a11b3f2f - txIsRanged and several of its callers. 2021-11-29 00:53:39 +01:00
Christoph Oelckers
174783e57b - formatting only 2021-11-29 00:53:39 +01:00
Christoph Oelckers
a4f7fabbfa - modernTypeOperateSprite 2021-11-29 00:53:39 +01:00
Christoph Oelckers
fe3da5eaab - split off formatting 2021-11-29 00:53:38 +01:00
Christoph Oelckers
766999118c - sectorKillSounds + useDudeSpawn 2021-11-29 00:53:38 +01:00
Christoph Oelckers
3761424501 - the remaining AIFight stuff. 2021-11-29 00:53:38 +01:00
Christoph Oelckers
a5471b1079 - aiFightDudeIsAffected + aiFightGetDudesForBattle 2021-11-29 00:53:38 +01:00
Christoph Oelckers
55716c9409 - aiFightGet(Fine)TargetDist 2021-11-29 00:53:38 +01:00
Christoph Oelckers
baf4bb0785 - formatting only. 2021-11-29 00:53:37 +01:00
Christoph Oelckers
57c3571555 - several aiFight functions. 2021-11-29 00:53:37 +01:00
Christoph Oelckers
ca3d7c9bdf - formatting only 2021-11-29 00:53:37 +01:00
Christoph Oelckers
78cbb4ed0a - aiFightGetTargetInRange 2021-11-29 00:53:37 +01:00
Christoph Oelckers
a449d97b86 - modernTypeTrigger 2021-11-29 00:53:37 +01:00
Christoph Oelckers
ea8166871a - formatting only. 2021-11-29 00:53:36 +01:00
Christoph Oelckers
43e9e07910 - 2 modernType functions. 2021-11-29 00:53:36 +01:00
Christoph Oelckers
1ff6dc7c69 - useSeqSpawnerGen 2021-11-29 00:53:36 +01:00
Christoph Oelckers
c59a6bbb86 - clean up some loops 2021-11-29 00:53:36 +01:00
Christoph Oelckers
9714febaab - eliminated the actPostSprite wrapper with an index parameter. 2021-11-29 00:53:36 +01:00
Christoph Oelckers
e0f1948ccc - wrapped all setsprite calls in Blood and adapted a few leftover uses of the index version of actPostSprite. 2021-11-29 00:53:35 +01:00
Christoph Oelckers
5cda9d0858 - tabified two files in Duke that were missed somehow, plus some comment cleanup elsewhere. 2021-11-29 00:53:35 +01:00
Christoph Oelckers
b54d3f3567 - useSpriteDamager + damageSprite 2021-11-29 00:53:35 +01:00
Christoph Oelckers
1689efe698 - useEffectGen + useSectorWindGen 2021-11-29 00:53:35 +01:00
Christoph Oelckers
1847b905ba - useTeleportTarget 2021-11-29 00:53:35 +01:00
Christoph Oelckers
f21dc51207 - usePropertiesChanger 2021-11-29 00:53:34 +01:00
Christoph Oelckers
cd98e940aa - useObjResizer 2021-11-29 00:53:34 +01:00
Christoph Oelckers
63ae861765 - DropVoodooCb 2021-11-29 00:53:34 +01:00
Christoph Oelckers
be9e423d7c - trPlayer* functions. 2021-11-29 00:53:34 +01:00
Christoph Oelckers
470f82bc26 - Blood: fixed loading of actors with extended AI states. 2021-11-29 00:51:35 +01:00
Christoph Oelckers
aac02d52db - Duke/RR: fixed hitradius
The recent optimization did not update the sector pointer inside the loop
2021-11-15 00:18:52 +01:00
Christoph Oelckers
dc1d97b6bd - SW: fix bad return value in QueueWallBlood.
Had been known for some time, it just wasn't unclear if this is bad.
Now I was able to confirm that this is indeed bad and can cause crashes.
2021-11-13 19:30:16 +01:00
Christoph Oelckers
5732bb2db3 - Blood: fixed loading of maps with tracking conditions.
These use a pointer in the DBloodActor structure, but this part wasn't cleared for sprites loaded with the map.

# Conflicts:
#	source/games/blood/src/nnexts.cpp
2021-11-13 13:55:25 +01:00
Christoph Oelckers
01deb13694 - SW: fixed NORM_xxx macros
kHitIndexMask already has the -1 considered, it is 0x3fff.
2021-11-12 11:09:24 +01:00
Christoph Oelckers
401f3cf1d7 - Blood: removed unused CSectorListMgr class. 2021-11-11 23:48:19 +01:00
Christoph Oelckers
9b21233c98 - little bit of cleanup 2021-11-11 23:47:26 +01:00
Christoph Oelckers
5a6d4f88d5 - Exhumed: eliminate all remaining MAXSECTORS references 2021-11-11 23:46:50 +01:00
Christoph Oelckers
794c4483ca -Exhumed: better handling of BuildNear/BelowNear.
BuildNear was only called right before calling BelowNear - now both functions are merged and use the global GlobalSectorList array for storage.
Since the data in this is local to this function it is also unnecessary to write it out to a savegame as it will get recereate each time before it is used.
2021-11-11 23:45:59 +01:00
Christoph Oelckers
d70e76e5c6 - Exhumed: use dynamic arrays for the palette backup in DrawView. 2021-11-11 23:34:03 +01:00
Christoph Oelckers
2e3c212444 - Duke: moved the temtempsector* arrays into the only function using them 2021-11-11 23:32:49 +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
f109f6c857 - Duke/RR: fixed two bad assignments to wall 0. 2021-11-11 21:58:15 +01:00
Christoph Oelckers
2164d244d2 - SW: removed 3 unused global arrays. 2021-11-11 21:58:14 +01:00
Christoph Oelckers
25a6774540 - SW: got rid of MAXWALLS.
Only places left are declarations of global arrays.
2021-11-11 21:58:14 +01:00
Christoph Oelckers
b6579809ad - SW: eliminated all remaining MAXSECTORS references, except static array declarations. 2021-11-11 21:58:14 +01:00
Christoph Oelckers
75e2d801a7 - SW: only check valid sectors for SecUser entries. 2021-11-11 21:58:14 +01:00
Christoph Oelckers
6bd239c5b7 - SW: use the global sector list in PreMapCombineFloors 2021-11-11 21:58:14 +01:00
Christoph Oelckers
a79f7a3784 - SW: use a dynamic array to track already visited sectors in TraverseBreakableWalls. 2021-11-11 21:57:55 +01:00
Christoph Oelckers
642088ed80 - let ValidateSprite print better messages when developer mode is set to warning and also call it for Blood. 2021-11-11 21:28:53 +01:00
Christoph Oelckers
f2e344a235 - removed magic flags added to sector indices in Polymost.
These are better done as separate function arguments.
2021-11-11 21:28:53 +01:00
Mitch Richters
3c4afaa6ee - InputScale(): Add enabled-by-default scaler to returned value from function to correct drift that occurs as the frame-rate increases, taking into account different scaling ratios needed for differing ticrates. 2021-11-10 20:27:19 +11:00
Christoph Oelckers
9433e9bdb1 - trPlayerCtrlStartScene + changing index to initiator pointer in QAVSCENE.
- clear QAVSCENE's initiator pointer at the start of a level or when it holds an actor that's about to be deleted.

Seems there is no proper bookkeeping here, so until we can GC actors it needs to be done manually.
2021-11-09 23:16:16 +01:00
Christoph Oelckers
ad36916fd3 - formatting again and fallthrough annotations. 2021-11-09 23:11:54 +01:00
Christoph Oelckers
bb094fd003 - 3 smaller functions. 2021-11-09 23:10:34 +01:00
Christoph Oelckers
733d9b2e2b - debrisMove 2021-11-09 23:10:03 +01:00
Christoph Oelckers
942e93b2e7 - debris functions. 2021-11-09 22:51:01 +01:00
Christoph Oelckers
6e2f8ec47f - vel replacements. 2021-11-09 22:49:43 +01:00
Christoph Oelckers
7430a630bd - yet another commit with extracted formatting stuff and minor cleanup.
# Conflicts:
#	source/games/blood/src/nnexts.cpp
2021-11-09 22:49:28 +01:00
Christoph Oelckers
5558c3e896 - debrisGetIndex and some related code. 2021-11-09 22:18:38 +01:00
Christoph Oelckers
ce622c9c88 - two missed lines 2021-11-09 21:51:51 +01:00
Christoph Oelckers
5b057415da - sanitized tileGetSurfType. 2021-11-09 21:42:51 +01:00
Christoph Oelckers
9221262dfc - refactoring of all getzrange code to use the Collision struct. 2021-11-09 21:39:59 +01:00
Christoph Oelckers
55362edce4 - cleanup and formatting in getSpriteMassBySize 2021-11-09 21:00:27 +01:00
Christoph Oelckers
6f8fe44bb0 - getSpriteMassBySize 2021-11-09 20:59:52 +01:00
Christoph Oelckers
81c3443af9 - nnExtProcessSuperSprites, plus replacing xindex with actor in TRCONDITION. 2021-11-09 20:58:27 +01:00
Christoph Oelckers
a898dfc4ec - some cleanup in nnExtProcessSuperSprites before refactoring. 2021-11-09 20:46:54 +01:00
Christoph Oelckers
754042e10a - windGenDoVerticalWind 2021-11-09 20:45:10 +01:00
Christoph Oelckers
06be31daea - pure formatting stuff split out of following commit. 2021-11-09 20:43:11 +01:00
Christoph Oelckers
18b608df1a - randomDropPickupObject + randomSpawnDude 2021-11-09 20:40:39 +01:00
Christoph Oelckers
c427669595 - randomGetDataValue 2021-11-09 20:37:10 +01:00
Christoph Oelckers
1cc5dbccb9 - GetDataVal 2021-11-09 20:33:16 +01:00
Christoph Oelckers
5465c9976c - replaced a few chars in Exhumed 2021-11-09 17:46:39 +01:00
Christoph Oelckers
baa3e531d4 - Exhumed: more ints for shorts 2021-11-09 17:32:50 +01:00
Christoph Oelckers
9b52b3b451 - made all nSector variables full ints.
This already takes care of most sector[] accesses in Exhumed
2021-11-09 17:27:54 +01:00
Christoph Oelckers
366df9d4b6 - Exhumed: use the sprite's sector() member where possible. 2021-11-09 00:26:46 +01:00
Christoph Oelckers
ef241acda2 - Exhumed: some quick sector[] substitution 2021-11-09 00:12:18 +01:00
Christoph Oelckers
a35900362e - only use un-deprecated variants of updatesector(z) in SW. 2021-11-09 00:09:48 +01:00
Christoph Oelckers
94b2b0af31 - widen sector index in engineLoadBoard to 32 bit 2021-11-09 00:07:00 +01:00
Christoph Oelckers
762ebafc2a - made clipmoveboxtracenum a function argument of clipmove
There’e zero need for hackery here.
2021-11-08 23:22:48 +01:00
Christoph Oelckers
2d91786516 - changed all sector variables being passed to pushmove to full ints 2021-11-08 23:18:40 +01:00
Christoph Oelckers
a5f51cfd88 - SW: migrate everything to the main clipmove function 2021-11-08 23:11:30 +01:00
Christoph Oelckers
16f9d4ec36 - got rid of COVERupdatesector
Not needed as it just forwards to the engine’s updatesector - and it gets in the way of other changes
2021-11-08 23:11:30 +01:00
Christoph Oelckers
3811147f70 - use proper clipmove variant in Blood and Exhumed
This merely extends some shorts to full ints to match the desired parameter's size.
2021-11-08 23:11:30 +01:00
Christoph Oelckers
2e1ff313b0 - Duke: only use the main clipmove function and match clipmove_ex’s interface 2021-11-08 23:11:29 +01:00
Christoph Oelckers
477a2a23e6 - nextSector in runlist 2021-11-08 18:37:21 +01:00
Christoph Oelckers
52389ae02e - sectp in osdcmd_spawn 2021-11-08 18:37:21 +01:00
Christoph Oelckers
066896db8e - warnings fix 2021-11-08 18:37:20 +01:00
Christoph Oelckers
f51cbf31ba - sectp in runlist_ProcessSectorTag 2021-11-08 18:37:20 +01:00
Christoph Oelckers
afec39aded - reworked non-functional anim detection when picking up an item.
This would not unregister the item's run list entries because the logic was insufficient.
2021-11-08 01:13:54 +01:00
Christoph Oelckers
43fdc1bb56 - Exhumed: fixed uninitialized variable in bullet code. 2021-11-07 23:33:39 +01:00
Christoph Oelckers
0da2250efe - Exhumed: try to improve timing of the menu plasma. 2021-11-07 22:14:58 +01:00
Christoph Oelckers
60faceaf59 - Exhumed: fixed serialization.
The exhumedActors array was not written out, resulting in all kinds of strange effects.
2021-11-07 21:45:51 +01:00
Christoph Oelckers
6b6c3f26a5 - use wallsofsector in a few more places. 2021-11-07 18:08:22 +01:00
Christoph Oelckers
59df3b0e19 - added a little utility that allows iterating over the walls of a sector with C++ for's. 2021-11-07 17:27:05 +01:00
Christoph Oelckers
4b0ffe5443 - looks I missed a few shorts.
Now all local short variables are gone, except for 2 lotags arrays.
2021-11-07 16:58:48 +01:00
Christoph Oelckers
ae08ae1d8d - some leftover shorts plus utilities that ended up unused but may be useful later. 2021-11-07 16:46:23 +01:00
Christoph Oelckers
35b9318580 - Duke/RR: checked the rest of the code for shorts and replaced most local ones with ints. 2021-11-07 16:33:13 +01:00
Christoph Oelckers
3a73a9f8ed - Duke/RR: replaced more local short variables with ints. 2021-11-07 16:30:56 +01:00
Christoph Oelckers
98f57a7ad4 - use explicitly sized types for static const arrays. 2021-11-07 16:30:56 +01:00
Christoph Oelckers
fd2764dc6e - Duke: eliminated all local short variables in actors*.cpp. 2021-11-07 16:30:55 +01:00
Christoph Oelckers
9b2b34a026 - removed a few unneeded type casts. 2021-11-07 16:30:55 +01:00
Christoph Oelckers
15be44a931 - use explicitly sized types for static const arrays. 2021-11-07 16:30:55 +01:00
Christoph Oelckers
1eeb8864a4 - Duke/RR: eliminated all uses of 'char' outside of text management 2021-11-07 16:30:55 +01:00
Christoph Oelckers
e2faeec2ce renamed all signed and unsigned chars to int8_t/uint8_t. 2021-11-07 16:30:55 +01:00
Christoph Oelckers
0eba3335c6 - eliminated some leftover 16 bit values used for storing indices. 2021-11-07 16:30:44 +01:00
Christoph Oelckers
977d668bef - extended animatetarget to 32 bit. 2021-11-07 16:21:44 +01:00
Christoph Oelckers
f95af3368b - use ints in hitscan wrapper as well. 2021-11-07 16:20:59 +01:00
Christoph Oelckers
de7a06bea4 - Duke: extended neartag wrapper to use 32 bit integers as return values. 2021-11-07 16:20:59 +01:00
Christoph Oelckers
887279f8a5 - RR: Use int instead of short in bowling functions. 2021-11-07 16:20:59 +01:00
Christoph Oelckers
b13398c268 - quick global wall[] replacements. 2021-11-07 15:57:29 +01:00
Christoph Oelckers
a594e6465c - added nextSector access function to walltype and used it to eliminate a few more sector[] references. 2021-11-07 15:56:29 +01:00
Christoph Oelckers
0c64560fd8 - Duke: wall[] replacement in script code. 2021-11-07 15:00:08 +01:00
Christoph Oelckers
c8c8ca05d3 - Duke: sector[] handled in one more premap loop. 2021-11-07 15:00:08 +01:00
Christoph Oelckers
5eed73f7af - Duke/RR: sector[] replacement in spawn code. 2021-11-07 15:00:08 +01:00
Christoph Oelckers
ca5a014a2d - Duke: a few more sector[] replacements in precaching code. 2021-11-07 15:00:08 +01:00
Christoph Oelckers
2c1881530a - Duke: use a sector pointer in spawneffector. 2021-11-07 15:00:07 +01:00
Christoph Oelckers
c068054fa0 - RR: most sector[] accesses replaced by pointers in actors_r.cpp. 2021-11-07 15:00:07 +01:00
Christoph Oelckers
7749bcbedf - Duke: clean up actors_lava.cpp.
Use sector pointer variables and extend all arrays holding sector indices to 32 bit.
2021-11-07 15:00:07 +01:00
Christoph Oelckers
e0f3fa2aa0 -Duke: replaced sector array accesses in actors_d.cpp. 2021-11-07 15:00:07 +01:00
Christoph Oelckers
8c5e4a7fa9 - Duke: a large batch of quick'n easy sector[] replacements with pointers. 2021-11-07 15:00:07 +01:00
Christoph Oelckers
d45f687d4b - pass a sector pointer to floorspace/ceilingspace. 2021-11-07 15:00:06 +01:00
Christoph Oelckers
060da8ec1d - Duke: replaced most sector array accesses with pointers in actors.cpp.
This already helped to find one 16 bit value that stored a sector index.
2021-11-07 15:00:06 +01:00
Mitch Richters
bc9ea38aba - Duke: Fix issue where calculated value for old player variable return_to_center could have been negative, causing undefined behaviour. 2021-11-07 21:14:29 +11:00
Christoph Oelckers
9a1c80c464 - Duke: added a wrapper for player_struct::cursectnum to directly return the sector pointer.
This eliminates more than 10% of the existing direct references to the sector[] array.
2021-11-06 21:59:42 +01:00
Christoph Oelckers
c3cbd1b1eb - Duke: cleanup of cycler code.
Now uses a struct instead of an array with magic indices.
2021-11-06 21:53:15 +01:00
Christoph Oelckers
1c0e3d849b - addressed the updatesector related deprecation warnings with Duke. 2021-11-06 20:46:08 +01:00
Christoph Oelckers
d20aa47adf - made sector parameter of updatesectorz an int and deprecated the short version. 2021-11-06 19:27:51 +01:00
Christoph Oelckers
e69e1b9908 - some ?vel replacements. 2021-11-06 18:16:18 +01:00
Christoph Oelckers
cce3d8f440 - some minor stuff 2021-11-06 18:14:39 +01:00
Christoph Oelckers
41316f7f8f - evSend 2021-11-06 18:14:08 +01:00
Christoph Oelckers
b8f8c0fe04 - more changesprite* renaming. 2021-11-06 18:13:16 +01:00
Christoph Oelckers
1bbcca5f28 - nnExtInitModernStuff 2021-11-06 17:21:08 +01:00
Christoph Oelckers
a184d919b8 - brace placement part taken out of following commit. 2021-11-06 17:19:24 +01:00
Christoph Oelckers
5f56423e88 - nnExtEraseModernStuff 2021-11-06 17:19:24 +01:00
Christoph Oelckers
6a96d6c354 - nnExtIsImmune 2021-11-06 17:00:52 +01:00
Christoph Oelckers
6846b50a21 - nnExtSpawnDude 2021-11-06 16:57:24 +01:00
Christoph Oelckers
5ee7505d11 - proper handling of actors in TRCONDITION. 2021-11-06 16:55:27 +01:00
Christoph Oelckers
83fe41e71e - made updatesector receive a 32 bit int pointer and deprecated the 16 bit variant. 2021-11-06 15:53:16 +01:00
Christoph Oelckers
f2adeff8c1 - Duke: extended 3 arrays holding sector and wall indices to full ints.
Just to be prepared for the future.
2021-11-06 14:22:16 +01:00
Christoph Oelckers
f4cc5b5b89 - Duke: const-ify SE24 tile lists 2021-11-06 14:19:55 +01:00
Christoph Oelckers
c8d65a1f06 - use sector wrappers where easily doable with search and replace. 2021-11-06 14:19:55 +01:00
Christoph Oelckers
9e4afd543c - Duke/RR: Some quick wall[] replacements. 2021-11-06 14:19:55 +01:00
Christoph Oelckers
b548d9eca2 - a few more quick sector[] replacements. 2021-11-06 14:19:55 +01:00
Christoph Oelckers
bc56b5a28f - RR: cleaned up STAT_DESTRUCT init code a bit 2021-11-06 14:19:54 +01:00
Christoph Oelckers
8818a3f1cb - Duke: added a getSector method to DDukeActor. 2021-11-06 14:19:54 +01:00
Mitch Richters
8f37097e1b - Exhumed: Revert change from edf54b4b0a that wasn't meant to be committed. 2021-11-06 19:54:12 +11:00
Mitch Richters
edf54b4b0a - Exhumed: Remove some dead input code that isn't in any usage. 2021-11-06 19:44:59 +11:00
Mitch Richters
3778327818 - Duke: Back up rotscrnang if script sets target to new value so we can interpolate the changes. 2021-11-06 17:57:37 +11: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
Mitch Richters
8bd2b960ee - Blood: Consolidate duplicated code in viewUpdateShake() into a lambda. 2021-11-06 15:14:25 +11:00
Mitch Richters
7499c84d0b - Add interpolatedhorizon() inlines to handle interpolating fixedhoriz objects without having to convert old and new values back to Q16.16 first. 2021-11-06 14:07:58 +11:00
Christoph Oelckers
389f760d45 - address C++20 deprecation warnings with enums in floating point arithmetic. 2021-11-02 23:32:31 +01:00
Mitch Richters
59850fa768 - SW: When adjusting horizon in DoPlayerDeathHoriz(), just use integer horizon values and not Q16.16. 2021-11-02 10:29:31 +11:00
Mitch Richters
523285b9b0 - Duke (RR): Clean up some unnecessary FixedToFloat() usage with the fixedhoriz asbuildf() method. 2021-11-02 10:29:26 +11:00
Christoph Oelckers
86166f5e67 Revert "- xs_Float.h: Make all inlines return an unsigned value, and change previous unsigned inlines to signed."
Revert "- `xs_Float.h`: Add `getint()` getter to `_xs_doubleints` struct."
Revert "- SW: When adjusting horizon in `DoPlayerDeathHoriz()`, just use integer horizon values and not Q16.16."
Revert "- Duke (RR): Clean up some unnecessary `FixedToFloat()` usage with the `fixedhoriz` `asbuildf()` method."
Revert "- `binaryangle.h`: Use `constexpr` on inline functions where it was previously not possible to do so."
Revert "- `m_fixed.h`: Use `constexpr` on inline functions where it was previously not possible to do so."
Revert "- `xs_Float.h`: Convert header to `constexpr`."

This does nor work as it violates the constexpr rules for unions. The code will error out on compilation for accessing an inactive member of a union.
2021-11-01 20:25:38 +01:00
Mitch Richters
3e25637385 - SW: When adjusting horizon in DoPlayerDeathHoriz(), just use integer horizon values and not Q16.16. 2021-11-01 23:37:32 +11:00
Mitch Richters
1363ed654c - Duke (RR): Clean up some unnecessary FixedToFloat() usage with the fixedhoriz asbuildf() method. 2021-11-01 23:37:32 +11:00
Mitch Richters
eb8b075727 - binaryangle.h: Change binangle bitshift operators to operate on signed value to properly handle angles > 1024. 2021-11-01 22:13:39 +11:00
Mitch Richters
a1570c185f - Duke: Remove posx/posy/posz variables and replace with points in the previously unionised pos vec3_t variable. 2021-10-31 17:52:52 +11:00
Mitch Richters
6ca6d5639b - SW: Fix horizon of camera screens originating from changes in 09a05f354c. 2021-10-31 11:06:13 +11:00
Mitch Richters
9495b9e6d0 - SW: Interpolate the player's weapon recoil.
* Reported as missing by @nashmuhandes.
2021-10-31 08:53:26 +11:00
Christoph Oelckers
e8f9afb174 - DoScaleSprite. 2021-10-30 17:30:03 +02:00
Christoph Oelckers
e84d61e80a - redid the iterators in _polymost.cpp. 2021-10-30 17:30:03 +02:00
Christoph Oelckers
d6bdc735d6 - patch up Blood's GetZRange to compile with getzrange_old being gone. 2021-10-30 17:30:03 +02:00
Mitch Richters
f0a347263a - SW: Replace use of getzrange_old() inline wrapper with getzrange() and remove inline wrappers. 2021-10-30 17:30:02 +02:00
Mitch Richters
1d39bb371e - Exhumed: Replace use of getzrange_old() inline wrapper with getzrange(). 2021-10-30 17:30:02 +02:00
Mitch Richters
add3481e40 - SW: Replace use of pushmove_old() inline wrapper with pushmove() and remove inline wrappers. 2021-10-30 17:30:02 +02:00
Mitch Richters
bdbe57a6b6 - Exhumed: Replace use of pushmove_old() inline wrapper with pushmove(). 2021-10-30 17:30:02 +02:00
Mitch Richters
0ee3b5af1c - Blood: Replace use of pushmove_old() inline wrapper with pushmove(). 2021-10-30 17:30:02 +02:00
Mitch Richters
adcdbdc931 - SW: Replace use of clipmove_old() inline wrapper with clipmove() and remove inline wrappers. 2021-10-30 17:30:02 +02:00
Mitch Richters
0ac63fd663 - Exhumed: Replace use of clipmove_old() inline wrapper with clipmove(). 2021-10-30 17:30:01 +02:00
Mitch Richters
b793bc8327 - Blood: Replace use of clipmove_old() inline wrapper with clipmove(). 2021-10-30 17:30:01 +02:00
Mitch Richters
b02a6a3ec9 - Replace MIN() from templates.h with version provided in STL. 2021-10-30 10:36:15 +02:00
Mitch Richters
9894729fc2 - Replace MAX() from templates.h with version provided in STL.
# Conflicts:
#	source/common/textures/hw_ihwtexture.cpp
#	source/common/utility/templates.h
2021-10-30 10:36:02 +02:00
Christoph Oelckers
57b638f26f - use std::clamp instead of our homegrown version. 2021-10-30 10:35:00 +02:00
Mitch Richters
059a99f7c8 - Blood: Remove costable[]. 2021-10-30 10:24:16 +02:00
Mitch Richters
5a57beb343 - Blood: Replace remaining uses of costable[] with Sin() inlines. 2021-10-30 10:24:16 +02:00
Mitch Richters
ad183b5a3e - Blood: Replace internals of Cos() to use sintable[] array instead of costable[] array. 2021-10-30 10:24:16 +02:00
Mitch Richters
79b3e10f2a - Blood: Replace internals of Sin() to use sintable[] array instead of costable[] array. 2021-10-30 10:24:15 +02:00
Mitch Richters
ead877450d - Blood: Replace CosScale16() with bsin() from backend. 2021-10-30 10:24:15 +02:00
Mitch Richters
3ec1767791 - Blood: Replace SinScale16() with bsin() from backend. 2021-10-30 10:24:15 +02:00
Mitch Richters
e699c264f0 - Blood: Fix missed change integer to enum change for StartQAV() call missed from 77704d54d9. 2021-10-30 10:24:15 +02:00
Mitch Richters
98d3850b95 - Blood: Fix horizon adjustment for death camera to avoid Fixed > Float > Fixed conversion. 2021-10-30 10:24:14 +02:00
Mitch Richters
20d958e0a9 - Exhumed: Don't run through the slopetilting math if the view is locked. 2021-10-30 10:24:14 +02:00
Mitch Richters
738491d9e5 - Exhumed: Repair player look/aim code. 2021-10-30 10:24:14 +02:00
Mitch Richters
8f679ecf61 - Exhumed: Repair math for chase camp gi functions. 2021-10-30 10:24:14 +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
8bad95c7c6 - reinstated deleted saveable_code entries with dummy pointers.
This is to preserve savegame compatibility for now.
Later the code pointer saving needs a thorough cleanup.
2021-10-29 09:16:07 +02:00
Christoph Oelckers
e241e7dc52 - SW: changed Animator interface to use USERp parameters. 2021-10-28 23:37:07 +02:00
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
821f3d356b - renamed DDukeActor::GetIndex to GetSpriteIndex to bring it in line with the other games. 2021-10-24 09:22:35 +02:00
Christoph Oelckers
7ebe492e94 - fixed map-spawned actor indexing in Blood.
This is needed for error reporting and the secret hint system.
2021-10-24 09:11:43 +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
da817a234b - fixed bad actor use in actCheckDudes. 2021-10-24 00:06:02 +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
Mitch Richters
d30c94c709 - Blood: Re-fix lighter when changing from TNT to aerosol.
* Fixes #564.
2021-10-20 20:58:10 +11:00
Mitch Richters
fc73c67bb1 - Blood: Fix TNT pickup accidentally equipping player with voodoo doll.
* Fixes #544.
* Thanks to @carnivoroussociety for pointing me in the right direction.
2021-10-20 19:58:07 +11:00
Christoph Oelckers
1214f8ba00 - properly macro-fy parsed strings from Blood's INI. 2021-10-19 21:49:03 +02:00
Christoph Oelckers
4d94fa9b03 - Duke/RR: strip trailing spaces off strings parsed in CON. 2021-10-19 21:49:02 +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
Mitch Richters
df88b23f63 - Blood: Backport GDX fix for lighter just appearing when switching to the aerosol.
* Fixes #564.
* Thanks to @carnivoroussociety for the heads up.
2021-10-19 11:20:44 +11: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
2396c89fb9 - migrated EVENT to use its actor pointer. 2021-10-14 21:59:49 +02:00
Christoph Oelckers
f430c28f88 - split up evSend
# Conflicts:
#	source/games/blood/src/nnexts.cpp
2021-10-14 21:59:49 +02:00
Christoph Oelckers
efc791ee00 - route all remaining calls to evPost and evKill through type specific variants. 2021-10-14 21:59:41 +02:00
Christoph Oelckers
b64aede68e - made patrolBonkles local to the only function using this array. 2021-10-14 20:31:45 +02:00
Christoph Oelckers
71b144023d - renamed evPost to evPostActor and evKill to evKillActor for clarity. 2021-10-14 20:31:17 +02:00
Christoph Oelckers
0ab33b7ffe - need to pass the actor separately to getDataFieldOfObject.
We cannot use rxindex anymore.
2021-10-14 20:28:56 +02:00
Christoph Oelckers
e32ac93d96 - use the actor pointer in rxBuckets. 2021-10-14 20:27:36 +02:00
Christoph Oelckers
b449e0a43b - event redirectors for rxBuckets. 2021-10-14 20:26:42 +02:00
Christoph Oelckers
40a8cd7fa3 - playerQavSceneProcess handled for rxBuckets 2021-10-14 20:25:10 +02:00
Christoph Oelckers
db9d4efdc9 - handled 4 aiFight functions for rxBuckets. 2021-10-14 19:53:08 +02:00
Christoph Oelckers
0ef388538d - refactored 'mate' function for rxBucket. 2021-10-14 19:51:49 +02:00
Christoph Oelckers
1d04ce90e4 - first batch of rxBucket refactoring. 2021-10-14 19:49:18 +02:00
Christoph Oelckers
5d0086cb49 - renamed RXBUCKET.index to rxindex.
This will be needed for refactoring for easier lookup.
2021-10-14 19:41:22 +02:00
Christoph Oelckers
93e909dd58 - use actors in the CFX interface. 2021-10-14 19:41:01 +02:00
Christoph Oelckers
77c827e817 - renamed evKill and added an actor pointer to EVENT struct. 2021-10-14 19:37:53 +02:00
Christoph Oelckers
1e1764eda6 - got rid of fxSpawn. 2021-10-14 19:36:25 +02:00
Christoph Oelckers
085bd3a165 - replaced all fxSpawn calls with fxSpawnActor. 2021-10-14 19:35:05 +02:00
Christoph Oelckers
fbe2373972 - started cleanup of evPost calls by renaming the internal functions.
This just renames things - no changes in functionality.
2021-10-14 19:07:51 +02:00
Christoph Oelckers
2a1f31581c - added null pointer checks to all event callback functions. 2021-10-14 19:07:24 +02:00
Christoph Oelckers
add368433e - sanitized callback interface. 2021-10-14 19:07:00 +02:00
Christoph Oelckers
143e947839 - renamed variable for consistency. 2021-10-14 19:02:48 +02:00
Christoph Oelckers
562968262c - moved spriteMass into DBloodActor 2021-10-14 19:01:10 +02:00
Christoph Oelckers
5519596a94 - refactored global sprite index arrays into pointer arrays. 2021-10-14 18:43:56 +02:00
Christoph Oelckers
b60caa362e - fixed bad merge 2021-10-14 01:15:05 +02:00
Christoph Oelckers
62d0d3712e - use a sprite flag to mark mapped sprites.
This avoids another global array which needs to be addressed by sprite index.
2021-10-14 15:09:43 +02:00
Christoph Oelckers
88e86b4248 - added 0 checks to all divisions for calculating dudeSlope.
I had it happen once that an actor was targeting itself here which resulted in zero distance and a division by zero exception.
2021-10-14 00:06:34 +02:00
Christoph Oelckers
a358cf8516 - SW: eliminated all SPRITE_TAG# macros. 2021-10-12 22:21:08 +02:00
Christoph Oelckers
b1ac1ad585 - more changesprite* renaming. 2021-10-12 21:36:42 +02:00
Christoph Oelckers
2e37cc627c - function renaming for clarity and easier lookup. 2021-10-12 21:36:42 +02:00
Christoph Oelckers
895ecc81bc - const-ified some static arrays.
# Conflicts:
#	source/games/blood/src/nnexts.cpp
2021-10-12 21:36:42 +02:00
Christoph Oelckers
3ea4c94266 - removed a few static array references. 2021-10-12 21:36:42 +02:00
Christoph Oelckers
a318129ff3 - iterators in ambient sound code. 2021-10-12 21:36:41 +02:00
Christoph Oelckers
3454fc397e - a few target_i removed.
# Conflicts:
#	source/games/blood/src/ai.cpp
2021-10-12 21:36:41 +02:00
Christoph Oelckers
dc5d32f510 - two missed iterators. 2021-10-12 21:36:41 +02:00
Christoph Oelckers
13348ca428 - a tiny bit of code cleanup. 2021-10-12 21:36:41 +02:00
Christoph Oelckers
b240d2b5bd - aiunicult.cpp is done. 2021-10-12 21:36:41 +02:00
Christoph Oelckers
013eadfd9f - genDudePrepare 2021-10-12 21:36:18 +02:00
Christoph Oelckers
fb5916a3dd - canSwim et.al. 2021-10-12 21:29:12 +02:00
Christoph Oelckers
acec23e034 - ensure the 'slave' array in genDudeExtra is always free of gaps.
This will ensure that adding entries won't accidentally overwrite things.
2021-10-12 21:29:11 +02:00
Christoph Oelckers
6bee3b5ba0 - updateTargetOfSlaves, also storing the slave data as pointers and major cleanup of this function. 2021-10-12 21:29:11 +02:00
Christoph Oelckers
c42e26351e - genDudeSpawn, genDudeTransform and updateTargetOfLeech. 2021-10-12 21:29:11 +02:00
Christoph Oelckers
e41fcb92ab - cleanup and formatting noise again. 2021-10-12 21:29:11 +02:00
Christoph Oelckers
f4fd2a770b - dudeLeechOperate 2021-10-12 21:29:11 +02:00
Christoph Oelckers
e415d93283 - doexplosion 2021-10-12 19:23:25 +02:00
Christoph Oelckers
b1f55434a2 - getRecoilChance + getDodgeChance 2021-10-12 19:23:25 +02:00
Christoph Oelckers
b70368050a - getDispersionModifier and getRangeAttackDist. 2021-10-12 19:23:25 +02:00
Christoph Oelckers
9801ce25dd - scaleDamage 2021-10-12 19:23:24 +02:00
Christoph Oelckers
544145fe4b - reformatting noise split from a larger commit. 2021-10-12 19:23:24 +02:00
Christoph Oelckers
c715ded287 - dudeIsMelee 2021-10-12 19:23:24 +02:00
Christoph Oelckers
eb478ba580 - getNextIncarnation
Event queue handling not refactored yet.
2021-10-12 19:23:24 +02:00
Christoph Oelckers
d892efb78a - killDudeLeech 2021-10-12 19:23:24 +02:00
Christoph Oelckers
040049f83e - more leech stuff.
# Conflicts:
#	source/games/blood/src/ai.cpp
2021-10-12 19:23:23 +02:00
Christoph Oelckers
d2f16ec8ab - leechIsDropped, pLifeLeech 2021-10-12 19:23:23 +02:00
Christoph Oelckers
d907627156 - spriteIsUnderwater 2021-10-12 19:23:23 +02:00
Christoph Oelckers
75258c8b29 - playGenDudeSound. 2021-10-12 19:23:23 +02:00
Christoph Oelckers
ea63229251 - some minor cleanup in aiunicult.cpp.
# Conflicts:
#	source/games/blood/src/aiunicult.cpp
2021-10-12 19:23:22 +02:00
Christoph Oelckers
05571de93a - genDudeUpdate handled. 2021-10-12 19:23:22 +02:00
Christoph Oelckers
49f75e6f51 - 2 more function changed to use actor parameters. 2021-10-12 19:23:22 +02:00
Christoph Oelckers
805ae48607 - ThrowThing cleanup.
Mostly use of VS's rename function.
2021-10-12 19:23:22 +02:00
Christoph Oelckers
c848518746 - use actor parameter in all calls to aiGenDudeNewState.
# Conflicts:
#	source/games/blood/src/aiunicult.cpp
2021-10-12 19:23:22 +02:00
Christoph Oelckers
9de6c7df46 - reformatting commit.
# Conflicts:
#	source/games/blood/src/ai.cpp
2021-10-12 19:23:22 +02:00
Christoph Oelckers
062b3dbf76 - route all access to genDudeExtra through the method in DBloodActor 2021-10-12 19:23:21 +02:00
Christoph Oelckers
cdacf8e470 - fixed badly resolved merge conflict 2021-10-12 00:07:24 +02:00
Christoph Oelckers
64b67291bc - properly write out the genPatrolStates in savegames. 2021-10-11 23:41:44 +02:00
Christoph Oelckers
f370c0f22f - fixed bad null check in aiProcessDudes. 2021-10-11 23:41:04 +02:00
Christoph Oelckers
c6dc564788 - fixed bad target check (again.) 2021-10-11 23:34:49 +02:00
Christoph Oelckers
afce1aba88 - SW: eliminated the only use of the SPRITE_TAG1 macro. 2021-10-11 23:02:54 +02:00
Christoph Oelckers
351dabdb90 - actFireMissile. 2021-10-10 22:36:12 +02:00
Christoph Oelckers
7eac8b71d5 - removed unused constants 2021-10-10 11:47:19 +02:00
Christoph Oelckers
2af688dd62 - replaced RANDOM_RANGE macro with direct calls to RandomRange 2021-10-10 11:47:19 +02:00
Christoph Oelckers
cc912fbf93 - removed pointless BOUND_4PIX macro 2021-10-10 11:47:19 +02:00
Christoph Oelckers
3220a6d786 - some SW cleanup 2021-10-10 11:47:19 +02:00
Christoph Oelckers
bbe49eee7c - reformatting commit 2021-10-10 11:47:18 +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
c485fce958 - reformatted the actor and ai sources. 2021-10-10 11:47:18 +02:00
Christoph Oelckers
0ee81b2bb8 - refactored the remaining pieces in the ai code to use actors. 2021-10-10 11:47:18 +02:00
Christoph Oelckers
d4439b879c - Blood: added checks to the SEQ code to handle situation where their attached object has been removed from the game. 2021-10-10 11:46:38 +02:00
Christoph Oelckers
62502439d7 - eliminated HITINFO.hitsprite.
This was one of the more annoying sprite index variables because it is part of static global data.
2021-10-09 23:09:09 +02:00
Christoph Oelckers
9b4ee3dc2c - some remaining sprite[] access in ai.cpp
# Conflicts:
#	source/games/blood/src/ai.cpp
2021-10-09 23:09:08 +02:00
Christoph Oelckers
f712a674ce - removed the few remaining uses of actDamageSprite_. 2021-10-09 23:09:08 +02:00
Christoph Oelckers
3ab636a13a - sfxPlay3DSound calls partially migrated. 2021-10-09 23:09:08 +02:00
Christoph Oelckers
741d24b9df - iterators in teslaHit. 2021-10-09 23:09:07 +02:00
Christoph Oelckers
ea7ff0b5eb - parameter stuff in a few weapon functions. 2021-10-09 23:09:07 +02:00
Christoph Oelckers
e64e359d07 - iterators in StompSeqCallback 2021-10-09 23:09:07 +02:00
Christoph Oelckers
39b9ddc04c - target stuff in aiInitSprite 2021-10-09 23:09:07 +02:00
Christoph Oelckers
b8d55feb1e - actor parameter substitution and a few bad constants. 2021-10-09 23:08:44 +02:00
Christoph Oelckers
fbae41ee0a - renamed the sprite variant of aiDamageSprite. 2021-10-09 23:08:43 +02:00
Christoph Oelckers
bbe3f333fa - replaced some GetSpriteExtents calls with GetActorExtents. 2021-10-09 23:08:43 +02:00
Christoph Oelckers
44b0e59127 - aiProcessDudes and aiInitSprite done, completing the main pass over ai.cpp. 2021-10-09 23:08:43 +02:00
Christoph Oelckers
29e245dfce - aiProcessDudes, getting rid of the global cumulDamage array and some reformatting 2021-10-09 23:04:29 +02:00
Christoph Oelckers
6968a072ae - another formatting-only commit.
# Conflicts:
#	source/games/blood/src/ai.cpp
2021-10-09 23:04:29 +02:00
Christoph Oelckers
fe92188b0c - removed the dudeIsPlayingSeq variant taking a sprite parameter. 2021-10-09 23:03:09 +02:00
Christoph Oelckers
890cc4947b - use actor parameters for aiSetTarget and aiActivateDude in several places. 2021-10-09 23:03:09 +02:00
Christoph Oelckers
61d9cd1b17 - switched all aiPlay3DSound calls to use actors. 2021-10-09 23:02:40 +02:00
Christoph Oelckers
bdba52aede - refactored aiDamageSprite. 2021-10-09 23:02:20 +02:00
Christoph Oelckers
10b0bba53e - fixed warnings in Exhumed. 2021-10-08 19:24:45 +02:00
Christoph Oelckers
948f194064 - fixed warnings in Duke. 2021-10-08 19:21:29 +02:00
Christoph Oelckers
8606b2ea5a - fixed warnings in Blood. 2021-10-08 19:09:26 +02:00
Christoph Oelckers
9b047c771c - reformatting of aiDamageSprite, no logic change here. 2021-10-07 22:54:18 +02:00
Christoph Oelckers
c8501f8ea6 - refactored aiSetTarget 2021-10-07 22:54:18 +02:00
carnivoroussociety
e6e9bac04b Add ifdef'd correct code for DUDEEXTRA struct saving 2021-10-07 22:51:43 +02:00
carnivoroussociety
8998d92688 Restore original savename variables for DUDEEXTRA struct 2021-10-07 22:51:42 +02:00
carnivoroussociety
8dbd0f10d3 Refactored DUDEEXTRA struct and correctly init state
# Conflicts:
#	source/games/blood/src/aiboneel.cpp
#	source/games/blood/src/aicerber.cpp
#	source/games/blood/src/aigarg.cpp
#	source/games/blood/src/aighost.cpp
#	source/games/blood/src/aitchern.cpp
2021-10-07 22:51:42 +02:00
Christoph Oelckers
8168c6f85c - use the vel() wrappers in a few more places. 2021-10-07 22:48:08 +02:00
Christoph Oelckers
595893a9a0 - added a few more ValidateTarget calls. 2021-10-07 22:48:08 +02:00
Christoph Oelckers
a3a5e7e90b - renamed aiSetTarget. 2021-10-07 22:48:08 +02:00
Mitch Richters
61ba58c529 - Duke: Use DeferredGameStart() instead of ChangeLevel() in cheatLevel() to instantly warp to the targeted map, matching DOS behaviour.
* Fixes #529.
2021-10-05 08:50:05 +11:00
Mitch Richters
5732ea0233 Revert "- Blood: Use more precision for flicker, quake and tilt effects."
This reverts commit 3c09f41b43.

* Fixes #554.
2021-10-05 08:43:32 +11:00
Christoph Oelckers
95acafdbac - manual update of NBlood commit 24908021f3b844a73de05632565d55d5b71b577c
- Fix kModernCustomDude is not inheriting sprite size if SEQ have zero repeats
- Damage scale tweaks for kModernCustomDude
- Fix hitscan kModernCondition
2021-09-19 16:35:02 +02:00
Christoph Oelckers
1732d206bd - Blood: fixed flare gun no longer being able to set trees on fire.
Somehow a bad damage type got in here...
2021-09-18 20:13:05 +02:00
Christoph Oelckers
11aea1c5d4 - more target replacements. 2021-09-17 20:49:27 +02:00
Christoph Oelckers
b9f6120380 - handle target validations in AI functions properly.
Now they will all print the function name along with the message and not rely on assert abuse.
2021-09-17 20:49:27 +02:00
Christoph Oelckers
261301bdea - replacing target_i, batch 1.
This was the simple stuff, mostly done by search&replacing common patterns.
2021-09-17 20:49:27 +02:00
Christoph Oelckers
90091965ba - replaced most occurences of target_i in already refactored code. 2021-09-17 20:49:27 +02:00
Christoph Oelckers
7a6629ce6a - renamed XSPRITE::target to target_i.
This is to make searching for it easier as 'target' is a very common word in the source.
2021-09-17 20:49:26 +02:00
Christoph Oelckers
774a015e6b - aiChooseDirection and its subfunctions. 2021-09-17 20:49:26 +02:00
Christoph Oelckers
a79d362b40 - dudeIsPlayingSeq + aiPlay3DSound. 2021-09-17 20:49:26 +02:00
Christoph Oelckers
7054313dd4 - formatting only. 2021-09-17 20:49:26 +02:00
Christoph Oelckers
00d0099333 - removed a few compatibility wrappers. 2021-09-17 20:49:26 +02:00
Christoph Oelckers
6a1ffca34f - actCheckExplosion, removed array access from SEQ callbacks in actor.cpp and renamed the two which still had assembly names. 2021-09-17 20:49:25 +02:00
Christoph Oelckers
663ecc79d1 - actFireVector 2021-09-17 20:49:25 +02:00
Christoph Oelckers
d6724185b3 - removed a few redundant one-liner functions. 2021-09-17 20:49:25 +02:00
Christoph Oelckers
d7078dda48 - actGetRespawnTime + actCheckRespawn. 2021-09-17 20:49:25 +02:00
Christoph Oelckers
6db18e61d9 - Blood: use a TArray for gPost and store actors as pointers.
This also does not need to be serialized because it gets cleared at the end of each game tick and will always be empty when saving is done.
2021-09-17 20:49:05 +02:00
Christoph Oelckers
4526f4149b - actSpawnThing and actFireThing. 2021-09-16 00:11:20 +02:00
Christoph Oelckers
7c1826e909 - fixed typo in the actor variant of seqKill. 2021-09-16 00:04:18 +02:00
Christoph Oelckers
c5d7455317 - actSpawnDude. 2021-09-16 00:01:16 +02:00
Christoph Oelckers
6be611fd94 - fixed merge. 2021-09-12 18:32:11 +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
Christoph Oelckers
7f485bfab1 - split off the extended sprite flags into their own word.
Some code overwrites the cstat field entirely (thanks Duke, for being sloppy with this...!)
2021-09-12 18:26:35 +02:00
Christoph Oelckers
61bc90949b - Blood: fixed super secret notification on the level summary screen. 2021-09-12 18:17:51 +02:00
Christoph Oelckers
0e82d75325 - SW: fixed recursive saving of panel sprites 2021-09-12 18:17:50 +02:00
Christoph Oelckers
bad57f6a5f - clear pspAsArray at the beginning of a save/load operation, not at the end.
If done at the end it may leave behind some stale data if saving or loading fails for some reason.
2021-09-12 18:17:50 +02:00
Christoph Oelckers
e13426ec6e - SW: avoid crashing when unwinding from a savegame loading error.
The linked list may be incomplete in this case.
Also kept the macro unmangling done to debug this code.
2021-09-12 18:17:50 +02:00
Christoph Oelckers
3c3da13d3f - fixed seqKill actor variant. 2021-09-12 18:17:27 +02:00
Christoph Oelckers
fefc9e91da - rename weaponhit to DDukeActor.
Just make do with one name instead of aliasing it.
2021-08-30 08:12:39 +02:00
Christoph Oelckers
2b6bc414f5 - Duke: fixed a few places using a sprite index where a player index is needed. 2021-08-30 08:08:33 +02:00
Christoph Oelckers
0bd0923f44 - cleaned up some dirty code. 2021-08-30 08:07:40 +02:00
Christoph Oelckers
07eda3cb4a - Duke: don't process input when not in a game. 2021-08-30 08:06:26 +02:00
Christoph Oelckers
bac1480997 - Blood: fixed use of bad index variable in condCheckSector 2021-08-28 18:00:13 +02:00
carnivoroussociety
deefbcf431 Use PlayerName() 2021-08-28 16:46:01 +10:00
carnivoroussociety
2b44f8e79d Carry over team flag fix from nblood 2021-08-28 16:46:01 +10:00
carnivoroussociety
049665e03e Fixed bug collecting lifeleech with ignited tnt/spray 2021-08-28 16:46:01 +10:00
Mitchell Richters
2fbfa82fe8 - Blood: Add interpolated weapon QAVs to WeaponInit() and WeaponPrecache() functions. 2021-08-28 16:43:17 +10: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
3c09f41b43 - Blood: Use more precision for flicker, quake and tilt effects. 2021-08-28 16:43:16 +10:00
Christoph Oelckers
dc0d201275 - Blood: added serialization for the tracking conditions array. 2021-08-27 18:23:04 +02: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
Christoph Oelckers
f3e10a595d - Blood: fixed pod fireballs not exploding.
Looks like something went wrong with cleaning out the broken code that once was here.
2021-08-27 13:25:01 +02:00
Christoph Oelckers
e010dce812 - Blood: fixed occasionally disappearing sprites when hitting something with the tesla gun. 2021-08-26 09:31:32 +02:00
Christoph Oelckers
9b061f9829 - Blood: fixed crash with Gargoyle projectiles.
Thanks, MSVC, for not warning about this... :(
2021-08-26 08:18:24 +02:00
Christoph Oelckers
1fbaeceada - Blood: avoid double free of sprites.
This happened to me once in Death Wish.
2021-08-26 08:18:23 +02:00
carnivoroussociety
03e6bb3696 Skip CheckProximityWall when newSectCheckMethod is set
Fixes edge case where CheckProximityWall misses
2021-08-26 08:02:11 +02: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
Christoph Oelckers
c80831555c - Blood: fixed broken missile collision checks.
Curse that stupid bit masking madness in clipmove. As long as this code isn't properly abstracted, we still need to handle it on the game side.
2021-08-25 08:47:40 +02:00
Christoph Oelckers
0cad0b9258 - reformatting the mess created by TortoiseMerge. 2021-08-25 08:46:31 +02:00
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
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
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
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
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
carnivoroussociety
8ec6cdaf91 Renamed SpidPoisonTarget to SpidPoisonPlayer 2021-08-21 20:53:38 +10:00
carnivoroussociety
44e6ccb3d4 Eliminate misused DemoRecordStatus usages 2021-08-21 20:29:01 +10:00
Mitchell Richters
f67a09680e - Blood: Rename CVAR cl_bloodhudinterp to cl_bloodqavinterp. 2021-08-21 19:55:02 +10:00
carnivoroussociety
1f6181fa99 Renamed untitled spider functions 2021-08-21 19:52:24 +10:00
Mitchell Richters
9251ce11c7 - Blood: Remove unused isOriginalQAV() function from weapon.cpp. 2021-08-21 13:35:41 +10:00
carnivoroussociety
cd53e4c966 Fix teleport triggers not updating player angle 2021-08-21 12:44:01 +10:00
carnivoroussociety
28d7f0de58 Do not use accurate clipmove for flame missiles
Changes gameplay too much
2021-08-19 22:34:49 +10:00
carnivoroussociety
6d4a3243b7 Lower flame damage if using accurate clipmove
The eduke clipmove will cause a higher hit %, lower all flame damage from 8->3 to compensate with overall higher sprite hit result
2021-08-19 22:18:52 +10:00
carnivoroussociety
f0627fa6c2 enginecompatibilitymode -> enginecompatibility_mode 2021-08-19 20:44:13 +10:00
carnivoroussociety
0e0c4e692f Set thing/missile to use accurate clipmove 2021-08-19 20:38:31 +10:00
carnivoroussociety
db9a413f21 Added new cl_bloodvanillaenemies CVAR
GetClosestSpriteSectors(): If newSectCheckMethod is set, then always test midpoints at least once
Use new CVAR for tiny Caleb/burning cultists/Cerberus fixes
Do not use new GetClosestSpriteSectors() fix for teslaHit() if vanilla explosions is set
Do not use GetClosestSpriteSectors() fix for enemies sight scanning if vanilla enemies is set
2021-08-19 14:26:53 +10:00
carnivoroussociety
24b5673130 GetClosestSpriteSectors - Fixed typo with nLength check 2021-08-18 22:34:20 +02:00
carnivoroussociety
440fa3b70e GetClosestSpriteSectors - Fixed typo with nLength check 2021-08-19 03:21:41 +10:00
carnivoroussociety
6606f0bc5a Improved GetClosestSpriteSectors() detection
Enables/disables new sector searching behavior for dude owned explosions
Added new CVAR cl_bloodvanillaexplosions
Swap ExplosBehavior menu settings
2021-08-18 15:52:15 +02:00
Mitchell Richters
968708a649 - Blood: Remove the extern for weaponQAV[] and move kQAVEnd enum into new enum from 9e84dd1ef6051f4e54d99dcfc6e3468560175e16 2021-08-18 20:02:35 +10:00
Mitchell Richters
84496029a9 - Blood: Replace a few missed numerical constants with enums. 2021-08-18 20:02:32 +10:00
Mitchell Richters
77704d54d9 - Blood: Replace all numerical constants in calls to StartQAV() with enum values. 2021-08-18 20:02:30 +10:00
Mitchell Richters
6a2a0da819 - Blood: Replace all numerical constants for player's weaponQav with enum values. 2021-08-18 20:02:27 +10:00
Mitchell Richters
cd5e01818a - Blood: Replace all numerical constants for player's nextWeapon with enum values. 2021-08-18 20:02:24 +10:00
Mitchell Richters
6f08eb2292 - Blood: Replace all numerical constants for player's newWeapon with enum values. 2021-08-18 20:02:22 +10:00
Mitchell Richters
ba94614078 - Blood: Replace all numerical constants for player's curWeapon with enum values. 2021-08-18 20:02:20 +10:00
Mitchell Richters
d939602875 - Blood: Define enum values for weapon numbers. Not in use yet. 2021-08-18 20:02:14 +10:00
Mitchell Richters
6fec5d582e - Blood: Define enum values for QAVs. Not in use yet. 2021-08-18 20:01:34 +10:00
Mitchell Richters
db5aa4ba17 - Blood: Backport voodoo doll fix from BloodGDX. 2021-08-18 20:00:52 +10:00
Mitchell Richters
b01cef7f15 - Blood: Remove lastframetic hack from QAV::Draw() added in 99508e6f15 since we now use proper timing code. 2021-08-18 20:00:49 +10:00
Mitchell Richters
24fbaa527c - Blood: Re-time weapon and scene QAV code based on reworked timer and QAV struct code. 2021-08-18 20:00:44 +10:00
Mitchell Richters
ab502ebc66 - Blood: Ensure looped QAVs interpolate using last frame in the array. 2021-08-18 20:00:36 +10:00
Mitchell Richters
c75778c08d - Blood: Re-time menu's blood dripping based on reworked timer and QAV struct code. 2021-08-18 20:00:32 +10:00
Mitchell Richters
502b76af70 - Blood: Parse the values of the QAV files instead of casting the binary data so we can extend the struct. 2021-08-18 20:00:22 +10:00
Christoph Oelckers
adf9747e5b - Blood: removed redundant STAT_Update call in StartLevel.
This was killing the level times for the 'printstats' display.
2021-08-17 23:44:46 +02:00
carnivoroussociety
a29303cde5 Don't trigger fall scream after player has died 2021-08-16 09:05:51 +02:00
carnivoroussociety
7ac662e0c8 Apply burning bypass to correct sprite type 2021-08-15 12:24:41 +02:00
carnivoroussociety
bd98096527 Fix burning Caleb's state 2021-08-15 12:24:41 +02:00
carnivoroussociety
52025fce68 Fixed burning Caleb state 2021-08-15 12:24:41 +02:00
carnivoroussociety
cd88bb1a67 Fixed burning cultists switching type in water
Fixed glitched burning enemy state
Fixed burning Caleb using innocent burning sprite
2021-08-15 12:24:41 +02:00
Christoph Oelckers
38c9d3f702 - Exhumed: fixed crash when ending the game. 2021-08-14 10:40:14 +02:00
carnivoroussociety
c3d03f21da Cleaned underwater next/prev weapon fix 2021-08-14 07:59:14 +02:00
carnivoroussociety
1957fc53be Tweaked next/prev weapon behavior underwater 2021-08-14 07:59:14 +02:00
Christoph Oelckers
5aa27bad3b - flag SW's cutscenes as 'boss death only'. 2021-08-13 22:25:13 +02:00
Christoph Oelckers
d5c9768414 - append an empty line to thr RFS file to be parsed.
Looks like the parser needs the last line to be properly terminated.
2021-08-13 21:44:23 +02:00
carnivoroussociety
8765b583f0 Fix spray -> tnt -> spray animation bug 2021-08-12 15:15:35 +02:00
carnivoroussociety
715bca4d53 input.newWeapon -> newWeapon 2021-08-12 13:59:44 +02:00
carnivoroussociety
1a344fe09b Fix ignited spray/TNT issue when going underwater 2021-08-12 13:59:44 +02:00
Mitchell Richters
17b2154e9a - Blood: Expose legacy 1.0 weapon handling game option as a CVAR. 2021-08-03 00:47:05 +10:00
Mitchell Richters
a9b75e7e7d - Blood: Put QAV interpolation code behind a CVAR for now until some final minor issues are resolved.
* Thanks to Dzierzan for testing and the reports.
2021-07-31 10:15:51 +10:00
Mitchell Richters
f6c7ed3984 - Blood: Restore originally intended isRunning code that never worked behind two CVARs to offer an alternative playing experience.
* `cl_bloodvanillarun` enables/disables the `isRunning` code that affects AI, bobbing and swaying.
* `cl_bloodvanillabobbing` enables/disables the `isRunning` code that affects bobbing and swaying, allowing only the `isRunning` AI changes.
2021-07-31 10:14:56 +10:00
Mitchell Richters
9884d5f396 - Blood: Perform interpolation of menu's blood dripping.
* All supporting code is here, is tested and works, need to determine best how to flag the menu as "Animated" to uncap the frame-rate.
2021-07-31 10:05:25 +10:00
Mitchell Richters
a67c126129 - Blood: Extend 99508e6f15 to find picnum of previous frame in all previous frame's tile indices if the current frame's tile index doesn't match.
* Allows more interpolation magic.
* Revealed an issue with `interpolatedanglef()` that was undetected. Removed in place of a binangle version returned as floating point build.
2021-07-29 19:23:00 +10:00
Mitchell Richters
32215ba570 - SW: Tidy some extra panel coordinate math that was missed in 4d4946fb6b. 2021-07-29 17:53:57 +10:00
Mitchell Richters
99508e6f15 - Blood: Perform interpolation between frames for each tile coordinate when there is more than one frame and the picnum between frames match. 2021-07-29 17:39:22 +10:00
Christoph Oelckers
9a8ee00aec - set currentLevel before calling engineLoadBoard.
This is needed if the compatibility patcher needs to alter mapinfo data.
2021-07-27 22:12:29 +02:00
NoOneBlood
a40d036623 Fix max players range check for kModernPlayerControl
Add power up control for kModernPlayerControl
2021-07-27 08:05:31 +10:00
Mitchell Richters
1fa0863a52 - Duke: Amend af9f2f3eb6 to not reset the skill if incoming skill is -1; 2021-07-26 19:41:17 +10:00
nukeykt
adb9547ba9 Blood: fix impact sprite OOB issue 2021-07-26 19:19:41 +10:00
nukeykt
ced8a83331 Blood: fix potential view sprite overflows 2021-07-26 16:06:56 +10:00
nukeykt
557cd7e734 Blood: fix view sprites overflow in ROR code 2021-07-26 16:00:13 +10:00
nukeykt
39547e2df5 Blood: fix OOB issue in aiPatrolSetMarker 2021-07-26 15:55:13 +10:00
Christoph Oelckers
1fde9f2173 - workaround to allow playing SW's Last Warrior mod in one go.
This disables the boss's death in L4 ending the game and just advances to the next level.
This seems to be the intent with this mod as the second episode starting at L5 is not defined and the first episode's subtitle advertises the full game.
2021-07-26 00:58:00 +02:00
Christoph Oelckers
1a5a2aba2b - Blood: fixed path validation for cutscene files. 2021-07-25 17:27:52 +02:00
Christoph Oelckers
dfb18ef9a9 - Duke/RR: Call Bowling lane reset code only when playing RR.
This may alter some tile references which will cause problems with hires replacements in Duke .
2021-07-25 12:43:03 +02:00
Christoph Oelckers
fa586d6d7c - Blood: fixed parser for 'mario' cheat to treat a leading space for the level number as 0. 2021-07-25 11:53:20 +02:00
Christoph Oelckers
b23db149e3 - use snprintf in condError.
While sprintf is generally problematic, it is particularly dangerous here where it is impossible to estimate the length of the messages.
2021-07-25 11:50:23 +02:00
Mitchell Richters
9fad44bab2 - Blood: Replace use of non-standard strupr() from 754554a493 with an FString object. 2021-07-25 19:44:07 +10:00
Mitchell Richters
3b82a08123 Revert "- Fix non-Windows and non-MSVC builds due to missing header for strupr()."
This reverts commit 2217dcb632.
2021-07-25 19:38:06 +10:00
sirlemonhead
e4fb67bc25 Rides Again: Possible array index by -1 in Proj_DoHitscan(). Added check to prevent this. 2021-07-25 19:37:02 +10:00
Mitchell Richters
2217dcb632 - Fix non-Windows and non-MSVC builds due to missing header for strupr(). 2021-07-25 19:27:31 +10:00
Christoph Oelckers
7702b3bb92 - rewrote the sound handling in the patrolling code for Raze's sound backend. 2021-07-25 10:42:15 +02:00
Christoph Oelckers
eae355110f - use enums instead of #defines. 2021-07-25 10:30:14 +02:00
Christoph Oelckers
cc3e6b74f3 - handle newly activated 'unused' fields properly for serialization. 2021-07-25 10:29:50 +02:00
Christoph Oelckers
b588abbca6 - deleted two unused functions that got back in again by accident. 2021-07-25 08:50:46 +02:00
Mitchell Richters
ffe62da3c7 - Blood: Add some nullptr checks to the aiPatrol*() inline bools. 2021-07-25 15:37:50 +10:00
Mitchell Richters
7329cb8f1f - Blood: Comment out bonk code from 754554a493 to get things building for now. 2021-07-25 13:12:29 +10:00
NoOneBlood
754554a493 Increase kMaxSuperXSprites from 128 to 512.
Fix mirror (ROR) intialization so it won't crash if more than 1024 sectors used.
Fix random item generator so items that inherits TX ID won't send command at respawn.
Fix for things (400 - 433) that affected by modern physics so it won't return to vanilla physics after getting damage.
Fix kTeleportTarget so teleported sprites won't stuck in floors or ceilings.
Corpses won't gib as gargoyles anymore (gModernMap).

kModernCondition:
 - remove bool comparison (condCmpb).
 - remove no extra comparison (condCmpne).
 - remove "else if" search at level start.
 - add global (game) conditions type.
 - add more conditions.
 - make error report a bit more informative.

Add more options and damage effects for kModernSpriteDamager.
Add more options for kModernMissileGen and allow to spawn projectile on TX ID sprites location.
Add more options and vertical wind processing for kModernWindGen.
Add more options and effects for kModernEffectGen.
Allow kMarkerDudeSpawn to spawn enemies on TX ID sprites location (gModernMap).
Allow kModernCustomDudeSpawn to spawn dude on TX ID sprites location.
Add Screen and Aim trigger flags for sprites that can be triggered with Sight (gModernMap).

Patrolling enemies:
 - add turn AI state.
 - add "return back" option for path markers.
 - add "turning while waiting" option for markers.
 - make enemies to hear some sounds assuming that player generates and hears it too.
 - add kModernStealthRegion type to affect current spot progress velocity.
 - replace AI's CanMove and aiChooseDirection to a better versions.
 - make flying enemies to not spin around the marker.
 - treat Phantasm as flying enemy!
 - allow to continue patrol when falling in water.

Fix compile warnings
Various minor fixes / cleanup.
2021-07-25 13:11:55 +10:00
Mitchell Richters
a55b8f716d - Blood: Repair some missing nullptr checks causing a crash upon reloading after dying.
* Reported by Spill.
2021-07-24 21:39:29 +10:00
Mitchell Richters
d9a7465c08 - SW: Remove gi->FreeGameData() from game as its inside code wasn't freeing game data but level data already freed in gi->FreeLevelData().
* This was causing `GameMain()` to try to call `TerminateLevel()` after tile data had been freed, causing a hard stop.
* Fixes #464.
2021-07-20 20:11:29 +10:00
Mitchell Richters
af9f2f3eb6 - Duke: Ensure gi->NextLevel() sets the skill level upon invocation. 2021-07-20 18:55:16 +10:00
Mitchell Richters
675356be1a - Ensure g_nextskill is used everywhere so that setting skill for next level works properly. 2021-07-20 18:51:34 +10:00
Mitchell Richters
33845c4a23 - Add skill CCMD to return player's current skill, while also being able to set skill for next game.
* Fixes #332.
2021-07-20 18:50:58 +10:00
Mitchell Richters
77630dcbc7 - Rename DeferedStartGame() to DeferredStartGame(). 2021-07-20 18:43:17 +10:00
Mitchell Richters
4ac1376b9f - Make naming of multiplayer episode exclusion stuff from d0e6a7ea29 more generic and exclude invalid episodes from "Duke It Out in DC", "Duke Nuclear Winter" and "Duke Caribbean". 2021-07-19 12:24:47 +10:00
Mitchell Richters
0f5243c39e - Blood: Lock input after setting angle/horizon targets in nnexts.cpp code, then unlock in ProcessInput() where resetForcedSyncInput() is called. 2021-07-18 19:26:24 +10:00
Mitchell Richters
58ed7f8745 - Blood: Restore original horizon algorithm in trPlayerCtrlSetLookAngle() and adjust to Raze's backend input code. 2021-07-18 18:52:21 +10:00
Mitchell Richters
b4af9e87c1 - Blood: Make delirium rotscrnang smoother with use of more precision. 2021-07-18 18:13:48 +10:00
Mitchell Richters
c62e5db2bc - Blood: Fix angle issues with NHIS. 2021-07-18 17:35:11 +10:00
Mitchell Richters
9432f9ec90 - Blood: Add nullptr check for actor2 in ProcessTouchObjects().
* Fixes crash during testing of NHIS.
2021-07-18 16:56:49 +10:00
Mitchell Richters
bcff74f5e4 Revert "- Duke: Restore a little bit of original code to make comparisons between us and the source easier."
This reverts commit 7607190dad.

* Not good in hindsight... We need the actual value from the backend to ensure we can match up against `WeaponSel_Next`/`WeaponSel_Prev`/`WeaponSel_Alt` as required.
2021-07-17 22:42:58 +10:00
Mitchell Richters
2a8e636066 - Exhumed: Extend 7b8dcde5d2 by showing the M60's clip/magazine amount available when cl_showmagamt 1 is set. 2021-07-17 14:57:43 +10:00
Mitchell Richters
6940384625 - Exhumed: Move pistol clip/magazine recalculation code that was added in 593bbe10ef from FillWeapons() to CheckClip(). 2021-07-17 14:57:00 +10:00
Mitchell Richters
052429f350 - Exhumed: Change M60's clip/magazine capacity from 99 to 100 to better match the max ammo capacity of the weapon. This does not increase the player's available ammunition. 2021-07-17 14:56:05 +10:00
Mitchell Richters
f9b75b1aa9 - Exhumed: Make FillWeapons() fill the ammo count to the maximum allowed by the game for all weapons (300). 2021-07-17 14:54:36 +10:00
Mitchell Richters
7607190dad - Duke: Restore a little bit of original code to make comparisons between us and the source easier. 2021-07-17 12:12:36 +10:00
Mitchell Richters
ec20f66eda - Duke/RR: Always ensure player's wantweaponfire is reset to -1 after switching weapon.
* Fixes #333.
2021-07-17 12:12:12 +10:00
Mitchell Richters
0bb0896985 - Duke: Fix BOSS2 (Cycloid Emperor) killing himself issue by removing some lines left behind from a2e3bb5725.
* Fixes #455.
2021-07-17 10:56:21 +10:00
Mitchell Richters
f022f197ab - Blood: Repair weapon switching issue by adding missing guard from 6980e8b355 that got lost during e375c799ce.
* Fixes #366.
2021-07-17 09:14:08 +10:00
Mitchell Richters
d0e6a7ea29 - Allow CON-based games to have multiplayer episodes filtered from menu.
* Fixes #461.
* Fixes #462.
2021-07-16 20:55:29 +02:00
Mitchell Richters
593bbe10ef - Exhumed: Ensure FillWeapons() recalculates the pistol clip amount after filling.
* When cheating, this wasn't done which lead to the clip having 6 rounds when via modulo it should have only had 3.
2021-07-17 00:11:37 +10:00
Mitchell Richters
7b8dcde5d2 - Exhumed: Make use of cl_showmagamt.
* Fixes #463.
2021-07-16 23:52:56 +10:00
Mitchell Richters
76554f5f4d - Repair incorrect method call to IniFile class from 6576adb80b.
* Fixes #473.
2021-07-16 23:01:07 +10:00
Christoph Oelckers
6576adb80b - Blood: validate .ini files before using them.
They must at least have one "Episode?" section to be accepted.
2021-07-13 12:34:35 +02:00
Christoph Oelckers
7a99b6376e - forgot to save this... 2021-07-13 12:31:14 +02:00
Christoph Oelckers
b06ad5c77f - Blood: fixed order of initialization for voxels.
Just like Shadow Warrior it needs to load its voxel table before .def files.
2021-07-13 12:11:17 +02:00
Mitchell Richters
5af06923d8 - Blood: Revise 6018213c71 and use the proper volume flag VF_HIDEFROMSP to hide multiplayer episodes from the menu. 2021-07-11 22:30:59 +10:00
Mitchell Richters
5441272bec - SW: Create inline function pspPresentRetractScale() to scale the rate at which weapons present and retract based on the current tile's height vs. the original asset's height.
* Reported to me by @Phredreeke, who had it reported to him from someone else.
* The sword in the widescreen assets pack we load by default has a height of 216px vs 136px of the default tile.
* Because the game presents and retracts weapons at a set rate, the time it took to swap between the sword and other weapons took ~1.58x longer than the original assets.
* This speeds up the present/retract rate based on the loaded asset's height to ensure the weapon switches in the same elapsed time.
* This may be extended to other weapons if required but the sword is the only one I'm aware of that has more height.
* Confirmed no matter what motion the sword was performing, `psp->picndx` was always 2080 so we shouldn't need a hashtable or anything like this.
2021-07-11 19:22:59 +10:00
Christoph Oelckers
1b45c83d59 - SW: fixed countermeasure for empty lower skills 2021-07-11 08:24:10 +02:00
Mitchell Richters
32283037ed - Use isWW2GI() in more places. 2021-07-11 12:42:33 +10:00
Mitchell Richters
172b77b9e7 - SW: Ensure PANEL_SPRITEstruct's ox/oy values are in the save data. 2021-07-11 12:05:53 +10:00
Mitchell Richters
9d64779da0 - SW: Replace all uses of NULL with nullptr. 2021-07-10 22:25:18 +10:00
Mitchell Richters
e3f2d76378 - SW: Declare and initialise variables in pWeaponBob() vs declaring and initialising later on to reduce warnings about variables being uninitialised. 2021-07-10 22:16:51 +10:00
Mitchell Richters
5d7938c24e - SW: Rename cl_smoothsway to cl_swsmoothsway and enable by default 2021-07-10 22:07:05 +10:00
Mitchell Richters
55cef642b6 - SW: Factor out bob coordinate backups. 2021-07-10 22:01:42 +10:00
Mitchell Richters
9575f8a3d3 - SW: Factor out panel interpolation backups; 2021-07-10 22:01:40 +10:00
Mitchell Richters
4d4946fb6b - SW: Factor out repeated panel coordinate math into inline functions. 2021-07-10 22:01:37 +10:00
Mitchell Richters
27f1e487a2 - SW: Remove fixed-point math from panel x/y coordinate updating. 2021-07-10 22:01:35 +10:00
Christoph Oelckers
64fc0b66b2 - SW: added countermeasure to re-enable lower skills on mods not implementing them.
Aside from spawning the enemies from the lowest supported skill it will also reduce the threat level by reducing health of some enemies or by replacing the harder Ninja variants with the base type.
2021-07-06 10:26:43 +02:00
Mitchell Richters
0724b3326c - SW: Promote PANEL_SPRITEstruct's xorig/yorig values from int to double to match x/ox and y/oy respectively.
* Makes bobbing a touch smoother.
* Removes 47 explicit casts.
2021-06-27 22:40:33 +10:00
Christoph Oelckers
5e96e955f3 - add hitscan only autoaim for SW.
# Conflicts:
#	source/games/sw/src/weapon.cpp
2021-06-26 12:22:10 +02:00
Christoph Oelckers
2af2d29084 - add hitscan only autoaim for SW. 2021-06-26 12:18:27 +02:00
Christoph Oelckers
4dd293d551 - zero-terminate the buffer for reading Blood's INI files. 2021-06-26 12:04:21 +02:00
Christoph Oelckers
0f7d3d0cbb - streamlined and fixed game startup with '-map' option.
* Blood: Initialize global pointers in app_init so that they are not NULL.
* consider Mapinfo data when checking for a given level name.
* removed redundant level name output.
2021-06-26 10:11:50 +02:00
Christoph Oelckers
63bc36e3c4 - renamed some constants.
Manually copied from NBlood because the underlying code has changed too much already.
2021-06-24 14:14:16 +02:00
Mitchell Richters
b015bc0685 - Duke (RRRA): Fix alt weapon slot for CHICKEN_WEAPON and CROSSBOW_WEAPON.
* Fixes #440.
2021-06-24 18:56:12 +10:00
Mitchell Richters
6018213c71 - Blood: Don't parse BloodBathOnly levels in the INI loader.
* Fixes #442.
2021-06-24 18:21:06 +10:00
Christoph Oelckers
20ca676539 - RR: fixed crash in function that handles acts of mass destruction (like blowing up gas stations.)
With bad setups 'spr' could be left uninitialized. This crashed E1L1 of 'The Hickston Swamp' mod.
2021-06-11 23:20:50 +02:00
Christoph Oelckers
d270d75d74 - re-added line of code that got lost during refactoring. 2021-06-10 00:14:04 +02:00
Christoph Oelckers
4b35a30de5 - RR: fixed the bowling lane lights.
Tiles had not been made writable.
Also renamed a few bowling related things.
2021-06-09 23:53:05 +02:00
Christoph Oelckers
5b38343407 - fixed sprite exclusion logic in getzrange.
This was using the wrong flag.
2021-06-09 00:31:54 +02:00
Christoph Oelckers
89344a6023 - Exhumed: precache all frames of tile animations. 2021-06-02 21:31:38 +02:00
Christoph Oelckers
207298aeb4 - fixed compilation (again.) 2021-06-02 21:00:39 +02:00
NoOneBlood
73683b3ebe Remove viewSetSystemMessage() when setting dude flags via command
# Conflicts:
#	source/blood/src/nnexts.cpp
2021-06-02 20:52:49 +02:00
Christoph Oelckers
86082d4c10 - fixed last commit 2021-06-02 20:52:48 +02:00
NoOneBlood
f433c6ee11 Use dude physics as base for debris physics
Remove dude flags commands
Update kModernSlopeChanger
Add stealth dude flag
Update for sector pause/continue motion

# Conflicts:
#	source/blood/src/db.h
#	source/blood/src/nnexts.cpp
#	source/blood/src/nnexts.h

# Conflicts:
#	source/blood/src/nnexts.cpp
2021-06-02 20:52:48 +02:00
Christoph Oelckers
7fa690082e - fixed cherry picked commit.
# Conflicts:
#	source/core/gamecontrol.h
2021-06-02 20:52:47 +02:00
NoOneBlood
3a59243ea0 - Fixed getPlayeById() function in multiplayer.
- Fixed debris physics flags was not properly reset on level restart.
- Added new modern type "kModernSlopeChanger" that can manipulate sector and sprite slopes.
- Allow to drop items and keys for players in multiplayer (gModernMap only).
- Added event commands to manipulate dude flags.
- Patrol enemies (xsprite.dudeFlag4, gModernMap only):
  - Added path markers following.
  - Added stealth mechanics.
  - Added spot target progress bar.
  - Added alarm dude flag.
  - Added blind dude flag.
  - Added deaf dude flag.
  - Added conditions for kModernCondition related to patrol enemies.
- kModernDamager can work like generator and damage anyone in sectors or in map.
- kSectorDamage is not does the damage if in Off state (gModernMap only).
- Additional options kModernSeqSpawner.
- Effects that created with kModernEffectSpawner now inherits offset of the sprite.
- Added kCmdSectorMotionPause and kCmdSectorMotionContinue event commands that allows to pause or continue sector motion (gModernMap only, WIP).
- Various minor fixes.

# Conflicts:
#	source/blood/src/ai.cpp
#	source/blood/src/common_game.h
#	source/blood/src/eventq.cpp
#	source/blood/src/nnexts.cpp
#	source/blood/src/nnexts.h
#	source/blood/src/triggers.cpp
#	source/blood/src/triggers.h
#	source/blood/src/view.cpp

# Conflicts:
#	source/games/blood/src/ai.cpp
#	source/games/blood/src/nnexts.h

# Conflicts:
#	source/games/blood/src/actor.cpp
#	source/games/blood/src/ai.cpp
2021-06-02 20:51:47 +02:00
Christoph Oelckers
c4fa99c891 - ProcessTouchObjects 2021-06-02 20:44:55 +02:00
Christoph Oelckers
f7668fc074 - first pass over ProcessTouchObject 2021-06-02 20:44:54 +02:00
Christoph Oelckers
a7572bca0a - actImpactMissile. 2021-06-02 20:43:14 +02:00
Christoph Oelckers
dc846dcd49 - Duke: avoid clipping against self when executing script logic for floor sprites.
A good place to see the result is a kitchen knife in E4L2 that went missing due to the faulty check.
2021-06-01 21:21:39 +02:00
Christoph Oelckers
454816299e - reorganized loading of textures.
Due to dependencies on initializing some data in app_init it was not possible to cleanly set up the fonts.
This adds a game-side function for loading the entire palettes before starting with the texture data and another one for loading game-side texture data.
This now allows fully setting up the palettes before starting with the textures and to fully set up the textures before reading the .def files.

All this is needed because to properly initialize, the fonts need to be able to access the fully initialized texture state, including replacements and hires substitutions from the .def files.
2021-06-01 11:05:26 +02:00
Christoph Oelckers
8b507ed606 - enabled the ENDOOM-like text screens when quitting Duke and SW.
Turned out that all they needed was the font.
2021-05-31 23:16:52 +02:00
Christoph Oelckers
9c60ab791b - implemented all needed font overrides for localization. 2021-05-31 21:20:31 +02:00
Christoph Oelckers
af781e0422 - moved all font setup out of the C++ code.
All internal fonts now get defined through FONTDEFS.
Also fixing a few offsets.
2021-05-31 21:20:31 +02:00
Christoph Oelckers
42b70a7d93 - added internationalized fonts.
This still needs a bit of fixing and tweaking but most is working.
2021-05-31 21:20:30 +02:00
Christoph Oelckers
f97b4e830d - pass fonts instead of indices to Blood's viewDrawText function.
As preparation for building a proper font system.
2021-05-31 21:20:28 +02:00
Christoph Oelckers
a7921e4c01 - use the same formula as Duke to offset SW's shadows in Polymost. 2021-05-29 14:04:57 +02:00
Christoph Oelckers
1ea09cd3d2 - removed bogus assert in SW's track setup.
One of the stock maps (WT $airport map.) triggers this assert so it cannot remain.
2021-05-29 13:22:14 +02:00
Christoph Oelckers
db21313c96 - add some hackery to deal with WT's bosses.
This was the result of some gross change to the spawning code which suddenly changed the rules about minibosses.
To reduce the impact, it is only enabled for the "Alien World Order" maps.
2021-05-29 13:12:50 +02:00
Christoph Oelckers
8fae793341 - defined a new constant, CR_NATIVEPAL, to use the font functions with a predefined palette.
This is mainly for code clarification, the value is the same as CR_UNDEFINED.
2021-05-29 11:47:05 +02:00
Christoph Oelckers
d44500863b - removed the multiplayer scoreboard screens.
Since there is no plan to keep them in case MP gets implemented there's no need to maintain them.
These should later be replaced by a generic screen using a better font and a layout that takes higher resolutions into account.
2021-05-27 13:33:54 +02:00
Christoph Oelckers
e10bcf6294 - split the screen job code into a generic and a Raze specific part.
Preparations for porting this to GZDoom.
2021-05-22 01:35:50 +02:00
Christoph Oelckers
d572e56839 - removed the indirection for the global arrays.
No idea what part of EDuke32 needed this, but it is not necessary.
2021-05-21 14:32:01 +02:00
Christoph Oelckers
ec976d9db7 - RR: fixed double negation in pitch math when throwing dynamite. 2021-05-20 19:06:11 +02:00
Christoph Oelckers
e5236d3423 - SW: fixed sector transfers involving a portal for real this time.
It is not enough to just copy the properties - if this happens the entire portal needs to be reinitialized. The only way to do this is to run CollectPortals again to reset all portals in the map.
2021-05-20 18:52:27 +02:00
Rachael Alexanderson
a75ed91796 - this crash was handled by nothing more than an assert... 2021-05-20 11:02:11 -04:00
Christoph Oelckers
5ee4bc5cca - Blood: handle title screens so that mods changing the original one still display it.
The rules are:
* If CRC of tile 2518 has changed, use that.
* If CRC of tile 2046 has changed, use that.
* If tile 2518 is not present, use tile 2046
* otherwise use tile 2518.

This allows display of Cryptic Passage's title screen while still using the "with Plasma" version for the regular game.
2021-05-19 00:07:50 +02:00
Christoph Oelckers
1d7f4c1f2b - SW: fix sector property transfers involving a portal. 2021-05-18 00:26:57 +02:00
Christoph Oelckers
395de23b21 - Exhumed: Don't autoaim backwards. 2021-05-16 19:20:36 +02:00
Christoph Oelckers
60fe1d32fb - Blood: unpositioned sounds must be limited to one per channel. 2021-05-16 11:51:51 +02:00
Christoph Oelckers
ee559b7ba9 - removed all leftover parts of the native status bars. 2021-05-16 10:35:33 +02:00
Christoph Oelckers
83f151529b - fixed SW status bar. 2021-05-16 10:25:56 +02:00
Christoph Oelckers
8d8b3cda46 - scriptified SW's status bar.
Not tested yet. This just compiles without errors.
2021-05-16 09:34:08 +02:00
Christoph Oelckers
f136330628 - removed the native versions of Duke's and RR's status bar. 2021-05-15 17:15:29 +02:00
Christoph Oelckers
781cb32dcf - fixed all issues with Duke's/RR's status bar. 2021-05-15 16:46:08 +02:00
Christoph Oelckers
f84f58e714 - ported Duke and RR status bars.
Compiles but not tested yet.
2021-05-15 14:27:32 +02:00
Christoph Oelckers
d311792e06 - engine side preparations for Duke Statusbar scriptification.
Mainly, gotweapon had to be reverted to a flat bool array to avoid implementing FixedBitArray for the VM.
Also adding a few new tile names and PushV for string arrays.
2021-05-15 10:44:35 +02:00
Christoph Oelckers
b520d38bc0 - removed the native implementation od Exhumed's status bar. 2021-05-15 10:25:39 +02:00
Christoph Oelckers
663f330684 - fixed GetChunkFrame implementation and one bad GetString call.
Exhumed's status bar is fully working with this.
2021-05-15 10:25:38 +02:00
Christoph Oelckers
b71c725e3e - ported Exhumed's status bar.
Not tested yet.
2021-05-15 10:25:38 +02:00
Christoph Oelckers
5a6121d424 - status bar interface work. 2021-05-15 10:25:38 +02:00
Christoph Oelckers
c716900a3c - handled the remaining arrays that got accessed by the status bar. 2021-05-15 10:25:38 +02:00
Christoph Oelckers
12b7c73393 - turning some of the player arrays into Player members.
For script code we do not want the arrays accessible so all that get accessed need to be moved into the struct first.
2021-05-15 10:25:38 +02:00
Christoph Oelckers
4e182ea5ee - Exhumed: made the status bar independent of static global state.
It will now perform all state change checks itself
2021-05-15 10:25:38 +02:00
Christoph Oelckers
c9361aff76 - Exhumed: moved nPlayerItem into PlayerList 2021-05-15 10:25:37 +02:00
Christoph Oelckers
71f4946879 - Exhumed: changed lung display as well. 2021-05-15 10:25:37 +02:00
Christoph Oelckers
35c07500c3 -Exhumed: changed key display on status bar to be controlled from the status bar itself.
First of 6 externally controlled status bar indicators.
2021-05-15 10:25:37 +02:00
Christoph Oelckers
317238147b - Blood: fixed scriptified MP statusbar code to the point where it compiles.
Mainly to avoid code rot by future changes, this probably cannot remain as it is if MP gets reimplemented.
2021-05-15 10:25:37 +02:00
Christoph Oelckers
5ae1c334fa - Duke: fixed bad check in 'ifnotmoving' CON command. 2021-05-14 10:03:07 +02:00
Christoph Oelckers
645ea1e1ae - SW: better handling for bogus ladders.
If there is no back sector, use the front sector of the wall as the ladder sector.
This at least fixes the badly defined ladder in Wanton Destruction's first map.
2021-05-13 23:28:29 +02:00
Christoph Oelckers
e5dd4a8638 - made the scripted version of Blood's status bar functional. 2021-05-12 21:50:02 +02:00
Christoph Oelckers
778378fd5c - scriptified version of Blood's status bar compiles.
Not tested yet.
2021-05-12 21:50:02 +02:00
Christoph Oelckers
4ad20e4c00 - more preparations for scriptification of Blood's status bar.
* restructured some code that could not be converted as-is due to access to data that should be off-limits to scripts.
* exporting most of PLAYER's member fields.
2021-05-12 21:50:02 +02:00
Christoph Oelckers
5859188d3a - Blood: use names instead of indices to address textures in the status bar drawer.
This is a preparation for scriptification of the status bars. Blood's wasn't using any symbolic constants at all aside from the new HUD fonts.
2021-05-12 21:50:01 +02:00
Christoph Oelckers
cb2bc7967a - fixed the remaining warnings. 2021-05-12 21:50:01 +02:00
Christoph Oelckers
cf22a70d82 - fixed all warnings in Duke. 2021-05-12 21:50:01 +02:00
Christoph Oelckers
694066c4ec - fixed all warnings in Exhumed. 2021-05-12 21:50:01 +02:00
Christoph Oelckers
fb21e39de5 - fixed remaining SW warnings. 2021-05-12 21:50:00 +02:00
Christoph Oelckers
1085b0b7a2 - first batch of SW warning fixes. 2021-05-12 21:49:34 +02:00
Christoph Oelckers
3e2cacfaf6 - silenced warnings in Blood. 2021-05-12 21:49:06 +02:00
Christoph Oelckers
d097c8e635 - removed the non-functional and long abandoned level music alias feature.
With RMAPINFO such a hack is no longer needed for anything.
2021-05-12 21:48:40 +02:00
Christoph Oelckers
03289f5097 - silenced some warnings. 2021-05-12 21:47:32 +02:00
Christoph Oelckers
4c161ae403 - SW: fixed signed-ness issues with SOP-related angle checks. 2021-05-12 00:10:02 +02:00
Christoph Oelckers
633d205d80 - SW: fixed ammo pickup amount. 2021-05-12 00:01:19 +02:00
Christoph Oelckers
bde644f77f - SW: replaced some asserts with proper value checks.
These asserts can actually be triggered by some maps with incorrect setups.
2021-05-11 00:59:23 +02:00
Christoph Oelckers
ae94fb921c - SW: Abort GetInput immediately if no valid sprite is attached to the given player. 2021-05-11 00:52:39 +02:00
Christoph Oelckers
3194efc646 - SW: processWeapon must check for valid player sprites.
On map start it can happen that this gets called with an incompletely set up map.
2021-05-11 00:21:50 +02:00
Christoph Oelckers
10a6515b9a - Exhumed: Fixed weapon swaying intensity, introduced by e76f63e2c0
Note that shifting right by 17 bits vs. shifting right by 16 bits and then multiplying the entire result by 0.5 is not the same here!
2021-05-11 00:12:03 +02:00
Christoph Oelckers
c6991add46 - Blood: fixed null pointer crash in actBurnSprite. 2021-05-11 00:02:26 +02:00
Christoph Oelckers
e40ed2262e - cleanup of 'gotpic' handling. 2021-05-10 20:13:28 +02:00
Christoph Oelckers
e74aca291c - position tweaking for Nam's skies.
Why is this such an utter mess to get skies placed correctly? :(
2021-05-10 20:13:28 +02:00
Christoph Oelckers
fc11f9327a - refactored actDamageSprite 2021-05-10 20:13:28 +02:00
Christoph Oelckers
b8dcd09f77 - reformatting. 2021-05-10 20:13:28 +02:00
Christoph Oelckers
965939957e - split up actKillSprite into several smaller functions.
The biggest problem in here was tracking the lifetime of local variables.
2021-05-10 20:13:28 +02:00
Cacodemon345
ce4b748ff0 Fix compilation with Clang on FreeBSD 2021-05-09 19:52:52 +02:00
Christoph Oelckers
0efe15ae98 - deleted some unused utilities. 2021-05-08 18:06:57 +02:00
Christoph Oelckers
43981bff85 - Duke: fixed mirror setup for new renderer.
A wall must be marked one-way to be used as a mirror.
2021-05-08 16:27:01 +02:00
Christoph Oelckers
de904d3052 . Duke: made the 'lonely effector' error non fatal.
Instead just move the bogus effector sprite out of the way.
2021-05-08 15:41:49 +02:00
Christoph Oelckers
3dfc3e73d2 - only process actually existing mirrors when updating their state. 2021-05-08 15:23:45 +02:00
Kevin Caccamo
6e1554d7ae Fix mirror updates in Shadow Warrior 2021-05-08 14:58:20 +02:00
Christoph Oelckers
8e070343c5 - added default crosshair for Exhumed.
See 1abadb6f1c
2021-05-08 14:49:49 +02:00
Christoph Oelckers
9a5a32c826 - Blood: split out the 'modern dude' part of actKillDude. 2021-05-08 14:43:09 +02:00
Christoph Oelckers
34b7bfc10b - handled the actDrop* functions. 2021-05-08 14:43:08 +02:00
Christoph Oelckers
d1cc7403b3 - actNapalmMove - another previously unnamed function.
# Conflicts:
#	source/games/blood/src/aiunicult.cpp
2021-05-08 14:43:08 +02:00
Christoph Oelckers
23df336ebe - complete cleanup of sub_2A620, now renamed to actRadiusDamage. 2021-05-08 14:43:08 +02:00
Christoph Oelckers
6110ec5cfd - redid ConcussSprite. 2021-05-08 14:43:08 +02:00
Christoph Oelckers
df6a9823e3 - fixed incorrect license in sw/d_menu.cpp.
Should be GPL 2+, not GPL 2.
2021-05-08 00:13:50 +02:00
Christoph Oelckers
db1cf63e7a - SW: fixed bad type for ceiling portals. 2021-05-07 00:23:56 +02:00
Christoph Oelckers
c679f83f75 - make all games return to the main menu when the game is ended with F10.
Duke still went to the intro movies which was a bit problematic.
2021-05-04 11:32:09 +02:00
Christoph Oelckers
0659bda6b6 - SW: clear old user content before allocating a new one.
If old data gets in here it may break the game.
https://github.com/coelckers/Raze/issues/349
2021-05-04 11:11:38 +02:00
Christoph Oelckers
a303da37a9 - added a mapinfo dumper and used it to verify correctness of the data generated from game-native definitions.
Also simplified the levelnumber setup a bit.
2021-05-03 23:00:24 +02:00
Christoph Oelckers
0db8fc6163 - removed UNREFERENCED_PARAMETER macro.
Using C++ standard of not naming such parameters instead.
2021-05-03 19:10:53 +02:00
Christoph Oelckers
7d77b2315f - merged the few remaining contents of mmulti.h into d_net.h 2021-05-03 19:01:00 +02:00
Christoph Oelckers
d206a767b2 - added render workaround for CP07. 2021-05-03 17:48:35 +02:00
Christoph Oelckers
56fcf904b5 - Backend update from GZDoom. 2021-05-03 14:48:55 +02:00
Christoph Oelckers
30b1b046e4 - added an intermediate data structure to decouple the rendering from the immediate map data.
This will be needed for sectors consisting of disjoint parts and for providing some help with addressing rendering anomalies
2021-05-03 00:04:36 +02:00
Christoph Oelckers
8003ab6fa3 Merge branch 'scriptable_cutscenes' into newrenderer 2021-05-02 22:37:46 +02:00
Christoph Oelckers
c9791bc148 - renamed PlayerHorizon function to deconflict with the same-named struct 2021-05-02 21:56:45 +02:00
Christoph Oelckers
698d62bbc6 - merged FixMapInfo into loadcons.
No need to delay the remaining content. The reasons for the separate function no longer exist.
2021-05-02 19:41:24 +02:00
Christoph Oelckers
60d007fa93 - Duke: fixed non-scrolling SE24. 2021-05-02 19:32:20 +02:00
Christoph Oelckers
a1381c0ff2 - fixed Blood cutscene setup to avoid dependency on the sound code initialization.
It now only stores the sound name or ID but not the internal index which is only looked up when needed.
2021-05-02 18:10:59 +02:00
Christoph Oelckers
dfd47ea33a - migrated SW to RMAPINFO as well.
Also removed the 'definecutscene' code from the .def parser as this was never meant to be more than a temporary solution.
2021-05-02 17:35:25 +02:00
Christoph Oelckers
4b064b9f34 - migrated Exhumed's level setup to RMAPINFO.
This game never had a proper setup so this also fixes the crashes with visiting the multiplayer maps.
2021-05-02 15:54:19 +02:00
Christoph Oelckers
bb9d492db6 - migrated RRRA as well. 2021-05-02 14:01:10 +02:00
Christoph Oelckers
6f4e380728 - migrated RR's cutscene definitions.
Also turned several level-specific init options into map flags or map parameters.
2021-05-02 13:12:24 +02:00
Christoph Oelckers
dbd179be5c - RR progression fixes.
* E1L7 abuses an 'end the game' command to progress to E2L1, this needs special treatment.
* handle ENDGAME.MAP more cleanly by injecting an 'engine.con' into the compilation chain to define its map record. The main issue with this is that it needs to be defined before the regular CONs run.
* check the already defined 'clearinventory' and 'clearweapons' flags that are exposed through RMAPINFO (Duke/RR only so far.)
2021-05-02 10:55:22 +02:00
Christoph Oelckers
9bc210fe35 - fixed RR weapon clearing in E2L2 and RRRA E1L3. 2021-05-02 10:37:20 +02:00
Christoph Oelckers
1798380f23 - adapted map transition in Duke/RR.
There's still some issues which will be taken care of by adding map flags.
2021-05-02 10:35:43 +02:00
Christoph Oelckers
e9385ed4e8 - adapted Blood to the new level progression features and simplified several parts, particularly the clumsy retrieval of the next level.
Some cheats in Duke will not work correctly with this commit!
2021-05-02 09:08:57 +02:00
Christoph Oelckers
93bfc35ad6 - use the volumes to find the starting maps for the menu and the clusters for the cutscenes. 2021-05-02 01:01:30 +02:00