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

Fixed a couple minor bugs.

Browse source
This commit is contained in:
Nick Winter 2014-05-09 14:30:33 -07:00
parent 6d8d119c94
commit a74d015d18
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/workers/worker_world.js
View file

@ -331,15 +331,8 @@ self.onDebugWorldLoaded = function onDebugWorldLoaded() {
}; };
self.onDebugWorldError = function onDebugWorldError(error) { self.onDebugWorldError = function onDebugWorldError(error) {
if(error instanceof Aether.problems.UserCodeProblem) { if(!error.isUserCodeProblem) {
if(!self.debugPostedErrors[error.key]) { console.log("Debug Non-UserCodeError:", error.toString() + "\n" + error.stack || error.stackTrace);
var problem = error.serialize();
self.postMessage({type: 'user-code-problem', problem: problem});
self.debugPostedErrors[error.key] = problem;
}
}
else {
console.log("Non-UserCodeError:", error.toString() + "\n" + error.stack || error.stackTrace);
} }
return true; return true;
}; };

2
app/lib/God.coffee
View file

@ -82,7 +82,7 @@ module.exports = class God
when 'new-debug-world' when 'new-debug-world'
console.log "New Debug world!" console.log "New Debug world!"
when 'console-log' when 'console-log'
console.log "|" + @id + "'s debugger |", event.data.args... console.log "|" + @id + "'s debugger|", event.data.args...
when 'debug-value-return' when 'debug-value-return'
Backbone.Mediator.publish 'god:debug-value-return', event.data.serialized Backbone.Mediator.publish 'god:debug-value-return', event.data.serialized

1
app/lib/surface/Mark.coffee
View file

@ -246,6 +246,7 @@ module.exports = class Mark extends CocoClass
size = @sprite.getAverageDimension() size = @sprite.getAverageDimension()
size += 60 if @name is 'selection' size += 60 if @name is 'selection'
size += 60 if @name is 'repair' size += 60 if @name is 'repair'
size *= @sprite.scaleFactor
scale = size / {selection: 128, target: 128, repair: 320, highlight: 160}[@name] scale = size / {selection: 128, target: 128, repair: 320, highlight: 160}[@name]
if @sprite?.thang.spriteName.search(/(dungeon|indoor).wall/i) isnt -1 if @sprite?.thang.spriteName.search(/(dungeon|indoor).wall/i) isnt -1
scale *= 2 scale *= 2