Christoph Oelckers
c84d75b8bf
- use inline access functions to read floorz/ceilingz.
2022-08-27 09:58:16 +02:00
Christoph Oelckers
0672572e63
- renamed sectortype::floorz and ceilingz as preparation for floatification
2022-08-27 09:47:48 +02:00
Christoph Oelckers
75ab0cf018
- handle a few leftovers in Blood.
2022-08-26 19:53:07 +02:00
Christoph Oelckers
58f573e578
- Blood: replaced the remaining spr.pos with int_pos() in nnexts
2022-08-26 19:53:05 +02:00
Christoph Oelckers
702a73ff6c
- Blood: handled the remaining write accesses to 'pos'
2022-08-26 19:53:03 +02:00
Christoph Oelckers
04c9422db8
- Blood: don't pass an actor's position directly to ClipMove
2022-08-26 19:53:03 +02:00
Christoph Oelckers
32dd061ab1
- Blood: wrapped write accesses to spr.pos in nnexts.cpp
2022-08-26 19:53:03 +02:00
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
0139ac5e4a
ported NBlood commit e3d7ab8b919c230b2b4a825137d607b03b363796
...
- (gModernMap) Add a way to move sprites that are close to outside walls of sector
- (gModernMap) Add loadsave construct
- (gModernMap) Fix movement direction for reverse moving sprites in TranslateSector
2022-08-17 20:45:43 +02:00
Mitchell Richters
71fb91940d
Revert "- Simplify PlayerHorizon::settarget()
by adding a dedicated angle setter that resets interpolated value as well."
...
This reverts commit 0416834d9d
.
Revert "- Simplify `PlayerAngle::settarget()` by adding a dedicated angle setter that resets interpolated value as well."
This reverts commit 5a550613f3
.
Revert "- Add bool `lock` to `PlayerHorizon::settarget()` when setting target from the ticker without having to call setters and resetters."
This reverts commit 18541d1ab4
.
Revert "- Add bool `lock` to `PlayerAngle::settarget()` when setting target from the ticker without having to call setters and resetters."
This reverts commit 1ac58dc41c
.
* We need to ensure only the ticker can unlock the player's input if it's telling us to lock the input.
2022-06-06 18:41:45 +10:00
Mitchell Richters
1ac58dc41c
- Add bool lock
to PlayerAngle::settarget()
when setting target from the ticker without having to call setters and resetters.
2022-05-30 21:24:02 +10:00
Mitchell Richters
18541d1ab4
- Add bool lock
to PlayerHorizon::settarget()
when setting target from the ticker without having to call setters and resetters.
2022-05-30 21:22:24 +10:00
Mitchell Richters
7282e0d8bf
- Remove multiple addadjustment()
/settarget()
overloads in favour of native binangle
/fixedhoriz
versions only.
...
* Simplifies these classes a bit.
* Better shows intent in actual game code.
* Removes unnecessary int to double conversions.
2022-05-30 20:35:41 +10:00
Christoph Oelckers
84bafe6d02
- manual merge of latest nnext update.
2022-05-11 08:31:58 +02:00
Christoph Oelckers
ca423e15f0
- Check enemy type when adding to enemy level count
...
Fixes count issues with respawning enemies
copied from NBlood commit a6bbac4a213f6fb76a7c20b80da6b30c9ffc3064
2022-05-06 01:08:09 +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
Mitchell Richters
f8ffaa4be9
- Blood: Tidy up some missed kWeap
constants.
2022-01-12 22:22:54 +11:00
Christoph Oelckers
8575447e37
- Blood: fixed bad parameter in aiPatrolMove
2022-01-01 09:56:45 +01: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
Christoph Oelckers
4bc32e2777
- use actors in the sloped sprite utilities.
2021-12-30 16:11:14 +01:00
Mitchell Richters
f091a72db1
- Blood: Replace XSPRITE
targetz
with TargetPos.Z
calls.
2021-12-30 23:00:41 +11:00
Mitchell Richters
431749cf6e
- Blood: Replace XSPRITE
targety
with TargetPos.Y
calls.
2021-12-30 23:00:40 +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
Christoph Oelckers
5061d5b37c
- tabified the rest of Blood's code.
2021-12-30 09:58:48 +01:00
Christoph Oelckers
1d28e166c6
- fixed nnexts comparison with statcount.
...
This value is no longer maintained, so we got to count when the value is needed.
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
e940fe1931
- the rest of nnexts.cpp
2021-12-30 09:57:22 +01:00
Christoph Oelckers
4177c31deb
- next batch of nnexts.cpp
2021-12-30 09:57:22 +01:00
Christoph Oelckers
d3e4f591f2
- third x() batch in nnexts.cpp.
2021-12-30 09:57:21 +01:00
Christoph Oelckers
60382d9992
- all pXCond's.
2021-12-30 09:57:21 +01:00
Christoph Oelckers
fd234984f5
- first batch of x() in nnexts.cpp.
2021-12-30 09:57:21 +01:00
Christoph Oelckers
a291364606
- the big 'pXSprite = &actor->x()' replacement.
2021-12-30 09:57:21 +01:00
Christoph Oelckers
8d8e0550df
- got rid of PLAYER::pXSprite.
...
Now the player references its actor through ONE pointer only.
2021-12-30 09:57:21 +01:00
Christoph Oelckers
aa3b930a4d
- several x()'s in nnexts.cpp.
2021-12-30 09:57:20 +01:00
Christoph Oelckers
812a4ccd7b
- handle sourceactor->x() in nnexts.cpp.
...
Almost exclusively done with search & replace.
2021-12-30 09:57:20 +01:00
Christoph Oelckers
8d66c8468d
- the remaining s()'s of nnexts.cpp.
2021-12-30 09:57:19 +01:00
Christoph Oelckers
46320aabac
- third batch of nnexts.cpp.
2021-12-30 09:57:19 +01:00
Christoph Oelckers
b8bee4dfe5
- upper/lower stuff in nnexts.cpp.
2021-12-30 09:57:18 +01:00
Christoph Oelckers
929fd7be99
- another block in nnexts.cpp.
2021-12-30 09:57:18 +01:00
Christoph Oelckers
e460d90f37
- several s() in nnexts.cpp.
2021-12-30 09:57:18 +01:00
Christoph Oelckers
648537a96b
- deal with most of PLAYER::pSprite.
2021-12-30 09:57:17 +01:00
Christoph Oelckers
2f9848a459
- deal with pSource in nnexts.cpp.
2021-12-30 09:57:17 +01:00
Christoph Oelckers
5623832b17
- deleted the pSprite definitions from last commit.
2021-12-30 09:57:16 +01:00
Christoph Oelckers
6b8ec17017
- the ultimate 'replace pSprite-> with actor->spr. commit.
...
This takes care of the majority of s() uses in Blood with a single search&replace action after ensuring that pSprite never gets used for other things.
(There were two small functions in nnexts.cpp left that still did.)
2021-12-30 09:57:16 +01:00