teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- the definitely last bit: There was still a spritenum reference in NEAR_TAG_INFO

Browse source 
SW done!
This commit is contained in:
Christoph Oelckers 2021-11-06 12:40:32 +01:00
parent b97760db29
commit 399f254629
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/games/sw/src/sector.cpp
View file

@ -2181,7 +2181,7 @@ void NearTagList(NEAR_TAG_INFOp ntip, PLAYERp pp, int z, int dist, int type, int
ntip->dist = neartaghitdist;
ntip->sectnum = neartagsector;
ntip->wallnum = -1;
ntip->spritenum = -1;
ntip->actor = nullptr;
nti_cnt++;
ntip++;
@ -2207,10 +2207,10 @@ void NearTagList(NEAR_TAG_INFOp ntip, PLAYERp pp, int z, int dist, int type, int
ntip->dist = neartaghitdist;
ntip->sectnum = -1;
ntip->wallnum = neartagwall;
ntip->spritenum = -1;
ntip->actor = nullptr;
nti_cnt++;
ntip++;
if (nti_cnt >= count)
return;
@ -2226,7 +2226,8 @@ void NearTagList(NEAR_TAG_INFOp ntip, PLAYERp pp, int z, int dist, int type, int
}
else if (neartagsprite >= 0)
{
auto sp = &sprite[neartagsprite];
auto actor = &swActors[neartagsprite];
auto sp = &actor->s();
// save off values
save_lotag = sp->lotag;
save_hitag = sp->hitag;
@ -2234,7 +2235,7 @@ void NearTagList(NEAR_TAG_INFOp ntip, PLAYERp pp, int z, int dist, int type, int
ntip->dist = neartaghitdist;
ntip->sectnum = -1;
ntip->wallnum = -1;
ntip->spritenum = neartagsprite;
ntip->actor = actor;
nti_cnt++;
ntip++;
@ -2256,7 +2257,7 @@ void NearTagList(NEAR_TAG_INFOp ntip, PLAYERp pp, int z, int dist, int type, int
ntip->dist = -1;
ntip->sectnum = -1;
ntip->wallnum = -1;
ntip->spritenum = -1;
ntip->actor = nullptr;
nti_cnt++;
ntip++;
@ -2345,9 +2346,9 @@ void PlayerOperateEnv(PLAYERp pp)
// try and find a sprite
for (nt_ndx = 0; nti[nt_ndx].dist >= 0; nt_ndx++)
{
if (nti[nt_ndx].spritenum >= 0 && nti[nt_ndx].dist < 1024 + 768)
if (nti[nt_ndx].actor != nullptr && nti[nt_ndx].dist < 1024 + 768)
{
if (OperateSprite(&swActors[nti[nt_ndx].spritenum], true))
if (OperateSprite(nti[nt_ndx].actor, true))
{
pp->KeyPressBits &= ~SB_OPEN;
found = true;
@ -2374,9 +2375,9 @@ void PlayerOperateEnv(PLAYERp pp)
for (nt_ndx = 0; nti[nt_ndx].dist >= 0; nt_ndx++)
{
if (nti[nt_ndx].spritenum >= 0 && nti[nt_ndx].dist < 1024 + 768)
if (nti[nt_ndx].actor != nullptr && nti[nt_ndx].dist < 1024 + 768)
{
if (OperateSprite(&swActors[nti[nt_ndx].spritenum], true))
if (OperateSprite(nti[nt_ndx].actor, true))
{
pp->KeyPressBits &= ~SB_OPEN;
break;

3
source/games/sw/src/sector.h
View file

@ -60,7 +60,8 @@ enum SO_SCALE_TYPE
typedef struct
{
int dist;
short sectnum, wallnum, spritenum;
short sectnum, wallnum;
DSWActor* actor;
} NEAR_TAG_INFO, *NEAR_TAG_INFOp;
extern short nti_cnt;