eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

I really do not trust nquake's configs. Completely refuse to exec them, at least when warnings are silenced (so manual attempts will still work).

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5840 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-05-09 13:01:21 +00:00
parent 2538e37e28
commit 7ca9d0698f
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
engine/common/cmd.c
View file

@ -806,7 +806,7 @@ static void Cmd_Exec_f (void)
//hack to try to work around nquake's b0rkedness //hack to try to work around nquake's b0rkedness
if (!strncmp(s, "// This is nQuake's Frogbot config", 33)) if (!strncmp(s, "// This is nQuake's Frogbot config", 33))
{ {
s = "echo Refusing to exec nQuake's Frogbot config"; //otherwise many people with nquake installed will be fucked over whenever they try playing singleplayer s = va("echo \""CON_ERROR"Refusing to exec nQuake's %s\"", buf); //otherwise many people with nquake installed will be fucked over whenever they try playing singleplayer
Cbuf_InsertText (s, level, true); Cbuf_InsertText (s, level, true);
} }
else else
@ -848,6 +848,16 @@ static void Cmd_Exec_f (void)
} }
break; break;
} }
#ifdef HAVE_CLIENT
if (!cl_warncmd.ival && foundone && (!strcmp(name, "quake.rc") || !strcmp(name, "default.cfg") || !strcmp(name, "autoexec.cfg")))
{
Menu_Prompt(NULL, NULL, va("WARNING: nquake %s file detected. The file has been ignored.", name), NULL, NULL, "Argh");
*s = 0;
foundone = 0;
}
#endif
Cbuf_InsertText (s, level, true); Cbuf_InsertText (s, level, true);
if (foundone) if (foundone)
Cbuf_InsertText(va("\necho \""CON_ERROR"fixups for nquake config %s: %i replacements\"\n", buf, foundone), level, false); Cbuf_InsertText(va("\necho \""CON_ERROR"fixups for nquake config %s: %i replacements\"\n", buf, foundone), level, false);