Merge commit '2859be144ea3737a9f338f1b892fe33fc0b37fe4'

Conflicts:
	www/corelib/classes/FireObjectClass.js

diff --cc www/corelib/classes/FireObjectClass.js
index 079f544,90746da..a630c1a
--- 1/www/corelib/classes/FireObjectClass.js
--- 2/www/corelib/classes/FireObjectClass.js
+++ b/www/corelib/classes/FireObjectClass.js
@@@ -41,7 -42,11 +42,11 @@@ var FireObjectClass = function(stage, a
                }
                this.movingSpeed.x = fvx;
                this.movingSpeed.y = -this.fireVelocity.y
-               ownerObj.ownerStage.addStageObject(this, true);
+               
+               // 初期位置で壁などに引っかかっていないか確認
+               if(this.canMoveTo(this.origin.x, this.origin.y)){
 -                      ownerObj.ownerStage.addStageObject(this);
++                      ownerObj.ownerStage.addStageObject(this, true);
+               }
                this.livingTick = 0;
        },