fix watermark issues :)

diff --git a/qcsrc/Makefile b/qcsrc/Makefile
index db69248e9f4496c2e6989f9a1cfaa5d23ab39967..a0c4d3fd5dd97a1a5bf8a536c8d88dba177f7bcb 100644 (file)
--- 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 835d2855ed78a866c8e0e15a806b63b6ff6b9766..dc8a64a11574e0e4318147841a4495930fb4a4f2 100644 (file)
--- 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 0f195d73ba7166726f3c52ee72c3669278086eb6..dffce2f2bb0e206c3a73b296b7136f82daecb18f 100644 (file)
--- 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 bccf5c8d61ea28fbf50e2191efe8482786382be6..827f3e7560a8d349952f0ae0441d142d27bac0b7 100644 (file)
--- 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 4c03eaa5f9caa9edb5255ee3f4a217a904799463..459b2155f2467076a01c1c36ad883927dff0742b 100644 (file)
--- 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 101e35cae2718d4702f43301b7061a4dbd138ae8..96e1af96b3f2b6b820f9485dc5fb4efdd941433f 100644 (file)
--- 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 dcf1ab76842afdd5a8885d68d4aacc16811c4627..6945fe7221463fd6dd638ec5688d1ee7f5532b30 100644 (file)
--- 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 5ddad200fe752499c8dffb78ef2db4b549407202..a95eed67ad7fa0ce4b970394cd08cf5473d0b849 100644 (file)
--- 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()));