codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-23 23:58:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed bug with team assignments and spell permissions.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/lib/LevelLoader.coffee
View file

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

8
app/views/play/level_view.coffee
View file

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

2
bower.json
View file

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