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

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

Browse source
This commit is contained in:
terminx 2008-08-07 11:08:08 +00:00
parent 8ac80b7249
commit ddf53e9516
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/source/actors.c
View file

@ -608,7 +608,7 @@ void guts(int sp, int gtype, int n)
// pal = 6; // pal = 6;
// else pal = 0; // else pal = 0;
for (j=0;j<n;j++) for (j=n;j>0;j--)
{ {
a = TRAND&2047; a = TRAND&2047;
i = EGS(s->sectnum,s->x+(TRAND&255)-128,s->y+(TRAND&255)-128,gutz-(TRAND&8191),gtype,-32,sx,sy,a,48+(TRAND&31),-512-(TRAND&2047),sp,5); i = EGS(s->sectnum,s->x+(TRAND&255)-128,s->y+(TRAND&255)-128,gutz-(TRAND&8191),gtype,-32,sx,sy,a,48+(TRAND&31),-512-(TRAND&2047),sp,5);
@ -642,7 +642,7 @@ void gutsdir(int sp, int gtype, int n)
if (s->picnum == COMMANDER) if (s->picnum == COMMANDER)
gutz -= (24<<8); gutz -= (24<<8);
for (j=0;j<n;j++) for (j=n;j>0;j--)
{ {
a = TRAND&2047; a = TRAND&2047;
i = EGS(s->sectnum,s->x,s->y,gutz,gtype,-32,sx,sy,a,256+(TRAND&127),-512-(TRAND&2047),sp,5); i = EGS(s->sectnum,s->x,s->y,gutz,gtype,-32,sx,sy,a,256+(TRAND&127),-512-(TRAND&2047),sp,5);

21
polymer/eduke32/source/game.c
View file

@ -1580,9 +1580,9 @@ static void invennum(int x,int y,char num1,char ha,char sbits)
{ {
if (shd) if (shd)
{ {
rotatesprite(sbarx(x-4+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,4,1|32|sbits,0,0,xdim-1,ydim-1); rotatesprite(sbarx(x-4+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,4,1|sbits,0,0,xdim-1,ydim-1);
rotatesprite(sbarx(x+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,4,1|32|sbits,0,0,xdim-1,ydim-1); rotatesprite(sbarx(x+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,4,1|sbits,0,0,xdim-1,ydim-1);
rotatesprite(sbarx(x+4+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[2]-'0',ha,4,1|32|sbits,0,0,xdim-1,ydim-1); rotatesprite(sbarx(x+4+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[2]-'0',ha,4,1|sbits,0,0,xdim-1,ydim-1);
} }
rotatesprite(sbarx(x-4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,sbits,0,0,xdim-1,ydim-1); rotatesprite(sbarx(x-4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,sbits,0,0,xdim-1,ydim-1);
rotatesprite(sbarx(x),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,sbits,0,0,xdim-1,ydim-1); rotatesprite(sbarx(x),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,sbits,0,0,xdim-1,ydim-1);
@ -1593,14 +1593,15 @@ static void invennum(int x,int y,char num1,char ha,char sbits)
{ {
if (shd) if (shd)
{ {
rotatesprite(sbarx(x+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,4,1|32|sbits,0,0,xdim-1,ydim-1); rotatesprite(sbarx(x+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,4,1|sbits,0,0,xdim-1,ydim-1);
rotatesprite(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,1|32|sbits,0,0,xdim-1,ydim-1); rotatesprite(sbarx(x+4+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,4,1|sbits,0,0,xdim-1,ydim-1);
} }
rotatesprite(sbarx(x),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,sbits,0,0,xdim-1,ydim-1); rotatesprite(sbarx(x),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,sbits,0,0,xdim-1,ydim-1);
rotatesprite(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,sbits,0,0,xdim-1,ydim-1); rotatesprite(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,sbits,0,0,xdim-1,ydim-1);
return; return;
} }
rotatesprite(sbarx(x+4+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,4,sbits,0,0,xdim-1,ydim-1);
rotatesprite(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,sbits,0,0,xdim-1,ydim-1); rotatesprite(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,sbits,0,0,xdim-1,ydim-1);
} }
@ -2007,7 +2008,7 @@ static void coolgaugetext(int snum)
int asprites[MAX_WEAPONS] = { BOOTS, AMMO, SHOTGUNAMMO, int asprites[MAX_WEAPONS] = { BOOTS, AMMO, SHOTGUNAMMO,
BATTERYAMMO, RPGAMMO, HBOMBAMMO, CRYSTALAMMO, DEVISTATORAMMO, BATTERYAMMO, RPGAMMO, HBOMBAMMO, CRYSTALAMMO, DEVISTATORAMMO,
TRIPBOMBSPRITE, FREEZEAMMO, HBOMBAMMO, GROWAMMO TRIPBOMBSPRITE, FREEZEAMMO+1, HBOMBAMMO, GROWAMMO
}; };
Bmemcpy(ammo_sprites,asprites,sizeof(ammo_sprites)); Bmemcpy(ammo_sprites,asprites,sizeof(ammo_sprites));
} }
@ -2081,7 +2082,7 @@ static void coolgaugetext(int snum)
rotatesprite(sbarx(231-o),sbary(200-21-2),sbarsc(65536L),0,i,0,0,10+16+permbit,0,0,xdim-1,ydim-1); rotatesprite(sbarx(231-o),sbary(200-21-2),sbarsc(65536L),0,i,0,0,10+16+permbit,0,0,xdim-1,ydim-1);
} }
minitext(292-30-o+1,190-3+1,"%",4,32+1+10+16+permbit + 256); minitext(292-30-o+1,190-3+1,"%",4,1+10+16+permbit + 256);
minitext(292-30-o,190-3,"%",6,10+16+permbit + 256); minitext(292-30-o,190-3,"%",6,10+16+permbit + 256);
j = 0x80000000; j = 0x80000000;
@ -2115,17 +2116,17 @@ static void coolgaugetext(int snum)
invennum(-(284-30-o),200-6-3,(char)i,0,10+permbit); invennum(-(284-30-o),200-6-3,(char)i,0,10+permbit);
if (j > 0) if (j > 0)
{ {
minitext(288-30-o+1,180-3+1,"ON",4,32+1+10+16+permbit + 256); minitext(288-30-o+1,180-3+1,"ON",4,1+10+16+permbit + 256);
minitext(288-30-o,180-3,"ON",0,10+16+permbit + 256); minitext(288-30-o,180-3,"ON",0,10+16+permbit + 256);
} }
else if ((unsigned int)j != 0x80000000) else if ((unsigned int)j != 0x80000000)
{ {
minitext(284-30-o+1,180-3+1,"OFF",4,32+1+10+16+permbit + 256); minitext(284-30-o+1,180-3+1,"OFF",4,1+10+16+permbit + 256);
minitext(284-30-o,180-3,"OFF",2,10+16+permbit + 256); minitext(284-30-o,180-3,"OFF",2,10+16+permbit + 256);
} }
if (p->inven_icon >= 6) if (p->inven_icon >= 6)
{ {
minitext(284-35-o+1,180-3+1,"AUTO",4,32+1+10+16+permbit + 256); minitext(284-35-o+1,180-3+1,"AUTO",4,1+10+16+permbit + 256);
minitext(284-35-o,180-3,"AUTO",2,10+16+permbit + 256); minitext(284-35-o,180-3,"AUTO",2,10+16+permbit + 256);
} }