From c2aab22aef7e4b69ac76cb6b8b48c98ffc210876 Mon Sep 17 00:00:00 2001
From: esteel <esteel@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Tue, 15 May 2007 20:53:49 +0000
Subject: [PATCH] the 'reset' in the player menu was pushed too far down put
 non-applyable options to the top in the video menu

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2569 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/menu/options/player.menu |  2 --
 data/menu/options/video.menu  | 38 +++++++++++++++++------------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/data/menu/options/player.menu b/data/menu/options/player.menu
index 6ca7df667..405e6eadc 100644
--- a/data/menu/options/player.menu
+++ b/data/menu/options/player.menu
@@ -207,8 +207,6 @@ Item Window Player
 			text	"Download Speed"
 			target	"::Data::Player::MapDLSpeed::Value"
 		}
-		Derive Nex_Void Seperator1
-		{}
 		Derive PictureButton Apply
 		{
 			normal		"$gfx/options_b_apply"
diff --git a/data/menu/options/video.menu b/data/menu/options/video.menu
index 771bc3c59..be2927cd7 100644
--- a/data/menu/options/video.menu
+++ b/data/menu/options/video.menu
@@ -21,6 +21,23 @@ Item Window Video
 			DeriveTemplate SwitchButton	Switch
 			{}
 		}
+		Derive Nex_Option_Switch GLSL
+		{
+			text	"OpenGL 2.0 Shaders"
+			target	"::Data::Video::GLSL::Switch"
+		}
+		Derive Nex_Option_Switch VBO
+		{
+			text	"Vertex Buffer Objects"
+			target	"::Data::Video::VBO::Switch"
+		}
+		Derive Nex_Option_Switch ShowFPS
+		{
+			text	"Show FPS"
+			target	"::Data::Video::ShowFPS::Switch"
+		}
+		Derive Nex_Line Seperator1
+		{}
 		Derive Nex_Video_Option_Switch Resolution
 		{
 			text	"Resolution"
@@ -57,24 +74,7 @@ Item Window Video
 			text	"Texture Quality Reduction"
 			target	"::Data::Video::PicmipWorld::Switch"
 		}
-		Derive Nex_Line	SeperatorGFXFeatures
-		{}
-		Derive Nex_Option_Switch GLSL
-		{
-			text	"OpenGL 2.0 Shaders"
-			target	"::Data::Video::GLSL::Switch"
-		}
-		Derive Nex_Option_Switch VBO
-		{
-			text	"Vertex Buffer Objects"
-			target	"::Data::Video::VBO::Switch"
-		}
-		Derive Nex_Option_Switch ShowFPS
-		{
-			text	"Show FPS"
-			target	"::Data::Video::ShowFPS::Switch"
-		}
-		Derive Nex_Void Seperator1
+		Derive Nex_Void Seperator2
 		{}
 		Derive PictureButton Apply
 		{
@@ -88,7 +88,7 @@ Item Window Video
 			init	Nex_Action_ResetData
 			target	"::Data::Video"
 		}
-		Derive Nex_Void Seperator2
+		Derive Nex_Line Seperator3
 		{}
 		Derive Label Presets
 		{
-- 
2.39.2