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

- jsector.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-24 23:11:38 +01:00
parent ce7465869f
commit 571dccda76
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/games/sw/src/jsector.cpp
View file

@ -435,7 +435,6 @@ void drawroomstotile(int daposx, int daposy, int daposz,
void void
JS_ProcessEchoSpot() JS_ProcessEchoSpot()
{ {
SPRITEp tp;
int j,dist; int j,dist;
PLAYERp pp = Player+screenpeek; PLAYERp pp = Player+screenpeek;
int16_t reverb; int16_t reverb;
@ -447,14 +446,12 @@ JS_ProcessEchoSpot()
{ {
dist = 0x7fffffff; dist = 0x7fffffff;
tp = &actor->s(); j = abs(actor->spr.pos.X - pp->pos.X);
j += abs(actor->spr.pos.Y - pp->pos.Y);
j = abs(tp->pos.X - pp->pos.X);
j += abs(tp->pos.Y - pp->pos.Y);
if (j < dist) if (j < dist)
dist = j; dist = j;
if (dist <= SP_TAG4(tp)) // tag4 = ang if (dist <= SP_TAG4(actor)) // tag4 = ang
{ {
reverb = SP_TAG2(actor); reverb = SP_TAG2(actor);
if (reverb > 200) reverb = 200; if (reverb > 200) reverb = 200;
@ -527,12 +524,10 @@ void JS_DrawCameras(PLAYERp pp, int tx, int ty, int tz, double smoothratio)
} }
else else
{ {
SPRITEp tp; DSWActor* camactor = mirror[cnt].camspriteActor;
tp = &mirror[cnt].camspriteActor->s(); j = abs(camactor->spr.pos.X - tx);
j += abs(camactor->spr.pos.Y - ty);
j = abs(tp->pos.X - tx);
j += abs(tp->pos.Y - ty);
if (j < dist) if (j < dist)
dist = j; dist = j;
} }
@ -925,8 +920,6 @@ void UnlockKeyLock(short key_num, DSWActor* hitActor)
SWStatIterator it(STAT_DEFAULT); SWStatIterator it(STAT_DEFAULT);
while (auto itActor = it.Next()) while (auto itActor = it.Next())
{ {
auto sp = &itActor->s();
switch (itActor->spr.picnum) switch (itActor->spr.picnum)
{ {
case SKEL_LOCKED: case SKEL_LOCKED: