From 242dea46763178252ffaca8cfe85ca21efef94d7 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Mon, 7 Feb 2022 14:34:36 +0000
Subject: [PATCH] Try and be a bit more portable; allow .map support in browser
 ports.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6186 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/sys_linux.c |  5 -----
 engine/common/bothdefs.h  |  2 +-
 engine/common/cmd.c       | 17 +++++++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/engine/client/sys_linux.c b/engine/client/sys_linux.c
index 24e74f90b..c517717ce 100644
--- a/engine/client/sys_linux.c
+++ b/engine/client/sys_linux.c
@@ -30,16 +30,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <dlfcn.h>
 #include <dirent.h>
-#if !defined(__CYGWIN__) && !defined(__DJGPP__)
-# include <sys/ipc.h>
-# include <sys/shm.h>
-#endif
 #include <sys/stat.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/engine/common/bothdefs.h b/engine/common/bothdefs.h
index 0575e00a2..728cc74b4 100644
--- a/engine/common/bothdefs.h
+++ b/engine/common/bothdefs.h
@@ -315,7 +315,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //	#undef Q3SERVER //match Q3CLIENT
 //	#undef Q2BSPS	//emscripten can't cope with bss, leading to increased download time. too lazy to fix.
 //	#undef Q3BSPS	//emscripten can't cope with bss, leading to increased download time. too lazy to fix.
-	#undef TERRAIN
+//	#undef TERRAIN
 //	#undef PSET_SCRIPT	//bss+size
 	#define GLSLONLY	//pointless having the junk
 	#define GLESONLY	//should reduce the conditions a little
diff --git a/engine/common/cmd.c b/engine/common/cmd.c
index 1e45dd555..b86479bdf 100644
--- a/engine/common/cmd.c
+++ b/engine/common/cmd.c
@@ -3794,17 +3794,22 @@ static void Cmd_set_f(void)
 	char name[256];
 	const char *desc = NULL;
 
-	if (Cmd_Argc()<3)
-	{
-		Con_TPrintf("%s %s <equation>\n", Cmd_Argv(0), *Cmd_Argv(1)?Cmd_Argv(1):"<var>");
-		return;
-	}
-
 	if (!strcmp(Cmd_Argv(0), "set_calc") || !strcmp(Cmd_Argv(0), "seta_calc"))
 		docalc = true;
 	else
 		docalc = false;
 
+	if (Cmd_Argc()<3)
+	{
+		if (docalc)
+			Con_TPrintf("%s %s <equation>\n", Cmd_Argv(0), *Cmd_Argv(1)?Cmd_Argv(1):"<var>");
+		else if (!strcmp(Cmd_Argv(0), "setfl"))
+			Con_TPrintf("%s %s <value> <a|u|s>\n", Cmd_Argv(0), *Cmd_Argv(1)?Cmd_Argv(1):"<var>");
+		else
+			Con_TPrintf("%s %s <value>\n", Cmd_Argv(0), *Cmd_Argv(1)?Cmd_Argv(1):"<var>");
+		return;
+	}
+
 	if (!strncmp(Cmd_Argv(0), "seta", 4) && !Cmd_FromGamecode())
 		forceflags |= CVAR_ARCHIVE;