Fix a couple of bugs

git-svn-id: https://svn.eduke32.com/eduke32@1605 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2010-03-03 01:37:27 +00:00
parent ebeee01510
commit 33780b42e9
2 changed files with 11 additions and 4 deletions

View file

@ -2618,7 +2618,7 @@ void G_DrawTXDigiNumZ(int32_t starttile, int32_t x,int32_t y,int32_t n,int32_t s
for (k=i-1; k>=0; k--)
{
p = starttile+*(b+k)-'0';
j += (tilesizx[p]+1*z)>>16;
j += (tilesizx[p]+1)*(z>>16);
}
if (cs&256) j<<=16;
c = x-(j>>1);
@ -2628,9 +2628,7 @@ void G_DrawTXDigiNumZ(int32_t starttile, int32_t x,int32_t y,int32_t n,int32_t s
{
p = starttile+*(b+k)-'0';
rotatesprite((c+j)<<shift,y<<shift,z,0,p,s,pal,2|cs,x1,y1,x2,y2);
/* rotatesprite((c+j)<<16,y<<16,65536L,0,p,s,pal,cs,0,0,xdim-1,ydim-1);
rotatesprite(x<<16,y<<16,32768L,a,tilenum,shade,p,2|orientation,windowx1,windowy1,windowx2,windowy2);*/
j += ((tilesizx[p]+1*z)>>((cs&256)?0:16));
j += ((tilesizx[p]+1) * (z>>((cs&256)?0:16)));
}
}

View file

@ -1546,6 +1546,7 @@ static void C_GetNextVarType(int32_t type)
int32_t i=0,f=0;
C_SkipComments();
if (!type && !g_labelsOnly && (isdigit(*textptr) || ((*textptr == '-') && (isdigit(*(textptr+1))))))
{
if (!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug)
@ -1580,6 +1581,8 @@ static void C_GetNextVarType(int32_t type)
C_GetNextLabelName();
return;
}
textptr++;
}
C_GetNextLabelName();
@ -4709,6 +4712,12 @@ repeatcase:
}
case CON_DEFAULT:
g_scriptPtr--; // don't save
C_SkipComments();
if (*textptr == ':')
textptr++;
if (g_checkingSwitch<1)
{
g_numCompilerErrors++;