辛夷祭初日の緊急修正多数。

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

diff --git a/www/corelib/classes/WarpItemClass.js b/www/corelib/classes/WarpItemClass.js
index c00712f..96fd894 100644 (file)
--- a/www/corelib/classes/WarpItemClass.js
+++ b/www/corelib/classes/WarpItemClass.js
@@ -1,51 +1,54 @@
-// args[0] : stageName  if blank warp in the stage
-// args[1] : move_to x  location(pixel) to warp
-// args[2] : move_to y
-// args[3] : size_x
-// args[4] : size_y
-// args[5] : saveInertia  \8aµ\90«\8fó\91Ô\82ð\95Û\91¶
-var WarpItemClass = function(stage, args){
-       
-       var moveToX = args[1];
-       var moveToY = args[2];
-       var stgName = args[0];
-       var saveInertia = args[5] != undefined ? args[5] : false;
-       
-       WarpItemClass.base.apply(this, [stage, [false, function(main, obj_x, obj_y){
-               var spdx, spdy;
-               if(saveInertia)
-               {
-                       spdx = stage.userControlledCharacter.movingSpeed.x;
-                       spdy = stage.userControlledCharacter.movingSpeed.y;
-               }
-               if(stgName)
-               {
-                       stage.manager.loadStageFromNetwork(stgName);
-               }
-               var stg = stage.manager.runningStage;
-               if(moveToX != undefined)
-               {
-                       stg.userControlledCharacter.origin.x = moveToX;
-               }
-               if(moveToY != undefined)
-               {
-                       stg.userControlledCharacter.origin.y = moveToY;
-               }
-               if(saveInertia)
-               {
-                       stg.userControlledCharacter.movingSpeed.x = spdx;
-                       stg.userControlledCharacter.movingSpeed.y = spdy;
-               }
-       }]]);
-       
-       if(args[3])
-       {
-               this.size.x = args[3];
-       }
-       if(args[4])
-       {
-               this.size.y = args[4];
-       }
-}.extend(FreeItemClass, {
-       
+// args[0] : stageName  if blank warp in the stage\r
+// args[1] : move_to x  location(pixel) to warp\r
+// args[2] : move_to y\r
+// args[3] : size_x\r
+// args[4] : size_y\r
+// args[5] : saveInertia  \8aµ\90«\8fó\91Ô\82ð\95Û\91¶\r
+var WarpItemClass = function(stage, args){\r
+       \r
+       var moveToX = args[1];\r
+       var moveToY = args[2];\r
+       var stgName = args[0];\r
+       var saveInertia = args[5] != undefined ? args[5] : false;\r
+       WarpItemClass.base.apply(this, [stage, [false, function(main, obj_x, obj_y){\r
+       /*      var spdx, spdy;\r
+               if(saveInertia)\r
+               {\r
+                       spdx = stage.userControlledCharacter.movingSpeed.x;\r
+                       spdy = stage.userControlledCharacter.movingSpeed.y;\r
+               }*/\r
+               var retv = false;\r
+               if(stgName != stage.manager.runningStageName && stgName)\r
+               {\r
+                       stage.manager.loadStageFromNetwork(stgName);\r
+                       retv = true;\r
+               } else{\r
+                       var stg = stage.manager.runningStage;\r
+                       if(moveToX != undefined)\r
+                       {\r
+                               stg.userControlledCharacter.origin.x = moveToX;\r
+                       }\r
+                       if(moveToY != undefined)\r
+                       {\r
+                               stg.userControlledCharacter.origin.y = moveToY;\r
+                       }\r
+                       if(saveInertia)\r
+                       {\r
+                               stg.userControlledCharacter.movingSpeed.x = spdx;\r
+                               stg.userControlledCharacter.movingSpeed.y = spdy;\r
+                       }\r
+               }\r
+               return retv;\r
+       }]]);\r
+       \r
+       if(args[3])\r
+       {\r
+               this.size.x = args[3];\r
+       }\r
+       if(args[4])\r
+       {\r
+               this.size.y = args[4];\r
+       }\r
+}.extend(FreeItemClass, {\r
+       \r
 });
\ No newline at end of file