From e6d45be2bca435031ccd05fb1faf6a2cdb305055 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 27 Oct 2011 19:14:44 -0500
Subject: [PATCH] move envutils2 into utilities.lua

---
 Themes/_fallback/Scripts/02 Utilities.lua | 15 ++++++++++
 Themes/_fallback/Scripts/03 EnvUtils2.lua | 35 -----------------------
 2 files changed, 15 insertions(+), 35 deletions(-)
 delete mode 100644 Themes/_fallback/Scripts/03 EnvUtils2.lua

diff --git a/Themes/_fallback/Scripts/02 Utilities.lua b/Themes/_fallback/Scripts/02 Utilities.lua
index 7d6181304c..e01c0d5ee4 100644
--- a/Themes/_fallback/Scripts/02 Utilities.lua	
+++ b/Themes/_fallback/Scripts/02 Utilities.lua	
@@ -255,6 +255,21 @@ File = {
 	end
 }
 
+envTable = GAMESTATE:Env()
+
+-- setenv(name,value)
+-- Sets aside an entry for <name> and puts <value> into it.
+-- Use a table as <value> to store multiple values
+function setenv(name,value)
+	envTable[name] = value
+end
+
+-- getenv(name)
+-- This will return whatever value is at envTable[name].
+function getenv(name)
+	return envTable[name]
+end
+
 -- (c) 2005-2011 Glenn Maynard, Chris Danford, SSC
 -- All rights reserved.
 -- 
diff --git a/Themes/_fallback/Scripts/03 EnvUtils2.lua b/Themes/_fallback/Scripts/03 EnvUtils2.lua
deleted file mode 100644
index ada8bbd384..0000000000
--- a/Themes/_fallback/Scripts/03 EnvUtils2.lua	
+++ /dev/null
@@ -1,35 +0,0 @@
---[[
-EnvUtils2: Environmental Variable Utilities
-Written by AJ Kelly of KKI Labs / Version 2.0
---]]
-
--- Env table global
-envTable = GAMESTATE:Env()
-
--- setenv(name,value)
--- Sets aside an entry for <name> and puts <value> into it.
--- Use a table as <value> to store multiple values
-function setenv(name,value)
-	envTable[name] = value
-end
-
--- getenv(name)
--- This will return whatever value is at envTable[name].
-function getenv(name)
-	return envTable[name]
-end
-
---[[
-Copyright © 2008 AJ Kelly/KKI Labs
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-]]
\ No newline at end of file