From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 14 May 2010 18:23:55 +0000 (+0200)
Subject: build revision watermark
X-Git-Tag: xonotic-v0.1.0preview~615
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=18d6521b3f7e760b9d2329bd0fd51067b91d8f1f;p=xonotic%2Fxonotic-data.pk3dir.git

build revision watermark
BRIX WILL BE ....
when you see it
---

diff --git a/Makefile b/Makefile
index 7128da2d6..e1d51f09d 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ ZIP ?= 7za a -tzip -mx=9
 ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc
 DIFF ?= diff
 
-FTEQCCFLAGS ?= -Werror -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo
+FTEQCCFLAGS_WATERMARK ?= -DWATERMARK='"^1$(shell git describe) TEST BUILD"'
+FTEQCCFLAGS ?= -Werror -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo $(FTEQCCFLAGS_EXTRA) $(FTEQCCFLAGS_WATERMARK)
 FTEQCCFLAGS_PROGS ?= 
 FTEQCCFLAGS_MENU ?= 
 
diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index d7ed1815a..2c579ac49 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1,17 +1,5 @@
 set g_xonoticversion 2.5svn	"Xonotic version (formatted for humans)"
 
-//!<showbrand
-showbrand 3
-echo
-echo A warning about this being a SVN development version was set up.
-echo This build shall be used for development and testing only!
-echo
-echo If you want to disable this warning, add the line
-echo   showbrand 0
-echo to your autoexec.cfg.
-echo
-//!>showbrand
-
 // changes a cvar and reports it to the server (for the menu to notify the
 // server about changes)
 alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\""
diff --git a/gfx/brand.tga b/gfx/brand.tga
deleted file mode 100644
index d2e88c250..000000000
Binary files a/gfx/brand.tga and /dev/null differ
diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 9c1af7d5f..575f8b062 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -60,6 +60,10 @@ void CSQC_Init(void)
 	
 	check_unacceptable_compiler_bugs();
 
+#ifdef WATERMARK
+	print("^4CSQC Build information: ", WATERMARK(), "\n");
+#endif
+
 	float i;
 	CSQC_CheckEngine();
 
diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 462337c05..b8fee02a1 100644
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -24,6 +24,10 @@ void() m_init =
 
 	check_unacceptable_compiler_bugs();
 
+#ifdef WATERMARK
+	print("^4MQC Build information: ", WATERMARK(), "\n");
+#endif
+
 	// list all game dirs (TEST)
 	if(cvar("developer"))
 	{
diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 4f365d794..0492760bf 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -322,8 +322,19 @@ float preMenuInit()
 
 string campaign_name_previous;
 float campaign_won_previous;
+#ifdef WATERMARK
+var string autocvar_menu_watermark = WATERMARK();
+#else
+var string autocvar_menu_watermark = "";
+#endif
 void postMenuDraw()
 {
+	if(autocvar_menu_watermark != "")
+	{
+		vector fs = '48 48 0';
+		float w;
+		draw_CenterText('0.5 0.1 0', autocvar_menu_watermark, globalToBoxSize('32 32 0', draw_scale), '1 1 1', 0.05, 1);
+	}
 }
 void preMenuDraw()
 {
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 5068f52d6..e9d9900ac 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1393,6 +1393,10 @@ void ClientConnect (void)
 
 	DecodeLevelParms();
 
+#ifdef WATERMARK
+	sprint(self, strcat("^4SVQC Build information: ", WATERMARK(), "\n"));
+#endif
+
 	self.classname = "player_joining";
 
 	self.flags = FL_CLIENT;