Merge pull request code-dot-org#4443 from code-dot-org/hoc2015smallupdate

hoc2015: small updates

Author: breville

apps/src/studio/collidable.js

@@ -131,11 +131,6 @@ Collidable.prototype.setActivity = function(type) {
  * options.
  */
 Collidable.prototype.update = function () {
-
-  if (this.activity === 'none') {
-    this.dir = Direction.NONE;
-    return;
-  }
 
   // Do we have an active location in grid coords?  If not, determine it.
   if (this.gridX === undefined) {
@@ -177,6 +172,13 @@ Collidable.prototype.update = function () {
   // If not, determine it.
   if (this.destGridX === undefined || reachedDestinationGridPosition) {
 
+    if (this.activity === 'none') {
+      this.dir = Direction.NONE;
+      this.destGridX = undefined;
+      this.destGridY = undefined;
+      return;
+    }
+
     var sprite = Studio.sprite[0];
 
     var spriteX = sprite.x + sprite.width/2;

apps/src/studio/constants.js

@@ -162,7 +162,7 @@ exports.NextTurn[Dir.SOUTH] = {};
 exports.NextTurn[Dir.SOUTH][Dir.NORTH] = Dir.SOUTHEAST;
 exports.NextTurn[Dir.SOUTH][Dir.EAST] = Dir.SOUTHEAST;
 exports.NextTurn[Dir.SOUTH][Dir.SOUTH] = Dir.SOUTH;
-exports.NextTurn[Dir.SOUTH][Dir.NONE] = Dir.SOUTH;
+exports.NextTurn[Dir.SOUTH][Dir.NONE] = Dir.NONE;
 exports.NextTurn[Dir.SOUTH][Dir.WEST] = Dir.SOUTHWEST;
 exports.NextTurn[Dir.SOUTH][Dir.NORTHEAST] = Dir.SOUTHEAST;
 exports.NextTurn[Dir.SOUTH][Dir.SOUTHEAST] = Dir.SOUTHEAST;
@@ -224,6 +224,16 @@ exports.NextTurn[Dir.NORTHWEST][Dir.SOUTHEAST] = Dir.WEST;
 exports.NextTurn[Dir.NORTHWEST][Dir.SOUTHWEST] = Dir.WEST;
 exports.NextTurn[Dir.NORTHWEST][Dir.NORTHWEST] = Dir.NORTHWEST;
 
+exports.NextTurn[Dir.NONE] = {};
+exports.NextTurn[Dir.NONE][Dir.NORTH] = Dir.SOUTHEAST;
+exports.NextTurn[Dir.NONE][Dir.EAST] = Dir.SOUTHEAST;
+exports.NextTurn[Dir.NONE][Dir.SOUTH] = Dir.SOUTH;
+exports.NextTurn[Dir.NONE][Dir.NONE] = Dir.NONE;
+exports.NextTurn[Dir.NONE][Dir.WEST] = Dir.SOUTHWEST;
+exports.NextTurn[Dir.NONE][Dir.NORTHEAST] = Dir.SOUTHEAST;
+exports.NextTurn[Dir.NONE][Dir.SOUTHEAST] = Dir.SOUTHEAST;
+exports.NextTurn[Dir.NONE][Dir.SOUTHWEST] = Dir.SOUTHWEST;
+exports.NextTurn[Dir.NONE][Dir.NORTHWEST] = Dir.SOUTHWEST;
 
 exports.Emotions = {
   NORMAL: 0,