diff --git a/app/assets/javascripts/workers/worker_world.js b/app/assets/javascripts/workers/worker_world.js index b5a156ca7..a1a5d455a 100644 --- a/app/assets/javascripts/workers/worker_world.js +++ b/app/assets/javascripts/workers/worker_world.js @@ -331,15 +331,8 @@ self.onDebugWorldLoaded = function onDebugWorldLoaded() { }; self.onDebugWorldError = function onDebugWorldError(error) { - if(error instanceof Aether.problems.UserCodeProblem) { - if(!self.debugPostedErrors[error.key]) { - 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); + if(!error.isUserCodeProblem) { + console.log("Debug Non-UserCodeError:", error.toString() + "\n" + error.stack || error.stackTrace); } return true; }; diff --git a/app/lib/God.coffee b/app/lib/God.coffee index 1a82377d1..583c95ab7 100644 --- a/app/lib/God.coffee +++ b/app/lib/God.coffee @@ -82,7 +82,7 @@ module.exports = class God when 'new-debug-world' console.log "New Debug world!" when 'console-log' - console.log "|" + @id + "'s debugger |", event.data.args... + console.log "|" + @id + "'s debugger|", event.data.args... when 'debug-value-return' Backbone.Mediator.publish 'god:debug-value-return', event.data.serialized diff --git a/app/lib/surface/Mark.coffee b/app/lib/surface/Mark.coffee index 3d01a2ee5..7c9abb91f 100644 --- a/app/lib/surface/Mark.coffee +++ b/app/lib/surface/Mark.coffee @@ -246,6 +246,7 @@ module.exports = class Mark extends CocoClass size = @sprite.getAverageDimension() size += 60 if @name is 'selection' size += 60 if @name is 'repair' + size *= @sprite.scaleFactor scale = size / {selection: 128, target: 128, repair: 320, highlight: 160}[@name] if @sprite?.thang.spriteName.search(/(dungeon|indoor).wall/i) isnt -1 scale *= 2