teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-19 15:40:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use zvel's alias inittype where it's not being used for velocity.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-01 00:00:36 +02:00
parent 70d0d0622b
commit 81fc066a5e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/core/maploader.cpp
View file

@ -318,7 +318,7 @@ static void ReadSpriteV7(FileReader& fr, spritetype& spr, int& secno)
spr.intowner = fr.ReadInt16();
spr.xvel = fr.ReadInt16();
spr.yvel = fr.ReadInt16();
spr.zvel = fr.ReadInt16();
spr.inittype = fr.ReadInt16();
spr.lotag = fr.ReadInt16();
spr.hitag = fr.ReadInt16();
spr.extra = fr.ReadInt16();
@ -344,7 +344,7 @@ static void ReadSpriteV6(FileReader& fr, spritetype& spr, int& secno)
spr.angle = DAngle::fromBuild(spr.intangle);
spr.xvel = fr.ReadInt16();
spr.yvel = fr.ReadInt16();
spr.zvel = fr.ReadInt16();
spr.inittype = fr.ReadInt16();
spr.intowner = fr.ReadInt16();
secno = fr.ReadInt16();
spr.statnum = fr.ReadInt16();
@ -372,7 +372,7 @@ static void ReadSpriteV5(FileReader& fr, spritetype& spr, int& secno)
spr.angle = DAngle::fromBuild(spr.intangle);
spr.xvel = fr.ReadInt16();
spr.yvel = fr.ReadInt16();
spr.zvel = fr.ReadInt16();
spr.inittype = fr.ReadInt16();
spr.intowner = fr.ReadInt16();
secno = fr.ReadInt16();
spr.statnum = fr.ReadInt16();

4
source/games/sw/src/game.h
View file

@ -2116,8 +2116,8 @@ inline uint8_t& SP_TAG3(DSWActor* actor) { return actor->spr.clipdist; }
inline int16_t& SP_TAG4(DSWActor* actor) { return actor->spr.intangle; } // this may not be transitioned to a real angular type
inline int16_t& SP_TAG5(DSWActor* actor) { return actor->spr.xvel; }
inline int16_t& SP_TAG6(DSWActor* actor) { return actor->spr.yvel; }
inline uint8_t& SP_TAG7(DSWActor* actor) { return MSB_VAR(actor->spr.zvel); }
inline uint8_t& SP_TAG8(DSWActor* actor) { return LSB_VAR(actor->spr.zvel); }
inline uint8_t& SP_TAG7(DSWActor* actor) { return MSB_VAR(actor->spr.inittype); }
inline uint8_t& SP_TAG8(DSWActor* actor) { return LSB_VAR(actor->spr.inittype); }
inline uint8_t& SP_TAG9(DSWActor* actor) { return MSB_VAR(actor->spr.intowner); }
inline uint8_t& SP_TAG10(DSWActor* actor) { return LSB_VAR(actor->spr.intowner); }
inline int8_t& SP_TAG11(DSWActor* actor) { return actor->spr.shade; }