Christoph Oelckers
b196e67f40
ported SHA-1: 82e3f6af9367200853fe2af1b9665dd0c53b4f05 from NBlood
...
* - Change gBusyCount limit to a higher value since xsector limit raised.
gModernMap:
- The return of the event causer (kChannelEventCauser, TXID 50).
- Fix flags for kModernPropertiesChanger type.
- Add new modern type kModernVelocityChanger.
- New features for kMarkerWarpDest type.
- New features for kModernSectorFXChanger type.
- Fix sector condition 58.
- Fix sprite hitscan conditions (35 - 38).
- Add new command (kCmdEventKillFull).
- Misc changes.
# Conflicts:
# source/games/blood/src/actor.cpp
# source/games/blood/src/nnexts.cpp
2022-08-17 20:45:51 +02:00
Christoph Oelckers
aab13addb7
-renamed spritetype’s owner field to ‚intowner‘
...
Mainly for easier searching.
Also remove the duplicate ‚detail‘ field.
2022-05-24 00:30:41 +02:00
Christoph Oelckers
84bafe6d02
- manual merge of latest nnext update.
2022-05-11 08:31:58 +02:00
Christoph Oelckers
acb244653c
- several more Blood fixes copied from NBlood
2022-05-06 01:40:27 +02:00
Christoph Oelckers
5c9730766d
- dd self check for burning cultist fix
...
Fix issue with spawned kDudeBurningCultist dudes entering water
Copied from NBlood ae80eef10fdd42224c7b6e782f259ba23c1069e7
2022-05-06 01:21:48 +02:00
Christoph Oelckers
1e356741f9
- Set inittype on actSpawnDude()
...
copied from NBlood commit 3fefdfa85bb86b5e8e951e886a6d13c769666215
2022-05-06 01:10:22 +02:00
Christoph Oelckers
f44736a5b6
-use an access function for reading wall positions so that we have a non-modifiable value wherever this is possible.
2022-02-15 22:18:23 +01:00
Christoph Oelckers
89ef81da55
- renamed walltype::pos as preparation for refactoring.
...
no functional changes here
2022-02-15 22:18:22 +01:00
Christoph Oelckers
7205319853
- Blood: clean up some variable mess in actFireVector
2022-01-02 17:23:01 +01:00
Christoph Oelckers
3e21db19be
- Blood: fixed Life Leech no longer gettable after having fired.
...
This was the direct result of dumb use of two pointers to different parts of the same objects.
2022-01-01 09:31:57 +01:00
Mitchell Richters
dcd006d34b
- Blood: Add missing actorHit
nullptr test in actImpactMissile()
.
2022-01-01 11:38:43 +11:00
Christoph Oelckers
5498699faf
- use DCoreActor::sector() wherever possible.
2021-12-30 16:51:56 +01:00
Christoph Oelckers
af6ca40e3d
- use DCoreActor::insector instead of spritetype::insector.
2021-12-30 16:24:51 +01:00
Mitchell Richters
f091a72db1
- Blood: Replace XSPRITE
targetz
with TargetPos.Z
calls.
2021-12-30 23:00:41 +11:00
Mitchell Richters
1d29716e6b
- Blood: Replace XSPRITE
targetx
with TargetPos.X
calls.
2021-12-30 23:00:40 +11:00
Mitchell Richters
22275a16f6
- Blood: Replace DBloodActor
zvel
with vel.Z
calls.
2021-12-30 23:00:40 +11:00
Mitchell Richters
ce08fd4304
- Blood: Replace DBloodActor
yvel
with vel.Y
calls.
2021-12-30 23:00:40 +11:00
Mitchell Richters
a9e66ec553
- Blood: Replace DBloodActor
xvel
with vel.X
calls.
2021-12-30 23:00:39 +11:00
Mitchell Richters
5badbd7884
- Blood: Replace game-side scale()
with backend Scale()
.
2021-12-30 20:46:38 +11:00
Mitchell Richters
9bbb54fe2e
- Replace every line that just contains spaces or tabs with an empty line feed in all files except 3rd party libraries.
2021-12-30 20:30:21 +11:00
Christoph Oelckers
e670cf2786
- re-tabified several files that got mangled by repeated merging
2021-12-30 09:58:47 +01:00
Christoph Oelckers
032c597fa5
- renamed shadowing variables in Blood.
2021-12-30 09:57:32 +01:00
Christoph Oelckers
41e003c831
- the remaining x() in actor.cpp.
2021-12-30 09:57:11 +01:00
Christoph Oelckers
bc42978295
- x() in actor.cpp callbacks.
2021-12-30 09:57:11 +01:00
Christoph Oelckers
bd07313017
- almost the last x() in actor.cpp.
2021-12-30 09:57:11 +01:00
Christoph Oelckers
692a269d92
- still more x() in actor.cpp.
2021-12-30 09:57:11 +01:00
Christoph Oelckers
3f65aee70b
- even more x() in actor.cpp.
2021-12-30 09:57:10 +01:00
Christoph Oelckers
3201f85ab9
- yet more x() in actor.cpp.
2021-12-30 09:57:10 +01:00
Christoph Oelckers
a1b2d4a21e
- more x() in actor.cpp.
2021-12-30 09:57:10 +01:00
Christoph Oelckers
ffeb52198a
- lots of ->x() calls removed in actor.cpp.
2021-12-30 09:57:10 +01:00
Christoph Oelckers
6e0128eb4c
- handle the remaining uses of s() in actor.cpp
2021-12-30 09:57:10 +01:00
Christoph Oelckers
b91fe45fc3
- handled all pSprite-> in actor.cpp.
2021-12-30 09:57:10 +01:00
Christoph Oelckers
27e9894ece
- handled all parts of actor.cpp which are not "pSprite = &actor->s();"
2021-12-30 09:57:10 +01:00
Christoph Oelckers
88c77ec71a
- some pSprite2's plus CheckSector.
2021-12-30 09:57:09 +01:00
Christoph Oelckers
fbb8f1ee70
- pSprite replacements in blood/src/actor.cpp
2021-12-30 09:57:09 +01:00
Christoph Oelckers
a87948677a
- globally replaced ->x(). with ->xspr.
2021-12-30 09:57:09 +01:00
Mitchell Richters
baf78848eb
- Replace spritetypebase
z
with pos.Z
calls and eliminate spritetypebase
pos
union.
2021-12-30 09:57:06 +01:00
Mitchell Richters
cecb8dc48e
- Replace spritetypebase
y
with pos.Y
calls.
2021-12-30 09:57:05 +01:00
Mitchell Richters
33ca55023f
- Replace spritetypebase
x
with pos.X
calls.
2021-12-30 09:57:05 +01:00
Mitchell Richters
09e00a69fe
- Replace walltype
y
with pos.Y
calls and eliminate walltype
pos
union.
2021-12-30 09:57:04 +01:00
Mitchell Richters
51b647da87
- Replace walltype
x
with pos.X
calls.
2021-12-30 09:57:04 +01:00
Mitchell Richters
b2ab64bb62
- Capitalise vec3_t
z
variable.
2021-12-30 09:57:03 +01:00
Mitchell Richters
68e2691be7
- Capitalise vec3_t
y
variable.
2021-12-30 09:57:03 +01:00
Mitchell Richters
c549cc5276
- Capitalise vec3_t
x
variable.
2021-12-30 09:57:02 +01:00
Christoph Oelckers
d9d05e90b5
- globally replaced all occurences of '->s().' with '->spr.'
2021-12-30 09:57:00 +01:00
Christoph Oelckers
5ff36f491e
- fixed the remaining places where the compiler complained about cstat.
2021-12-30 09:56:51 +01:00
Christoph Oelckers
092cb1e5a3
- second set of Blood flags.
2021-12-30 09:56:50 +01:00
Christoph Oelckers
3bc337264a
- flags in blood's actor.cpp
...
plus a few others caught by search&replace.
2021-12-30 09:56:50 +01:00
Christoph Oelckers
c5ae454207
- another big batch of automatic replacements.
2021-12-30 09:56:48 +01:00
Christoph Oelckers
5b65e214e0
- global search & replace of the more frequent sprite flag patterns.
2021-12-30 09:56:48 +01:00