ruby-miyako 2.1.4 → 2.1.5

data/lib/Miyako/API/yuki.rb

@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #lambdaの別名として、yuki_plotメソッドを追加
 alias :yuki_plot :lambda
+alias :scenario_plot :lambda
 
 #=シナリオ言語Yuki実装モジュール
 module Miyako
@@ -190,15 +191,22 @@ module Miyako
 
       @valign = :middle
 
-      @release_checks_default = [lambda{ Input.pushed_any?(:btn1, :spc) }, lambda{ @mouse_enable && Input.click?(:left) } ]
+      @release_checks_default = [
+        lambda{ Input.pushed_any?(:btn1, :spc) },
+        lambda{ @mouse_enable && Input.click?(:left) }
+      ]
       @release_checks = @release_checks_default.dup
 
-      @ok_checks_default = [lambda{ Input.pushed_any?(:btn1, :spc) },
-        lambda{ @mouse_enable && self.commandbox.attach_any_command?(*Input.get_mouse_position) && Input.click?(:left) } ]
+      @ok_checks_default = [
+        lambda{ Input.pushed_any?(:btn1, :spc) },
+        lambda{ @mouse_enable && self.commandbox.attach_any_command?(*Input.get_mouse_position) && Input.click?(:left) }
+      ]
       @ok_checks = @ok_checks_default.dup
 
-      @cancel_checks_default = [lambda{ Input.pushed_any?(:btn2, :esc) },
-                                lambda{ @mouse_enable && Input.click?(:right) } ]
+      @cancel_checks_default = [
+        lambda{ Input.pushed_any?(:btn2, :esc) },
+        lambda{ @mouse_enable && Input.click?(:right) }
+      ]
       @cancel_checks = @cancel_checks_default.dup
 
       @key_amount_proc   = lambda{ Input.pushed_amount }
@@ -226,6 +234,10 @@ module Miyako
       raise MiyakoCopyError.not_copy("Yuki")
     end
 
+    def over_engine
+      @over_yuki
+    end
+
     #===マウスでの制御を可能にする
     #ゲームパッド・キーボードでのコマンド・ポーズ制御を行えるが、
     #それに加えて、マウスでもゲームパッド・キーボードでの制御が行える
@@ -258,7 +270,6 @@ module Miyako
     #なお、visibleの値がfalseの時は描画されない。
     #返却値:: 自分自身を返す
     def render
-      @visibles.render if @visible
       @over_yuki.render if @over_yuki && @over_yuki.executing?
       return self
     end
@@ -268,7 +279,6 @@ module Miyako
     #なお、visibleの値がfalseの時は描画されない。
     #返却値:: 自分自身を返す
     def render_to(dst)
-      @visibles.render_to(dst) if @visible
       @over_yuki.render_to(dst) if @over_yuki && @over_yuki.executing?
       return self
     end
@@ -278,7 +288,6 @@ module Miyako
     #返却値:: 描く画像のupdate_spriteメソッドを呼び出した結果を配列で返す
     def update_animation
       @over_yuki.update_animation if @over_yuki && @over_yuki.executing?
-      @visibles.update_animation
     end
 
     #===変数を参照する
@@ -1470,4 +1479,6 @@ module Miyako
       @is_outer_height = nil
     end
   end
+
+  ScenarioEngine = Yuki
 end

data/lib/Miyako/miyako.rb

@@ -42,6 +42,9 @@ require 'forwardable'
 require 'iconv' if RUBY_VERSION < '1.9.0'
 require 'kconv'
 require 'rbconfig'
+require 'singleton'
+require 'csv'
+require 'delegate'
 
 #画面などの初期設定を自動的に行うかどうかの設定。デフォルトはtrue
 $miyako_auto_open = true if $miyako_auto_open.nil?

data/miyako_basicdata.c

