zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

astub.c: revert portions of r4763, fixing display of some "member edit" dialogs.

Browse source 
Specifically, this fixes edit lines for 2 members, e.g. "(X,Y)pan".

git-svn-id: https://svn.eduke32.com/eduke32@4794 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-12-05 23:12:30 +00:00
parent 09e12917f0
commit 7cce9c39cb
1 changed files with 82 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10827,9 +10827,7 @@ static void med_handlecommon(int32_t xpos, int32_t ypos, int32_t *row, int32_t r
static void EditSectorData(int16_t sectnum) static void EditSectorData(int16_t sectnum)
{ {
int32_t col=1, row=0, rowmax = 6; int32_t col=1, row=0, rowmax = 6;
#ifdef YAX_ENABLE__COMPAT
int32_t i = -1; int32_t i = -1;
#endif
int32_t xpos = 208, ypos = ydim-STATUS2DSIZ+48; int32_t xpos = 208, ypos = ydim-STATUS2DSIZ+48;
med_editval = 0; med_editval = 0;
@ -10895,10 +10893,19 @@ static void EditSectorData(int16_t sectnum)
#endif #endif
break; break;
case 1: case 1:
handlemed(0, "X Pan", "Ceiling X Pan", &sector[sectnum].ceilingxpanning, i = Bsprintf(med_disptext,"(X,Y)pan: %d, %d",
sizeof(sector[sectnum].ceilingxpanning), 255, 0); TrackerCast(sector[sectnum].ceilingxpanning),
handlemed(0, "Y Pan", "Ceiling Y Pan", &sector[sectnum].ceilingypanning, TrackerCast(sector[sectnum].ceilingypanning));
sizeof(sector[sectnum].ceilingypanning), 255, 0); for (; i < med_dispwidth; i++) med_disptext[i] = ' ';
if (med_editval)
{
Bsprintf(med_edittext,"Sector %d Ceiling X Pan: ",sectnum);
printmessage16("%s", med_edittext);
sector[sectnum].ceilingxpanning = (char)getnumber16(med_edittext,(int32_t)sector[sectnum].ceilingxpanning,255,0);
Bsprintf(med_edittext,"Sector %d Ceiling Y Pan: ",sectnum);
printmessage16("%s", med_edittext);
sector[sectnum].ceilingypanning = (char)getnumber16(med_edittext,(int32_t)sector[sectnum].ceilingypanning,255,0);
}
break; break;
case 2: case 2:
handlemed(0, "Shade byte", "Ceiling Shade", &sector[sectnum].ceilingshade,sizeof(sector[sectnum].ceilingshade), 128, 1); handlemed(0, "Shade byte", "Ceiling Shade", &sector[sectnum].ceilingshade,sizeof(sector[sectnum].ceilingshade), 128, 1);
@ -10939,10 +10946,19 @@ static void EditSectorData(int16_t sectnum)
break; break;
case 1: case 1:
handlemed(0, "X Pan", "Floor X Pan", &sector[sectnum].floorxpanning, i = Bsprintf(med_disptext,"(X,Y)pan: %d, %d",
sizeof(sector[sectnum].floorxpanning), 255, 0); TrackerCast(sector[sectnum].floorxpanning),
handlemed(0, "Y Pan", "Floor Y Pan", &sector[sectnum].floorypanning, TrackerCast(sector[sectnum].floorypanning));
sizeof(sector[sectnum].floorypanning), 255, 0); for (; i < med_dispwidth; i++) med_disptext[i] = ' ';
if (med_editval)
{
Bsprintf(med_edittext,"Sector %d Floor X Pan: ",sectnum);
printmessage16("%s", med_edittext);
sector[sectnum].floorxpanning = (char)getnumber16(med_edittext,(int32_t)sector[sectnum].floorxpanning,255,0);
Bsprintf(med_edittext,"Sector %d Floor Y Pan: ",sectnum);
printmessage16("%s", med_edittext);
sector[sectnum].floorypanning = (char)getnumber16(med_edittext,(int32_t)sector[sectnum].floorypanning,255,0);
}
break; break;
case 2: case 2:
@ -10986,9 +11002,7 @@ static void EditSectorData(int16_t sectnum)
static void EditWallData(int16_t wallnum) static void EditWallData(int16_t wallnum)
{ {
int32_t row=0; int32_t row=0;
#if !defined NEW_MAP_FORMAT
int32_t i = -1; int32_t i = -1;
#endif
int32_t xpos = 208, ypos = ydim-STATUS2DSIZ+48; int32_t xpos = 208, ypos = ydim-STATUS2DSIZ+48;
med_editval = 0; med_editval = 0;
@ -11029,16 +11043,34 @@ static void EditWallData(int16_t wallnum)
sizeof(wall[wallnum].pal), M32_MAXPALOOKUPS, 0); sizeof(wall[wallnum].pal), M32_MAXPALOOKUPS, 0);
break; break;
case 3: case 3:
handlemed(0, "X Repeat", "X Repeat", &wall[wallnum].xrepeat, i = Bsprintf(med_disptext,"(X,Y)repeat: %d, %d",
sizeof(wall[wallnum].xrepeat), 255, 0); TrackerCast(wall[wallnum].xrepeat),
handlemed(0, "Y Repeat", "Y Repeat", &wall[wallnum].yrepeat, TrackerCast(wall[wallnum].yrepeat));
sizeof(wall[wallnum].yrepeat), 255, 0); for (; i < med_dispwidth; i++) med_disptext[i] = ' ';
if (med_editval)
{
Bsprintf(med_edittext,"Wall %d X Repeat: ",wallnum);
printmessage16("%s", med_edittext);
wall[wallnum].xrepeat = (char)getnumber16(med_edittext,(int32_t)wall[wallnum].xrepeat,255,0);
Bsprintf(med_edittext,"Wall %d Y Repeat: ",wallnum);
printmessage16("%s", med_edittext);
wall[wallnum].yrepeat = (char)getnumber16(med_edittext,(int32_t)wall[wallnum].yrepeat,255,0);
}
break; break;
case 4: case 4:
handlemed(0, "X Pan", "X Pan", &wall[wallnum].xpanning, i = Bsprintf(med_disptext,"(X,Y)pan: %d, %d",
sizeof(wall[wallnum].xpanning), 255, 0); TrackerCast(wall[wallnum].xpanning),
handlemed(0, "Y Pan", "Y Pan", &wall[wallnum].ypanning, TrackerCast(wall[wallnum].ypanning));
sizeof(wall[wallnum].ypanning), 255, 0); for (; i < med_dispwidth; i++) med_disptext[i] = ' ';
if (med_editval)
{
Bsprintf(med_edittext,"Wall %d X Pan: ",wallnum);
printmessage16("%s", med_edittext);
wall[wallnum].xpanning = (char)getnumber16(med_edittext,(int32_t)wall[wallnum].xpanning,255,0);
Bsprintf(med_edittext,"Wall %d Y Pan: ",wallnum);
printmessage16("%s", med_edittext);
wall[wallnum].ypanning = (char)getnumber16(med_edittext,(int32_t)wall[wallnum].ypanning,255,0);
}
break; break;
case 5: case 5:
handlemed(0, "Tile number", "Tile number", &wall[wallnum].picnum, handlemed(0, "Tile number", "Tile number", &wall[wallnum].picnum,
@ -11211,16 +11243,38 @@ static void EditSpriteData(int16_t spritenum)
sizeof(sprite[spritenum].blend), MAXBLENDTABS, 0); sizeof(sprite[spritenum].blend), MAXBLENDTABS, 0);
break; break;
case 4: case 4:
handlemed(0, "X Repeat", "X Repeat", &sprite[spritenum].xrepeat, {
sizeof(sprite[spritenum].xrepeat), 255, 0); i = Bsprintf(med_disptext,"(X,Y)repeat: %d, %d",
handlemed(0, "Y Repeat", "Y Repeat", &sprite[spritenum].yrepeat, TrackerCast(sprite[spritenum].xrepeat),
sizeof(sprite[spritenum].yrepeat), 255, 0); TrackerCast(sprite[spritenum].yrepeat));
for (; i < med_dispwidth; i++) med_disptext[i] = ' ';
if (med_editval)
{
Bsprintf(med_edittext,"Sprite %d X Repeat: ",spritenum);
printmessage16("%s", med_edittext);
sprite[spritenum].xrepeat = (char)getnumber16(med_edittext,(int32_t)sprite[spritenum].xrepeat,255,0);
Bsprintf(med_edittext,"Sprite %d Y Repeat: ",spritenum);
printmessage16("%s", med_edittext);
sprite[spritenum].yrepeat = (char)getnumber16(med_edittext,(int32_t)sprite[spritenum].yrepeat,255,0);
}
}
break; break;
case 5: case 5:
handlemed(0, "X Offset", "X Offset", &sprite[spritenum].xoffset, {
sizeof(sprite[spritenum].xoffset), 128, 1); i = Bsprintf(med_disptext,"(X,Y)offset: %d, %d",
handlemed(0, "Y Offset", "Y Offset", &sprite[spritenum].yoffset, TrackerCast(sprite[spritenum].xoffset),
sizeof(sprite[spritenum].yoffset), 128, 1); TrackerCast(sprite[spritenum].yoffset));
for (; i < med_dispwidth; i++) med_disptext[i] = ' ';
if (med_editval)
{
Bsprintf(med_edittext,"Sprite %d X Offset: ",spritenum);
printmessage16("%s", med_edittext);
sprite[spritenum].xoffset = (char)getnumber16(med_edittext,(int32_t)sprite[spritenum].xoffset,128,1);
Bsprintf(med_edittext,"Sprite %d Y Offset: ",spritenum);
printmessage16("%s", med_edittext);
sprite[spritenum].yoffset = (char)getnumber16(med_edittext,(int32_t)sprite[spritenum].yoffset,128,1);
}
}
break; break;
case 6: case 6:
handlemed(0, "Tile number", "Tile number", &sprite[spritenum].picnum, handlemed(0, "Tile number", "Tile number", &sprite[spritenum].picnum,