Merge pull request #1034 from NimbusBP1729/remove_level_hack

removed ugly hack

src/main.lua

@@ -13,7 +13,6 @@ if correctVersion then
   local mixpanel = require 'vendor/mixpanel'
 
   local debugger = require 'debugger'
-  local Level = require 'level'
   local camera = require 'camera'
   local fonts = require 'fonts'
   local window = require 'window'
@@ -22,9 +21,6 @@ if correctVersion then
   local character = require 'character'
   local cheat = require 'cheat'
   local player = require 'player'
-
-  -- XXX Hack for level loading
-  Gamestate.Level = Level
 
   math.randomseed( os.time() )
 

src/vendor/gamestate.lua

@@ -50,12 +50,9 @@ function GS.new()
   }
 end
 
-GS.Level = nil
-
 function GS.get(name)
   if love.filesystem.exists("maps/" .. name .. ".lua") then
-    -- ugly hack to get around circular import
-    return GS.Level.new(name)
+    return require("level").new(name)
   else
     return require(name)
   end