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

Cheap hack to replace "space" in quote 13 with "use"

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@913 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2008-07-28 02:40:23 +00:00
parent 7e7193c8fe
commit d5add9a2ef
5 changed files with 33 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -668,7 +668,7 @@ int32 CONFIG_ReadSetup(void)
if (atof(tempbuf)) if (atof(tempbuf))
{ {
r_ambientlight = atof(tempbuf); r_ambientlight = atof(tempbuf);
r_ambientlightrecip = 1/r_ambientlight; r_ambientlightrecip = 1.f/r_ambientlight;
} }
#if defined(POLYMOST) && defined(USE_OPENGL) #if defined(POLYMOST) && defined(USE_OPENGL)

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

@ -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 loadpheader(char spot,int32 *vn,int32 *ln,int32 *psk,int32 *numplr);
extern int loadplayer(int spot); extern int loadplayer(int spot);
extern int saveplayer(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 menus(void);
extern void palto(int r,int g,int b,int e); extern void palto(int r,int g,int b,int e);
extern void playanm(const char *fn,char); extern void playanm(const char *fn,char);

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

@ -5358,6 +5358,22 @@ void loadefs(const char *filenam)
for (i=0;i<128;i++) for (i=0;i<128;i++)
if (fta_quotes[i] == NULL) if (fta_quotes[i] == NULL)
fta_quotes[i] = Bcalloc(MAXQUOTELEN,sizeof(char)); 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;i<MAXQUOTELEN-5;i++)
if (Bstrncmp(&fta_quotes[13][i],"SPACE",5) == 0)
{
Bstrncpy(tempbuf,fta_quotes[13],i);
Bstrcat(tempbuf,"USE");
Bstrcat(tempbuf,&fta_quotes[13][i+5]);
Bstrcpy(fta_quotes[13],tempbuf);
break;
}
{ {
const char *ppdeathstrings[] = const char *ppdeathstrings[] =
{ {

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

@ -191,10 +191,11 @@ static inline int probesm(int x,int y,int i,int n)
return probe_(1,x,y,i,n); return probe_(1,x,y,i,n);
} }
static int menutext_(int x,int y,short s,short p,char *t) int menutext(int x,int y,int s,int p,char *t)
{ {
short i, ac, centre; short i, ac, centre;
t = (char *)stripcolorcodes(t);
y -= 12; y -= 12;
i = centre = 0; i = centre = 0;
@ -311,11 +312,6 @@ static int menutext_(int x,int y,short s,short p,char *t)
return (x); return (x);
} }
inline int menutext(int x,int y,int s,int p,const char *t)
{
return(menutext_(x,y,s,p,(char *)stripcolorcodes(t)));
}
static void _bar(int type, int x,int y,int *p,int dainc,int damodify,int s, int pa, int min, int max) static void _bar(int type, int x,int y,int *p,int dainc,int damodify,int s, int pa, int min, int max)
{ {
int xloc; int xloc;
@ -2557,11 +2553,11 @@ cheat_for_port_credits:
{ {
int i = (float)r_ambientlight*1024.f; int i = (float)r_ambientlight*1024.f;
int j = i; int j = i;
_bar(1,d+8,yy+7, &i,128,x==io,MENUHIGHLIGHT(io),0,128,4096); _bar(1,d+8,yy+7, &i,128,x==io,MENUHIGHLIGHT(io),numplayers>1,128,4096);
if (i != j) if (i != j)
{ {
r_ambientlight = (float)i/1024.f; r_ambientlight = (float)i/1024.f;
r_ambientlightrecip = 1/r_ambientlight; r_ambientlightrecip = 1.f/r_ambientlight;
} }
break; break;
} }
@ -3360,14 +3356,14 @@ cheat_for_port_credits:
sprintf(tempbuf,"%d x %d", sprintf(tempbuf,"%d x %d",
(newvidmode==validmodecnt)?xdim:validmode[newvidmode].xdim, (newvidmode==validmodecnt)?xdim:validmode[newvidmode].xdim,
(newvidmode==validmodecnt)?ydim:validmode[newvidmode].ydim); (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"); menutext(c,50+16,MENUHIGHLIGHT(1),0,"RENDERER");
sprintf(tempbuf, "%d-bit %s", vidsets[newvidset]&0x0ffff, (vidsets[newvidset]&0x20000)?"OpenGL":"Software"); Bsprintf(tempbuf,(vidsets[newvidset]&0x20000)?"%d-bit OpenGL":"Software", vidsets[newvidset]&0x0ffff);
mgametext(c+154,50+16-8,tempbuf,MENUHIGHLIGHT(1),2+8+16); mgametext(c+160,50+16-8,tempbuf,MENUHIGHLIGHT(1),2+8+16);
menutext(c,50+16+16,MENUHIGHLIGHT(2),0,"FULLSCREEN"); 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"); 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 i = (float)r_ambientlight*1024.f;
int j = i; int j = i;
menutext(c,50+62+16+16,MENUHIGHLIGHT(5),0,"PIXEL DOUBLING"); 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); modval(0,1,(int *)&ud.detail,1,probey==5);
menutext(c,50+62+16+16+16,MENUHIGHLIGHT(4),PHX(-6),"AMBIENT LIGHT"); menutext(c,50+62+16+16+16,MENUHIGHLIGHT(6),PHX(-6),"AMBIENT LIGHT");
_bar(0,c+171,50+62+16+16+16,&i,128,x==6,MENUHIGHLIGHT(probey),0,128,4096); _bar(0,c+177,50+62+16+16+16,&i,128,x==6,MENUHIGHLIGHT(6),numplayers>1,128,4096);
if (i != j) if (i != j)
{ {
r_ambientlight = (float)i/1024.f; r_ambientlight = (float)i/1024.f;
r_ambientlightrecip = 1/r_ambientlight; r_ambientlightrecip = 1.f/r_ambientlight;
} }
} }
#if defined(POLYMOST) && defined(USE_OPENGL) #if defined(POLYMOST) && defined(USE_OPENGL)
else else
{ {
menutext(c,50+62+16+16,MENUHIGHLIGHT(5),!getrendermode(),"FILTERING"); menutext(c,50+62+16+16,MENUHIGHLIGHT(5),0,"TEXTURE FILTER");
switch (gltexfiltermode) switch (gltexfiltermode)
{ {
case 0: case 0:
@ -3425,7 +3421,7 @@ cheat_for_port_credits:
strcpy(tempbuf,"OTHER"); strcpy(tempbuf,"OTHER");
break; 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"); menutext(c,50+62+16+16+16,MENUHIGHLIGHT(6),bpp==8,"MORE SETTINGS");
} }
#endif #endif

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

@ -1324,7 +1324,7 @@ static int osdcmd_visibility(const osdfuncparm_t *parm)
} }
f = max(0.05f,min(10.f,atof(parm->parms[0]))); f = max(0.05f,min(10.f,atof(parm->parms[0])));
r_ambientlight = f; r_ambientlight = f;
r_ambientlightrecip = 1/f; r_ambientlightrecip = 1.f/r_ambientlight;
OSD_Printf("%s\n",parm->raw); OSD_Printf("%s\n",parm->raw);
return OSDCMD_OK; return OSDCMD_OK;
} }