zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-21 02:51:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed all access to sprite[] from mirrors.cpp.

Browse source
This commit is contained in:
Christoph Oelckers 2021-09-04 20:49:00 +02:00
parent 826fd7ddb2
commit 85c4b96177
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/games/blood/src/mirrors.cpp
View file

@ -110,30 +110,32 @@ void InitMirrors(void)
if (sector[i].floorpicnum == 504)
{
int nLink = gUpperLink[i];
if (nLink < 0)
auto link = getUpperLink(i);
if (link == nullptr)
continue;
int nLink2 = sprite[nLink].owner /*& 0xfff*/;
int j = sprite[nLink2].sectnum;
auto link2 = link->GetOwner();
if (link2 == nullptr)
continue;
int j = link2->s().sectnum;
if (sector[j].ceilingpicnum != 504)
I_Error("Lower link sector %d doesn't have mirror picnum\n", j);
mirror[mirrorcnt].type = 2;
mirror[mirrorcnt].dx = sprite[nLink2].x-sprite[nLink].x;
mirror[mirrorcnt].dy = sprite[nLink2].y-sprite[nLink].y;
mirror[mirrorcnt].dz = sprite[nLink2].z-sprite[nLink].z;
mirror[mirrorcnt].dx = link2->s().x - link->s().x;
mirror[mirrorcnt].dy = link2->s().y - link->s().y;
mirror[mirrorcnt].dz = link2->s().z - link->s().z;
mirror[mirrorcnt].wallnum = i;
mirror[mirrorcnt].link = j;
sector[i].floorpicnum = 4080+mirrorcnt;
sector[i].floorpicnum = 4080 + mirrorcnt;
sector[i].portalflags = PORTAL_SECTOR_FLOOR;
sector[i].portalnum = portalAdd(PORTAL_SECTOR_FLOOR, j, mirror[mirrorcnt].dx, mirror[mirrorcnt].dy, mirror[mirrorcnt].dz);
mirrorcnt++;
mirror[mirrorcnt].type = 1;
mirror[mirrorcnt].dx = sprite[nLink].x-sprite[nLink2].x;
mirror[mirrorcnt].dy = sprite[nLink].y-sprite[nLink2].y;
mirror[mirrorcnt].dz = sprite[nLink].z-sprite[nLink2].z;
mirror[mirrorcnt].dx = link->s().x - link2->s().x;
mirror[mirrorcnt].dy = link->s().y - link2->s().y;
mirror[mirrorcnt].dz = link->s().z - link2->s().z;
mirror[mirrorcnt].wallnum = j;
mirror[mirrorcnt].link = i;
sector[j].ceilingpicnum = 4080+mirrorcnt;
sector[j].ceilingpicnum = 4080 + mirrorcnt;
sector[j].portalflags = PORTAL_SECTOR_CEILING;
sector[j].portalnum = portalAdd(PORTAL_SECTOR_CEILING, i, mirror[mirrorcnt].dx, mirror[mirrorcnt].dy, mirror[mirrorcnt].dz);
mirrorcnt++;