From 60f0086680ece4ec06493e0e543c5c25aae0e36e Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Tue, 28 Apr 2015 06:26:46 +1000
Subject: [PATCH] Cache WoM env and terrain identifiers.

---
 Network/NetworkProcessor.cs | 4 +++-
 Network/WomConfigHandler.cs | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Network/NetworkProcessor.cs b/Network/NetworkProcessor.cs
index 6c135eecc..8d6c1e871 100644
--- a/Network/NetworkProcessor.cs
+++ b/Network/NetworkProcessor.cs
@@ -316,7 +316,9 @@ namespace ClassicalSharp {
 							// different world, the environment settings from the last world are not loaded in the
 							// new world if the async 'get request' didn't complete before the new world was loaded.
 							womCounter++;
-							Window.AsyncDownloader.DownloadPage( url, true, "womenv_" + womCounter );
+							womEnvIdentifier = "womenv_" + womCounter;
+							womTerrainIdentifier = "womterrain_" + womCounter;
+							Window.AsyncDownloader.DownloadPage( url, true, womEnvIdentifier );
 							sendWomId = true;
 						}
 						receivedFirstPosition = false;
diff --git a/Network/WomConfigHandler.cs b/Network/WomConfigHandler.cs
index ec52929a6..ee35eabdf 100644
--- a/Network/WomConfigHandler.cs
+++ b/Network/WomConfigHandler.cs
@@ -7,9 +7,10 @@ namespace ClassicalSharp {
 
 	public partial class NetworkProcessor {
 		
+		string womEnvIdentifier = "womenv_0", womTerrainIdentifier = "womterrain_0";
 		void CheckForWomEnvironment() {
 			string page;
-			Window.AsyncDownloader.TryGetPage( "womenv_" + womCounter, out page );
+			Window.AsyncDownloader.TryGetPage( womEnvIdentifier, out page );
 			if( page != null ) {
 				ParseWomConfig( page );
 			}
@@ -18,7 +19,7 @@ namespace ClassicalSharp {
 		
 		void CheckWomBitmaps() {
 			Bitmap terrainBmp;
-			Window.AsyncDownloader.TryGetImage( "womterrain_" + womCounter, out terrainBmp );
+			Window.AsyncDownloader.TryGetImage( womTerrainIdentifier, out terrainBmp );
 			if( terrainBmp != null ) {
 				Window.ChangeTerrainAtlas( terrainBmp );
 			}