zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-14 08:30:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

legibility improvements: rotatesprite(..., 0,0,xdim-1,ydim-1) -> rotatesprite_fs

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2308 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-02-02 17:35:05 +00:00
parent 55699e1240
commit 99e08bf441
10 changed files with 219 additions and 212 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
polymer/eduke32/build/include/build.h
View file

@ -594,6 +594,13 @@ void drawline256(int32_t x1, int32_t y1, int32_t x2, int32_t y2, char col);
int32_t printext16(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, const char *name, char fontsize) ATTRIBUTE((nonnull(5))); int32_t printext16(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, const char *name, char fontsize) ATTRIBUTE((nonnull(5)));
void printext256(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, const char *name, char fontsize) ATTRIBUTE((nonnull(5))); void printext256(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, const char *name, char fontsize) ATTRIBUTE((nonnull(5)));
////////// specialized rotatesprite wrappers for (very) often used cases //////////
// don't clip at all, i.e. the whole screen real estate is available
static inline void rotatesprite_fs(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t picnum, int8_t dashade, char dapalnum, int32_t dastat)
{
rotatesprite(sx, sy, z, a, picnum, dashade, dapalnum, dastat, 0,0,xdim-1,ydim-1);
}
void bfirst_search_init(int16_t *list, uint8_t *bitmap, int32_t *eltnumptr, int32_t maxnum, int16_t firstelt); void bfirst_search_init(int16_t *list, uint8_t *bitmap, int32_t *eltnumptr, int32_t maxnum, int16_t firstelt);
void bfirst_search_try(int16_t *list, uint8_t *bitmap, int32_t *eltnumptr, int16_t elt); void bfirst_search_try(int16_t *list, uint8_t *bitmap, int32_t *eltnumptr, int16_t elt);

2
polymer/eduke32/source/anim.c
View file

@ -411,7 +411,7 @@ void G_PlayAnim(const char *fn,char t)
g_restorePalette = 0; g_restorePalette = 0;
} }
rotatesprite(0<<16,0<<16,65536L,512,TILE_ANIM,0,0,2+4+8+16+64+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); rotatesprite_fs(0<<16,0<<16,65536L,512,TILE_ANIM,0,0,2+4+8+16+64+(ud.bgstretch?1024:0));
nextpage(); nextpage();
} }

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

@ -4356,7 +4356,7 @@ static void drawtileinfo(const char *title,int32_t x,int32_t y,int32_t picnum,in
setaspect(65536L, (int32_t)divscale16(ydim*320L,xdim*200L)); setaspect(65536L, (int32_t)divscale16(ydim*320L,xdim*200L));
// +1024: prevents rotatesprite from setting aspect itself // +1024: prevents rotatesprite from setting aspect itself
rotatesprite((x1+13)<<16,(y+11)<<16,scale,0, picnum,shade,pal, 2+1024, 0,0,xdim-1,ydim-1); rotatesprite_fs((x1+13)<<16,(y+11)<<16,scale,0, picnum,shade,pal, 2+1024);
setaspect(oviewingrange, oyxaspect); setaspect(oviewingrange, oyxaspect);
x *= xdimgame/320.0; x *= xdimgame/320.0;
@ -9429,7 +9429,7 @@ void GAME_drawosdchar(int32_t x, int32_t y, char ch, int32_t shade, int32_t pal)
ac = ch-'!'+STARTALPHANUM; ac = ch-'!'+STARTALPHANUM;
if (ac < STARTALPHANUM || ac > ENDALPHANUM) return; if (ac < STARTALPHANUM || ac > ENDALPHANUM) return;
rotatesprite(((x<<3)+x)<<16, (y<<3)<<16, 65536l, 0, ac, shade, pal, 8|16, 0, 0, xdim-1, ydim-1); rotatesprite_fs(((x<<3)+x)<<16, (y<<3)<<16, 65536l, 0, ac, shade, pal, 8|16);
} }
void GAME_drawosdstr(int32_t x, int32_t y, char *ch, int32_t len, int32_t shade, int32_t pal) void GAME_drawosdstr(int32_t x, int32_t y, char *ch, int32_t len, int32_t shade, int32_t pal)
@ -9446,7 +9446,7 @@ void GAME_drawosdstr(int32_t x, int32_t y, char *ch, int32_t len, int32_t shade,
ac = *ch-'!'+STARTALPHANUM; ac = *ch-'!'+STARTALPHANUM;
if (ac < STARTALPHANUM || ac > ENDALPHANUM) return; if (ac < STARTALPHANUM || ac > ENDALPHANUM) return;
rotatesprite(x<<16, (y<<3)<<16, 65536l, 0, ac, shade, pal, 8|16, 0, 0, xdim-1, ydim-1); rotatesprite_fs(x<<16, (y<<3)<<16, 65536l, 0, ac, shade, pal, 8|16);
if (*ch >= '0' && *ch <= '9') x+=8; if (*ch >= '0' && *ch <= '9') x+=8;
else x += tilesizx[ac]; else x += tilesizx[ac];
} }
@ -9467,7 +9467,7 @@ void GAME_drawosdcursor(int32_t x, int32_t y, int32_t type, int32_t lastkeypress
else ac = '_'-'!'+STARTALPHANUM; else ac = '_'-'!'+STARTALPHANUM;
if (!((GetTime()-lastkeypress) & 0x40l)) if (!((GetTime()-lastkeypress) & 0x40l))
rotatesprite(((x<<3)+x)<<16, ((y<<3)+(type?-1:2))<<16, 65536l, 0, ac, 0, 8, 8|16, 0, 0, xdim-1, ydim-1); rotatesprite_fs(((x<<3)+x)<<16, ((y<<3)+(type?-1:2))<<16, 65536l, 0, ac, 0, 8, 8|16);
} }
int32_t GAME_getcolumnwidth(int32_t w) int32_t GAME_getcolumnwidth(int32_t w)

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

@ -590,7 +590,7 @@ nextdemo:
rotatesprite(150<<16,16<<16,32768,0,SLIDEBAR,0,0,2+8+16+1024,(xdim*155)/320,0,xdim-1,ydim-1); rotatesprite(150<<16,16<<16,32768,0,SLIDEBAR,0,0,2+8+16+1024,(xdim*155)/320,0,xdim-1,ydim-1);
j = (182<<16) - ((((120*(g_demo_totalCnt-g_demo_cnt))<<4)/g_demo_totalCnt)<<12); j = (182<<16) - ((((120*(g_demo_totalCnt-g_demo_cnt))<<4)/g_demo_totalCnt)<<12);
rotatesprite(j,(16<<16)+(1<<15),32768,0,SLIDEBAR+1,0,0,2+8+16+1024,0,0,xdim-1,ydim-1); rotatesprite_fs(j,(16<<16)+(1<<15),32768,0,SLIDEBAR+1,0,0,2+8+16+1024);
j=(g_demo_totalCnt-g_demo_cnt)/(TICRATE/TICSPERFRAME); j=(g_demo_totalCnt-g_demo_cnt)/(TICRATE/TICSPERFRAME);
Bsprintf(buf, "-%02d:%02d%s", j/60, j%60, g_demo_paused?" ^15PAUSED":""); Bsprintf(buf, "-%02d:%02d%s", j/60, j%60, g_demo_paused?" ^15PAUSED":"");
@ -654,7 +654,7 @@ nextdemo:
if (VOLUMEONE) if (VOLUMEONE)
{ {
if (ud.show_help == 0 && (g_player[myconnectindex].ps->gm&MODE_MENU) == 0) if (ud.show_help == 0 && (g_player[myconnectindex].ps->gm&MODE_MENU) == 0)
rotatesprite((320-50)<<16,9<<16,65536L,0,BETAVERSION,0,0,2+8+16+128,0,0,xdim-1,ydim-1); rotatesprite_fs((320-50)<<16,9<<16,65536L,0,BETAVERSION,0,0,2+8+16+128);
} }
handleevents(); handleevents();
Net_GetPackets(); Net_GetPackets();

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

