From cb450766ffdf537ea6cf499adbde5b458539e56a Mon Sep 17 00:00:00 2001
From: Wombat <hpwombat@yahoo.com>
Date: Sun, 22 Aug 2010 12:46:38 -0400
Subject: Removed warp object to 002-4

Removed the warp object to 002-4, warp is now based on an npc
---
 maps/002-3.tmx | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/maps/002-3.tmx b/maps/002-3.tmx
index 9cf9c3f5..57ad04e4 100644
--- a/maps/002-3.tmx
+++ b/maps/002-3.tmx
@@ -34,13 +34,6 @@
   </data>
  </layer>
  <objectgroup name="Objects" width="0" height="0">
-  <object name="toLevel2" type="warp" x="2176" y="3136" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="002-4"/>
-    <property name="dest_x" value="1088"/>
-    <property name="dest_y" value="3136"/>
-   </properties>
-  </object>
   <object name="Exit" type="warp" x="1184" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="002-1"/>
@@ -72,7 +65,7 @@
     <property name="monster_id" value="54"/>
    </properties>
   </object>
-  <object name="Ice Goblin" type="spawn" x="2080" y="3136" width="288" height="192">
+  <object name="Ice Goblin" type="spawn" x="2079" y="3140" width="288" height="192">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
-- 
cgit v1.2.3-60-g2f50


From c83577f386ff156964a83088be9510158a516553 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sun, 29 Aug 2010 00:13:18 -0600
Subject: Revert "Fix map issue with half barrels everywhere"

This reverts commit 1dbfedaffe0b57114afe53097286faf4b3421470.
---
 graphics/tiles/woodland_indoor_x2.png | Bin 9298 -> 12909 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/graphics/tiles/woodland_indoor_x2.png b/graphics/tiles/woodland_indoor_x2.png
index 6ffe1af2..07c7008a 100644
Binary files a/graphics/tiles/woodland_indoor_x2.png and b/graphics/tiles/woodland_indoor_x2.png differ
-- 
cgit v1.2.3-60-g2f50