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

Text renderer: removed unneccessary function bt2idx().

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1057 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2008-09-05 23:23:26 +00:00
parent 57de846b59
commit b881cc116c
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3175,18 +3175,10 @@ int64 ldistsqr(spritetype *s1,spritetype *s2)
((int64)(s2->y - s1->y))*((int64)(s2->y - s1->y))); ((int64)(s2->y - s1->y))*((int64)(s2->y - s1->y)));
} }
int bt2idx(short basetile)
{
if (basetile==STARTALPHANUM) return 0;
if (basetile==BIGALPHANUM) return 1;
if (basetile==2966) return 2;
return 3;
}
void rendertext(short startspr) void rendertext(short startspr)
{ {
char ch, buffer[80], good; char ch, buffer[80], good;
short daang, t, basetile, linebegspr, curspr; short daang, t, basetile, basetidx, linebegspr, curspr;
int i, k, dax, day; int i, k, dax, day;
static unsigned char hgap=0, vgap=4; static unsigned char hgap=0, vgap=4;
static unsigned char spcgap[4]= static unsigned char spcgap[4]=
@ -3207,13 +3199,25 @@ void rendertext(short startspr)
t = sprite[startspr].picnum; t = sprite[startspr].picnum;
if (t >= STARTALPHANUM && t <= ENDALPHANUM) if (t >= STARTALPHANUM && t <= ENDALPHANUM)
{
basetile = STARTALPHANUM; // blue font basetile = STARTALPHANUM; // blue font
basetidx = 0;
}
else if ((t>=2929 && t<=2965) || (t>=3002 && t<=3009) || t==3022) else if ((t>=2929 && t<=2965) || (t>=3002 && t<=3009) || t==3022)
{
basetile = BIGALPHANUM; // big red font basetile = BIGALPHANUM; // big red font
basetidx = 1;
}
else if (t>=2966 && t<=3001) else if (t>=2966 && t<=3001)
{
basetile = 2966; // silver font basetile = 2966; // silver font
basetidx = 2;
}
else if ((t>=MINIFONT && t<=3135) || (t>=3162 && t<=3165)) else if ((t>=MINIFONT && t<=3135) || (t>=3162 && t<=3165))
{
basetile=MINIFONT; basetile=MINIFONT;
basetidx = 3;
}
else else
{ {
message("Must point at a text sprite."); message("Must point at a text sprite.");
@ -3261,12 +3265,12 @@ void rendertext(short startspr)
if (keystatus[KEYSC_INSERT]) // space gap in half pixels if (keystatus[KEYSC_INSERT]) // space gap in half pixels
{ {
keystatus[KEYSC_INSERT]=0; keystatus[KEYSC_INSERT]=0;
if (spcgap[bt2idx(basetile)]<255) spcgap[bt2idx(basetile)]++; if (spcgap[basetidx]<255) spcgap[basetidx]++;
} }
if (keystatus[KEYSC_DELETE]) if (keystatus[KEYSC_DELETE])
{ {
keystatus[KEYSC_DELETE]=0; keystatus[KEYSC_DELETE]=0;
if (spcgap[bt2idx(basetile)]>1) spcgap[bt2idx(basetile)]--; if (spcgap[basetidx]>1) spcgap[basetidx]--;
} }
if (keystatus[KEYSC_HOME]) // shade if (keystatus[KEYSC_HOME]) // shade
@ -3311,7 +3315,7 @@ void rendertext(short startspr)
printmessage256(0,0,"^251Text entry mode.^31 Navigation keys change vars."); printmessage256(0,0,"^251Text entry mode.^31 Navigation keys change vars.");
Bsprintf(buffer, "Hgap=%d, Vgap=%d, SPCgap=%d, Shd=%d, Pal=%d", Bsprintf(buffer, "Hgap=%d, Vgap=%d, SPCgap=%d, Shd=%d, Pal=%d",
hgap, vgap, spcgap[bt2idx(basetile)], sprite[curspr].shade, sprite[curspr].pal); hgap, vgap, spcgap[basetidx], sprite[curspr].shade, sprite[curspr].pal);
printmessage256(0, 9, buffer); printmessage256(0, 9, buffer);
showframe(1); showframe(1);
@ -3417,8 +3421,8 @@ void rendertext(short startspr)
} }
else if (ch == 32) else if (ch == 32)
{ {
dax += ((sp->xrepeat*spcgap[bt2idx(basetile)]*sintable[daang])>>17); dax += ((sp->xrepeat*spcgap[basetidx]*sintable[daang])>>17);
day -= ((sp->xrepeat*spcgap[bt2idx(basetile)]*sintable[(daang+512)&2047])>>17); day -= ((sp->xrepeat*spcgap[basetidx]*sintable[(daang+512)&2047])>>17);
} }
else if (ch == 8 || ch == 127) // backspace else if (ch == 8 || ch == 127) // backspace
{ {