teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-22 11:41:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: Replace XWALL panXVel with panVel.X calls.

Browse source
This commit is contained in:
Mitchell Richters 2021-12-30 21:26:39 +11:00
parent f091a72db1
commit a325dfec62
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/blood/src/db.cpp
View file

@ -444,7 +444,7 @@ void dbLoadMap(const char* pPath, int* pX, int* pY, int* pZ, short* pAngle, sect
pXWall->restState = bitReader.readUnsigned(1); pXWall->restState = bitReader.readUnsigned(1);
pXWall->interruptable = bitReader.readUnsigned(1); pXWall->interruptable = bitReader.readUnsigned(1);
pXWall->panAlways = bitReader.readUnsigned(1); pXWall->panAlways = bitReader.readUnsigned(1);
pXWall->panXVel = bitReader.readSigned(8); pXWall->panVel.X = bitReader.readSigned(8);
pXWall->panYVel = bitReader.readSigned(8); pXWall->panYVel = bitReader.readSigned(8);
pXWall->decoupled = bitReader.readUnsigned(1); pXWall->decoupled = bitReader.readUnsigned(1);
pXWall->triggerOnce = bitReader.readUnsigned(1); pXWall->triggerOnce = bitReader.readUnsigned(1);

2
source/games/blood/src/loadsave.cpp
View file

@ -530,7 +530,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, XWALL& w, XWALL* d
("busytime", w.busyTime, def->busyTime) ("busytime", w.busyTime, def->busyTime)
("waittime", w.waitTime, def->waitTime) ("waittime", w.waitTime, def->waitTime)
("command", w.command, def->command) ("command", w.command, def->command)
("panxvel", w.panXVel, def->panXVel) ("panxvel", w.panVel.X, def->panVel.X)
("panyvel", w.panYVel, def->panYVel) ("panyvel", w.panYVel, def->panYVel)
("key", w.key, def->key) ("key", w.key, def->key)
.EndObject(); .EndObject();

2
source/games/blood/src/mapstructs.h
View file

@ -253,7 +253,7 @@ struct XWALL {
uint16_t waitTime; // waitTime uint16_t waitTime; // waitTime
uint8_t command; // Cmd uint8_t command; // Cmd
int8_t panXVel; // panX vec3_t panVel;
int8_t panYVel; // panY int8_t panYVel; // panY
uint8_t key; // Key uint8_t key; // Key
}; };

8
source/games/blood/src/sectorfx.cpp
View file

@ -313,7 +313,7 @@ void DoSectorPanning(void)
XWALL* pXWall = &pWall->xw(); XWALL* pXWall = &pWall->xw();
if (pXWall->panAlways || pXWall->busy) if (pXWall->panAlways || pXWall->busy)
{ {
int psx = pXWall->panXVel << 10; int psx = pXWall->panVel.X << 10;
int psy = pXWall->panYVel << 10; int psy = pXWall->panYVel << 10;
if (!pXWall->panAlways && (pXWall->busy & 0xffff)) if (!pXWall->panAlways && (pXWall->busy & 0xffff))
{ {
@ -371,11 +371,11 @@ void InitSectorFX(void)
if (wal.hasX()) if (wal.hasX())
{ {
XWALL* pXWall = &wal.xw(); XWALL* pXWall = &wal.xw();
if (pXWall->panXVel || pXWall->panYVel) if (pXWall->panVel.X || pXWall->panYVel)
{ {
wallPanList.Push(&wal); wallPanList.Push(&wal);
if (pXWall->panXVel) StartInterpolation(&wal, Interp_Wall_PanX); if (pXWall->panVel.X) StartInterpolation(&wal, Interp_Wall_PanX);
if (pXWall->panXVel) StartInterpolation(&wal, Interp_Wall_PanY); if (pXWall->panVel.X) StartInterpolation(&wal, Interp_Wall_PanY);
} }
} }
} }