zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
terminx 2008-07-30 01:00:40 +00:00
parent 6191c05299
commit e344cf477e
9 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/build/src/mdsprite.c
View file

@ -860,7 +860,7 @@ int mdloadskin(md2model *m, int number, int pal, int surf)
if (ysiz == pow2long[j]) { i |= 2; } if (ysiz == pow2long[j]) { i |= 2; }
} }
cachead.flags = (i!=3) | (hasalpha ? 2 : 0); cachead.flags = (i!=3) | (hasalpha ? 2 : 0);
initprintf("No cached tex for %s. ",fn); initprintf("No cached tex for %s.\n",fn);
writexcache(fn, picfillen, pal<<8, (globalnoeffect)?0:hictinting[pal].f, &cachead); writexcache(fn, picfillen, pal<<8, (globalnoeffect)?0:hictinting[pal].f, &cachead);
} }

3
polymer/build/src/osd.c
View file

@ -889,7 +889,7 @@ int OSD_HandleChar(char ch)
if (!lastmatch->next) break; if (!lastmatch->next) break;
symb=findsymbol(osdedittmp, lastmatch->next); symb=findsymbol(osdedittmp, lastmatch->next);
} }
OSD_Printf(OSDTEXT_RED "Found %d possible completions for '%s':\n",num,osdedittmp); OSD_Printf(OSDTEXT_RED "\nFound %d possible completions for '%s':\n",num,osdedittmp);
maxwidth += 3; maxwidth += 3;
symb = tabc; symb = tabc;
OSD_Printf(" "); OSD_Printf(" ");
@ -909,6 +909,7 @@ int OSD_HandleChar(char ch)
} }
} }
if (x) OSD_Printf("\n"); if (x) OSD_Printf("\n");
OSD_Printf(OSDTEXT_RED "Press TAB again to cycle through matches\n");
} }
} }
} }

5
polymer/build/src/polymost.c
View file

@ -183,7 +183,8 @@ int r_cullobstructedmodels = 0;
int r_fullbrights = 1; int r_fullbrights = 1;
// texture downsizing // texture downsizing
int r_downsize = 0; // is medium quality a good default?
int r_downsize = 1;
static float fogresult, fogcol[4]; static float fogresult, fogcol[4];
@ -1718,7 +1719,7 @@ int gloadtile_hi(int dapic,int dapalnum, int facen, hicreplctyp *hicr, int damet
if (ysiz == pow2long[j]) { x |= 2; } if (ysiz == pow2long[j]) { x |= 2; }
} }
cachead.flags = (x!=3) | (hasalpha != 255 ? 2 : 0); cachead.flags = (x!=3) | (hasalpha != 255 ? 2 : 0);
initprintf("No cached tex for tile %d pal %d. ",dapic,dapalnum); initprintf("No cached tex for tile %d pal %d.\n",dapic,dapalnum);
writexcache(fn, picfillen+(dapalnum<<8), dameth, effect, &cachead); writexcache(fn, picfillen+(dapalnum<<8), dameth, effect, &cachead);
} }

3
polymer/eduke32/source/duke3d.h
View file

@ -22,8 +22,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
#define APPNAME "EDuke32"
#define VERSION " 1.5.0devel" #define VERSION " 1.5.0devel"
#define HEAD2 "EDuke32"VERSION #define HEAD2 APPNAME VERSION
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

1
polymer/eduke32/source/funct.h
View file

@ -249,5 +249,6 @@ extern int getteampal(int team);
extern void se40code(int x,int y,int z,int a,int h, int smoothratio); extern void se40code(int x,int y,int z,int a,int h, int smoothratio);
extern void FreeMapState(int mapnum); extern void FreeMapState(int mapnum);
extern void getlevelfromfilename(const char *fn, char *volume, char *level);
#endif // __funct_h__ #endif // __funct_h__

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

