From e01f24bebb908e1cc82d44b31718af710d65bb8e Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Thu, 24 Sep 2015 15:56:35 +1000
Subject: [PATCH] Update readme, fix non-compliant GL calls.

---
 ClassicalSharp/2D/Screens/Menu/KeyMappingsScreen.cs | 5 ++++-
 ClassicalSharp/2D/Screens/Menu/MenuInputScreen.cs   | 7 +++++--
 ClassicalSharp/2D/Screens/Menu/MenuScreen.cs        | 7 ++++---
 ClassicalSharp/2D/Screens/Menu/OptionsScreen.cs     | 4 ----
 ClassicalSharp/2D/Screens/Menu/PauseScreen.cs       | 7 +++++++
 ClassicalSharp/ClassicalSharp.csproj                | 2 +-
 readme.md                                           | 6 ++----
 7 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/ClassicalSharp/2D/Screens/Menu/KeyMappingsScreen.cs b/ClassicalSharp/2D/Screens/Menu/KeyMappingsScreen.cs
index f752af4e2..a7a60926b 100644
--- a/ClassicalSharp/2D/Screens/Menu/KeyMappingsScreen.cs
+++ b/ClassicalSharp/2D/Screens/Menu/KeyMappingsScreen.cs
@@ -10,8 +10,11 @@ namespace ClassicalSharp {
 		}
 		
 		public override void Render( double delta ) {
-			base.Render( delta );
+			RenderMenuBounds();
+			graphicsApi.Texturing = true;
+			RenderMenuButtons( delta );
 			statusWidget.Render( delta );
+			graphicsApi.Texturing = false;
 		}
 		
 		Font keyFont;
diff --git a/ClassicalSharp/2D/Screens/Menu/MenuInputScreen.cs b/ClassicalSharp/2D/Screens/Menu/MenuInputScreen.cs
index 92bfc9102..2d1d2f336 100644
--- a/ClassicalSharp/2D/Screens/Menu/MenuInputScreen.cs
+++ b/ClassicalSharp/2D/Screens/Menu/MenuInputScreen.cs
@@ -16,11 +16,14 @@ namespace ClassicalSharp {
 		protected int okayIndex;
 		
 		public override void Render( double delta ) {
-			base.Render( delta );
+			RenderMenuBounds();
+			graphicsApi.Texturing = true;
+			RenderMenuButtons( delta );
 			if( inputWidget != null )
 				inputWidget.Render( delta );
 			if( descWidget != null )
 				descWidget.Render( delta );
+			graphicsApi.Texturing = false;
 		}
 		
 		public override bool HandlesKeyPress( char key ) {
@@ -66,7 +69,7 @@ namespace ClassicalSharp {
 			if( descWidget != null )
 				descWidget.Dispose();
 			
-			string text = widget.Text + " : " + widget.GetValue( game );
+			string text = widget.Text + ": " + widget.GetValue( game );
 			descWidget = TextWidget.Create( game, 0, 100, text, Docking.Centre, Docking.Centre, regularFont );
 		}
 		
diff --git a/ClassicalSharp/2D/Screens/Menu/MenuScreen.cs b/ClassicalSharp/2D/Screens/Menu/MenuScreen.cs
index 760590414..9c86550cb 100644
--- a/ClassicalSharp/2D/Screens/Menu/MenuScreen.cs
+++ b/ClassicalSharp/2D/Screens/Menu/MenuScreen.cs
@@ -11,14 +11,15 @@ namespace ClassicalSharp {
 		protected ButtonWidget[] buttons;
 		protected Font titleFont, regularFont;
 		
-		public override void Render( double delta ) {
+		protected void RenderMenuBounds() {
 			graphicsApi.Draw2DQuad( 0, 0, game.Width, game.Height, new FastColour( 60, 60, 60, 160 ) );
-			graphicsApi.Texturing = true;
+		}
+		
+		protected void RenderMenuButtons( double delta ) {
 			for( int i = 0; i < buttons.Length; i++ ) {
 				if( buttons[i] == null ) continue;
 				buttons[i].Render( delta );
 			}
-			graphicsApi.Texturing = false;
 		}
 		
 		public override void Dispose() {
diff --git a/ClassicalSharp/2D/Screens/Menu/OptionsScreen.cs b/ClassicalSharp/2D/Screens/Menu/OptionsScreen.cs
index 81fb14082..6966f6b76 100644
--- a/ClassicalSharp/2D/Screens/Menu/OptionsScreen.cs
+++ b/ClassicalSharp/2D/Screens/Menu/OptionsScreen.cs
@@ -8,10 +8,6 @@ namespace ClassicalSharp {
 		public OptionsScreen( Game game ) : base( game ) {
 		}
 		
-		public override void Render( double delta ) {
-			base.Render( delta );
-		}
-		
 		public override void Init() {
 			titleFont = new Font( "Arial", 16, FontStyle.Bold );
 			regularFont = new Font( "Arial", 16, FontStyle.Regular );
diff --git a/ClassicalSharp/2D/Screens/Menu/PauseScreen.cs b/ClassicalSharp/2D/Screens/Menu/PauseScreen.cs
index 0ef93cfa3..c4f8360f6 100644
--- a/ClassicalSharp/2D/Screens/Menu/PauseScreen.cs
+++ b/ClassicalSharp/2D/Screens/Menu/PauseScreen.cs
@@ -9,6 +9,13 @@ namespace ClassicalSharp {
 		public PauseScreen( Game game ) : base( game ) {
 		}		
 		
+		public override void Render( double delta ) {
+			RenderMenuBounds();
+			graphicsApi.Texturing = true;
+			RenderMenuButtons( delta );
+			graphicsApi.Texturing = false;
+		}
+		
 		public override void Init() {
 			titleFont = new Font( "Arial", 16, FontStyle.Bold );
 			buttons = new ButtonWidget[] {
diff --git a/ClassicalSharp/ClassicalSharp.csproj b/ClassicalSharp/ClassicalSharp.csproj
index f91cf5e95..3ac7eeee8 100644
--- a/ClassicalSharp/ClassicalSharp.csproj
+++ b/ClassicalSharp/ClassicalSharp.csproj
@@ -47,7 +47,7 @@
     <StartAction>Project</StartAction>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug_DX' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <OutputPath>..\output\debug\</OutputPath>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>Full</DebugType>
diff --git a/readme.md b/readme.md
index 0a073e1c0..c18326b7c 100644
--- a/readme.md
+++ b/readme.md
@@ -32,13 +32,11 @@ These are expected to be in the form: `<username> <mppass> <ip> <port> <skin ser
 
 #### Key combinations
 * Press escape (after joining a world) to switch to the pause menu. 
-* The pause menu lists all of the key combinations used by the client. 
-  These key combinations can be reassigned by clicking on a key combination.
-* Press escape or click "Back to game" to return to the game.
+* Pause menu -> Key mappings lists all of the key combinations used by the client. 
 
 Some points to note:
 * If the server has disabled hacks, key combinations such as fly and speed will not do anything.
-* Press F6 to change view distance. A smaller number of visible chunks can improve performance.
+* Press F6 to cycle view distance. A smaller number of visible chunks can improve performance.
 * Press F7 to toggle VSync on or off. (on minimises CPU usage)
 
 #### Client commands