zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-09 15:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed bad interpolation setup in AddFlow, plus some variable renaming.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-21 00:01:21 +02:00
parent 4ee3505dde
commit 51ee9cf6c6
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
source/games/exhumed/src/lighting.cpp
View file

@ -65,8 +65,8 @@ struct Flow
short type; short type;
int xdelta; int xdelta;
int ydelta; int ydelta;
int field_C; int angcos;
int field_10; int angsin;
int xacc; int xacc;
int yacc; int yacc;
}; };
@ -137,8 +137,8 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, Flow& w, Flow* def
("type", w.type) ("type", w.type)
("xdelta", w.xdelta) ("xdelta", w.xdelta)
("ydelta", w.ydelta) ("ydelta", w.ydelta)
("atc", w.field_C) ("atc", w.angcos)
("at10", w.field_10) ("at10", w.angsin)
("xacc", w.xacc) ("xacc", w.xacc)
("yacc", w.yacc) ("yacc", w.yacc)
.EndObject(); .EndObject();
@ -665,21 +665,21 @@ void AddFlow(int nIndex, int nSpeed, int b)
short nFlow = nFlowCount; short nFlow = nFlowCount;
nFlowCount++; nFlowCount++;
short var_18;
if (b < 2) if (b < 2)
{ {
var_18 = sprite[nIndex].sectnum; int sectnum = sprite[nIndex].sectnum;
short nPic = sector[var_18].floorpicnum; short nPic = sector[sectnum].floorpicnum;
short nAngle = sprite[nIndex].ang; short nAngle = sprite[nIndex].ang;
sFlowInfo[nFlow].xacc = (tileWidth(nPic) << 14) - 1; sFlowInfo[nFlow].xacc = (tileWidth(nPic) << 14) - 1;
sFlowInfo[nFlow].yacc = (tileHeight(nPic) << 14) - 1; sFlowInfo[nFlow].yacc = (tileHeight(nPic) << 14) - 1;
sFlowInfo[nFlow].field_C = -bcos(nAngle) * nSpeed; sFlowInfo[nFlow].angcos = -bcos(nAngle) * nSpeed;
sFlowInfo[nFlow].field_10 = bsin(nAngle) * nSpeed; sFlowInfo[nFlow].angsin = bsin(nAngle) * nSpeed;
sFlowInfo[nFlow].objindex = sectnum;
StartInterpolation(nIndex, b ? Interp_Sect_CeilingPanX : Interp_Sect_FloorPanX); StartInterpolation(sectnum, b ? Interp_Sect_CeilingPanX : Interp_Sect_FloorPanX);
StartInterpolation(nIndex, b ? Interp_Sect_CeilingPanY : Interp_Sect_FloorPanY); StartInterpolation(sectnum, b ? Interp_Sect_CeilingPanY : Interp_Sect_FloorPanY);
} }
else else
{ {
@ -695,18 +695,17 @@ void AddFlow(int nIndex, int nSpeed, int b)
nAngle = 1536; nAngle = 1536;
} }
var_18 = nIndex; short nPic = wall[nIndex].picnum;
short nPic = wall[var_18].picnum;
sFlowInfo[nFlow].xacc = (tileWidth(nPic) * wall[var_18].xrepeat) << 8; sFlowInfo[nFlow].xacc = (tileWidth(nPic) * wall[nIndex].xrepeat) << 8;
sFlowInfo[nFlow].yacc = (tileHeight(nPic) * wall[var_18].yrepeat) << 8; sFlowInfo[nFlow].yacc = (tileHeight(nPic) * wall[nIndex].yrepeat) << 8;
sFlowInfo[nFlow].field_C = -bcos(nAngle) * nSpeed; sFlowInfo[nFlow].angcos = -bcos(nAngle) * nSpeed;
sFlowInfo[nFlow].field_10 = bsin(nAngle) * nSpeed; sFlowInfo[nFlow].angsin = bsin(nAngle) * nSpeed;
sFlowInfo[nFlow].objindex = nIndex;
} }
sFlowInfo[nFlow].ydelta = 0; sFlowInfo[nFlow].ydelta = 0;
sFlowInfo[nFlow].xdelta = 0; sFlowInfo[nFlow].xdelta = 0;
sFlowInfo[nFlow].objindex = var_18;
sFlowInfo[nFlow].type = b; sFlowInfo[nFlow].type = b;
} }
@ -714,8 +713,8 @@ void DoFlows()
{ {
for (int i = 0; i < nFlowCount; i++) for (int i = 0; i < nFlowCount; i++)
{ {
sFlowInfo[i].xdelta += sFlowInfo[i].field_C; sFlowInfo[i].xdelta += sFlowInfo[i].angcos;
sFlowInfo[i].ydelta += sFlowInfo[i].field_10; sFlowInfo[i].ydelta += sFlowInfo[i].angsin;
switch (sFlowInfo[i].type) switch (sFlowInfo[i].type)
{ {