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

build.c: factor out two identical code instances into handle_sprite_in_clipboard

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2699 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-05-26 21:58:26 +00:00
parent eeb42f20bf
commit 5efab4d850
1 changed files with 30 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
polymer/eduke32/build/src/build.c
View file

@ -927,10 +927,37 @@ static void mainloop_move(void)
} }
} }
static void handle_sprite_in_clipboard(int32_t i)
{
if (somethingintab == 3)
{
int32_t j, k;
sprite[i].picnum = temppicnum;
if (tilesizx[temppicnum] <= 0 || tilesizy[temppicnum] <= 0)
{
j = 0;
for (k=0; k<MAXTILES; k++)
if (tilesizx[k] > 0 && tilesizy[k] > 0)
{
j = k;
break;
}
sprite[i].picnum = j;
}
sprite[i].shade = tempshade;
sprite[i].pal = temppal;
sprite[i].xrepeat = max(tempxrepeat, 1);
sprite[i].yrepeat = max(tempyrepeat, 1);
sprite[i].cstat = tempcstat;
}
}
void editinput(void) void editinput(void)
{ {
int32_t mousz, bstatus; int32_t mousz, bstatus;
int32_t i, j, k, tempint=0; int32_t i, tempint=0;
int32_t goalz, xvect, yvect, hiz, loz, oposz; int32_t goalz, xvect, yvect, hiz, loz, oposz;
int32_t dax, day, hihit, lohit, omlook=mlook; int32_t dax, day, hihit, lohit, omlook=mlook;
@ -1239,27 +1266,7 @@ void editinput(void)
{ {
int32_t cz, fz; int32_t cz, fz;
if (somethingintab == 3) handle_sprite_in_clipboard(i);
{
sprite[i].picnum = temppicnum;
if (tilesizx[temppicnum] <= 0 || tilesizy[temppicnum] <= 0)
{
j = 0;
for (k=0; k<MAXTILES; k++)
if (tilesizx[k] > 0 && tilesizy[k] > 0)
{
j = k;
break;
}
sprite[i].picnum = j;
}
sprite[i].shade = tempshade;
sprite[i].pal = temppal;
sprite[i].xrepeat = max(tempxrepeat, 1);
sprite[i].yrepeat = max(tempyrepeat, 1);
sprite[i].cstat = tempcstat;
}
getzsofslope(hitinfo.hitsect, hitinfo.pos.x, hitinfo.pos.y, &cz, &fz); getzsofslope(hitinfo.hitsect, hitinfo.pos.x, hitinfo.pos.y, &cz, &fz);
@ -6123,26 +6130,7 @@ end_join_sectors:
sprite[i].xrepeat = sprite[i].yrepeat = 48; sprite[i].xrepeat = sprite[i].yrepeat = 48;
prefixarg = 0; prefixarg = 0;
} }
else if (somethingintab == 3) else handle_sprite_in_clipboard(i);
{
sprite[i].picnum = temppicnum;
if (tilesizx[temppicnum] <= 0 || tilesizy[temppicnum] <= 0)
{
j = 0;
for (k=0; k<MAXTILES; k++)
if (tilesizx[k] > 0 && tilesizy[k] > 0)
{
j = k;
break;
}
sprite[i].picnum = j;
}
sprite[i].shade = tempshade;
sprite[i].pal = temppal;
sprite[i].xrepeat = max(tempxrepeat, 1);
sprite[i].yrepeat = max(tempyrepeat, 1);
sprite[i].cstat = tempcstat;
}
if (tilesizy[sprite[i].picnum] >= 32) if (tilesizy[sprite[i].picnum] >= 32)
sprite[i].cstat |= 1; sprite[i].cstat |= 1;