From ec68721e7a17f43d3edbefba8bf978835082f78b Mon Sep 17 00:00:00 2001
From: 0x81c <mmlxxvi@gmail.com>
Date: Tue, 17 Mar 2015 02:15:28 -0400
Subject: [PATCH] ma_ing room for level editorgit add -A

---
 conf.lua             | 4 ++--
 dialogue_manager.lua | 0
 npc.lua              | 2 +-
 room.lua             | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 dialogue_manager.lua

diff --git a/conf.lua b/conf.lua
index 95c9562..c1dbb0a 100644
--- a/conf.lua
+++ b/conf.lua
@@ -1,5 +1,5 @@
 function love.conf(t)
-	t.window.width = 700
-	t.window.height = 700
+	t.window.width = 900
+	t.window.height = 640
 	t.window.title = "CHROMA SOLSTICE"
 end
\ No newline at end of file
diff --git a/dialogue_manager.lua b/dialogue_manager.lua
new file mode 100644
index 0000000..e69de29
diff --git a/npc.lua b/npc.lua
index 99f4211..7aee18d 100644
--- a/npc.lua
+++ b/npc.lua
@@ -8,7 +8,7 @@ function npc:initialize(x, y, color, name)
 		collision = "unmoveable",
 		sprite = sprites.npc[name][color],
 		onBump = function(self)
-			self.tal_ing = true
+			
 		end,
 	})
 end
\ No newline at end of file
diff --git a/room.lua b/room.lua
index 47c9654..a4b9d58 100644
--- a/room.lua
+++ b/room.lua
@@ -10,6 +10,7 @@ require "art"
 require "assorted"
 require "switch"
 require "door"
+require "dialogue_manager"
 
 function Room:initialize(t)
 	self.player = {}