diff --git a/polymer/eduke32/source/config.c b/polymer/eduke32/source/config.c index ec02f42aa..b27eed7ee 100644 --- a/polymer/eduke32/source/config.c +++ b/polymer/eduke32/source/config.c @@ -668,7 +668,7 @@ int32 CONFIG_ReadSetup(void) if (atof(tempbuf)) { r_ambientlight = atof(tempbuf); - r_ambientlightrecip = 1/r_ambientlight; + r_ambientlightrecip = 1.f/r_ambientlight; } #if defined(POLYMOST) && defined(USE_OPENGL) diff --git a/polymer/eduke32/source/funct.h b/polymer/eduke32/source/funct.h index 66cdccf86..9b73f2d10 100644 --- a/polymer/eduke32/source/funct.h +++ b/polymer/eduke32/source/funct.h @@ -107,7 +107,7 @@ extern void savetemp(const char *fn,int daptr,int dasiz); // extern int loadpheader(char spot,int32 *vn,int32 *ln,int32 *psk,int32 *numplr); extern int loadplayer(int spot); extern int saveplayer(int spot); -extern inline int menutext(int x,int y,int s,int p,const char *t); +extern int menutext(int x,int y,int s,int p,char *t); extern void menus(void); extern void palto(int r,int g,int b,int e); extern void playanm(const char *fn,char); diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index c37bb6bd6..621c9cc5d 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -5358,6 +5358,22 @@ void loadefs(const char *filenam) for (i=0;i<128;i++) if (fta_quotes[i] == NULL) fta_quotes[i] = Bcalloc(MAXQUOTELEN,sizeof(char)); + +// if (!Bstrcmp(fta_quotes[13],"PRESS SPACE TO RESTART LEVEL")) +// Bstrcpy(fta_quotes[13],"PRESS USE TO RESTART LEVEL"); + + Bmemset(tempbuf,0,sizeof(tempbuf)); + + for (i=0;i1,128,4096); if (i != j) { r_ambientlight = (float)i/1024.f; - r_ambientlightrecip = 1/r_ambientlight; + r_ambientlightrecip = 1.f/r_ambientlight; } break; } @@ -3360,14 +3356,14 @@ cheat_for_port_credits: sprintf(tempbuf,"%d x %d", (newvidmode==validmodecnt)?xdim:validmode[newvidmode].xdim, (newvidmode==validmodecnt)?ydim:validmode[newvidmode].ydim); - mgametext(c+154,50-8,tempbuf,MENUHIGHLIGHT(0),2+8+16); + mgametext(c+160,50-8,tempbuf,MENUHIGHLIGHT(0),2+8+16); menutext(c,50+16,MENUHIGHLIGHT(1),0,"RENDERER"); - sprintf(tempbuf, "%d-bit %s", vidsets[newvidset]&0x0ffff, (vidsets[newvidset]&0x20000)?"OpenGL":"Software"); - mgametext(c+154,50+16-8,tempbuf,MENUHIGHLIGHT(1),2+8+16); + Bsprintf(tempbuf,(vidsets[newvidset]&0x20000)?"%d-bit OpenGL":"Software", vidsets[newvidset]&0x0ffff); + mgametext(c+160,50+16-8,tempbuf,MENUHIGHLIGHT(1),2+8+16); menutext(c,50+16+16,MENUHIGHLIGHT(2),0,"FULLSCREEN"); - menutext(c+154,50+16+16,MENUHIGHLIGHT(2),0,newfullscreen?"YES":"NO"); + menutext(c+160,50+16+16,MENUHIGHLIGHT(2),0,newfullscreen?"YES":"NO"); menutext(c+16,50+16+16+22,MENUHIGHLIGHT(3),changesmade==0,"APPLY CHANGES"); @@ -3387,20 +3383,20 @@ cheat_for_port_credits: int i = (float)r_ambientlight*1024.f; int j = i; menutext(c,50+62+16+16,MENUHIGHLIGHT(5),0,"PIXEL DOUBLING"); - menutext(c+154,50+62+16+16,MENUHIGHLIGHT(5),0,ud.detail?"OFF":"ON"); + menutext(c+160,50+62+16+16,MENUHIGHLIGHT(5),0,ud.detail?"OFF":"ON"); modval(0,1,(int *)&ud.detail,1,probey==5); - menutext(c,50+62+16+16+16,MENUHIGHLIGHT(4),PHX(-6),"AMBIENT LIGHT"); - _bar(0,c+171,50+62+16+16+16,&i,128,x==6,MENUHIGHLIGHT(probey),0,128,4096); + menutext(c,50+62+16+16+16,MENUHIGHLIGHT(6),PHX(-6),"AMBIENT LIGHT"); + _bar(0,c+177,50+62+16+16+16,&i,128,x==6,MENUHIGHLIGHT(6),numplayers>1,128,4096); if (i != j) { r_ambientlight = (float)i/1024.f; - r_ambientlightrecip = 1/r_ambientlight; + r_ambientlightrecip = 1.f/r_ambientlight; } } #if defined(POLYMOST) && defined(USE_OPENGL) else { - menutext(c,50+62+16+16,MENUHIGHLIGHT(5),!getrendermode(),"FILTERING"); + menutext(c,50+62+16+16,MENUHIGHLIGHT(5),0,"TEXTURE FILTER"); switch (gltexfiltermode) { case 0: @@ -3425,7 +3421,7 @@ cheat_for_port_credits: strcpy(tempbuf,"OTHER"); break; } - mgametextpal(c+154,50+62+16+16-8,tempbuf,MENUHIGHLIGHT(5),!getrendermode()); + mgametextpal(c+160,50+62+16+16-8,tempbuf,MENUHIGHLIGHT(5),!getrendermode()); menutext(c,50+62+16+16+16,MENUHIGHLIGHT(6),bpp==8,"MORE SETTINGS"); } #endif diff --git a/polymer/eduke32/source/osdcmds.c b/polymer/eduke32/source/osdcmds.c index 72fdc6371..1fe539c8e 100644 --- a/polymer/eduke32/source/osdcmds.c +++ b/polymer/eduke32/source/osdcmds.c @@ -1324,7 +1324,7 @@ static int osdcmd_visibility(const osdfuncparm_t *parm) } f = max(0.05f,min(10.f,atof(parm->parms[0]))); r_ambientlight = f; - r_ambientlightrecip = 1/f; + r_ambientlightrecip = 1.f/r_ambientlight; OSD_Printf("%s\n",parm->raw); return OSDCMD_OK; }