@ -527,8 +527,8 @@ int32_t minitext_(int32_t x,int32_t y,const char *t,int32_t s,int32_t p,int32_t
} }
else ac = ch - '!' + MINIFONT; else ac = ch - '!' + MINIFONT;
if (cmode) rotatesprite(sbarx(x),sbary(y),sbarsc(65536L),0,ac,s,p,sb,0,0,xdim-1,ydim-1); if (cmode) rotatesprite_fs(sbarx(x),sbary(y),sbarsc(65536L),0,ac,s,p,sb);
else rotatesprite(x<<16,y<<16,65536L,0,ac,s,p,sb,0,0,xdim-1,ydim-1); else rotatesprite_fs(x<<16,y<<16,65536L,0,ac,s,p,sb);
x += 4; // tilesizx[ac]+1; x += 4; // tilesizx[ac]+1;
} }
@ -732,37 +732,37 @@ static void G_DrawInvNum(int32_t x,int32_t y,char num1,char ha,int32_t sbits)
{ {
if (shd && ud.screen_size == 4 && getrendermode() >= 3 && althud_shadows) if (shd && ud.screen_size == 4 && getrendermode() >= 3 && althud_shadows)
{ {
rotatesprite(sbarx(x-4+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,4,POLYMOSTTRANS|sbits,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x-4+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,4,POLYMOSTTRANS|sbits);
rotatesprite(sbarx(x+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,4,POLYMOSTTRANS|sbits,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,4,POLYMOSTTRANS|sbits);
rotatesprite(sbarx(x+4+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[2]-'0',ha,4,POLYMOSTTRANS|sbits,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+4+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[2]-'0',ha,4,POLYMOSTTRANS|sbits);
} }
rotatesprite(sbarx(x-4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,sbits,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x-4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,sbits);
rotatesprite(sbarx(x),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,sbits,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,sbits);
rotatesprite(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[2]-'0',ha,0,sbits,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[2]-'0',ha,0,sbits);
return; return;
} }
if (num1 > 9) if (num1 > 9)
{ {
if (shd && ud.screen_size == 4 && getrendermode() >= 3 && althud_shadows) if (shd && ud.screen_size == 4 && getrendermode() >= 3 && althud_shadows)
{ {
rotatesprite(sbarx(x+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,4,POLYMOSTTRANS|sbits,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,4,POLYMOSTTRANS|sbits);
rotatesprite(sbarx(x+4+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,4,POLYMOSTTRANS|sbits,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+4+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,4,POLYMOSTTRANS|sbits);
} }
rotatesprite(sbarx(x),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,sbits,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,sbits);
rotatesprite(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,sbits,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,sbits);
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_fs(sbarx(x+4+1),sbary(y+1),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,4,sbits);
rotatesprite(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,sbits,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,sbits);
} }
static void G_DrawWeapNum(int16_t ind,int32_t x,int32_t y,int32_t num1, int32_t num2,int32_t ha) static void G_DrawWeapNum(int16_t ind,int32_t x,int32_t y,int32_t num1, int32_t num2,int32_t ha)
{ {
char dabuf[80] = {0}; char dabuf[80] = {0};
rotatesprite(sbarx(x-7),sbary(y),sbarsc(65536L),0,THREEBYFIVE+ind+1,ha-10,7,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x-7),sbary(y),sbarsc(65536L),0,THREEBYFIVE+ind+1,ha-10,7,10);
rotatesprite(sbarx(x-3),sbary(y),sbarsc(65536L),0,THREEBYFIVE+10,ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x-3),sbary(y),sbarsc(65536L),0,THREEBYFIVE+10,ha,0,10);
if (VOLUMEONE && (ind > HANDBOMB_WEAPON || ind < 0)) if (VOLUMEONE && (ind > HANDBOMB_WEAPON || ind < 0))
{ {
@ -770,7 +770,7 @@ static void G_DrawWeapNum(int16_t ind,int32_t x,int32_t y,int32_t num1, int32_t
return; return;
} }
rotatesprite(sbarx(x+9),sbary(y),sbarsc(65536L),0,THREEBYFIVE+11,ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+9),sbary(y),sbarsc(65536L),0,THREEBYFIVE+11,ha,0,10);
if (num1 > 99) num1 = 99; if (num1 > 99) num1 = 99;
if (num2 > 99) num2 = 99; if (num2 > 99) num2 = 99;
@ -778,58 +778,58 @@ static void G_DrawWeapNum(int16_t ind,int32_t x,int32_t y,int32_t num1, int32_t
Bsprintf(dabuf,"%d",num1); Bsprintf(dabuf,"%d",num1);
if (num1 > 9) if (num1 > 9)
{ {
rotatesprite(sbarx(x),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10);
rotatesprite(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,10);
} }
else rotatesprite(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10,0,0,xdim-1,ydim-1); else rotatesprite_fs(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10);
Bsprintf(dabuf,"%d",num2); Bsprintf(dabuf,"%d",num2);
if (num2 > 9) if (num2 > 9)
{ {
rotatesprite(sbarx(x+13),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+13),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10);
rotatesprite(sbarx(x+17),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+17),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,10);
return; return;
} }
rotatesprite(sbarx(x+13),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+13),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10);
} }
static void G_DrawWeapNum2(char ind,int32_t x,int32_t y,int32_t num1, int32_t num2,char ha) static void G_DrawWeapNum2(char ind,int32_t x,int32_t y,int32_t num1, int32_t num2,char ha)
{ {
char dabuf[80] = {0}; char dabuf[80] = {0};
rotatesprite(sbarx(x-7),sbary(y),sbarsc(65536L),0,THREEBYFIVE+ind+1,ha-10,7,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x-7),sbary(y),sbarsc(65536L),0,THREEBYFIVE+ind+1,ha-10,7,10);
rotatesprite(sbarx(x-4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+10,ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x-4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+10,ha,0,10);
rotatesprite(sbarx(x+13),sbary(y),sbarsc(65536L),0,THREEBYFIVE+11,ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+13),sbary(y),sbarsc(65536L),0,THREEBYFIVE+11,ha,0,10);
Bsprintf(dabuf,"%d",num1); Bsprintf(dabuf,"%d",num1);
if (num1 > 99) if (num1 > 99)
{ {
rotatesprite(sbarx(x),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10);
rotatesprite(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,10);
rotatesprite(sbarx(x+8),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[2]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+8),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[2]-'0',ha,0,10);
} }
else if (num1 > 9) else if (num1 > 9)
{ {
rotatesprite(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+4),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10);
rotatesprite(sbarx(x+8),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+8),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,10);
} }
else rotatesprite(sbarx(x+8),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10,0,0,xdim-1,ydim-1); else rotatesprite_fs(sbarx(x+8),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10);
Bsprintf(dabuf,"%d",num2); Bsprintf(dabuf,"%d",num2);
if (num2 > 99) if (num2 > 99)
{ {
rotatesprite(sbarx(x+17),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+17),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10);
rotatesprite(sbarx(x+21),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+21),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,10);
rotatesprite(sbarx(x+25),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[2]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+25),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[2]-'0',ha,0,10);
} }
else if (num2 > 9) else if (num2 > 9)
{ {
rotatesprite(sbarx(x+17),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+17),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10);
rotatesprite(sbarx(x+21),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+21),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[1]-'0',ha,0,10);
return; return;
} }
else else
rotatesprite(sbarx(x+25),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(x+25),sbary(y),sbarsc(65536L),0,THREEBYFIVE+dabuf[0]-'0',ha,0,10);
} }
static void G_DrawWeapAmounts(DukePlayer_t *p,int32_t x,int32_t y,int32_t u) static void G_DrawWeapAmounts(DukePlayer_t *p,int32_t x,int32_t y,int32_t u)
@ -938,7 +938,7 @@ static void G_DrawDigiNum(int32_t x,int32_t y,int32_t n,char s,int32_t cs)
for (k=0; k<i; k++) for (k=0; k<i; k++)
{ {
p = DIGITALNUM+*(b+k)-'0'; p = DIGITALNUM+*(b+k)-'0';
rotatesprite(sbarx(c+j),sbary(y),sbarsc(65536L),0,p,s,0,cs,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(c+j),sbary(y),sbarsc(65536L),0,p,s,0,cs);
j += tilesizx[p]+1; j += tilesizx[p]+1;
} }
} }
@ -996,8 +996,8 @@ static void G_DrawAltDigiNum(int32_t x,int32_t y,int32_t n,char s,int32_t cs)
{ {
p = althud_numbertile+*(b+k)-'0'; p = althud_numbertile+*(b+k)-'0';
if (shd && getrendermode() >= 3 && althud_shadows) if (shd && getrendermode() >= 3 && althud_shadows)
rotatesprite(sbarxr(c+j-1),sbary(y+1),sbarsc(65536L),0,p,s,4,cs|POLYMOSTTRANS2,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarxr(c+j-1),sbary(y+1),sbarsc(65536L),0,p,s,4,cs|POLYMOSTTRANS2);
rotatesprite(sbarxr(c+j),sbary(y),sbarsc(65536L),0,p,s,althud_numberpal,cs,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarxr(c+j),sbary(y),sbarsc(65536L),0,p,s,althud_numberpal,cs);
j -= tilesizx[p]+1; j -= tilesizx[p]+1;
} }
return; return;
@ -1007,8 +1007,8 @@ static void G_DrawAltDigiNum(int32_t x,int32_t y,int32_t n,char s,int32_t cs)
{ {
p = althud_numbertile+*(b+k)-'0'; p = althud_numbertile+*(b+k)-'0';
if (shd && getrendermode() >= 3 && althud_shadows) if (shd && getrendermode() >= 3 && althud_shadows)
rotatesprite(sbarx(c+j+1),sbary(y+1),sbarsc(65536L),0,p,s,4,cs|POLYMOSTTRANS2,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(c+j+1),sbary(y+1),sbarsc(65536L),0,p,s,4,cs|POLYMOSTTRANS2);
rotatesprite(sbarx(c+j),sbary(y),sbarsc(65536L),0,p,s,althud_numberpal,cs,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(c+j),sbary(y),sbarsc(65536L),0,p,s,althud_numberpal,cs);
j += tilesizx[p]+1; j += tilesizx[p]+1;
} }
} }
@ -1084,10 +1084,10 @@ void G_DrawFrags(void)
TRAVERSE_CONNECT(i) TRAVERSE_CONNECT(i)
if (i > j) j = i; if (i > j) j = i;
rotatesprite(0,0,65600L,0,FRAGBAR,0,0,2+8+16+64,0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65600L,0,FRAGBAR,0,0,2+8+16+64);
if (j >= 4) rotatesprite(319,(8)<<16,65600L,0,FRAGBAR,0,0,10+16+64,0,0,xdim-1,ydim-1); if (j >= 4) rotatesprite_fs(319,(8)<<16,65600L,0,FRAGBAR,0,0,10+16+64);
if (j >= 8) rotatesprite(319,(16)<<16,65600L,0,FRAGBAR,0,0,10+16+64,0,0,xdim-1,ydim-1); if (j >= 8) rotatesprite_fs(319,(16)<<16,65600L,0,FRAGBAR,0,0,10+16+64);
if (j >= 12) rotatesprite(319,(24)<<16,65600L,0,FRAGBAR,0,0,10+16+64,0,0,xdim-1,ydim-1); if (j >= 12) rotatesprite_fs(319,(24)<<16,65600L,0,FRAGBAR,0,0,10+16+64);
TRAVERSE_CONNECT(i) TRAVERSE_CONNECT(i)
{ {
@ -1148,11 +1148,11 @@ static void G_DrawStatusBar(int32_t snum)
Bmemcpy(ammo_sprites,asprites,sizeof(ammo_sprites)); 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_fs(sbarx(5+1),sbary(200-25+1),sbarsc(49152L),0,SIXPAK,0,4,10+16+1+32);
// rotatesprite(sbarx(5),sbary(200-25),sbarsc(49152L),0,SIXPAK,0,0,10+16,0,0,xdim-1,ydim-1); // rotatesprite_fs(sbarx(5),sbary(200-25),sbarsc(49152L),0,SIXPAK,0,0,10+16);
if (getrendermode() >= 3 && althud_shadows) if (getrendermode() >= 3 && althud_shadows)
rotatesprite(sbarx(2+1),sbary(200-21+1),sbarsc(49152L),0,COLA,0,4,10+16+256+POLYMOSTTRANS2,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(2+1),sbary(200-21+1),sbarsc(49152L),0,COLA,0,4,10+16+256+POLYMOSTTRANS2);
rotatesprite(sbarx(2),sbary(200-21),sbarsc(49152L),0,COLA,0,0,10+16+256,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(2),sbary(200-21),sbarsc(49152L),0,COLA,0,0,10+16+256);
if (sprite[p->i].pal == 1 && p->last_extra < 2) if (sprite[p->i].pal == 1 && p->last_extra < 2)
G_DrawAltDigiNum(40,-(200-22),1,-16,10+16+256); G_DrawAltDigiNum(40,-(200-22),1,-16,10+16+256);
@ -1165,8 +1165,8 @@ static void G_DrawStatusBar(int32_t snum)
} }
if (getrendermode() >= 3 && althud_shadows) if (getrendermode() >= 3 && althud_shadows)
rotatesprite(sbarx(62+1),sbary(200-25+1),sbarsc(49152L),0,SHIELD,0,4,10+16+POLYMOSTTRANS2+256,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(62+1),sbary(200-25+1),sbarsc(49152L),0,SHIELD,0,4,10+16+POLYMOSTTRANS2+256);
rotatesprite(sbarx(62),sbary(200-25),sbarsc(49152L),0,SHIELD,0,0,10+16+256,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(62),sbary(200-25),sbarsc(49152L),0,SHIELD,0,0,10+16+256);
{ {
int32_t lAmount=Gv_GetVarByLabel("PLR_MORALE",-1, p->i, snum); int32_t lAmount=Gv_GetVarByLabel("PLR_MORALE",-1, p->i, snum);
@ -1176,20 +1176,20 @@ static void G_DrawStatusBar(int32_t snum)
if (getrendermode() >= 3 && althud_shadows) if (getrendermode() >= 3 && althud_shadows)
{ {
if (p->got_access&1) rotatesprite(sbarxr(39-1),sbary(200-43+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+POLYMOSTTRANS2+512,0,0,xdim-1,ydim-1); if (p->got_access&1) rotatesprite_fs(sbarxr(39-1),sbary(200-43+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+POLYMOSTTRANS2+512);
if (p->got_access&4) rotatesprite(sbarxr(34-1),sbary(200-41+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+POLYMOSTTRANS2+512,0,0,xdim-1,ydim-1); if (p->got_access&4) rotatesprite_fs(sbarxr(34-1),sbary(200-41+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+POLYMOSTTRANS2+512);
if (p->got_access&2) rotatesprite(sbarxr(29-1),sbary(200-39+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+POLYMOSTTRANS2+512,0,0,xdim-1,ydim-1); if (p->got_access&2) rotatesprite_fs(sbarxr(29-1),sbary(200-39+1),sbarsc(32768),0,ACCESSCARD,0,4,10+16+POLYMOSTTRANS2+512);
} }
if (p->got_access&1) rotatesprite(sbarxr(39),sbary(200-43),sbarsc(32768),0,ACCESSCARD,0,0,10+16+512,0,0,xdim-1,ydim-1); if (p->got_access&1) rotatesprite_fs(sbarxr(39),sbary(200-43),sbarsc(32768),0,ACCESSCARD,0,0,10+16+512);
if (p->got_access&4) rotatesprite(sbarxr(34),sbary(200-41),sbarsc(32768),0,ACCESSCARD,0,23,10+16+512,0,0,xdim-1,ydim-1); if (p->got_access&4) rotatesprite_fs(sbarxr(34),sbary(200-41),sbarsc(32768),0,ACCESSCARD,0,23,10+16+512);
if (p->got_access&2) rotatesprite(sbarxr(29),sbary(200-39),sbarsc(32768),0,ACCESSCARD,0,21,10+16+512,0,0,xdim-1,ydim-1); if (p->got_access&2) rotatesprite_fs(sbarxr(29),sbary(200-39),sbarsc(32768),0,ACCESSCARD,0,21,10+16+512);
i = (p->curr_weapon == PISTOL_WEAPON) ? 16384 : 32768; i = (p->curr_weapon == PISTOL_WEAPON) ? 16384 : 32768;
if (getrendermode() >= 3 && althud_shadows) if (getrendermode() >= 3 && althud_shadows)
rotatesprite(sbarxr(57-1),sbary(200-15+1),sbarsc(i),0,ammo_sprites[p->curr_weapon],0,4,10+POLYMOSTTRANS2+512,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarxr(57-1),sbary(200-15+1),sbarsc(i),0,ammo_sprites[p->curr_weapon],0,4,10+POLYMOSTTRANS2+512);
rotatesprite(sbarxr(57),sbary(200-15),sbarsc(i),0,ammo_sprites[p->curr_weapon],0,0,10+512,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarxr(57),sbary(200-15),sbarsc(i),0,ammo_sprites[p->curr_weapon],0,0,10+512);
if (p->curr_weapon == HANDREMOTE_WEAPON) i = HANDBOMB_WEAPON; if (p->curr_weapon == HANDREMOTE_WEAPON) i = HANDBOMB_WEAPON;
else i = p->curr_weapon; else i = p->curr_weapon;
@ -1232,8 +1232,8 @@ static void G_DrawStatusBar(int32_t snum)
if (i >= 0) if (i >= 0)
{ {
if (getrendermode() >= 3 && althud_shadows) if (getrendermode() >= 3 && althud_shadows)
rotatesprite(sbarx(231-o+1),sbary(200-21-2+1),sbarsc(65536L),0,i,0,4,10+16+permbit+POLYMOSTTRANS2+256,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(231-o+1),sbary(200-21-2+1),sbarsc(65536L),0,i,0,4,10+16+permbit+POLYMOSTTRANS2+256);
rotatesprite(sbarx(231-o),sbary(200-21-2),sbarsc(65536L),0,i,0,0,10+16+permbit+256,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(231-o),sbary(200-21-2),sbarsc(65536L),0,i,0,0,10+16+permbit+256);
} }
if (getrendermode() >= 3 && althud_shadows) if (getrendermode() >= 3 && althud_shadows)
@ -1292,15 +1292,15 @@ static void G_DrawStatusBar(int32_t snum)
return; return;
} }
rotatesprite(sbarx(5),sbary(200-28),sbarsc(65536L),0,HEALTHBOX,0,21,10+16+256,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(5),sbary(200-28),sbarsc(65536L),0,HEALTHBOX,0,21,10+16+256);
if (p->inven_icon) if (p->inven_icon)
rotatesprite(sbarx(69),sbary(200-30),sbarsc(65536L),0,INVENTORYBOX,0,21,10+16+256,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(69),sbary(200-30),sbarsc(65536L),0,INVENTORYBOX,0,21,10+16+256);
if (sprite[p->i].pal == 1 && p->last_extra < 2) // frozen if (sprite[p->i].pal == 1 && p->last_extra < 2) // frozen
G_DrawDigiNum(20,200-17,1,-16,10+16+256); G_DrawDigiNum(20,200-17,1,-16,10+16+256);
else G_DrawDigiNum(20,200-17,p->last_extra,-16,10+16+256); else G_DrawDigiNum(20,200-17,p->last_extra,-16,10+16+256);
rotatesprite(sbarx(37),sbary(200-28),sbarsc(65536L),0,AMMOBOX,0,21,10+16+256,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(37),sbary(200-28),sbarsc(65536L),0,AMMOBOX,0,21,10+16+256);
if (p->curr_weapon == HANDREMOTE_WEAPON) i = HANDBOMB_WEAPON; if (p->curr_weapon == HANDREMOTE_WEAPON) i = HANDBOMB_WEAPON;
else i = p->curr_weapon; else i = p->curr_weapon;
@ -1336,7 +1336,7 @@ static void G_DrawStatusBar(int32_t snum)
default: default:
i = -1; i = -1;
} }
if (i >= 0) rotatesprite(sbarx(231-o),sbary(200-21),sbarsc(65536L),0,i,0,0,10+16+permbit+256,0,0,xdim-1,ydim-1); if (i >= 0) rotatesprite_fs(sbarx(231-o),sbary(200-21),sbarsc(65536L),0,i,0,0,10+16+permbit+256);
minitext(292-30-o,190,"%",6,10+16+permbit+256 + ROTATESPRITE_MAX); minitext(292-30-o,190,"%",6,10+16+permbit+256 + ROTATESPRITE_MAX);
@ -1530,7 +1530,7 @@ static void G_DrawStatusBar(int32_t snum)
{ {
G_PatchStatusBar(0,0,320,200); G_PatchStatusBar(0,0,320,200);
if ((g_netServer || (g_netServer || ud.multimode > 1)) && (GametypeFlags[ud.coop] & GAMETYPE_FRAGBAR)) if ((g_netServer || (g_netServer || ud.multimode > 1)) && (GametypeFlags[ud.coop] & GAMETYPE_FRAGBAR))
rotatesprite(sbarx(277+1),sbary(SBY+7-1),sbarsc(65536L),0,KILLSICON,0,0,10+16,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(277+1),sbary(SBY+7-1),sbarsc(65536L),0,KILLSICON,0,0,10+16);
} }
if ((g_netServer || (g_netServer || ud.multimode > 1)) && (GametypeFlags[ud.coop] & GAMETYPE_FRAGBAR)) if ((g_netServer || (g_netServer || ud.multimode > 1)) && (GametypeFlags[ud.coop] & GAMETYPE_FRAGBAR))
{ {
@ -1545,9 +1545,9 @@ static void G_DrawStatusBar(int32_t snum)
if (u&16384) if (u&16384)
{ {
if (u != -1) G_PatchStatusBar(275,SBY+18,299,SBY+18+12); if (u != -1) G_PatchStatusBar(275,SBY+18,299,SBY+18+12);
if (p->got_access&4) rotatesprite(sbarx(275),sbary(SBY+16),sbarsc(65536L),0,ACCESS_ICON,0,23,10+16,0,0,xdim-1,ydim-1); if (p->got_access&4) rotatesprite_fs(sbarx(275),sbary(SBY+16),sbarsc(65536L),0,ACCESS_ICON,0,23,10+16);
if (p->got_access&2) rotatesprite(sbarx(288),sbary(SBY+16),sbarsc(65536L),0,ACCESS_ICON,0,21,10+16,0,0,xdim-1,ydim-1); if (p->got_access&2) rotatesprite_fs(sbarx(288),sbary(SBY+16),sbarsc(65536L),0,ACCESS_ICON,0,21,10+16);
if (p->got_access&1) rotatesprite(sbarx(281),sbary(SBY+23),sbarsc(65536L),0,ACCESS_ICON,0,0,10+16,0,0,xdim-1,ydim-1); if (p->got_access&1) rotatesprite_fs(sbarx(281),sbary(SBY+23),sbarsc(65536L),0,ACCESS_ICON,0,0,10+16);
} }
} }
if (u&(4+8+16+32+64+128+256+512+65536L)) G_DrawWeapAmounts(p,96,SBY+16,u); if (u&(4+8+16+32+64+128+256+512+65536L)) G_DrawWeapAmounts(p,96,SBY+16,u);
@ -1625,7 +1625,7 @@ static void G_DrawStatusBar(int32_t snum)
i = BOOT_ICON; i = BOOT_ICON;
break; break;
} }
rotatesprite(sbarx(231-o),sbary(SBY+13),sbarsc(65536L),0,i,0,0,10+16+permbit,0,0,xdim-1,ydim-1); rotatesprite_fs(sbarx(231-o),sbary(SBY+13),sbarsc(65536L),0,i,0,0,10+16+permbit);
minitext(292-30-o,SBY+24,"%",6,10+16+permbit + ROTATESPRITE_MAX); minitext(292-30-o,SBY+24,"%",6,10+16+permbit + ROTATESPRITE_MAX);
if (p->inven_icon >= 6) minitext(284-35-o,SBY+14,"AUTO",2,10+16+permbit + ROTATESPRITE_MAX); if (p->inven_icon >= 6) minitext(284-35-o,SBY+14,"AUTO",2,10+16+permbit + ROTATESPRITE_MAX);
} }
@ -1958,7 +1958,7 @@ static void fadepaltile(int32_t r, int32_t g, int32_t b, int32_t start, int32_t
KB_ClearKeyDown(sc_Space); KB_ClearKeyDown(sc_Space);
return; return;
} }
rotatesprite(0,0,65536L,0,tile,0,0,2+8+16+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,tile,0,0,2+8+16+(ud.bgstretch?1024:0));
G_FadePalette(r,g,b,start); G_FadePalette(r,g,b,start);
} }
} }
@ -1969,7 +1969,7 @@ static void fadepaltile(int32_t r, int32_t g, int32_t b, int32_t start, int32_t
KB_ClearKeyDown(sc_Space); KB_ClearKeyDown(sc_Space);
return; return;
} }
rotatesprite(0,0,65536L,0,tile,0,0,2+8+16+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,tile,0,0,2+8+16+(ud.bgstretch?1024:0));
G_FadePalette(r,g,b,start); G_FadePalette(r,g,b,start);
} }
} }
@ -1989,7 +1989,7 @@ static void G_DisplayExtraScreens(void)
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0 /*1*/); // JBF 20040308 P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0 /*1*/); // JBF 20040308
fadepal(0,0,0, 0,64,7); fadepal(0,0,0, 0,64,7);
KB_FlushKeyboardQueue(); KB_FlushKeyboardQueue();
rotatesprite(0,0,65536L,0,3291,0,0,2+8+16+64+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,3291,0,0,2+8+16+64+(ud.bgstretch?1024:0));
fadepaltile(0,0,0, 63,0,-7, 3291); fadepaltile(0,0,0, 63,0,-7, 3291);
while (!KB_KeyWaiting()) while (!KB_KeyWaiting())
{ {
@ -1999,7 +1999,7 @@ static void G_DisplayExtraScreens(void)
fadepaltile(0,0,0, 0,64,7, 3291); fadepaltile(0,0,0, 0,64,7, 3291);
KB_FlushKeyboardQueue(); KB_FlushKeyboardQueue();
rotatesprite(0,0,65536L,0,3290,0,0,2+8+16+64+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,3290,0,0,2+8+16+64+(ud.bgstretch?1024:0));
fadepaltile(0,0,0, 63,0,-7,3290); fadepaltile(0,0,0, 63,0,-7,3290);
while (!KB_KeyWaiting()) while (!KB_KeyWaiting())
{ {
@ -2016,7 +2016,7 @@ static void G_DisplayExtraScreens(void)
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0 /*1*/); // JBF 20040308 P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0 /*1*/); // JBF 20040308
fadepal(0,0,0, 0,64,7); fadepal(0,0,0, 0,64,7);
KB_FlushKeyboardQueue(); KB_FlushKeyboardQueue();
rotatesprite(0,0,65536L,0,TENSCREEN,0,0,2+8+16+64+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,TENSCREEN,0,0,2+8+16+64+(ud.bgstretch?1024:0));
fadepaltile(0,0,0, 63,0,-7,TENSCREEN); fadepaltile(0,0,0, 63,0,-7,TENSCREEN);
while (!KB_KeyWaiting() && totalclock < 2400) while (!KB_KeyWaiting() && totalclock < 2400)
{ {
@ -2145,8 +2145,8 @@ int32_t _EnterText(int32_t small,int32_t x,int32_t y,char *t,int32_t dalen,int32
} }
if (small&1) if (small&1)
rotatesprite(textsc(x)<<16,(y<<16),32768,0,SPINNINGNUKEICON+((totalclock>>3)%7),c,0,(small&1)?(8|16):2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(textsc(x)<<16,(y<<16),32768,0,SPINNINGNUKEICON+((totalclock>>3)%7),c,0,(small&1)?(8|16):2+8);
else rotatesprite((x+((small&1)?4:8))<<16,((y+((small&1)?0:4))<<16),32768,0,SPINNINGNUKEICON+((totalclock>>3)%7),c,0,(small&1)?(8|16):2+8,0,0,xdim-1,ydim-1); else rotatesprite_fs((x+((small&1)?4:8))<<16,((y+((small&1)?0:4))<<16),32768,0,SPINNINGNUKEICON+((totalclock>>3)%7),c,0,(small&1)?(8|16):2+8);
return (0); return (0);
} }
@ -2690,10 +2690,10 @@ void G_DisplayRest(int32_t smoothratio)
switch (ud.show_help) switch (ud.show_help)
{ {
case 1: case 1:
rotatesprite(0,0,65536L,0,TEXTSTORY,0,0,10+16+64, 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,TEXTSTORY,0,0,10+16+64);
break; break;
case 2: case 2:
rotatesprite(0,0,65536L,0,F1HELP,0,0,10+16+64, 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,F1HELP,0,0,10+16+64);
break; break;
} }
@ -2976,7 +2976,7 @@ void G_DisplayRest(int32_t smoothratio)
if (VOLUMEONE) if (VOLUMEONE)
{ {
if (ud.show_help == 0 && g_showShareware > 0 && (g_player[myconnectindex].ps->gm&MODE_MENU) == 0) if (ud.show_help == 0 && g_showShareware > 0 && (g_player[myconnectindex].ps->gm&MODE_MENU) == 0)
rotatesprite((320-50)<<16,9<<16,65536L,0,BETAVERSION,0,0,2+8+16+128,0,0,xdim-1,ydim-1); rotatesprite_fs((320-50)<<16,9<<16,65536L,0,BETAVERSION,0,0,2+8+16+128);
} }
if (g_player[myconnectindex].ps->gm&MODE_TYPE) if (g_player[myconnectindex].ps->gm&MODE_TYPE)
@ -3084,9 +3084,9 @@ void G_DrawBackground(void)
{ {
for (y=y1; y<y2; y+=tilesizy[aGameVars[g_iReturnVarID].val.lValue]) for (y=y1; y<y2; y+=tilesizy[aGameVars[g_iReturnVarID].val.lValue])
for (x=0; x<xdim; x+=tilesizx[aGameVars[g_iReturnVarID].val.lValue]) for (x=0; x<xdim; x+=tilesizx[aGameVars[g_iReturnVarID].val.lValue])
rotatesprite(x<<16,y<<16,65536L,0,aGameVars[g_iReturnVarID].val.lValue,bpp==8?16:8,0,8+16+64,0,0,xdim-1,ydim-1); rotatesprite_fs(x<<16,y<<16,65536L,0,aGameVars[g_iReturnVarID].val.lValue,bpp==8?16:8,0,8+16+64);
} }
else rotatesprite(320<<15,200<<15,65536L,0,aGameVars[g_iReturnVarID].val.lValue,bpp==8?16:8,0,2+8+64+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); else rotatesprite_fs(320<<15,200<<15,65536L,0,aGameVars[g_iReturnVarID].val.lValue,bpp==8?16:8,0,2+8+64+(ud.bgstretch?1024:0));
return; return;
} }
@ -9210,13 +9210,13 @@ static void G_DisplayLogo(void)
P_SetGamePalette(g_player[myconnectindex].ps, DREALMSPAL, 8+2/*+1*/); // JBF 20040308 P_SetGamePalette(g_player[myconnectindex].ps, DREALMSPAL, 8+2/*+1*/); // JBF 20040308
fadepal(0,0,0, 0,64,7); fadepal(0,0,0, 0,64,7);
flushperms(); flushperms();
rotatesprite(0,0,65536L,0,DREALMS,0,0,2+8+16+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,DREALMS,0,0,2+8+16+(ud.bgstretch?1024:0));
nextpage(); nextpage();
fadepaltile(0,0,0, 63,0,-7,DREALMS); fadepaltile(0,0,0, 63,0,-7,DREALMS);
totalclock = 0; totalclock = 0;
while (totalclock < (120*7) && !KB_KeyWaiting() && !MOUSE_GetButtons()&LEFT_MOUSE && !BUTTON(gamefunc_Fire) && !BUTTON(gamefunc_Open)) while (totalclock < (120*7) && !KB_KeyWaiting() && !MOUSE_GetButtons()&LEFT_MOUSE && !BUTTON(gamefunc_Fire) && !BUTTON(gamefunc_Open))
{ {
rotatesprite(0,0,65536L,0,DREALMS,0,0,2+8+16+64+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,DREALMS,0,0,2+8+16+64+(ud.bgstretch?1024:0));
handleevents(); handleevents();
Net_GetPackets(); Net_GetPackets();
if (g_restorePalette) if (g_restorePalette)
@ -9240,14 +9240,14 @@ static void G_DisplayLogo(void)
//g_player[myconnectindex].ps->palette = titlepal; //g_player[myconnectindex].ps->palette = titlepal;
P_SetGamePalette(g_player[myconnectindex].ps, TITLEPAL, 8+2/*+1*/); // JBF 20040308 P_SetGamePalette(g_player[myconnectindex].ps, TITLEPAL, 8+2/*+1*/); // JBF 20040308
flushperms(); flushperms();
rotatesprite(0,0,65536L,0,BETASCREEN,0,0,2+8+16,0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,BETASCREEN,0,0,2+8+16);
KB_FlushKeyboardQueue(); KB_FlushKeyboardQueue();
fadepaltile(0,0,0, 63,0,-7,BETASCREEN); fadepaltile(0,0,0, 63,0,-7,BETASCREEN);
totalclock = 0; totalclock = 0;
while (totalclock < (860+120) && !KB_KeyWaiting() && !MOUSE_GetButtons()&LEFT_MOUSE && !BUTTON(gamefunc_Fire) && !BUTTON(gamefunc_Open)) while (totalclock < (860+120) && !KB_KeyWaiting() && !MOUSE_GetButtons()&LEFT_MOUSE && !BUTTON(gamefunc_Fire) && !BUTTON(gamefunc_Open))
{ {
rotatesprite(0,0,65536L,0,BETASCREEN,0,0,2+8+16+64+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,BETASCREEN,0,0,2+8+16+64+(ud.bgstretch?1024:0));
if (logoflags & LOGO_DUKENUKEM) if (logoflags & LOGO_DUKENUKEM)
{ {
if (totalclock > 120 && totalclock < (120+60)) if (totalclock > 120 && totalclock < (120+60))
@ -9257,10 +9257,10 @@ static void G_DisplayLogo(void)
soundanm++; soundanm++;
S_PlaySound(PIPEBOMB_EXPLODE); S_PlaySound(PIPEBOMB_EXPLODE);
} }
rotatesprite(160<<16,104<<16,(totalclock-120)<<10,0,DUKENUKEM,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,104<<16,(totalclock-120)<<10,0,DUKENUKEM,0,0,2+8);
} }
else if (totalclock >= (120+60)) else if (totalclock >= (120+60))
rotatesprite(160<<16,(104)<<16,60<<10,0,DUKENUKEM,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(104)<<16,60<<10,0,DUKENUKEM,0,0,2+8);
} }
else soundanm++; else soundanm++;
@ -9274,11 +9274,11 @@ static void G_DisplayLogo(void)
S_PlaySound(PIPEBOMB_EXPLODE); S_PlaySound(PIPEBOMB_EXPLODE);
} }
rotatesprite(160<<16,(104)<<16,60<<10,0,DUKENUKEM,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(104)<<16,60<<10,0,DUKENUKEM,0,0,2+8);
rotatesprite(160<<16,(129)<<16,(totalclock - 220)<<11,0,THREEDEE,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(129)<<16,(totalclock - 220)<<11,0,THREEDEE,0,0,2+8);
} }
else if (totalclock >= (220+30)) else if (totalclock >= (220+30))
rotatesprite(160<<16,(129)<<16,30<<11,0,THREEDEE,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(129)<<16,30<<11,0,THREEDEE,0,0,2+8);
} }
else soundanm++; else soundanm++;
@ -9287,7 +9287,7 @@ static void G_DisplayLogo(void)
// JBF 20030804 // JBF 20030804
if (totalclock >= 280 && totalclock < 395) if (totalclock >= 280 && totalclock < 395)
{ {
rotatesprite(160<<16,(151)<<16,(410-totalclock)<<12,0,PLUTOPAKSPRITE+1,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(151)<<16,(410-totalclock)<<12,0,PLUTOPAKSPRITE+1,0,0,2+8);
if (soundanm == 2) if (soundanm == 2)
{ {
soundanm++; soundanm++;
@ -9301,7 +9301,7 @@ static void G_DisplayLogo(void)
soundanm++; soundanm++;
S_PlaySound(PIPEBOMB_EXPLODE); S_PlaySound(PIPEBOMB_EXPLODE);
} }
rotatesprite(160<<16,(151)<<16,30<<11,0,PLUTOPAKSPRITE+1,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(151)<<16,30<<11,0,PLUTOPAKSPRITE+1,0,0,2+8);
} }
} }
@ -10472,7 +10472,7 @@ CLEAN_DIRECTORY:
//g_player[myconnectindex].ps->palette = palette; //g_player[myconnectindex].ps->palette = palette;
//G_FadePalette(0,0,0,0); //G_FadePalette(0,0,0,0);
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0); // JBF 20040308 P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0); // JBF 20040308
rotatesprite(320<<15,200<<15,65536L,0,LOADSCREEN,0,0,2+8+64+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,200<<15,65536L,0,LOADSCREEN,0,0,2+8+64+(ud.bgstretch?1024:0));
menutext(160,105,0,0,"LOADING SAVED GAME..."); menutext(160,105,0,0,"LOADING SAVED GAME...");
nextpage(); nextpage();
@ -10907,7 +10907,7 @@ static void G_DoOrderScreen(void)
//g_player[myconnectindex].ps->palette = palette; //g_player[myconnectindex].ps->palette = palette;
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0 /*1*/); // JBF 20040308 P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0 /*1*/); // JBF 20040308
KB_FlushKeyboardQueue(); KB_FlushKeyboardQueue();
rotatesprite(0,0,65536L,0,ORDERING,0,0,2+8+16+64+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,ORDERING,0,0,2+8+16+64+(ud.bgstretch?1024:0));
fadepal(0,0,0, 63,0,-7); fadepal(0,0,0, 63,0,-7);
while (!KB_KeyWaiting()) while (!KB_KeyWaiting())
{ {
@ -10917,7 +10917,7 @@ static void G_DoOrderScreen(void)
fadepal(0,0,0, 0,63,7); fadepal(0,0,0, 0,63,7);
KB_FlushKeyboardQueue(); KB_FlushKeyboardQueue();
rotatesprite(0,0,65536L,0,ORDERING+1,0,0,2+8+16+64+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,ORDERING+1,0,0,2+8+16+64+(ud.bgstretch?1024:0));
fadepal(0,0,0, 63,0,-7); fadepal(0,0,0, 63,0,-7);
while (!KB_KeyWaiting()) while (!KB_KeyWaiting())
{ {
@ -10927,7 +10927,7 @@ static void G_DoOrderScreen(void)
fadepal(0,0,0, 0,63,7); fadepal(0,0,0, 0,63,7);
KB_FlushKeyboardQueue(); KB_FlushKeyboardQueue();
rotatesprite(0,0,65536L,0,ORDERING+2,0,0,2+8+16+64+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,ORDERING+2,0,0,2+8+16+64+(ud.bgstretch?1024:0));
fadepal(0,0,0, 63,0,-7); fadepal(0,0,0, 63,0,-7);
while (!KB_KeyWaiting()) while (!KB_KeyWaiting())
{ {
@ -10937,7 +10937,7 @@ static void G_DoOrderScreen(void)
fadepal(0,0,0, 0,63,7); fadepal(0,0,0, 0,63,7);
KB_FlushKeyboardQueue(); KB_FlushKeyboardQueue();
rotatesprite(0,0,65536L,0,ORDERING+3,0,0,2+8+16+64+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,ORDERING+3,0,0,2+8+16+64+(ud.bgstretch?1024:0));
fadepal(0,0,0, 63,0,-7); fadepal(0,0,0, 63,0,-7);
while (!KB_KeyWaiting()) while (!KB_KeyWaiting())
{ {
@ -11016,7 +11016,7 @@ void G_BonusScreen(int32_t bonusonly)
{ {
P_SetGamePalette(g_player[myconnectindex].ps, ENDINGPAL, 8+2/*+1*/); // JBF 20040308 P_SetGamePalette(g_player[myconnectindex].ps, ENDINGPAL, 8+2/*+1*/); // JBF 20040308
clearview(0L); clearview(0L);
rotatesprite(0,50<<16,65536L,0,VICTORY1,0,0,2+8+16+64+128+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); rotatesprite_fs(0,50<<16,65536L,0,VICTORY1,0,0,2+8+16+64+128+(ud.bgstretch?1024:0));
nextpage(); nextpage();
//g_player[myconnectindex].ps->palette = endingpal; //g_player[myconnectindex].ps->palette = endingpal;
fadepal(0,0,0, 63,0,-1); fadepal(0,0,0, 63,0,-1);
@ -11027,7 +11027,7 @@ void G_BonusScreen(int32_t bonusonly)
while (1) while (1)
{ {
clearview(0L); clearview(0L);
rotatesprite(0,50<<16,65536L,0,VICTORY1,0,0,2+8+16+64+128+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); rotatesprite_fs(0,50<<16,65536L,0,VICTORY1,0,0,2+8+16+64+128+(ud.bgstretch?1024:0));
// boss // boss
if (totalclock > 390 && totalclock < 780) if (totalclock > 390 && totalclock < 780)
@ -11039,7 +11039,7 @@ void G_BonusScreen(int32_t bonusonly)
S_PlaySound(SQUISHED); S_PlaySound(SQUISHED);
bonuscnt++; bonuscnt++;
} }
rotatesprite(bossmove[t+3]<<16,bossmove[t+4]<<16,65536L,0,bossmove[t+2],0,0,2+8+16+64+128+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); rotatesprite_fs(bossmove[t+3]<<16,bossmove[t+4]<<16,65536L,0,bossmove[t+2],0,0,2+8+16+64+128+(ud.bgstretch?1024:0));
} }
// Breathe // Breathe
@ -11047,7 +11047,7 @@ void G_BonusScreen(int32_t bonusonly)
{ {
if (totalclock >= 750) if (totalclock >= 750)
{ {
rotatesprite(86<<16,59<<16,65536L,0,VICTORY1+8,0,0,2+8+16+64+128+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); rotatesprite_fs(86<<16,59<<16,65536L,0,VICTORY1+8,0,0,2+8+16+64+128+(ud.bgstretch?1024:0));
if (totalclock >= 750 && bonuscnt == 2) if (totalclock >= 750 && bonuscnt == 2)
{ {
S_PlaySound(DUKETALKTOBOSS); S_PlaySound(DUKETALKTOBOSS);
@ -11063,7 +11063,7 @@ void G_BonusScreen(int32_t bonusonly)
S_PlaySound(BOSSTALKTODUKE); S_PlaySound(BOSSTALKTODUKE);
bonuscnt++; bonuscnt++;
} }
rotatesprite(breathe[t+3]<<16,breathe[t+4]<<16,65536L,0,breathe[t+2],0,0,2+8+16+64+128+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); rotatesprite_fs(breathe[t+3]<<16,breathe[t+4]<<16,65536L,0,breathe[t+2],0,0,2+8+16+64+128+(ud.bgstretch?1024:0));
} }
} }
handleevents(); handleevents();
@ -11079,7 +11079,7 @@ void G_BonusScreen(int32_t bonusonly)
//g_player[myconnectindex].ps->palette = palette; //g_player[myconnectindex].ps->palette = palette;
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 8+2/*+1*/); // JBF 20040308 P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 8+2/*+1*/); // JBF 20040308
rotatesprite(0,0,65536L,0,3292,0,0,2+8+16+64+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,3292,0,0,2+8+16+64+(ud.bgstretch?1024:0));
fadepal(0,0,0, 63,0,-1); fadepal(0,0,0, 63,0,-1);
while (!KB_KeyWaiting() && !MOUSE_GetButtons()&LEFT_MOUSE && !BUTTON(gamefunc_Fire) && !BUTTON(gamefunc_Open)) while (!KB_KeyWaiting() && !MOUSE_GetButtons()&LEFT_MOUSE && !BUTTON(gamefunc_Fire) && !BUTTON(gamefunc_Open))
{ {
@ -11111,7 +11111,7 @@ void G_BonusScreen(int32_t bonusonly)
KB_FlushKeyboardQueue(); KB_FlushKeyboardQueue();
//g_player[myconnectindex].ps->palette = palette; //g_player[myconnectindex].ps->palette = palette;
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 8+2/*+1*/); // JBF 20040308 P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 8+2/*+1*/); // JBF 20040308
rotatesprite(0,0,65536L,0,3293,0,0,2+8+16+64+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,3293,0,0,2+8+16+64+(ud.bgstretch?1024:0));
fadepal(0,0,0, 63,0,-1); fadepal(0,0,0, 63,0,-1);
while (!KB_KeyWaiting() && !MOUSE_GetButtons()&LEFT_MOUSE && !BUTTON(gamefunc_Fire) && !BUTTON(gamefunc_Open)) while (!KB_KeyWaiting() && !MOUSE_GetButtons()&LEFT_MOUSE && !BUTTON(gamefunc_Fire) && !BUTTON(gamefunc_Open))
{ {
@ -11296,10 +11296,10 @@ FRAGBONUS:
if (!(ud.config.MusicToggle == 0 || ud.config.MusicDevice < 0)) if (!(ud.config.MusicToggle == 0 || ud.config.MusicDevice < 0))
S_PlaySound(BONUSMUSIC); S_PlaySound(BONUSMUSIC);
rotatesprite(0,0,65536L,0,MENUSCREEN,16,0,2+8+16+64+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,MENUSCREEN,16,0,2+8+16+64+(ud.bgstretch?1024:0));
rotatesprite(160<<16,34<<16,65536L,0,INGAMEDUKETHREEDEE,0,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,34<<16,65536L,0,INGAMEDUKETHREEDEE,0,0,10);
if (PLUTOPAK) // JBF 20030804 if (PLUTOPAK) // JBF 20030804
rotatesprite((260)<<16,36<<16,65536L,0,PLUTOPAKSPRITE+2,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs((260)<<16,36<<16,65536L,0,PLUTOPAKSPRITE+2,0,0,2+8);
gametext(160,58+2,"MULTIPLAYER TOTALS",0,2+8+16); gametext(160,58+2,"MULTIPLAYER TOTALS",0,2+8+16);
gametext(160,58+10,MapInfo[(ud.volume_number*MAXLEVELS)+ud.last_level-1].name,0,2+8+16); gametext(160,58+10,MapInfo[(ud.volume_number*MAXLEVELS)+ud.last_level-1].name,0,2+8+16);
@ -11391,7 +11391,7 @@ FRAGBONUS:
break; break;
} }
rotatesprite(0,0,65536L,0,BONUSSCREEN+gfx_offset,0,0,2+8+16+64+128+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,BONUSSCREEN+gfx_offset,0,0,2+8+16+64+128+(ud.bgstretch?1024:0));
if (lastmapname) if (lastmapname)
menutext(160,20-6,0,0,lastmapname); menutext(160,20-6,0,0,lastmapname);
@ -11443,7 +11443,7 @@ FRAGBONUS:
if (g_player[myconnectindex].ps->gm&MODE_EOL) if (g_player[myconnectindex].ps->gm&MODE_EOL)
{ {
rotatesprite(0,0,65536L,0,BONUSSCREEN+gfx_offset,0,0,2+8+16+64+128+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,BONUSSCREEN+gfx_offset,0,0,2+8+16+64+128+(ud.bgstretch?1024:0));
if (totalclock > (1000000000L) && totalclock < (1000000320L)) if (totalclock > (1000000000L) && totalclock < (1000000320L))
{ {
@ -11473,11 +11473,11 @@ FRAGBONUS:
case 1: case 1:
case 4: case 4:
case 5: case 5:
rotatesprite(199<<16,31<<16,65536L,0,BONUSSCREEN+3+gfx_offset,0,0,2+8+16+64+128+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); rotatesprite_fs(199<<16,31<<16,65536L,0,BONUSSCREEN+3+gfx_offset,0,0,2+8+16+64+128+(ud.bgstretch?1024:0));
break; break;
case 2: case 2:
case 3: case 3:
rotatesprite(199<<16,31<<16,65536L,0,BONUSSCREEN+4+gfx_offset,0,0,2+8+16+64+128+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); rotatesprite_fs(199<<16,31<<16,65536L,0,BONUSSCREEN+4+gfx_offset,0,0,2+8+16+64+128+(ud.bgstretch?1024:0));
break; break;
} }
} }
@ -11488,10 +11488,10 @@ FRAGBONUS:
{ {
case 1: case 1:
case 3: case 3:
rotatesprite(199<<16,31<<16,65536L,0,BONUSSCREEN+1+gfx_offset,0,0,2+8+16+64+128+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); rotatesprite_fs(199<<16,31<<16,65536L,0,BONUSSCREEN+1+gfx_offset,0,0,2+8+16+64+128+(ud.bgstretch?1024:0));
break; break;
case 2: case 2:
rotatesprite(199<<16,31<<16,65536L,0,BONUSSCREEN+2+gfx_offset,0,0,2+8+16+64+128+(ud.bgstretch?1024:0),0,0,xdim-1,ydim-1); rotatesprite_fs(199<<16,31<<16,65536L,0,BONUSSCREEN+2+gfx_offset,0,0,2+8+16+64+128+(ud.bgstretch?1024:0));
break; break;
} }
} }

144
polymer/eduke32/source/menus.c
View file

@ -157,14 +157,14 @@ static int32_t probe_(int32_t type,int32_t x,int32_t y,int32_t i,int32_t n)
{ {
if (centre) if (centre)
{ {
// rotatesprite(((320>>1)+(centre)+54)<<16,(y+(probey*i)-4)<<16,65536L,0,SPINNINGNUKEICON+6-((6+(totalclock>>3))%7),sh,0,10,0,0,xdim-1,ydim-1); // rotatesprite_fs(((320>>1)+(centre)+54)<<16,(y+(probey*i)-4)<<16,65536L,0,SPINNINGNUKEICON+6-((6+(totalclock>>3))%7),sh,0,10);
// rotatesprite(((320>>1)-(centre)-54)<<16,(y+(probey*i)-4)<<16,65536L,0,SPINNINGNUKEICON+((totalclock>>3)%7),sh,0,10,0,0,xdim-1,ydim-1); // rotatesprite_fs(((320>>1)-(centre)-54)<<16,(y+(probey*i)-4)<<16,65536L,0,SPINNINGNUKEICON+((totalclock>>3)%7),sh,0,10);
rotatesprite(((320>>1)+(centre>>1)+70)<<16,(y+(probey*i)-4)<<16,65536L>>type,0,SPINNINGNUKEICON+6-((6+(totalclock>>3))%7),sh,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(((320>>1)+(centre>>1)+70)<<16,(y+(probey*i)-4)<<16,65536L>>type,0,SPINNINGNUKEICON+6-((6+(totalclock>>3))%7),sh,0,10);
rotatesprite(((320>>1)-(centre>>1)-70)<<16,(y+(probey*i)-4)<<16,65536L>>type,0,SPINNINGNUKEICON+((totalclock>>3)%7),sh,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(((320>>1)-(centre>>1)-70)<<16,(y+(probey*i)-4)<<16,65536L>>type,0,SPINNINGNUKEICON+((totalclock>>3)%7),sh,0,10);
} }
else else
rotatesprite((x<<16)-((tilesizx[BIGFNTCURSOR]-4)<<(16-type)),(y+(probey*i)-(4>>type))<<16,65536L>>type,0,SPINNINGNUKEICON+(((totalclock>>3))%7),sh,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs((x<<16)-((tilesizx[BIGFNTCURSOR]-4)<<(16-type)),(y+(probey*i)-(4>>type))<<16,65536L>>type,0,SPINNINGNUKEICON+(((totalclock>>3))%7),sh,0,10);
} }
if (KB_KeyPressed(sc_Space) || KB_KeyPressed(sc_kpad_Enter) || KB_KeyPressed(sc_Enter) || (LMB && !onbar)) if (KB_KeyPressed(sc_Space) || KB_KeyPressed(sc_kpad_Enter) || KB_KeyPressed(sc_Enter) || (LMB && !onbar))
@ -319,7 +319,7 @@ int32_t menutext_(int32_t x,int32_t y,int32_t s,int32_t p,char *t,int32_t bits)
continue; continue;
} }
rotatesprite(x<<16,y<<16,65536L,0,ac,s,p,bits,0,0,xdim-1,ydim-1); rotatesprite_fs(x<<16,y<<16,65536L,0,ac,s,p,bits);
x += tilesizx[ac]; x += tilesizx[ac];
t++; t++;
@ -376,11 +376,11 @@ static void _bar(int32_t type, int32_t x,int32_t y,int32_t *p,int32_t dainc,int3
} }
xloc = *p; xloc = *p;
rotatesprite((x<<16)+(22<<(16-type)),(y<<16)-(3<<(16-type)),65536L>>type,0,SLIDEBAR,s,pa,10,0,0,xdim-1,ydim-1); rotatesprite_fs((x<<16)+(22<<(16-type)),(y<<16)-(3<<(16-type)),65536L>>type,0,SLIDEBAR,s,pa,10);
if (rev == 0) if (rev == 0)
rotatesprite((x<<16)+((scale(64,xloc-min,max-min)+1)<<(16-type)),(y<<16)+(1<<(16-type)),65536L>>type,0,SLIDEBAR+1,s,pa,10,0,0,xdim-1,ydim-1); rotatesprite_fs((x<<16)+((scale(64,xloc-min,max-min)+1)<<(16-type)),(y<<16)+(1<<(16-type)),65536L>>type,0,SLIDEBAR+1,s,pa,10);
else else
rotatesprite((x<<16)+((65-scale(64,xloc-min,max-min))<<(16-type)),(y<<16)+(1<<(16-type)),65536L>>type,0,SLIDEBAR+1,s,pa,10,0,0,xdim-1,ydim-1); rotatesprite_fs((x<<16)+((65-scale(64,xloc-min,max-min))<<(16-type)),(y<<16)+(1<<(16-type)),65536L>>type,0,SLIDEBAR+1,s,pa,10);
} }
#define bar(x,y,p,dainc,damodify,s,pa) _bar(0,x,y,p,dainc,damodify,s,pa,0,63); #define bar(x,y,p,dainc,damodify,s,pa) _bar(0,x,y,p,dainc,damodify,s,pa,0,63);
@ -493,12 +493,12 @@ static void M_DisplaySaveGameList(void)
c += 64; c += 64;
for (x = 0; x <= 108; x += 12) for (x = 0; x <= 108; x += 12)
rotatesprite((c+91-64)<<16,(x+56)<<16,65536L,0,TEXTBOX,24,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs((c+91-64)<<16,(x+56)<<16,65536L,0,TEXTBOX,24,0,10);
rotatesprite(22<<16,97<<16,65536L,0,WINDOWBORDER2,24,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(22<<16,97<<16,65536L,0,WINDOWBORDER2,24,0,10);
rotatesprite(180<<16,97<<16,65536L,1024,WINDOWBORDER2,24,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(180<<16,97<<16,65536L,1024,WINDOWBORDER2,24,0,10);
rotatesprite(99<<16,50<<16,65536L,512,WINDOWBORDER1,24,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(99<<16,50<<16,65536L,512,WINDOWBORDER1,24,0,10);
rotatesprite(103<<16,144<<16,65536L,1024+512,WINDOWBORDER1,24,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(103<<16,144<<16,65536L,1024+512,WINDOWBORDER1,24,0,10);
for (x=0; x<=9; x++) for (x=0; x<=9; x++)
{ {
@ -567,7 +567,7 @@ static void Menus_LoadSave_DisplayCommon1(void)
G_LoadSaveHeaderNew(probey, &savehead); G_LoadSaveHeaderNew(probey, &savehead);
lastsavehead = probey; lastsavehead = probey;
rotatesprite(101<<16,97<<16,65536L>>1,512,TILE_LOADSHOT,-32,0,4+10+64,0,0,xdim-1,ydim-1); rotatesprite_fs(101<<16,97<<16,65536L>>1,512,TILE_LOADSHOT,-32,0,4+10+64);
if (ud.savegame[probey][20] == 32) if (ud.savegame[probey][20] == 32)
{ {
@ -591,12 +591,12 @@ void M_DisplayMenus(void)
if (g_netSync) if (g_netSync)
{ {
P_SetGamePalette(g_player[myconnectindex].ps, TITLEPAL, 8+2/*+1*/); P_SetGamePalette(g_player[myconnectindex].ps, TITLEPAL, 8+2/*+1*/);
rotatesprite(0,0,65536L,0,BETASCREEN,0,0,2+8+16+64,0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,BETASCREEN,0,0,2+8+16+64);
rotatesprite(160<<16,(104)<<16,60<<10,0,DUKENUKEM,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(104)<<16,60<<10,0,DUKENUKEM,0,0,2+8);
rotatesprite(160<<16,(129)<<16,30<<11,0,THREEDEE,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(129)<<16,30<<11,0,THREEDEE,0,0,2+8);
if (PLUTOPAK) // JBF 20030804 if (PLUTOPAK) // JBF 20030804
rotatesprite(160<<16,(151)<<16,30<<11,0,PLUTOPAKSPRITE+1,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(151)<<16,30<<11,0,PLUTOPAKSPRITE+1,0,0,2+8);
gametext(160,190,"Transferring gamestate",14,2); gametext(160,190,"Transferring gamestate",14,2);
nextpage(); nextpage();
@ -635,7 +635,7 @@ void M_DisplayMenus(void)
int32_t x,y=0; int32_t x,y=0;
for (; y<ydim; y+=tilesizy[MENUSCREEN]) for (; y<ydim; y+=tilesizy[MENUSCREEN])
for (x=0; x<xdim; x+=tilesizx[MENUSCREEN]) for (x=0; x<xdim; x+=tilesizx[MENUSCREEN])
rotatesprite(x<<16,y<<16,65536L,0,MENUSCREEN,80,0,1+8+16,0,0,xdim-1,ydim-1); rotatesprite_fs(x<<16,y<<16,65536L,0,MENUSCREEN,80,0,1+8+16);
} }
if (!(g_currentMenu >= 1000 && g_currentMenu <= 2999 && g_currentMenu >= 300 && g_currentMenu <= 369)) if (!(g_currentMenu >= 1000 && g_currentMenu <= 2999 && g_currentMenu >= 300 && g_currentMenu <= 369))
@ -716,7 +716,7 @@ void M_DisplayMenus(void)
break; break;
case 20001: case 20001:
rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(160,24,0,0,"NETWORK GAME"); menutext(160,24,0,0,"NETWORK GAME");
x = M_Probe(160,100-18,18,3); x = M_Probe(160,100-18,18,3);
@ -733,7 +733,7 @@ void M_DisplayMenus(void)
case 20002: case 20002:
case 20003: case 20003:
rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(160,24,0,0,"PLAYER SETUP"); menutext(160,24,0,0,"PLAYER SETUP");
c = (320>>1)-120; c = (320>>1)-120;
{ {
@ -764,7 +764,7 @@ void M_DisplayMenus(void)
if (probey == 2) if (probey == 2)
x = G_GetTeamPalette(ud.team); x = G_GetTeamPalette(ud.team);
rotatesprite((260)<<16,(24+(tilesizy[APLAYER]>>1))<<16,49152L,0,1441-((((4-(totalclock>>4)))&3)*5),0,x,10,0,0,xdim-1,ydim-1); rotatesprite_fs((260)<<16,(24+(tilesizy[APLAYER]>>1))<<16,49152L,0,1441-((((4-(totalclock>>4)))&3)*5),0,x,10);
for (ii=io=0; opts[ii]; ii++) for (ii=io=0; opts[ii]; ii++)
{ {
@ -992,7 +992,7 @@ void M_DisplayMenus(void)
} }
case 20004: case 20004:
case 20005: case 20005:
rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(160,24,0,0,"MULTIPLAYER MACROS"); menutext(160,24,0,0,"MULTIPLAYER MACROS");
if (g_currentMenu == 20004) if (g_currentMenu == 20004)
@ -1041,7 +1041,7 @@ void M_DisplayMenus(void)
#if 0 #if 0
case 20010: case 20010:
rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(160,24,0,0,"HOST NETWORK GAME"); menutext(160,24,0,0,"HOST NETWORK GAME");
x = M_Probe(46,50,80,2); x = M_Probe(46,50,80,2);
@ -1087,7 +1087,7 @@ void M_DisplayMenus(void)
case 20011: case 20011:
c = (320>>1) - 120; c = (320>>1) - 120;
rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(160,24,0,0,"NET GAME OPTIONS"); menutext(160,24,0,0,"NET GAME OPTIONS");
x = M_Probe(c,57-8,16,8); x = M_Probe(c,57-8,16,8);
@ -1228,7 +1228,7 @@ void M_DisplayMenus(void)
case 20020: case 20020:
case 20021: // editing server case 20021: // editing server
case 20022: // editing port case 20022: // editing port
rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(160,24,0,0,"JOIN NETWORK GAME"); menutext(160,24,0,0,"JOIN NETWORK GAME");
if (g_currentMenu == 20020) if (g_currentMenu == 20020)
@ -1370,7 +1370,7 @@ void M_DisplayMenus(void)
case 10001: case 10001:
c = 60; c = 60;
rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(160,24,0,0,"ADULT MODE"); menutext(160,24,0,0,"ADULT MODE");
x = M_Probe(60,50+16,16,2); x = M_Probe(60,50+16,16,2);
@ -1479,10 +1479,10 @@ void M_DisplayMenus(void)
case 1008: case 1008:
case 1009: case 1009:
rotatesprite(160<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64);
rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(160,24,0,0,"LOAD GAME"); menutext(160,24,0,0,"LOAD GAME");
rotatesprite(101<<16,97<<16,65536>>1,512,TILE_LOADSHOT,-32,0,4+10+64,0,0,xdim-1,ydim-1); rotatesprite_fs(101<<16,97<<16,65536>>1,512,TILE_LOADSHOT,-32,0,4+10+64);
M_DisplaySaveGameList(); M_DisplaySaveGameList();
@ -1582,11 +1582,11 @@ void M_DisplayMenus(void)
case 2008: case 2008:
case 2009: case 2009:
rotatesprite(160<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64);
rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(160,24,0,0,"SAVE GAME"); menutext(160,24,0,0,"SAVE GAME");
rotatesprite(101<<16,97<<16,65536L>>1,512,TILE_LOADSHOT,-32,0,4+10+64,0,0,xdim-1,ydim-1); rotatesprite_fs(101<<16,97<<16,65536L>>1,512,TILE_LOADSHOT,-32,0,4+10+64);
Bsprintf(tempbuf,"PLAYERS: %-2d ",ud.multimode); Bsprintf(tempbuf,"PLAYERS: %-2d ",ud.multimode);
mgametext(160,156,tempbuf,0,2+8+16); mgametext(160,156,tempbuf,0,2+8+16);
@ -1634,8 +1634,8 @@ void M_DisplayMenus(void)
c = 160; c = 160;
if (!VOLUMEALL || !PLUTOPAK) if (!VOLUMEALL || !PLUTOPAK)
{ {
//rotatesprite(c<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64,0,0,xdim-1,ydim-1); //rotatesprite_fs(c<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64);
rotatesprite(c<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(c<<16,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(c,24,0,0,g_currentMenu == 998 ? "ABOUT EDUKE32" : "CREDITS"); menutext(c,24,0,0,g_currentMenu == 998 ? "ABOUT EDUKE32" : "CREDITS");
l = 8; l = 8;
@ -1818,11 +1818,11 @@ void M_DisplayMenus(void)
case 990: case 990:
case 991: case 991:
case 992: case 992:
rotatesprite(160<<16,200<<15,65536L,0,2504+g_currentMenu-990,0,0,10+64,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,200<<15,65536L,0,2504+g_currentMenu-990,0,0,10+64);
break; break;
case 993: // JBF 20031220 case 993: // JBF 20031220
rotatesprite(160<<16,200<<15,65536L,0,MENUSCREEN,0,0,10+64,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,200<<15,65536L,0,MENUSCREEN,0,0,10+64);
rotatesprite(c<<16,19<<16,65536L,0,MENUBAR,0,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(c<<16,19<<16,65536L,0,MENUBAR,0,0,10);
menutext(160,24,0,0,"ABOUT EDUKE32"); menutext(160,24,0,0,"ABOUT EDUKE32");
cheat_for_port_credits: cheat_for_port_credits:
@ -1908,9 +1908,9 @@ cheat_for_port_credits:
case 0: case 0:
c = (320>>1); c = (320>>1);
rotatesprite(c<<16,28<<16,65536L,0,INGAMEDUKETHREEDEE,0,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(c<<16,28<<16,65536L,0,INGAMEDUKETHREEDEE,0,0,10);
if (PLUTOPAK) // JBF 20030804 if (PLUTOPAK) // JBF 20030804
rotatesprite((c+100)<<16,36<<16,65536L,0,PLUTOPAKSPRITE+2,(sintable[(totalclock<<4)&2047]>>11),0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs((c+100)<<16,36<<16,65536L,0,PLUTOPAKSPRITE+2,(sintable[(totalclock<<4)&2047]>>11),0,2+8);
x = M_Probe(c,67,16,6); x = M_Probe(c,67,16,6);
if (x >= 0) if (x >= 0)
{ {
@ -1987,9 +1987,9 @@ cheat_for_port_credits:
case 50: case 50:
c = (320>>1); c = (320>>1);
rotatesprite(c<<16,32<<16,65536L,0,INGAMEDUKETHREEDEE,0,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(c<<16,32<<16,65536L,0,INGAMEDUKETHREEDEE,0,0,10);
if (PLUTOPAK) // JBF 20030804 if (PLUTOPAK) // JBF 20030804
rotatesprite((c+100)<<16,36<<16,65536L,0,PLUTOPAKSPRITE+2,(sintable[(totalclock<<4)&2047]>>11),0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs((c+100)<<16,36<<16,65536L,0,PLUTOPAKSPRITE+2,(sintable[(totalclock<<4)&2047]>>11),0,2+8);
x = M_Probe(c,67,16,7); x = M_Probe(c,67,16,7);
switch (x) switch (x)
{ {
@ -2067,7 +2067,7 @@ cheat_for_port_credits:
break; break;
case 100: case 100:
rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(160,24,0,0,"SELECT AN EPISODE"); menutext(160,24,0,0,"SELECT AN EPISODE");
x = M_Probe(160,VOLUMEONE?60:60-(g_numVolumes*2),20,VOLUMEONE?3:g_numVolumes+1); x = M_Probe(160,VOLUMEONE?60:60-(g_numVolumes*2),20,VOLUMEONE?3:g_numVolumes+1);
if (x >= 0) if (x >= 0)
@ -2135,7 +2135,7 @@ cheat_for_port_credits:
ChangeToMenu(102); ChangeToMenu(102);
KB_FlushKeyboardQueue(); KB_FlushKeyboardQueue();
case 102: case 102:
rotatesprite(160<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(160,24,0,0,"SELECT A USER MAP"); menutext(160,24,0,0,"SELECT A USER MAP");
// black translucent background underneath file lists // black translucent background underneath file lists
@ -2348,7 +2348,7 @@ cheat_for_port_credits:
case 110: case 110:
c = (320>>1); c = (320>>1);
rotatesprite(c<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(c<<16,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(c,24,0,0,"SELECT SKILL"); menutext(c,24,0,0,"SELECT SKILL");
x = M_Probe(c,70,19,4); x = M_Probe(c,70,19,4);
if (x >= 0) if (x >= 0)
@ -2406,7 +2406,7 @@ cheat_for_port_credits:
break; break;
case 230: case 230:
#ifdef USE_OPENGL #ifdef USE_OPENGL
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,24,0,0,"RENDERER SETUP"); menutext(320>>1,24,0,0,"RENDERER SETUP");
c = (320>>1)-120; c = (320>>1)-120;
@ -2607,7 +2607,7 @@ cheat_for_port_credits:
break; break;
case 231: case 231:
case 232: case 232:
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,24,0,0,"COLOR CORRECTION"); menutext(320>>1,24,0,0,"COLOR CORRECTION");
c = (320>>1)-120; c = (320>>1)-120;
@ -2695,7 +2695,7 @@ cheat_for_port_credits:
case 200: case 200:
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,24,0,0,"GAME SETUP"); menutext(320>>1,24,0,0,"GAME SETUP");
c = (320>>1)-120; c = (320>>1)-120;
@ -2868,7 +2868,7 @@ cheat_for_port_credits:
case 201: case 201:
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,24,0,0,"GAME SETUP"); menutext(320>>1,24,0,0,"GAME SETUP");
c = (320>>1)-120; c = (320>>1)-120;
@ -3038,7 +3038,7 @@ cheat_for_port_credits:
// JBF 20031205: Second level options menu selection // JBF 20031205: Second level options menu selection
case 202: case 202:
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,24,0,0,"OPTIONS"); menutext(320>>1,24,0,0,"OPTIONS");
c = 50; c = 50;
@ -3120,7 +3120,7 @@ cheat_for_port_credits:
// JBF 20031206: Video settings menu // JBF 20031206: Video settings menu
case 203: case 203:
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,24,0,0,"VIDEO SETUP"); menutext(320>>1,24,0,0,"VIDEO SETUP");
c = (320>>1)-120; c = (320>>1)-120;
@ -3484,7 +3484,7 @@ cheat_for_port_credits:
break; break;
case 204: case 204:
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,24,0,0,"KEYBOARD SETUP"); menutext(320>>1,24,0,0,"KEYBOARD SETUP");
c = (320>>1)-120; c = (320>>1)-120;
@ -3584,7 +3584,7 @@ cheat_for_port_credits:
case 210: case 210:
{ {
int32_t sc; int32_t sc;
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,24,0,0,"KEYBOARD SETUP"); menutext(320>>1,24,0,0,"KEYBOARD SETUP");
mgametext(320>>1,90,"PRESS THE KEY TO ASSIGN AS",0,2+8+16); mgametext(320>>1,90,"PRESS THE KEY TO ASSIGN AS",0,2+8+16);
@ -3625,7 +3625,7 @@ cheat_for_port_credits:
break; break;
} }
case 205: case 205:
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,24,0,0,"MOUSE SETUP"); menutext(320>>1,24,0,0,"MOUSE SETUP");
c = 60-4; c = 60-4;
@ -3755,7 +3755,7 @@ cheat_for_port_credits:
break; break;
case 211: case 211:
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,19<<16,65536L,0,MENUBAR,16,0,10);
if (function == 0) menutext(320>>1,24,0,0,"MOUSE SETUP"); if (function == 0) menutext(320>>1,24,0,0,"MOUSE SETUP");
else if (function == 1) menutext(320>>1,24,0,0,"ADVANCED MOUSE"); else if (function == 1) menutext(320>>1,24,0,0,"ADVANCED MOUSE");
else if (function == 2) menutext(320>>1,24,0,0,"JOYSTICK BUTTONS"); else if (function == 2) menutext(320>>1,24,0,0,"JOYSTICK BUTTONS");
@ -3921,7 +3921,7 @@ cheat_for_port_credits:
break; break;
case 212: case 212:
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,24,0,0,"ADVANCED MOUSE"); menutext(320>>1,24,0,0,"ADVANCED MOUSE");
c = (320>>1)-120; c = (320>>1)-120;
@ -4009,7 +4009,7 @@ cheat_for_port_credits:
l = ud.config.MouseDeadZone>>1; l = ud.config.MouseDeadZone>>1;
bar(c+160+40,46+16+16,&l,2,x==2,MENUHIGHLIGHT(2),0); bar(c+160+40,46+16+16,&l,2,x==2,MENUHIGHLIGHT(2),0);
ud.config.MouseDeadZone = l<<1; ud.config.MouseDeadZone = l<<1;
rotatesprite(320<<15,94<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,94<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,43+16+16+16+8,0,0,"DIGITAL AXES SETUP"); menutext(320>>1,43+16+16+16+8,0,0,"DIGITAL AXES SETUP");
if (ud.config.MouseDeadZone == 0) if (ud.config.MouseDeadZone == 0)
@ -4063,7 +4063,7 @@ cheat_for_port_credits:
break; break;
case 206: case 206:
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,24,0,0,"JOYSTICK SETUP"); menutext(320>>1,24,0,0,"JOYSTICK SETUP");
x = M_Probe(160,100-18,18,3); x = M_Probe(160,100-18,18,3);
@ -4090,7 +4090,7 @@ cheat_for_port_credits:
break; break;
case 207: case 207:
rotatesprite(320<<15,10<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,10<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,15,0,0,"JOYSTICK BUTTONS"); menutext(320>>1,15,0,0,"JOYSTICK BUTTONS");
c = 2*joynumbuttons + 4*(joynumhats>0); c = 2*joynumbuttons + 4*(joynumhats>0);
@ -4172,7 +4172,7 @@ cheat_for_port_credits:
{ {
int32_t thispage, twothispage; int32_t thispage, twothispage;
rotatesprite(320<<15,10<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,10<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,15,0,0,"JOYSTICK AXES"); menutext(320>>1,15,0,0,"JOYSTICK AXES");
thispage = (g_currentMenu < 217) ? (g_currentMenu-208) : (g_currentMenu-217)+2; thispage = (g_currentMenu < 217) ? (g_currentMenu-208) : (g_currentMenu-217)+2;
@ -4358,7 +4358,7 @@ cheat_for_port_credits:
{ {
// Pray this is enough pages for now :-| // Pray this is enough pages for now :-|
int32_t first,last; int32_t first,last;
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,24,0,0,"JOY DEAD ZONES"); menutext(320>>1,24,0,0,"JOY DEAD ZONES");
first = 4*(g_currentMenu-213); first = 4*(g_currentMenu-213);
@ -4419,7 +4419,7 @@ cheat_for_port_credits:
case 701: case 701:
c = (320>>1)-120; c = (320>>1)-120;
rotatesprite(320<<15,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(320<<15,19<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,24,0,0,"SOUND SETUP"); menutext(320>>1,24,0,0,"SOUND SETUP");
if (!(changesmade & 8)) if (!(changesmade & 8))
@ -4709,8 +4709,8 @@ cheat_for_port_credits:
case 300: case 300:
c = 320>>1; c = 320>>1;
rotatesprite(c<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64,0,0,xdim-1,ydim-1); rotatesprite_fs(c<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64);
rotatesprite(c<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(c<<16,19<<16,65536L,0,MENUBAR,16,0,10);
if (g_currentMenu == 300) menutext(c,24,0,0,"LOAD GAME"); if (g_currentMenu == 300) menutext(c,24,0,0,"LOAD GAME");
else menutext(c,24,0,0,"SAVE GAME"); else menutext(c,24,0,0,"SAVE GAME");
@ -4771,9 +4771,9 @@ cheat_for_port_credits:
crc = 0; crc = 0;
} }
rotatesprite(101<<16,97<<16,65536>>1,512,TILE_SAVESHOT,-32,0,2+4+8+64,0,0,xdim-1,ydim-1); rotatesprite_fs(101<<16,97<<16,65536>>1,512,TILE_SAVESHOT,-32,0,2+4+8+64);
M_DisplaySaveGameList(); M_DisplaySaveGameList();
rotatesprite((c+67+strlen(&ud.savegame[g_currentMenu-360][0])*4)<<16,(50+12*probey)<<16,32768L-10240,0,SPINNINGNUKEICON+(((totalclock)>>3)%7),0,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs((c+67+strlen(&ud.savegame[g_currentMenu-360][0])*4)<<16,(50+12*probey)<<16,32768L-10240,0,SPINNINGNUKEICON+(((totalclock)>>3)%7),0,0,10);
break; break;
} }
@ -4933,7 +4933,7 @@ DISPLAYNAMES:
} }
flushperms(); flushperms();
rotatesprite(0,0,65536L,0,ORDERING+g_currentMenu-400,0,0,10+16+64,0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,ORDERING+g_currentMenu-400,0,0,10+16+64);
break; break;
VOLUME_ALL_40x: VOLUME_ALL_40x:
@ -5012,10 +5012,10 @@ VOLUME_ALL_40x:
switch (g_currentMenu) switch (g_currentMenu)
{ {
case 400: case 400:
rotatesprite(0,0,65536L,0,TEXTSTORY,0,0,10+16+64, 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,TEXTSTORY,0,0,10+16+64);
break; break;
case 401: case 401:
rotatesprite(0,0,65536L,0,F1HELP,0,0,10+16+64, 0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,F1HELP,0,0,10+16+64);
break; break;
} }
@ -5091,7 +5091,7 @@ VOLUME_ALL_40x:
case 601: case 601:
G_DrawFrags(); G_DrawFrags();
rotatesprite(160<<16,29<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,29<<16,65536L,0,MENUBAR,16,0,10);
menutext(320>>1,34,0,0,&g_player[myconnectindex].user_name[0]); menutext(320>>1,34,0,0,&g_player[myconnectindex].user_name[0]);
Bsprintf(tempbuf,"Waiting for master"); Bsprintf(tempbuf,"Waiting for master");
@ -5216,7 +5216,7 @@ VOLUME_ALL_40x:
c = (320>>1) - 120; c = (320>>1) - 120;
if ((g_player[myconnectindex].ps->gm&MODE_GAME) != MODE_GAME) if ((g_player[myconnectindex].ps->gm&MODE_GAME) != MODE_GAME)
G_DrawFrags(); G_DrawFrags();
rotatesprite(160<<16,26<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,26<<16,65536L,0,MENUBAR,16,0,10);
menutext(160,31,0,0,&g_player[myconnectindex].user_name[0]); menutext(160,31,0,0,&g_player[myconnectindex].user_name[0]);
x = M_Probe(c,57-8,16,8); x = M_Probe(c,57-8,16,8);

16
polymer/eduke32/source/net.c
View file

@ -2590,12 +2590,12 @@ void Net_GetPackets(void)
g_multiMapState = (mapstate_t *)Brealloc(g_multiMapState, sizeof(mapstate_t)); g_multiMapState = (mapstate_t *)Brealloc(g_multiMapState, sizeof(mapstate_t));
rotatesprite(0,0,65536L,0,BETASCREEN,0,0,2+8+16+64,0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,BETASCREEN,0,0,2+8+16+64);
rotatesprite(160<<16,(104)<<16,60<<10,0,DUKENUKEM,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(104)<<16,60<<10,0,DUKENUKEM,0,0,2+8);
rotatesprite(160<<16,(129)<<16,30<<11,0,THREEDEE,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(129)<<16,30<<11,0,THREEDEE,0,0,2+8);
if (PLUTOPAK) // JBF 20030804 if (PLUTOPAK) // JBF 20030804
rotatesprite(160<<16,(151)<<16,30<<11,0,PLUTOPAKSPRITE+1,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(151)<<16,30<<11,0,PLUTOPAKSPRITE+1,0,0,2+8);
if (buf && event.packet->dataLength == SYNCPACKETSIZE) if (buf && event.packet->dataLength == SYNCPACKETSIZE)
{ {
@ -3213,12 +3213,12 @@ void Net_WaitForServer(void)
{ {
if (quitevent || keystatus[1]) G_GameExit(""); if (quitevent || keystatus[1]) G_GameExit("");
rotatesprite(0,0,65536L,0,BETASCREEN,0,0,2+8+16+64,0,0,xdim-1,ydim-1); rotatesprite_fs(0,0,65536L,0,BETASCREEN,0,0,2+8+16+64);
rotatesprite(160<<16,(104)<<16,60<<10,0,DUKENUKEM,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(104)<<16,60<<10,0,DUKENUKEM,0,0,2+8);
rotatesprite(160<<16,(129)<<16,30<<11,0,THREEDEE,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(129)<<16,30<<11,0,THREEDEE,0,0,2+8);
if (PLUTOPAK) // JBF 20030804 if (PLUTOPAK) // JBF 20030804
rotatesprite(160<<16,(151)<<16,30<<11,0,PLUTOPAKSPRITE+1,0,0,2+8,0,0,xdim-1,ydim-1); rotatesprite_fs(160<<16,(151)<<16,30<<11,0,PLUTOPAKSPRITE+1,0,0,2+8);
gametext(160,170,"WAITING FOR SERVER",14,2); gametext(160,170,"WAITING FOR SERVER",14,2);
nextpage(); nextpage();

6
polymer/eduke32/source/osdfuncs.c
View file

@ -40,7 +40,7 @@ void GAME_drawosdchar(int32_t x, int32_t y, char ch, int32_t shade, int32_t pal)
ac = ch-'!'+STARTALPHANUM; ac = ch-'!'+STARTALPHANUM;
if (ac < STARTALPHANUM || ac > ENDALPHANUM) return; if (ac < STARTALPHANUM || ac > ENDALPHANUM) return;
usehightile = (osdhightile && ht); usehightile = (osdhightile && ht);
rotatesprite(((x<<3)+x)<<16, (y<<3)<<16, 65536l, 0, ac, shade, pal, 8|16, 0, 0, xdim-1, ydim-1); rotatesprite_fs(((x<<3)+x)<<16, (y<<3)<<16, 65536l, 0, ac, shade, pal, 8|16);
usehightile = ht; usehightile = ht;
} }
@ -93,7 +93,7 @@ void GAME_drawosdstr(int32_t x, int32_t y, char *ch, int32_t len, int32_t shade,
ac = *ch-'!'+STARTALPHANUM; ac = *ch-'!'+STARTALPHANUM;
if (ac < STARTALPHANUM || ac > ENDALPHANUM) { usehightile = ht; return; } if (ac < STARTALPHANUM || ac > ENDALPHANUM) { usehightile = ht; return; }
rotatesprite(x<<16, (y<<3)<<16, 65536, 0, ac, shade, pal, 8|16, 0, 0, xdim-1, ydim-1); rotatesprite_fs(x<<16, (y<<3)<<16, 65536, 0, ac, shade, pal, 8|16);
x += OSDCHAR_WIDTH+1; x += OSDCHAR_WIDTH+1;
ch++; ch++;
} }
@ -110,7 +110,7 @@ void GAME_drawosdcursor(int32_t x, int32_t y, int32_t type, int32_t lastkeypress
else ac = '_'-'!'+STARTALPHANUM; else ac = '_'-'!'+STARTALPHANUM;
if (!((GetTime()-lastkeypress) & 0x40l)) if (!((GetTime()-lastkeypress) & 0x40l))
rotatesprite(((x<<3)+x)<<16, ((y<<3)+(type?-1:2))<<16, 65536l, 0, ac, 0, 8, 8|16, 0, 0, xdim-1, ydim-1); rotatesprite_fs(((x<<3)+x)<<16, ((y<<3)+(type?-1:2))<<16, 65536l, 0, ac, 0, 8, 8|16);
} }
int32_t GAME_getcolumnwidth(int32_t w) int32_t GAME_getcolumnwidth(int32_t w)

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

@ -1949,9 +1949,9 @@ static void P_DisplaySpit(int32_t snum)
z = 4096+((g_player[snum].ps->loogcnt+i)<<9); z = 4096+((g_player[snum].ps->loogcnt+i)<<9);
x = (-g_player[snum].sync->avel)+(sintable[((g_player[snum].ps->loogcnt+i)<<6)&2047]>>10); x = (-g_player[snum].sync->avel)+(sintable[((g_player[snum].ps->loogcnt+i)<<6)&2047]>>10);
rotatesprite( rotatesprite_fs(
(g_player[snum].ps->loogiex[i]+x)<<16,(200+g_player[snum].ps->loogiey[i]-y)<<16,z-(i<<8),256-a, (g_player[snum].ps->loogiex[i]+x)<<16,(200+g_player[snum].ps->loogiey[i]-y)<<16,z-(i<<8),256-a,
LOOGIE,0,0,2,0,0,xdim-1,ydim-1); LOOGIE,0,0,2);
} }
} }

8
polymer/eduke32/source/premap.c
View file

@ -365,8 +365,8 @@ static void G_DoLoadScreen(char *statustext, int32_t percent)
if ((uint32_t)j < 2*MAXTILES) if ((uint32_t)j < 2*MAXTILES)
{ {
rotatesprite(320<<15,200<<15,65536L,0, j > MAXTILES-1?j-MAXTILES:j,0,0, rotatesprite_fs(320<<15,200<<15,65536L,0, j > MAXTILES-1?j-MAXTILES:j,0,0,
2+8+64+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); 2+8+64+(ud.bgstretch?1024:0));
} }
else else
{ {
@ -423,8 +423,8 @@ static void G_DoLoadScreen(char *statustext, int32_t percent)
if ((uint32_t)j < 2*MAXTILES) if ((uint32_t)j < 2*MAXTILES)
{ {
rotatesprite(320<<15,200<<15,65536L, 0,j > MAXTILES-1?j-MAXTILES:j,0,0, rotatesprite_fs(320<<15,200<<15,65536L, 0,j > MAXTILES-1?j-MAXTILES:j,0,0,
2+8+64+(ud.bgstretch?1024:0), 0,0,xdim-1,ydim-1); 2+8+64+(ud.bgstretch?1024:0));
} }
else else
{ {