Fixed bug with team assignments and spell permissions.

This commit is contained in:
Nick Winter 2014-01-16 11:37:04 -08:00
parent d0f1510623
commit 1fb68ae717
3 changed files with 10 additions and 17 deletions

View file

@ -120,7 +120,6 @@ module.exports = class LevelLoader extends CocoClass
@world = new World @level.get('name')
serializedLevel = @level.serialize(@supermodel)
@world.loadFromLevel serializedLevel, false
# @setTeam @world.teamForPlayer 1 # We don't know which player we are; this will go away--temp TODO
@buildSpriteSheets()
buildSpriteSheets: ->

View file

@ -106,7 +106,7 @@ module.exports = class PlayLevelView extends View
@level = @levelLoader.level
@world = @levelLoader.world
@loadingScreen.destroy()
# @initWorld()
@setTeam @world.teamForPlayer 1 # We don't know which player we are; this will go away--temp TODO
@initSurface()
@initGod()
@initGoalManager()
@ -291,12 +291,6 @@ module.exports = class PlayLevelView extends View
return if p.length
@$el.append($('<img src="/images/level/pointer.png" id="pointer">'))
initWorld: ->
@world ?= new World @level.get('name')
serializedLevel = @level.serialize(@supermodel)
@world.loadFromLevel serializedLevel, false
@setTeam @world.teamForPlayer 1 # We don't know which player we are; this will go away--temp TODO
initSurface: ->
surfaceCanvas = $('canvas#surface', @$el)
@surface = new Surface(@world, surfaceCanvas, thangTypes: @supermodel.getModels(ThangType), playJingle: not @isEditorPreview)

View file

@ -32,7 +32,7 @@
"firepad": "~0.1.2",
"marked": "~0.3.0",
"moment": "~2.5.0",
"aether": "~0.0.1",
"aether": "~0.0.5",
"underscore.string": "~2.3.3",
"firebase": "~1.0.2"
},