zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 19:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

SW: More TrackerCast

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7525 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-04-08 06:27:39 +00:00 committed by Christoph Oelckers
parent bc96cd998d
commit 7f3052c662
4 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/sw/src/console.cpp
View file

@ -1045,7 +1045,6 @@ void CON_SpriteDetail(void)
{
char base[80];
int16_t op1=0;
SPRITEp sp;
short i;
// Format: showsprite [SpriteNum]
@ -1057,7 +1056,7 @@ void CON_SpriteDetail(void)
}
if (!CheckValidSprite(op1)) return;
sp = &sprite[op1];
auto const sp = (uspritetype const *)&sprite[op1];
CON_ConMessage("x = %d, y = %d, z = %d",sp->x,sp->y,sp->z);
CON_ConMessage("cstat = %d, picnum = %d",sp->cstat,sp->picnum);

24
source/sw/src/jnstub.cpp
View file

@ -2688,12 +2688,12 @@ ExtGetSpriteCaption(short spritenum)
sprintf(tempbuf, "%s%s", p, multi_str);
else
sprintf(tempbuf, "%s%s%d,%d,%d,%d,%d,%d", p, multi_str,
SPRITE_TAG1(spritenum),
SPRITE_TAG2(spritenum),
SPRITE_TAG3(spritenum),
SPRITE_TAG4(spritenum),
SPRITE_TAG5(spritenum),
SPRITE_TAG6(spritenum));
TrackerCast(SPRITE_TAG1(spritenum)),
TrackerCast(SPRITE_TAG2(spritenum)),
TrackerCast(SPRITE_TAG3(spritenum)),
TrackerCast(SPRITE_TAG4(spritenum)),
TrackerCast(SPRITE_TAG5(spritenum)),
TrackerCast(SPRITE_TAG6(spritenum)));
break;
case CAPTION_ALL:
@ -2704,12 +2704,12 @@ ExtGetSpriteCaption(short spritenum)
sprintf(tempbuf, "%s%s", p, multi_str);
else
sprintf(tempbuf, "%s%s%d,%d,%d,%d,%d,%d,%d,%d,%d,%d", p, multi_str,
SPRITE_TAG1(spritenum),
SPRITE_TAG2(spritenum),
SPRITE_TAG3(spritenum),
SPRITE_TAG4(spritenum),
SPRITE_TAG5(spritenum),
SPRITE_TAG6(spritenum),
TrackerCast(SPRITE_TAG1(spritenum)),
TrackerCast(SPRITE_TAG2(spritenum)),
TrackerCast(SPRITE_TAG3(spritenum)),
TrackerCast(SPRITE_TAG4(spritenum)),
TrackerCast(SPRITE_TAG5(spritenum)),
TrackerCast(SPRITE_TAG6(spritenum)),
SPRITE_TAG7(spritenum),
SPRITE_TAG8(spritenum),
SPRITE_TAG9(spritenum),

2
source/sw/src/sprite.cpp
View file

@ -1043,7 +1043,7 @@ ActorTestSpawn(SPRITEp sp)
default: c = "?"; break;
}
buildprintf("WARNING: skill-masked %s at %d,%d,%d not being killed because it "
"activates something\n", c,sp->x,sp->y,sp->z);
"activates something\n", c, TrackerCast(sp->x), TrackerCast(sp->y), TrackerCast(sp->z));
return TRUE;
}

2
source/sw/src/track.cpp
View file

@ -634,7 +634,7 @@ TrackSetup(void)
if (t->NumPoints == 0)
{
int i, nexti;
SPRITEp sp = &sprite[headspritestat[STAT_TRACK+ndx]];
auto const sp = (uspritetype const *)&sprite[headspritestat[STAT_TRACK+ndx]];
buildprintf("WARNING: Did not find first point of Track Number %d, x %d, y %d", ndx, sp->x, sp->y);
for (i=headspritestat[STAT_TRACK+ndx]; i>=0; i=nexti)
{