@ -324,7 +324,7 @@ int gametext_z(int small, int starttile, int x,int y,const char *t,int s,int p,i
t = oldt; t = oldt;
x = (320>>1)-(newx>>1); x = (320>>1)-(newx>>1);
} }
usehightile = (ht && !r_downsize); usehightile = (ht && r_downsize < 2);
while (*t) while (*t)
{ {
if (*t == '^' && isdigit(*(t+1))) if (*t == '^' && isdigit(*(t+1)))
@ -3399,11 +3399,9 @@ void displayrest(int smoothratio)
if (ud.overhead_on == 2) if (ud.overhead_on == 2)
{ {
if (ud.screen_size > 0) a = 147; a = (ud.screen_size > 2)?scale(tilesizy[BOTTOMSTATUSBAR],ud.statusbarscale,100):5;
else a = 182; minitext(5,200-a-6-6-6-6,volume_names[ud.volume_number],0,2+8+16);
minitext(5,200-a-6-6-6-6-6,map[ud.volume_number*MAXLEVELS + ud.level_number].name,0,2+8+16);
minitext(1,a+6,volume_names[ud.volume_number],0,2+8+16);
minitext(1,a+12,map[ud.volume_number*MAXLEVELS + ud.level_number].name,0,2+8+16);
} }
} }
} }
@ -3507,23 +3505,23 @@ void displayrest(int smoothratio)
// JBF 20040124: display level stats in screen corner // JBF 20040124: display level stats in screen corner
if (ud.levelstats && (g_player[myconnectindex].ps->gm&MODE_MENU) == 0) if (ud.levelstats && (g_player[myconnectindex].ps->gm&MODE_MENU) == 0)
{ {
i = (ud.screen_size <= 4)?0:scale(tilesizy[BOTTOMSTATUSBAR],ud.statusbarscale,100); i = (ud.screen_size > 2)?scale(tilesizy[BOTTOMSTATUSBAR],ud.statusbarscale,100):5;
Bsprintf(tempbuf,"Time: %d:%02d", Bsprintf(tempbuf,"T:%d:%02d",
(g_player[myconnectindex].ps->player_par/(26*60)), (g_player[myconnectindex].ps->player_par/(26*60)),
(g_player[myconnectindex].ps->player_par/26)%60); (g_player[myconnectindex].ps->player_par/26)%60);
minitext(320-5*12,200-i-6-6-6,tempbuf,0,26); minitext(5,200-i-6-6-6,tempbuf,10,26);
if (ud.player_skill > 3 || (ud.multimode > 1 && !GTFLAGS(GAMETYPE_FLAG_PLAYERSFRIENDLY))) if (ud.player_skill > 3 || (ud.multimode > 1 && !GTFLAGS(GAMETYPE_FLAG_PLAYERSFRIENDLY)))
Bsprintf(tempbuf,"Kills: %d",(ud.multimode>1 &&!GTFLAGS(GAMETYPE_FLAG_PLAYERSFRIENDLY))?g_player[i].ps->frag-g_player[i].ps->fraggedself:g_player[myconnectindex].ps->actors_killed); Bsprintf(tempbuf,"K:%d",(ud.multimode>1 &&!GTFLAGS(GAMETYPE_FLAG_PLAYERSFRIENDLY))?g_player[i].ps->frag-g_player[i].ps->fraggedself:g_player[myconnectindex].ps->actors_killed);
else else
Bsprintf(tempbuf,"Kills: %d/%d",g_player[myconnectindex].ps->actors_killed, Bsprintf(tempbuf,"K:%d/%d",g_player[myconnectindex].ps->actors_killed,
g_player[myconnectindex].ps->max_actors_killed>g_player[myconnectindex].ps->actors_killed? g_player[myconnectindex].ps->max_actors_killed>g_player[myconnectindex].ps->actors_killed?
g_player[myconnectindex].ps->max_actors_killed:g_player[myconnectindex].ps->actors_killed); g_player[myconnectindex].ps->max_actors_killed:g_player[myconnectindex].ps->actors_killed);
minitext(320-5*12,200-i-6-6,tempbuf,0,26); minitext(5,200-i-6-6,tempbuf,10,26);
Bsprintf(tempbuf,"Secrets: %d/%d", g_player[myconnectindex].ps->secret_rooms,g_player[myconnectindex].ps->max_secret_rooms); Bsprintf(tempbuf,"S:%d/%d", g_player[myconnectindex].ps->secret_rooms,g_player[myconnectindex].ps->max_secret_rooms);
minitext(320-5*12,200-i-6,tempbuf,0,26); minitext(5,200-i-6,tempbuf,10,26);
} }
if (tintf > 0 || dotint) palto(tintr,tintg,tintb,tintf|128); if (tintf > 0 || dotint) palto(tintr,tintg,tintb,tintf|128);
} }
@ -9407,7 +9405,7 @@ static void Logo(void)
flushperms(); flushperms();
nextpage(); nextpage();
Bsprintf(tempbuf,"%s - " HEAD2,duke3dgrpstring); Bsprintf(tempbuf,"%s - " APPNAME,duke3dgrpstring);
wm_setapptitle(tempbuf); wm_setapptitle(tempbuf);
MUSIC_StopSong(); MUSIC_StopSong();
@ -10155,7 +10153,7 @@ void backtomenu(void)
g_player[myconnectindex].ps->gm = MODE_MENU; g_player[myconnectindex].ps->gm = MODE_MENU;
cmenu(0); cmenu(0);
KB_FlushKeyboardQueue(); KB_FlushKeyboardQueue();
Bsprintf(tempbuf,HEAD2 " - %s",duke3dgrpstring); Bsprintf(tempbuf,APPNAME " - %s",duke3dgrpstring);
wm_setapptitle(tempbuf); wm_setapptitle(tempbuf);
} }
@ -10479,7 +10477,7 @@ void app_main(int argc,const char **argv)
// gotta set the proper title after we compile the CONs if this is the full version // gotta set the proper title after we compile the CONs if this is the full version
Bsprintf(tempbuf,"%s - " HEAD2,duke3dgrpstring); Bsprintf(tempbuf,"%s - " APPNAME,duke3dgrpstring);
wm_setapptitle(tempbuf); wm_setapptitle(tempbuf);
@ -11991,7 +11989,7 @@ void dobonus(int bonusonly)
350, 380,VICTORY1+8,86,59 350, 380,VICTORY1+8,86,59
}; };
Bsprintf(tempbuf,"%s - " HEAD2,duke3dgrpstring); Bsprintf(tempbuf,"%s - " APPNAME,duke3dgrpstring);
wm_setapptitle(tempbuf); wm_setapptitle(tempbuf);
if (ud.volume_number == 0 && ud.last_level == 8 && boardfilename[0]) if (ud.volume_number == 0 && ud.last_level == 8 && boardfilename[0])

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

