From 6ed4ad65195b1ceef578f1585da4c901dc41db7b Mon Sep 17 00:00:00 2001
From: Matei <matei@wildfiregames.com>
Date: Tue, 5 Dec 2006 02:08:52 +0000
Subject: [PATCH] Added a hotkey to toggle rendering of territory outlines.
 (Currently "T").

This was SVN commit r4675.
---
 binaries/data/config/system.cfg                    |  1 +
 binaries/data/mods/official/gui/test/4_session.xml |  9 +++++++++
 source/ps/Hotkey.cpp                               |  5 +++--
 source/ps/Hotkey.h                                 |  1 +
 source/renderer/Renderer.cpp                       |  3 ++-
 source/renderer/Renderer.h                         |  6 ++++++
 source/scripting/ScriptGlue.cpp                    | 12 ++++++++++++
 7 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/binaries/data/config/system.cfg b/binaries/data/config/system.cfg
index 927c0927ea..620a3ede24 100644
--- a/binaries/data/config/system.cfg
+++ b/binaries/data/config/system.cfg
@@ -186,6 +186,7 @@ hotkey.dudemachine.random = "Ctrl+ForwardSlash"			; Create random Dude.
 hotkey.water.toggle = "Q"					; Toggle water rendering
 hotkey.water.raise = "A"					; Raise water plane
 hotkey.water.lower = "Z"					; Lower water plane
+hotkey.territory.rendering.toggle = "T"				; Toggle territory rendering
 
 ; > OVERLAY KEYS
 hotkey.fps.toggle = "Shift+F"					; Toggle frame counter.
diff --git a/binaries/data/mods/official/gui/test/4_session.xml b/binaries/data/mods/official/gui/test/4_session.xml
index 5c1e046194..9c75f57c21 100644
--- a/binaries/data/mods/official/gui/test/4_session.xml
+++ b/binaries/data/mods/official/gui/test/4_session.xml
@@ -63,6 +63,15 @@
 				setWaterHeight( getWaterHeight() - 0.25 );
 			]]></action>
 		</object>
+			
+		<!-- EMPTY OBJECT USED TO TOGGLE TERRITORY RENDERING. -->
+		<object name="snTerritoryToggle"
+			hotkey="territory.rendering.toggle"
+		>
+			<action on="Press"><![CDATA[		
+				toggleTerritoryRendering();
+			]]></action>
+		</object>
 		
 		<!-- GROUP: MINIMAP -->
 		<object	name="snMiniMap"
diff --git a/source/ps/Hotkey.cpp b/source/ps/Hotkey.cpp
index dfcfc73a23..25e7b31f0d 100644
--- a/source/ps/Hotkey.cpp
+++ b/source/ps/Hotkey.cpp
@@ -139,8 +139,9 @@ static SHotkeyInfo hotkeyInfo[] =
 	{ HOTKEY_PROFILE_SAVE, "profile.save", 0, 0 },
 	{ HOTKEY_PLAYMUSIC, "playmusic", SDLK_p, 0 },
 	{ HOTKEY_WATER_TOGGLE, "water.toggle", SDLK_q, 0 },
-	{ HOTKEY_WATER_RAISE, "water.toggle", SDLK_a, 0 },
-	{ HOTKEY_WATER_LOWER, "water.toggle", SDLK_z, 0 },
+	{ HOTKEY_WATER_RAISE, "water.raise", SDLK_a, 0 },
+	{ HOTKEY_WATER_LOWER, "water.lower", SDLK_z, 0 },
+	{ HOTKEY_TERRITORY_RENDERING_TOGGLE, "territory.rendering.toggle", SDLK_t, 0 },
 	{ HOTKEY_PAUSE, "pause", SDLK_PAUSE, 0 },
 	{ HOTKEY_SPEED_INCREASE, "speed.increase", 0, 0 },
 	{ HOTKEY_SPEED_DECREASE, "speed.decrease", 0, 0 }
diff --git a/source/ps/Hotkey.h b/source/ps/Hotkey.h
index 11d4a500cd..d76e9c6036 100644
--- a/source/ps/Hotkey.h
+++ b/source/ps/Hotkey.h
@@ -108,6 +108,7 @@ enum
 	HOTKEY_WATER_TOGGLE,
 	HOTKEY_WATER_RAISE,
 	HOTKEY_WATER_LOWER,
+	HOTKEY_TERRITORY_RENDERING_TOGGLE,
 	HOTKEY_PAUSE,
 	HOTKEY_SPEED_INCREASE,
 	HOTKEY_SPEED_DECREASE,
diff --git a/source/renderer/Renderer.cpp b/source/renderer/Renderer.cpp
index 0283f5e2e9..0b3b172972 100644
--- a/source/renderer/Renderer.cpp
+++ b/source/renderer/Renderer.cpp
@@ -358,6 +358,7 @@ CRenderer::CRenderer()
 	m_DisableCopyShadow = false;
 	m_FastPlayerColor = true;
 	m_SkipSubmit = false;
+	m_RenderTerritories = true;
 
 	m_VertexShader = 0;
 
@@ -1245,7 +1246,7 @@ void CRenderer::RenderSubmissions()
 	RenderPatches();
 	oglCheck();
 
-	if (g_Game)
+	if (g_Game && m_RenderTerritories)
 	{
 		g_Game->GetWorld()->GetTerritoryManager()->renderTerritories();
 		oglCheck();
diff --git a/source/renderer/Renderer.h b/source/renderer/Renderer.h
index a5797d9a2a..62d81c210a 100644
--- a/source/renderer/Renderer.h
+++ b/source/renderer/Renderer.h
@@ -469,6 +469,12 @@ public:
 	 * Can be accessed via JS as renderer.skipSubmit
 	 */
 	bool m_SkipSubmit;
+
+	/**
+	 * m_RenderTerritories: 
+	 * Turn territory boundary rendering on or off.
+	 */
+	bool m_RenderTerritories;
 };
 
 
diff --git a/source/scripting/ScriptGlue.cpp b/source/scripting/ScriptGlue.cpp
index e902a4e5b1..e4dc08bd19 100644
--- a/source/scripting/ScriptGlue.cpp
+++ b/source/scripting/ScriptGlue.cpp
@@ -1077,6 +1077,15 @@ JSBool toggleSky( JSContext* cx, JSObject* UNUSED(globalObject), uint argc, jsva
 	return( JS_TRUE );
 }
 
+// Toggles drawing territory outlines
+JSBool toggleTerritoryRendering( JSContext* cx, JSObject* UNUSED(globalObject), uint argc, jsval* argv, jsval* rval )
+{
+	JSU_REQUIRE_NO_PARAMS();
+	g_Renderer.m_RenderTerritories = !g_Renderer.m_RenderTerritories;
+	*rval = JSVAL_VOID;
+	return( JS_TRUE );
+}
+
 // Toggles drawing the water plane
 JSBool toggleWater( JSContext* cx, JSObject* UNUSED(globalObject), uint argc, jsval* argv, jsval* rval )
 {
@@ -1364,6 +1373,9 @@ JSFunctionSpec ScriptFunctionTable[] =
 	JS_FUNC(setWaterFullDepth, setWaterFullDepth, 0)
 	JS_FUNC(setWaterAlphaOffset, setWaterAlphaOffset, 0)
 
+	// Territory rendering
+	JS_FUNC(toggleTerritoryRendering, toggleTerritoryRendering, 0)
+
 	// GUI
 #ifndef NO_GUI
 	JS_FUNC(getGUIObjectByName, JSI_IGUIObject::getByName, 1)	// external