From dda43e46974fffc2f637806fbcbf3e3fc62a8902 Mon Sep 17 00:00:00 2001
From: lordhavoc <lordhavoc@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Fri, 17 Feb 2006 11:15:03 +0000
Subject: [PATCH] added g_spawnshieldtime and g_midair_shieldtime to menu

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1076 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/menu/creategame/gamemodes/gamemisc.menu | 12 ++++++++++++
 data/menu/data/gamemodes/gamemisc.menu       | 16 +++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/data/menu/creategame/gamemodes/gamemisc.menu b/data/menu/creategame/gamemodes/gamemisc.menu
index c65677f56..2eac7fdb1 100644
--- a/data/menu/creategame/gamemodes/gamemisc.menu
+++ b/data/menu/creategame/gamemodes/gamemisc.menu
@@ -40,6 +40,11 @@ Item Layout Misc
 				text	"Join Message Display Time"
 				target	"Data::Game::Misc::JoinMessageTime::Text"
 			}
+			Derive Nex_Option_EditBox SpawnShieldTime
+			{
+				text	"Invulnerability time after spawning"
+				target	"Data::Game::Misc::SpawnShieldTime::Text"
+			}
 			Derive Nex_Option_Switch Grapple
 			{
 				text	"Grappling Hook Enabled"
@@ -173,11 +178,18 @@ Item Layout Misc
 				text	"Laser-Guide Rockets"
 				target	"::Data::Game::Misc::HomingRocket::Switch"
 			}
+			Derive Nex_Line	SeperatorMidAir
+			{}
 			Derive Nex_Option_Switch MidAir
 			{
 				text	"MidAir"
 				target	"::Data::Game::Misc::MidAir::Switch"
 			}
+			Derive Nex_Option_EditBox MidAirShieldTime
+			{
+				text	"Invulnerability time after leaving floor"
+				target	"::Data::Game::Misc::MidAirShieldTime::Text"
+			}
 			Derive Nex_Line	SeperatorMinstagib
 			{}
 			Derive Nex_Option_Switch MinstaGibMode
diff --git a/data/menu/data/gamemodes/gamemisc.menu b/data/menu/data/gamemodes/gamemisc.menu
index cea0754b5..3cf7e0bfe 100644
--- a/data/menu/data/gamemodes/gamemisc.menu
+++ b/data/menu/data/gamemodes/gamemisc.menu
@@ -11,6 +11,13 @@ Item DataContainer Misc
 
 		[DataLink_Setting]
 	}
+	Item Data_CvarCreateSave SpawnShieldTime
+	{
+		cvarName	"g_spawnshieldtime"
+		defValue	0
+
+		[DataLink_Setting]
+	}
 	Item Data_CvarCreateSave Grapple
 	{
 		cvarName	"g_grappling_hook"
@@ -31,7 +38,7 @@ Item DataContainer Misc
 		defValue	1000
 
 		[DataLink_Setting]
-	}	
+	}
 	Item Data_Cvar StartLaser
 	{
 		cvarName	"g_start_weapon_laser"
@@ -193,6 +200,13 @@ Item DataContainer Misc
 
 		[DataLink_OnOffSwitch]
 	}
+	Item Data_Cvar MidAirShieldTime
+	{
+		cvarName	"g_midair_shieldtime"
+		defValue	0.3
+
+		[DataLink_Setting]
+	}
 	Item Data_Cvar MinstaGibMode
 	{
 		cvarName	"g_minstagib"
-- 
2.39.2