Merge branch 'master' of github.com:DancingBanana/game-off-2012

Conflicts: public/coffee/models/Loader.coffee
DancingBanana · Dec 1, 2012 · 39e45be · 39e45be
2 parents 62285a7 + dfc8e65
commit 39e45be
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/public/coffee/models/Loader.coffee b/public/coffee/models/Loader.coffee
@@ -16,6 +16,13 @@ define [
  constructor: ->
  @nextLevel 1
  @currentLevel = 1
+ $canvas = $ '#gamescape'
+ @canvas = $canvas.get 0
+ @sound = new SoundHelper $canvas
+ @loadLevel Level
+ $('#gamescape').on 'requestLevel', (e) =>
+ @loadLevel @currentLevelRequest
+ # @currentLevel = 1
 
  loadLevel: (levelRequested) =>
 
@@ -34,6 +41,8 @@ define [
  do goal.destroy
  do player.destroy
 
+ world = boxbox.createWorld @canvas, levelRequested.World
+
  grounds = (new GroundEntity world, options).register() for options in levelRequested.GroundEntity
 
  doors = (new DoorEntity world, options).register() for options in levelRequested.DoorEntity