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

git-svn-id: https://svn.eduke32.com/eduke32@729 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-05-16 20:15:43 +00:00
parent 310c7240e1
commit f7e8583a52
2 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
polymer/build/src/build.c
View file

@ -2941,6 +2941,7 @@ void overheadeditor(void)
short hitsect, hitwall, hitsprite; short hitsect, hitwall, hitsprite;
int hitx, hity, hitz; int hitx, hity, hitz;
walltype *wal; walltype *wal;
int prefixarg;
//qsetmode640480(); //qsetmode640480();
qsetmodeany(xdim2d,ydim2d); qsetmodeany(xdim2d,ydim2d);
@ -4629,6 +4630,14 @@ void overheadeditor(void)
keystatus[0x24] = 0; keystatus[0x24] = 0;
} }
// PK
for (i=0x02; i<=0x0b; i++) // keys '1' to '0' on the upper row
if (keystatus[i])
{
prefixarg = i-1;
break;
}
if ((keystatus[0x38]||keystatus[0xb8])&&keystatus[0x1f]) //ALT-S if ((keystatus[0x38]||keystatus[0xb8])&&keystatus[0x1f]) //ALT-S
{ {
if ((linehighlight >= 0) && (wall[linehighlight].nextwall == -1)) if ((linehighlight >= 0) && (wall[linehighlight].nextwall == -1))
@ -4705,7 +4714,14 @@ void overheadeditor(void)
else else
sprite[i].picnum = 0; sprite[i].picnum = 0;
if (somethingintab == 3) // PK
if (prefixarg)
{
sprite[i].picnum = prefixarg;
sprite[i].xrepeat = sprite[i].yrepeat = 48;
prefixarg=0;
}
else if (somethingintab == 3)
{ {
sprite[i].picnum = temppicnum; sprite[i].picnum = temppicnum;
if ((tilesizx[temppicnum] <= 0) || (tilesizy[temppicnum] <= 0)) if ((tilesizx[temppicnum] <= 0) || (tilesizy[temppicnum] <= 0))

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

@ -1945,7 +1945,7 @@ static int m32gettile(int idInitialTile)
if (searchy < 12) searchy = 12; if (searchy < 12) searchy = 12;
if (searchx > xdim-13) searchx = xdim-13; if (searchx > xdim-13) searchx = xdim-13;
if (searchy > ydim-23) searchy = ydim-23; if (searchy > ydim-23) searchy = ydim-23;
if (bstatus&2) /* if (bstatus&2)
{ {
moffset+=mousedy; moffset+=mousedy;
if (iTopLeftTile==0 && moffset>0)moffset=0; if (iTopLeftTile==0 && moffset>0)moffset=0;
@ -1960,6 +1960,12 @@ static int m32gettile(int idInitialTile)
moffset+=ZoomToThumbSize[s_Zoom]; moffset+=ZoomToThumbSize[s_Zoom];
} }
} }
*/
if (bstatus&16 && !eitherCTRL)
iTopLeftTile -= nXTiles;
if (bstatus&32 && !eitherCTRL)
iTopLeftTile += nXTiles;
mtile=iTile=(searchx/ZoomToThumbSize[s_Zoom])+((searchy-moffset)/ZoomToThumbSize[s_Zoom])*nXTiles+iTopLeftTile; mtile=iTile=(searchx/ZoomToThumbSize[s_Zoom])+((searchy-moffset)/ZoomToThumbSize[s_Zoom])*nXTiles+iTopLeftTile;
while (iTile >= iTopLeftTile + nDisplayedTiles) while (iTile >= iTopLeftTile + nDisplayedTiles)
{ {
@ -1978,10 +1984,10 @@ static int m32gettile(int idInitialTile)
lockclock += synctics; lockclock += synctics;
// Zoom in / out using numeric key pad's / and * keys // Zoom in / out using numeric key pad's / and * keys
if (((keystatus[KEYSC_gSLASH] || bstatus&16) && s_Zoom<(signed)(NUM_ZOOMS-1)) if (((keystatus[KEYSC_gSLASH] || (eitherCTRL && (bstatus&16))) && s_Zoom<(signed)(NUM_ZOOMS-1))
|| ((keystatus[KEYSC_gSTAR] || bstatus&32) && s_Zoom>0)) || ((keystatus[KEYSC_gSTAR] || (eitherCTRL && (bstatus&32))) && s_Zoom>0))
{ {
if (keystatus[KEYSC_gSLASH] || bstatus&16) if (keystatus[KEYSC_gSLASH] || (eitherCTRL && (bstatus&16)))
{ {
keystatus[KEYSC_gSLASH] = 0; keystatus[KEYSC_gSLASH] = 0;
mouseb &= ~16; mouseb &= ~16;