@ -4475,7 +4475,7 @@ repeatcase:
} }
gamename[i] = '\0'; gamename[i] = '\0';
duke3dgrpstring = Bstrdup(gamename); duke3dgrpstring = Bstrdup(gamename);
Bsprintf(tempbuf,"%s - " HEAD2,duke3dgrpstring); Bsprintf(tempbuf,"%s - " APPNAME,duke3dgrpstring);
wm_setapptitle(tempbuf); wm_setapptitle(tempbuf);
} }
return 0; return 0;

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

@ -2167,7 +2167,7 @@ cheat_for_port_credits:
scale(320-40+4,xdim,320)-1,scale(12+32+112+4,ydim,200)-1); scale(320-40+4,xdim,320)-1,scale(12+32+112+4,ydim,200)-1);
// path // path
minitext(38,45,boardfilename,0,26); minitext(38,45,boardfilename,16,26);
{ {
// JBF 20040208: seek to first name matching pressed character // JBF 20040208: seek to first name matching pressed character
@ -2232,7 +2232,7 @@ cheat_for_port_credits:
else dir=dir->prev; else dir=dir->prev;
for (i=6; i>-7 && dir; i--, dir=dir->next) for (i=6; i>-7 && dir; i--, dir=dir->next)
{ {
if (dir == finddirshigh) c=0; if (dir == finddirshigh && currentlist == 0) c=0;
else c=16; else c=16;
minitextshade(40,1+12+32+8*(7-i),dir->name,c,0,26); minitextshade(40,1+12+32+8*(7-i),dir->name,c,0,26);
} }
@ -2247,7 +2247,7 @@ cheat_for_port_credits:
else dir=dir->prev; else dir=dir->prev;
for (i=7; i>-7 && dir; i--, dir=dir->next) for (i=7; i>-7 && dir; i--, dir=dir->next)
{ {
if (dir == findfileshigh) c=0; if (dir == findfileshigh && currentlist == 1) c=0;
else c=16; else c=16;
minitextshade(180,1+12+32+8*(7-i),dir->name,c,2,26); minitextshade(180,1+12+32+8*(7-i),dir->name,c,2,26);
} }

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

@ -1583,7 +1583,7 @@ void resetmys(void)
extern int voting, vote_map, vote_episode; extern int voting, vote_map, vote_episode;
static void getlevelfromfilename(const char *fn, char *volume, char *level) void getlevelfromfilename(const char *fn, char *volume, char *level)
{ {
for (*volume=0;*volume<MAXVOLUMES;(*volume)++) for (*volume=0;*volume<MAXVOLUMES;(*volume)++)
{ {
@ -1673,9 +1673,9 @@ int enterlevel(int g)
if (boardfilename[0] != 0 && ud.m_level_number == 7 && ud.m_volume_number == 0) if (boardfilename[0] != 0 && ud.m_level_number == 7 && ud.m_volume_number == 0)
{ {
Bstrcpy(levname, boardfilename); Bstrcpy(levname, boardfilename);
Bsprintf(apptitle,"%s - %s - " HEAD2,levname,duke3dgrpstring); Bsprintf(apptitle,"%s - %s - " APPNAME,levname,duke3dgrpstring);
} }
else Bsprintf(apptitle,"%s - %s - " HEAD2,map[(ud.volume_number*MAXLEVELS)+ud.level_number].name,duke3dgrpstring); else Bsprintf(apptitle,"%s - %s - " APPNAME,map[(ud.volume_number*MAXLEVELS)+ud.level_number].name,duke3dgrpstring);
Bstrcpy(tempbuf,apptitle); Bstrcpy(tempbuf,apptitle);
wm_setapptitle(tempbuf); wm_setapptitle(tempbuf);