@@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
 /*
-=拡張ライブラリmiyako_no_katana
-Authors:: サイロス誠
+=miyako_no_katana
+Authors:: Cyross Makoto
 Version:: 2.0
 Copyright:: 2007-2008 Cyross Makoto
 License:: LGPL2.1
@@ -183,8 +183,9 @@ static VALUE counter_reset(VALUE self)
 static VALUE counter_resume(VALUE self)
 {
   VALUE stop_tick = rb_iv_get(self, "@stop_tick");
+  Uint32 st;
   if(stop_tick == Qnil) return self;
-  Uint32 st = NUM2INT(rb_iv_get(self, "@st")) + SDL_GetTicks() - NUM2INT(stop_tick);
+  st = NUM2INT(rb_iv_get(self, "@st")) + SDL_GetTicks() - NUM2INT(stop_tick);
   rb_iv_set(self, "@st", INT2NUM(st));
   rb_iv_set(self, "@stop_tick", Qnil);
   rb_iv_set(self, "@counting", Qtrue);
@@ -251,6 +252,7 @@ static VALUE counter_wait(VALUE self)
 */
 static int counter_update_inner(VALUE key, VALUE val)
 {
+  int count, ncount;
   if(rb_iv_get(key, "@counting") == Qfalse){ return 0; }
   if(counter_finish(key) == Qtrue)
   {
@@ -263,8 +265,8 @@ static int counter_update_inner(VALUE key, VALUE val)
     rb_ary_push(call_arg, *(array_ptr+2));
     rb_proc_call(*array_ptr, call_arg);
 
-    int count = NUM2INT(*(array_ptr+1));
-    int ncount = NUM2INT(*(array_ptr+2));
+    count = NUM2INT(*(array_ptr+1));
+    ncount = NUM2INT(*(array_ptr+2));
 
     if(ncount > count)
     {
@@ -322,6 +324,9 @@ void _miyako_counter_post_update()
   counter_post_update(cWaitCounter);
 }
 
+/*
+:nodoc:
+*/
 static VALUE su_move(VALUE self, VALUE dx, VALUE dy)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -342,6 +347,9 @@ static VALUE su_move(VALUE self, VALUE dx, VALUE dy)
   return self;
 }
 
+/*
+:nodoc:
+*/
 static VALUE su_move_to(VALUE self, VALUE x, VALUE y)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -362,6 +370,9 @@ static VALUE su_move_to(VALUE self, VALUE x, VALUE y)
   return self;
 }
 
+/*
+:nodoc:
+*/
 static VALUE point_move(VALUE self, VALUE dx, VALUE dy)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -382,6 +393,9 @@ static VALUE point_move(VALUE self, VALUE dx, VALUE dy)
   return self;
 }
 
+/*
+:nodoc:
+*/
 static VALUE point_move_to(VALUE self, VALUE x, VALUE y)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -402,6 +416,9 @@ static VALUE point_move_to(VALUE self, VALUE x, VALUE y)
   return self;
 }
 
+/*
+:nodoc:
+*/
 static VALUE size_resize(VALUE self, VALUE dw, VALUE dh)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -422,6 +439,9 @@ static VALUE size_resize(VALUE self, VALUE dw, VALUE dh)
   return self;
 }
 
+/*
+:nodoc:
+*/
 static VALUE size_resize_to(VALUE self, VALUE w, VALUE h)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -442,6 +462,9 @@ static VALUE size_resize_to(VALUE self, VALUE w, VALUE h)
   return self;
 }
 
+/*
+:nodoc:
+*/
 static VALUE rect_resize(VALUE self, VALUE dw, VALUE dh)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -462,6 +485,9 @@ static VALUE rect_resize(VALUE self, VALUE dw, VALUE dh)
   return self;
 }
 
+/*
+:nodoc:
+*/
 static VALUE rect_resize_to(VALUE self, VALUE w, VALUE h)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -482,6 +508,9 @@ static VALUE rect_resize_to(VALUE self, VALUE w, VALUE h)
   return self;
 }
 
+/*
+:nodoc:
+*/
 static VALUE rect_in_range(VALUE self, VALUE vx, VALUE vy)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -496,6 +525,9 @@ static VALUE rect_in_range(VALUE self, VALUE vx, VALUE vy)
   return Qfalse;
 }
 
+/*
+:nodoc:
+*/
 static VALUE square_move(VALUE self, VALUE dx, VALUE dy)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -524,6 +556,9 @@ static VALUE square_move(VALUE self, VALUE dx, VALUE dy)
   return self;
 }
 
+/*
+:nodoc:
+*/
 static VALUE square_move_to(VALUE self, VALUE x, VALUE y)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -554,6 +589,9 @@ static VALUE square_move_to(VALUE self, VALUE x, VALUE y)
   return self;
 }
 
+/*
+:nodoc:
+*/
 static VALUE square_resize(VALUE self, VALUE dw, VALUE dh)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -574,6 +612,9 @@ static VALUE square_resize(VALUE self, VALUE dw, VALUE dh)
   return self;
 }
 
+/*
+:nodoc:
+*/
 static VALUE square_resize_to(VALUE self, VALUE w, VALUE h)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -596,6 +637,9 @@ static VALUE square_resize_to(VALUE self, VALUE w, VALUE h)
   return self;
 }
 
+/*
+:nodoc:
+*/
 static VALUE square_in_range(VALUE self, VALUE vx, VALUE vy)
 {
   VALUE *st = RSTRUCT_PTR(self);
@@ -610,6 +654,9 @@ static VALUE square_in_range(VALUE self, VALUE vx, VALUE vy)
   return Qfalse;
 }
 
+/*
+:nodoc:
+*/
 void Init_miyako_basicdata()
 {
   mSDL = rb_define_module("SDL");