Merge commit '2859be144ea3737a9f338f1b892fe33fc0b37fe4'

[h58pcdgame/GameScriptCoreLibrary.git] / www / corelib / classes / FireObjectClass.js

diff --git a/www/corelib/classes/FireObjectClass.js b/www/corelib/classes/FireObjectClass.js
index 079f544..a630c1a 100644 (file)
--- a/www/corelib/classes/FireObjectClass.js
+++ b/www/corelib/classes/FireObjectClass.js
@@ -32,6 +32,7 @@ var FireObjectClass = function(stage, args){
                } else{
                        this.origin.y = ownerObj.origin.y + y;
                }
+               
                //発射
                var fvx = this.fireVelocity.x;
                if(ownerObj.direction == 0){
@@ -41,7 +42,11 @@ var FireObjectClass = function(stage, args){
                }
                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, true);
+               }
                this.livingTick = 0;
        },