mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-24 02:30:46 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@935 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
a5f12d9f55
commit
8ac80b7249
2 changed files with 24 additions and 18 deletions
|
@ -587,7 +587,8 @@ void lotsofmoneymailpaper(int sp, int n, int pic)
|
|||
void guts(int sp, int gtype, int n)
|
||||
{
|
||||
int gutz,floorz;
|
||||
int i,a,j,sx,sy,pal;
|
||||
int i,a,j,sx,sy;
|
||||
// int pal;
|
||||
spritetype *s = &sprite[sp];
|
||||
|
||||
if (badguy(s) && s->xrepeat < 16)
|
||||
|
@ -603,9 +604,9 @@ void guts(int sp, int gtype, int n)
|
|||
if (s->picnum == COMMANDER)
|
||||
gutz -= (24<<8);
|
||||
|
||||
if (badguy(s) && s->pal == 6)
|
||||
pal = 6;
|
||||
else pal = 0;
|
||||
// if (badguy(s) && s->pal == 6)
|
||||
// pal = 6;
|
||||
// else pal = 0;
|
||||
|
||||
for (j=0;j<n;j++)
|
||||
{
|
||||
|
@ -616,8 +617,9 @@ void guts(int sp, int gtype, int n)
|
|||
sprite[i].xrepeat >>= 2;
|
||||
sprite[i].yrepeat >>= 2;
|
||||
}
|
||||
if (pal == 6)
|
||||
sprite[i].pal = 6;
|
||||
// if (pal == 6)
|
||||
// sprite[i].pal = 6;
|
||||
sprite[i].pal = s->pal;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -644,6 +646,7 @@ void gutsdir(int sp, int gtype, int n)
|
|||
{
|
||||
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);
|
||||
sprite[i].pal = s->pal;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2012,8 +2012,11 @@ static void coolgaugetext(int snum)
|
|||
Bmemcpy(ammo_sprites,asprites,sizeof(ammo_sprites));
|
||||
}
|
||||
|
||||
rotatesprite(sbarx(5+1),sbary(200-25+1),sbarsc(49152L),0,SIXPAK,0,4,10+16+1+32,0,0,xdim-1,ydim-1);
|
||||
rotatesprite(sbarx(5),sbary(200-25),sbarsc(49152L),0,SIXPAK,0,0,10+16,0,0,xdim-1,ydim-1);
|
||||
// rotatesprite(sbarx(5+1),sbary(200-25+1),sbarsc(49152L),0,SIXPAK,0,4,10+16+1+32,0,0,xdim-1,ydim-1);
|
||||
// rotatesprite(sbarx(5),sbary(200-25),sbarsc(49152L),0,SIXPAK,0,0,10+16,0,0,xdim-1,ydim-1);
|
||||
|
||||
rotatesprite(sbarx(2+1),sbary(200-22+1),sbarsc(49152L),0,COLA,0,4,10+16+1+32,0,0,xdim-1,ydim-1);
|
||||
rotatesprite(sbarx(2),sbary(200-22),sbarsc(49152L),0,COLA,0,0,10+16,0,0,xdim-1,ydim-1);
|
||||
|
||||
if (sprite[p->i].pal == 1 && p->last_extra < 2)
|
||||
altdigitalnumber(40,-(200-22),1,-16,10+16);
|
||||
|
@ -2024,10 +2027,18 @@ static void coolgaugetext(int snum)
|
|||
|
||||
altdigitalnumber(105,-(200-22),p->shield_amount,-16,10+16);
|
||||
|
||||
if (p->got_access&1) rotatesprite(sbarxr(39-1),sbary(200-43+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+32+1,0,0,xdim-1,ydim-1);
|
||||
if (p->got_access&2) rotatesprite(sbarxr(34-1),sbary(200-41+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+32+1,0,0,xdim-1,ydim-1);
|
||||
if (p->got_access&4) rotatesprite(sbarxr(29-1),sbary(200-39+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+32+1,0,0,xdim-1,ydim-1);
|
||||
|
||||
if (p->got_access&1) rotatesprite(sbarxr(39),sbary(200-43),sbarsc(32768),0,ACCESSCARD,0,0,10+16,0,0,xdim-1,ydim-1);
|
||||
if (p->got_access&2) rotatesprite(sbarxr(34),sbary(200-41),sbarsc(32768),0,ACCESSCARD,0,21,10+16,0,0,xdim-1,ydim-1);
|
||||
if (p->got_access&4) rotatesprite(sbarxr(29),sbary(200-39),sbarsc(32768),0,ACCESSCARD,0,23,10+16,0,0,xdim-1,ydim-1);
|
||||
|
||||
i = 32768;
|
||||
if (p->curr_weapon == PISTOL_WEAPON) i = 16384;
|
||||
rotatesprite(sbarxr(57-1),sbary(200-14+1),sbarsc(i),0,ammo_sprites[p->curr_weapon],0,4,2+1+32,0,0,xdim-1,ydim-1);
|
||||
rotatesprite(sbarxr(57),sbary(200-14),sbarsc(i),0,ammo_sprites[p->curr_weapon],0,0,2,0,0,xdim-1,ydim-1);
|
||||
rotatesprite(sbarxr(57-1),sbary(200-15+1),sbarsc(i),0,ammo_sprites[p->curr_weapon],0,4,2+1+32,0,0,xdim-1,ydim-1);
|
||||
rotatesprite(sbarxr(57),sbary(200-15),sbarsc(i),0,ammo_sprites[p->curr_weapon],0,0,2,0,0,xdim-1,ydim-1);
|
||||
|
||||
if (p->curr_weapon == HANDREMOTE_WEAPON) i = HANDBOMB_WEAPON;
|
||||
else i = p->curr_weapon;
|
||||
|
@ -2119,14 +2130,6 @@ static void coolgaugetext(int snum)
|
|||
}
|
||||
|
||||
}
|
||||
if (p->got_access&1) rotatesprite(sbarxr(39-1),sbary(200-43+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+32+1,0,0,xdim-1,ydim-1);
|
||||
if (p->got_access&2) rotatesprite(sbarxr(34-1),sbary(200-41+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+32+1,0,0,xdim-1,ydim-1);
|
||||
if (p->got_access&4) rotatesprite(sbarxr(29-1),sbary(200-39+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+32+1,0,0,xdim-1,ydim-1);
|
||||
|
||||
if (p->got_access&1) rotatesprite(sbarxr(39),sbary(200-43),sbarsc(32768),0,ACCESSCARD,0,0,10+16,0,0,xdim-1,ydim-1);
|
||||
if (p->got_access&2) rotatesprite(sbarxr(34),sbary(200-41),sbarsc(32768),0,ACCESSCARD,0,21,10+16,0,0,xdim-1,ydim-1);
|
||||
if (p->got_access&4) rotatesprite(sbarxr(29),sbary(200-39),sbarsc(32768),0,ACCESSCARD,0,23,10+16,0,0,xdim-1,ydim-1);
|
||||
|
||||
return;
|
||||
}
|
||||
rotatesprite(sbarx(5),sbary(200-28),sbarsc(65536L),0,HEALTHBOX,0,21,10+16,0,0,xdim-1,ydim-1);
|
||||
|
|
Loading…
Reference in a new issue