From d7bae41fab5570bdac547a46463974adb4723f96 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Mon, 25 Feb 2019 18:47:55 -0500
Subject: mem leak patches; world ground from image

---
 xml/!town.xml     | 18 +-----------------
 xml/bobshouse.xml | 18 +-----------------
 2 files changed, 2 insertions(+), 34 deletions(-)

(limited to 'xml')

diff --git a/xml/!town.xml b/xml/!town.xml
index b2d96a5..1b1d527 100644
--- a/xml/!town.xml
+++ b/xml/!town.xml
@@ -12,22 +12,7 @@
 		<layer path="bg/dirt.png"/>
 		<layer path="bg/grass.png"/>
 	</style>
-	<generation>
-		x = 0
-
-		ground = function()
-			if (x == 320) then
-				height = -1
-			else
-				height = 1 / math.pow(2, (x - 50) / 2) + 60 
-			end
-			x = x + 1
-		end
-
-		grass = function()
-			height = math.random(2, 7)
-		end
-	</generation>
+	<generation>assets/testground.png</generation>
 	<weather>Sunny</weather>
 	<link right="!town2.xml"/>
 	<spawnx>-300</spawnx>
@@ -37,7 +22,6 @@
 	<structure type="1" position="300.0,100.0"/>
 	<structure inside="bobshouse.xml" type="1" position="10.0,100.0"/>
 	<skirl />
-	<birb position="-300.0,100.0" />
 	<firefly />
 </World>
 
diff --git a/xml/bobshouse.xml b/xml/bobshouse.xml
index 9160ef0..384af4f 100644
--- a/xml/bobshouse.xml
+++ b/xml/bobshouse.xml
@@ -13,23 +13,7 @@
 		<layer path="bg/carpet.png"/>
 	</style>
 	<house width="800" texture="assets/style/classic/bg/insideWoodHouse.png"/>
-	<generation>
-		x = 0
-
-		ground = function()
-			if (x == 320) then
-				height = -1
-			else
-				height = 60
-			end
-
-			x = x + 1
-		end
-
-		grass = function()
-			height = 2
-		end
-	</generation>
+	<generation>testground.png</generation>
 	<time>6000</time>
 	<!--<link outside="town.xml"/>-->
 	<npc name="Bob" hasDialog="true" spawnx="30"/>
-- 
cgit v1.2.3