codeninjasllc/codecombat
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Trying to fix some Simulator loading errors.

Browse source
This commit is contained in:
Nick Winter 2014-05-25 08:29:33 -07:00
parent 33408020f1
commit 1a6fd75103
2 changed files with 6 additions and 2 deletions

3
app/lib/LevelLoader.coffee
View file

@ -164,6 +164,7 @@ module.exports = class LevelLoader extends CocoClass
@supermodel.loadModel(model, resourceName) @supermodel.loadModel(model, resourceName)
onSupermodelLoaded: -> onSupermodelLoaded: ->
return if @destroyed
console.log 'SuperModel for Level loaded in', new Date().getTime() - @t0, 'ms' console.log 'SuperModel for Level loaded in', new Date().getTime() - @t0, 'ms'
@loadLevelSounds() @loadLevelSounds()
@denormalizeSession() @denormalizeSession()
@ -182,7 +183,7 @@ module.exports = class LevelLoader extends CocoClass
spriteSheetResource.spriteSheetKeys = keys spriteSheetResource.spriteSheetKeys = keys
else else
spriteSheetResource.markLoaded() spriteSheetResource.markLoaded()
clearInterval @buildLoopInterval unless someLeft clearInterval @buildLoopInterval unless someLeft
onBuildComplete: (e) -> onBuildComplete: (e) ->

5
app/lib/simulator/Simulator.coffee
View file

@ -43,6 +43,7 @@ module.exports = class Simulator extends CocoClass
@supermodel ?= new SuperModel() @supermodel ?= new SuperModel()
@supermodel.resetProgress() @supermodel.resetProgress()
@stopListening @supermodel, 'loaded-all'
@levelLoader = new LevelLoader supermodel: @supermodel, levelID: @task.getLevelName(), sessionID: @task.getFirstSessionID(), headless: true @levelLoader = new LevelLoader supermodel: @supermodel, levelID: @task.getLevelName(), sessionID: @task.getFirstSessionID(), headless: true
if @supermodel.finished() if @supermodel.finished()
@ -95,7 +96,7 @@ module.exports = class Simulator extends CocoClass
else else
@sendSingleGameBackToServer(taskResults) @sendSingleGameBackToServer(taskResults)
@cleanupSimulation() @cleanupAndSimulateAnotherTask()
sendSingleGameBackToServer: (results) -> sendSingleGameBackToServer: (results) ->
@trigger 'statusUpdate', 'Simulation completed, sending results back to server!' @trigger 'statusUpdate', 'Simulation completed, sending results back to server!'
@ -163,6 +164,7 @@ module.exports = class Simulator extends CocoClass
@supermodel ?= new SuperModel() @supermodel ?= new SuperModel()
@supermodel.resetProgress() @supermodel.resetProgress()
@stopListening @supermodel, 'loaded-all'
@levelLoader = new LevelLoader supermodel: @supermodel, levelID: levelID, sessionID: @task.getFirstSessionID(), headless: true @levelLoader = new LevelLoader supermodel: @supermodel, levelID: levelID, sessionID: @task.getFirstSessionID(), headless: true
if @supermodel.finished() if @supermodel.finished()
@simulateGame() @simulateGame()
@ -232,6 +234,7 @@ module.exports = class Simulator extends CocoClass
processResults: (simulationResults) -> processResults: (simulationResults) ->
taskResults = @formTaskResultsObject simulationResults taskResults = @formTaskResultsObject simulationResults
console.error "*** Error: taskResults has no taskID ***\ntaskResults:", taskResults, "\ntask:", @task unless taskResults.taskID
@sendResultsBackToServer taskResults @sendResultsBackToServer taskResults
sendResultsBackToServer: (results) -> sendResultsBackToServer: (results) ->