stupid merge that i hate

1 files changed, 6 insertions, 1 deletions

diff --git a/main.lua b/main.lua
index da681fe..2dfda3d 100644
--- a/main.lua
+++ b/main.lua
@@ -12,7 +12,8 @@ function love.load()
   event_bind(scn.on_draw, "Sprite", sprite_draw_sys)
   event_bind(scn.on_draw, "Tilemap", tilemap_draw_sys)
 
-  event_bind(scn.on_ui, "Player", player_ui_sys)
+  event_bind(scn.on_update, "Room_Editor", room_editor_ui_sys)
+  event_bind(scn.on_ui, "Room_Editor", tile_place_sys)
 
   set_scene(scn)
 
@@ -24,6 +25,9 @@ function love.load()
 
   ground1 = phys.Box.new(5, 50, 64, 16, {})
   ground2 = phys.Box.new(64 - 16, 50 + 16, 16, 64, {})
+
+  local room_editor = new_entity()
+  add_comp(room_editor, "Room_Editor")
 end
 
 function love.update(dt)
@@ -52,6 +56,7 @@ function love.draw(dt)
   local scr_width, scr_height = lg.getDimensions()
   WindowScale = min(scr_width / SCR_WIDTH, scr_height / SCR_HEIGHT)
 
+  lg.setColor(1, 1, 1)
   lg.draw(
     viewport,
     scr_width / 2, scr_height / 2, 0,