From a8ba2849de68dcad9dea0c02f60559d66d91dc67 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 17 Dec 2012 17:28:58 +0100
Subject: [PATCH] fix watermark issues :)

---
 qcsrc/Makefile              | 1 -
 qcsrc/client/Main.qc        | 2 +-
 qcsrc/common/util-pre.qh    | 8 ++++++++
 qcsrc/menu/menu.qc          | 2 +-
 qcsrc/menu/xonotic/util.qc  | 2 +-
 qcsrc/server/cl_client.qc   | 2 +-
 qcsrc/server/cl_player.qc   | 2 +-
 qcsrc/server/playerstats.qc | 2 +-
 8 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index db69248e9..a0c4d3fd5 100644
--- a/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@ -6,7 +6,6 @@ QCC ?= fteqcc
 VERSION_MESSAGE = $(shell $(QCC) --version --help)
 ifneq (,$(findstring GMQCC,$(VERSION_MESSAGE)))
 # this is gmqcc
-QCCFLAGS_WATERMARK =
 QCCFLAGS ?= -Wall -Wno-field-redeclared -Wno-double-declaration -Wno-assign-function-types -Wno-unused-variable -std=fteqcc -fshort-logic -O1 -flno $(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
 else
 # this. is. fteqccccccccccccccccccc!
diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 835d2855e..dc8a64a11 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -102,7 +102,7 @@ void CSQC_Init(void)
 	check_unacceptable_compiler_bugs();
 
 #ifdef WATERMARK
-	print(sprintf(_("^4CSQC Build information: ^1%s\n"), WATERMARK()));
+	print(sprintf(_("^4CSQC Build information: ^1%s\n"), WATERMARK));
 #endif
 
 	float i;
diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh
index 0f195d73b..dffce2f2b 100644
--- a/qcsrc/common/util-pre.qh
+++ b/qcsrc/common/util-pre.qh
@@ -13,3 +13,11 @@
 # define COMPAT_NO_MOD_IS_XONOTIC
 # define COMPAT_XON060_DONTCRASH_CHECKPVS
 #endif
+
+#ifdef FTEQCC
+#ifdef WATERMARK
+string FTEQCC_SUCKS_WATERMARKS_THROUGH_C60_FULLERENES = WATERMARK();
+#undef WATERMARK
+#define WATERMARK FTEQCC_SUCKS_WATERMARKS_THROUGH_C60_FULLERENES
+#endif
+#endif
diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index bccf5c8d6..827f3e756 100644
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -55,7 +55,7 @@ void m_init()
 	check_unacceptable_compiler_bugs();
 
 #ifdef WATERMARK
-	print(sprintf(_("^4MQC Build information: ^1%s\n"), WATERMARK()));
+	print(sprintf(_("^4MQC Build information: ^1%s\n"), WATERMARK));
 #endif
 
 	// list all game dirs (TEST)
diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 4c03eaa5f..459b2155f 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -465,7 +465,7 @@ float preMenuInit()
 string campaign_name_previous;
 float campaign_won_previous;
 #ifdef WATERMARK
-var string autocvar_menu_watermark = WATERMARK();
+var string autocvar_menu_watermark = WATERMARK;
 #else
 var string autocvar_menu_watermark = "";
 #endif
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 101e35cae..96e1af96b 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1355,7 +1355,7 @@ void ClientConnect (void)
 	DecodeLevelParms();
 
 #ifdef WATERMARK
-	sprint(self, strcat("^4SVQC Build information: ^1", WATERMARK(), "\n"));
+	sprint(self, strcat("^4SVQC Build information: ^1", WATERMARK, "\n"));
 #endif
 
 	self.classname = "player_joining";
diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index dcf1ab768..6945fe722 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -26,7 +26,7 @@ void WeaponStats_ready(entity fh, entity pass, float status)
 			url_fputs(fh, "#begin statsfile\n");
 			url_fputs(fh, strcat("#date ", strftime(TRUE, "%a %b %e %H:%M:%S %Z %Y"), "\n"));
 #ifdef WATERMARK
-			url_fputs(fh, strcat("#version ", WATERMARK(), "\n"));
+			url_fputs(fh, strcat("#version ", WATERMARK, "\n"));
 #endif
 			url_fputs(fh, strcat("#config ", ftos(crc16(FALSE, cvar_purechanges)), "\n"));
 			url_fputs(fh, strcat("#cvar_purechanges ", ftos(cvar_purechanges_count), "\n"));
diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index 5ddad200f..a95eed67a 100644
--- a/qcsrc/server/playerstats.qc
+++ b/qcsrc/server/playerstats.qc
@@ -225,7 +225,7 @@ void PlayerStats_ready(entity fh, entity pass, float status)
 		case URL_READY_CANWRITE:
 			url_fputs(fh, "V 5\n");
 #ifdef WATERMARK
-			url_fputs(fh, sprintf("R %s\n", WATERMARK()));
+			url_fputs(fh, sprintf("R %s\n", WATERMARK));
 #endif
 			url_fputs(fh, sprintf("T %s.%06d\n", strftime(FALSE, "%s"), floor(random() * 1000000)));
 			url_fputs(fh, sprintf("G %s\n", GetGametype()));
-- 
2.39.2