zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 02:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mapster32: in 3D mode's tile info, highlight members of swapped bottom walls.

Browse source 
- If aiming at a swapped bottom wall, display "Wall <wallnum> -> <otherwallnum>"
- highlight pic, shade, pal, cstat in yellow then
- in printext256, accept at most 3 digits for the color format string (e.g. ^123)

git-svn-id: https://svn.eduke32.com/eduke32@3308 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-12-20 12:04:39 +00:00
parent 55283e5ce6
commit 518ac7b4df
3 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
polymer/eduke32/build/src/engine.c
View file

@ -4266,7 +4266,6 @@ static void grouscan(int32_t dax1, int32_t dax2, int32_t sectnum, char dastat)
dx = mulscale14(wall[wal->point2].x-wal->x,dasqr);
dy = mulscale14(wall[wal->point2].y-wal->y,dasqr);
// NOTE: sector[].*heinum is int16_t and not supposed to be <0.
i = nsqrtasm(daslope*daslope+16777216);
x = globalx; y = globaly;
@ -15803,12 +15802,13 @@ void printext256(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, const
for (i=0; name[i]; i++)
{
// TODO: factor out!
if (name[i] == '^' && isdigit(name[i+1]))
{
char smallbuf[8];
int32_t bi=0;
while (isdigit(name[i+1]) && bi<8)
while (isdigit(name[i+1]) && bi<3)
{
smallbuf[bi++]=name[i+1];
i++;
@ -15863,7 +15863,7 @@ void printext256(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, const
{
char smallbuf[8];
int32_t bi=0;
while (isdigit(name[i+1]) && bi<8)
while (isdigit(name[i+1]) && bi<3)
{
smallbuf[bi++]=name[i+1];
i++;

2
polymer/eduke32/build/src/polymost.c
View file

@ -6200,7 +6200,7 @@ int32_t polymost_printext256(int32_t xpos, int32_t ypos, int16_t col, int16_t ba
{
char smallbuf[8];
int32_t bi=0;
while (isdigit(name[c+1]) && bi<8)
while (isdigit(name[c+1]) && bi<3)
{
smallbuf[bi++]=name[c+1];
c++;

34
polymer/eduke32/source/astub.c
View file

@ -4190,16 +4190,19 @@ restart:
#define WIND1X 3
#define WIND1Y 150
static char *tileinfo_colorstr = "";
static void tileinfo_doprint(int32_t x, int32_t y, char *buf, const char *label, int32_t value, int32_t pos)
{
int32_t small = (xdimgame<=640), i = ydimgame>>6;
Bsprintf(buf,"%s:%4d",label,value);
Bsprintf(buf,"%s:%s%4d", label, tileinfo_colorstr, value);
printext256(x+2, y+2+i*pos, 0, -1, buf, small);
printext256(x, y+i*pos, whitecol, -1, buf, small);
}
// flags: 1:draw asterisk for lotag
// 2:draw asterisk for extra
// 4:print bottom-swapped wall members colored
static void drawtileinfo(const char *title,int32_t x,int32_t y,int32_t picnum,int32_t shade,int32_t pal,int32_t cstat,
int32_t lotag,int32_t hitag,int32_t extra, uint32_t flags)
{
@ -4233,10 +4236,13 @@ static void drawtileinfo(const char *title,int32_t x,int32_t y,int32_t picnum,in
printext256(x+2,y+2,0,-1,title,small);
printext256(x,y,255-13,-1,title,small);
if (flags&4)
tileinfo_colorstr = "^242";
tileinfo_doprint(x, y, buf, "Pic", picnum, 1);
tileinfo_doprint(x, y, buf, "Shd", shade, 2);
tileinfo_doprint(x, y, buf, "Pal", pal, 3);
tileinfo_doprint(x, y, buf, "Cst", cstat, 4);
tileinfo_colorstr = "";
tileinfo_doprint(x, y, buf, (flags&1)?"Lo*":"Lot", lotag, 5);
tileinfo_doprint(x, y, buf, "Hit", hitag, 6);
tileinfo_doprint(x, y, buf, (flags&2)?"Ex*":"Ext", extra, 7);
@ -4842,26 +4848,29 @@ static void Keys3d(void)
if (searchsector > -1 && searchsector < numsectors)
{
char lines[8][64];
int32_t dist, height1=0,height2=0,height3=0, num=0;
int32_t num=0;
int32_t x,y,flags=0;
int16_t w;
if (infobox&1)
{
height2 = sector[searchsector].floorz - sector[searchsector].ceilingz;
int32_t height2 = sector[searchsector].floorz - sector[searchsector].ceilingz;
switch (searchstat)
{
case SEARCH_WALL:
case SEARCH_MASKWALL:
w = SELECT_WALL();
{
int32_t dist, height1=0, height3=0;
const int32_t w = SELECT_WALL();
const int32_t swappedbot = (int32_t)(w != searchwall);
flags |= (swappedbot<<2);
#ifdef YAX_ENABLE
flags |= (yax_getnextwall(searchwall, YAX_CEILING)>=0) + 2*(yax_getnextwall(searchwall, YAX_FLOOR)>=0);
#endif
drawtileinfo("Current", WIND1X,WIND1Y,
AIMING_AT_WALL ? wall[w].picnum : wall[w].overpicnum,
wall[w].shade, wall[w].pal, wall[searchwall].cstat,
wall[searchwall].lotag, wall[searchwall].hitag, wall[searchwall].extra,flags);
wall[w].shade, wall[w].pal, wall[w].cstat,
wall[searchwall].lotag, wall[searchwall].hitag, wall[searchwall].extra, flags);
dist = wallength(searchwall);
@ -4873,7 +4882,8 @@ static void Keys3d(void)
height3 = sector[nextsect].ceilingz - sector[searchsector].ceilingz;
}
Bsprintf_nowarn(lines[num++],"Panning: %d, %d", TrackerCast(wall[w].xpanning), TrackerCast(wall[w].ypanning));
Bsprintf_nowarn(lines[num++],"Panning:%s %d, %d", swappedbot?"^242":"",
TrackerCast(wall[w].xpanning), TrackerCast(wall[w].ypanning));
Bsprintf_nowarn(lines[num++],"Repeat: %d, %d", TrackerCast(wall[searchwall].xrepeat), TrackerCast(wall[searchwall].yrepeat));
Bsprintf_nowarn(lines[num++],"Overpic: %d", TrackerCast(wall[searchwall].overpicnum));
lines[num++][0]=0;
@ -4881,13 +4891,17 @@ static void Keys3d(void)
if (getmessageleng)
break;
Bsprintf(lines[num++],"^251Wall %d^31", searchwall);
if (searchwall != searchbottomwall)
Bsprintf(lines[num++],"^251Wall %d ->^242 %d", searchwall, searchbottomwall);
else
Bsprintf(lines[num++],"^251Wall %d", searchwall);
if (wall[searchwall].nextsector!=-1)
Bsprintf(lines[num++],"LoHeight:%d, HiHeight:%d, Length:%d",height1,height3,dist);
else
Bsprintf(lines[num++],"Height:%d, Length:%d",height2,dist);
break;
}
case SEARCH_CEILING:
case SEARCH_FLOOR:
@ -5339,7 +5353,7 @@ static void Keys3d(void)
if (PRESSED_KEYSC(2)) // 2 (bottom wall swapping)
{
if (searchstat != SEARCH_SPRITE)
if (!AIMING_AT_SPRITE && searchwall>=0)
{
wall[searchwall].cstat ^= 2;
message("Wall %d bottom texture swap bit %s", searchwall, ONOFF(wall[searchwall].cstat&2));