zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: Replace XWALL panYVel with panVel.Y calls.

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

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

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

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

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

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

@ -254,7 +254,6 @@ struct XWALL {
uint8_t command; // Cmd
vec3_t panVel;
int8_t panYVel; // panY
uint8_t key; // Key
};

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

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