ruby-miyako 2.1.4 → 2.1.5

data/miyako_collision.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-2009 Cyross Makoto
 License:: LGPL2.1
@@ -82,16 +82,17 @@ static VALUE collision_c_collision(VALUE self, VALUE c1, VALUE pos1, VALUE c2, V
   VALUE *prect1 = RSTRUCT_PTR(rb_iv_get(c1, "@rect"));
   VALUE *prect2 = RSTRUCT_PTR(rb_iv_get(c2, "@rect"));
   VALUE x1, y1, x2, y2;
+  double l1, l2, t1, t2, r1, r2, b1, b2;
   collision_get_position(pos1, &x1, &y1);
   collision_get_position(pos2, &x2, &y2);
-  double l1 = NUM2DBL(x1) + NUM2DBL(*prect1);
-  double t1 = NUM2DBL(y1) + NUM2DBL(*(prect1+1));
-  double r1 = l1 + NUM2DBL(*(prect1+2)) - 1;
-  double b1 = t1 + NUM2DBL(*(prect1+3)) - 1;
-  double l2 = NUM2DBL(x2) + NUM2DBL(*prect2);
-  double t2 = NUM2DBL(y2) + NUM2DBL(*(prect2+1));
-  double r2 = l2 + NUM2DBL(*(prect2+2)) - 1;
-  double b2 = t2 + NUM2DBL(*(prect2+3)) - 1;
+  l1 = NUM2DBL(x1) + NUM2DBL(*prect1);
+  t1 = NUM2DBL(y1) + NUM2DBL(*(prect1+1));
+  r1 = l1 + NUM2DBL(*(prect1+2)) - 1;
+  b1 = t1 + NUM2DBL(*(prect1+3)) - 1;
+  l2 = NUM2DBL(x2) + NUM2DBL(*prect2);
+  t2 = NUM2DBL(y2) + NUM2DBL(*(prect2+1));
+  r2 = l2 + NUM2DBL(*(prect2+2)) - 1;
+  b2 = t2 + NUM2DBL(*(prect2+3)) - 1;
 
   if(l2 <= r1 && r1 <= r2)
   {
@@ -116,16 +117,17 @@ static VALUE collision_c_meet(VALUE self, VALUE c1, VALUE pos1, VALUE c2, VALUE
   VALUE *prect1 = RSTRUCT_PTR(rb_iv_get(c1, "@rect"));
   VALUE *prect2 = RSTRUCT_PTR(rb_iv_get(c2, "@rect"));
   VALUE x1, y1, x2, y2;
+  double l1, l2, t1, t2, r1, r2, b1, b2;
   collision_get_position(pos1, &x1, &y1);
   collision_get_position(pos2, &x2, &y2);
-  double l1 = NUM2DBL(x1) + NUM2DBL(*prect1);
-  double t1 = NUM2DBL(y1) + NUM2DBL(*(prect1+1));
-  double r1 = l1 + NUM2DBL(*(prect1+2)) - 1;
-  double b1 = t1 + NUM2DBL(*(prect1+3)) - 1;
-  double l2 = NUM2DBL(x2) + NUM2DBL(*prect2);
-  double t2 = NUM2DBL(y2) + NUM2DBL(*(prect2+1));
-  double r2 = l2 + NUM2DBL(*(prect2+2)) - 1;
-  double b2 = t2 + NUM2DBL(*(prect2+3)) - 1;
+  l1 = NUM2DBL(x1) + NUM2DBL(*prect1);
+  t1 = NUM2DBL(y1) + NUM2DBL(*(prect1+1));
+  r1 = l1 + NUM2DBL(*(prect1+2)) - 1;
+  b1 = t1 + NUM2DBL(*(prect1+3)) - 1;
+  l2 = NUM2DBL(x2) + NUM2DBL(*prect2);
+  t2 = NUM2DBL(y2) + NUM2DBL(*(prect2+1));
+  r2 = l2 + NUM2DBL(*(prect2+2)) - 1;
+  b2 = t2 + NUM2DBL(*(prect2+3)) - 1;
 
   if(r1 == l2 || b1 == t2 || l1 == r2 || t1 == b2) return Qtrue;
   return Qfalse;
@@ -138,17 +140,18 @@ static VALUE collision_c_cover(VALUE self, VALUE c1, VALUE pos1, VALUE c2, VALUE
 {
   VALUE *prect1 = RSTRUCT_PTR(rb_iv_get(c1, "@rect"));
   VALUE *prect2 = RSTRUCT_PTR(rb_iv_get(c2, "@rect"));
+  double l1, l2, t1, t2, r1, r2, b1, b2;
   VALUE x1, y1, x2, y2;
   collision_get_position(pos1, &x1, &y1);
   collision_get_position(pos2, &x2, &y2);
-  double l1 = NUM2DBL(x1) + NUM2DBL(*prect1);
-  double t1 = NUM2DBL(y1) + NUM2DBL(*(prect1+1));
-  double r1 = l1 + NUM2DBL(*(prect1+2)) - 1;
-  double b1 = t1 + NUM2DBL(*(prect1+3)) - 1;
-  double l2 = NUM2DBL(x2) + NUM2DBL(*prect2);
-  double t2 = NUM2DBL(y2) + NUM2DBL(*(prect2+1));
-  double r2 = l2 + NUM2DBL(*(prect2+2)) - 1;
-  double b2 = t2 + NUM2DBL(*(prect2+3)) - 1;
+  l1 = NUM2DBL(x1) + NUM2DBL(*prect1);
+  t1 = NUM2DBL(y1) + NUM2DBL(*(prect1+1));
+  r1 = l1 + NUM2DBL(*(prect1+2)) - 1;
+  b1 = t1 + NUM2DBL(*(prect1+3)) - 1;
+  l2 = NUM2DBL(x2) + NUM2DBL(*prect2);
+  t2 = NUM2DBL(y2) + NUM2DBL(*(prect2+1));
+  r2 = l2 + NUM2DBL(*(prect2+2)) - 1;
+  b2 = t2 + NUM2DBL(*(prect2+3)) - 1;
 
   if(l1 >= l2 && r1 <= r2 && t1 >= t2 && b1 <= b2) return Qtrue;
   if(l1 <= l2 && r1 >= r2 && t1 <= t2 && b1 >= b2) return Qtrue;
@@ -163,16 +166,17 @@ static VALUE collision_c_covers(VALUE self, VALUE c1, VALUE pos1, VALUE c2, VALU
   VALUE *prect1 = RSTRUCT_PTR(rb_iv_get(c1, "@rect"));
   VALUE *prect2 = RSTRUCT_PTR(rb_iv_get(c2, "@rect"));
   VALUE x1, y1, x2, y2;
+  double l1, l2, t1, t2, r1, r2, b1, b2;
   collision_get_position(pos1, &x1, &y1);
   collision_get_position(pos2, &x2, &y2);
-  double l1 = NUM2DBL(x1) + NUM2DBL(*prect1);
-  double t1 = NUM2DBL(y1) + NUM2DBL(*(prect1+1));
-  double r1 = l1 + NUM2DBL(*(prect1+2)) - 1;
-  double b1 = t1 + NUM2DBL(*(prect1+3)) - 1;
-  double l2 = NUM2DBL(x2) + NUM2DBL(*prect2);
-  double t2 = NUM2DBL(y2) + NUM2DBL(*(prect2+1));
-  double r2 = l2 + NUM2DBL(*(prect2+2)) - 1;
-  double b2 = t2 + NUM2DBL(*(prect2+3)) - 1;
+  l1 = NUM2DBL(x1) + NUM2DBL(*prect1);
+  t1 = NUM2DBL(y1) + NUM2DBL(*(prect1+1));
+  r1 = l1 + NUM2DBL(*(prect1+2)) - 1;
+  b1 = t1 + NUM2DBL(*(prect1+3)) - 1;
+  l2 = NUM2DBL(x2) + NUM2DBL(*prect2);
+  t2 = NUM2DBL(y2) + NUM2DBL(*(prect2+1));
+  r2 = l2 + NUM2DBL(*(prect2+2)) - 1;
+  b2 = t2 + NUM2DBL(*(prect2+3)) - 1;
 
   if(l1 <= l2 && r1 >= r2 && t1 <= t2 && b1 >= b2) return Qtrue;
   return Qfalse;
@@ -186,16 +190,17 @@ static VALUE collision_c_covered(VALUE self, VALUE c1, VALUE pos1, VALUE c2, VAL
   VALUE *prect1 = RSTRUCT_PTR(rb_iv_get(c1, "@rect"));
   VALUE *prect2 = RSTRUCT_PTR(rb_iv_get(c2, "@rect"));
   VALUE x1, y1, x2, y2;
+  double l1, l2, t1, t2, r1, r2, b1, b2;
   collision_get_position(pos1, &x1, &y1);
   collision_get_position(pos2, &x2, &y2);
-  double l1 = NUM2DBL(x1) + NUM2DBL(*prect1);
-  double t1 = NUM2DBL(y1) + NUM2DBL(*(prect1+1));
-  double r1 = l1 + NUM2DBL(*(prect1+2)) - 1;
-  double b1 = t1 + NUM2DBL(*(prect1+3)) - 1;
-  double l2 = NUM2DBL(x2) + NUM2DBL(*prect2);
-  double t2 = NUM2DBL(y2) + NUM2DBL(*(prect2+1));
-  double r2 = l2 + NUM2DBL(*(prect2+2)) - 1;
-  double b2 = t2 + NUM2DBL(*(prect2+3)) - 1;
+  l1 = NUM2DBL(x1) + NUM2DBL(*prect1);
+  t1 = NUM2DBL(y1) + NUM2DBL(*(prect1+1));
+  r1 = l1 + NUM2DBL(*(prect1+2)) - 1;
+  b1 = t1 + NUM2DBL(*(prect1+3)) - 1;
+  l2 = NUM2DBL(x2) + NUM2DBL(*prect2);
+  t2 = NUM2DBL(y2) + NUM2DBL(*(prect2+1));
+  r2 = l2 + NUM2DBL(*(prect2+2)) - 1;
+  b2 = t2 + NUM2DBL(*(prect2+3)) - 1;
 
   if(l1 >= l2 && r1 <= r2 && t1 >= t2 && b1 <= b2) return Qtrue;
   return Qfalse;
@@ -252,13 +257,14 @@ static VALUE circlecollision_c_collision(VALUE self, VALUE c1, VALUE pos1, VALUE
   double r2 = NUM2DBL(rb_iv_get(c2, "@radius"));
   double r  = (r1 + r2) * (r1 + r2);
   VALUE x1, y1, x2, y2;
+  double cx1, cy1, cx2, cy2, d;
   collision_get_position(pos1, &x1, &y1);
   collision_get_position(pos2, &x2, &y2);
-  double cx1 = NUM2DBL(x1) + NUM2DBL(*pcenter1);
-  double cy1 = NUM2DBL(y1) + NUM2DBL(*(pcenter1+1));
-  double cx2 = NUM2DBL(x2) + NUM2DBL(*pcenter2);
-  double cy2 = NUM2DBL(y2) + NUM2DBL(*(pcenter2+1));
-  double d   = (cx1-cx2) * (cx1-cx2) + (cy1-cy2) * (cy1-cy2);
+  cx1 = NUM2DBL(x1) + NUM2DBL(*pcenter1);
+  cy1 = NUM2DBL(y1) + NUM2DBL(*(pcenter1+1));
+  cx2 = NUM2DBL(x2) + NUM2DBL(*pcenter2);
+  cy2 = NUM2DBL(y2) + NUM2DBL(*(pcenter2+1));
+  d   = (cx1-cx2) * (cx1-cx2) + (cy1-cy2) * (cy1-cy2);
 
   if(d <= r) return Qtrue;
   return Qfalse;
@@ -275,13 +281,14 @@ static VALUE circlecollision_c_meet(VALUE self, VALUE c1, VALUE pos1, VALUE c2,
   double r2 = NUM2DBL(rb_iv_get(c2, "@radius"));
   double r  = (r1 + r2) * (r1 + r2);
   VALUE x1, y1, x2, y2;
+  double cx1, cy1, cx2, cy2, d;
   collision_get_position(pos1, &x1, &y1);
   collision_get_position(pos2, &x2, &y2);
-  double cx1 = NUM2DBL(x1) + NUM2DBL(*pcenter1);
-  double cy1 = NUM2DBL(y1) + NUM2DBL(*(pcenter1+1));
-  double cx2 = NUM2DBL(x2) + NUM2DBL(*pcenter2);
-  double cy2 = NUM2DBL(y2) + NUM2DBL(*(pcenter2+1));
-  double d   = (cx1-cx2) * (cx1-cx2) + (cy1-cy2) * (cy1-cy2);
+  cx1 = NUM2DBL(x1) + NUM2DBL(*pcenter1);
+  cy1 = NUM2DBL(y1) + NUM2DBL(*(pcenter1+1));
+  cx2 = NUM2DBL(x2) + NUM2DBL(*pcenter2);
+  cy2 = NUM2DBL(y2) + NUM2DBL(*(pcenter2+1));
+  d   = (cx1-cx2) * (cx1-cx2) + (cy1-cy2) * (cy1-cy2);
 
   if(d == r) return Qtrue;
   return Qfalse;
@@ -298,13 +305,14 @@ static VALUE circlecollision_c_cover(VALUE self, VALUE c1, VALUE pos1, VALUE c2,
   double r2 = NUM2DBL(rb_iv_get(c2, "@radius"));
   double r = (r1 - r2) * (r1 - r2); // y = (x-a)^2 -> y = x^2 - 2ax + a^2
   VALUE x1, y1, x2, y2;
+  double cx1, cy1, cx2, cy2, d;
   collision_get_position(pos1, &x1, &y1);
   collision_get_position(pos2, &x2, &y2);
-  double cx1 = NUM2DBL(x1) + NUM2DBL(*pcenter1);
-  double cy1 = NUM2DBL(y1) + NUM2DBL(*(pcenter1+1));
-  double cx2 = NUM2DBL(x2) + NUM2DBL(*pcenter2);
-  double cy2 = NUM2DBL(y2) + NUM2DBL(*(pcenter2+1));
-  double d   = (cx1-cx2) * (cx1-cx2) + (cy1-cy2) * (cy1-cy2);
+  cx1 = NUM2DBL(x1) + NUM2DBL(*pcenter1);
+  cy1 = NUM2DBL(y1) + NUM2DBL(*(pcenter1+1));
+  cx2 = NUM2DBL(x2) + NUM2DBL(*pcenter2);
+  cy2 = NUM2DBL(y2) + NUM2DBL(*(pcenter2+1));
+  d   = (cx1-cx2) * (cx1-cx2) + (cy1-cy2) * (cy1-cy2);
 
   if(d <= r) return Qtrue;
   return Qfalse;
@@ -321,13 +329,14 @@ static VALUE circlecollision_c_covers(VALUE self, VALUE c1, VALUE pos1, VALUE c2
   double r2 = NUM2DBL(rb_iv_get(c2, "@radius"));
   double r = (r1 - r2) * (r1 - r2); // y = (x-a)^2 -> y = x^2 - 2ax + a^2
   VALUE x1, y1, x2, y2;
+  double cx1, cy1, cx2, cy2, d;
   collision_get_position(pos1, &x1, &y1);
   collision_get_position(pos2, &x2, &y2);
-  double cx1 = NUM2DBL(x1) + NUM2DBL(*pcenter1);
-  double cy1 = NUM2DBL(y1) + NUM2DBL(*(pcenter1+1));
-  double cx2 = NUM2DBL(x2) + NUM2DBL(*pcenter2);
-  double cy2 = NUM2DBL(y2) + NUM2DBL(*(pcenter2+1));
-  double d   = (cx1-cx2) * (cx1-cx2) + (cy1-cy2) * (cy1-cy2);
+  cx1 = NUM2DBL(x1) + NUM2DBL(*pcenter1);
+  cy1 = NUM2DBL(y1) + NUM2DBL(*(pcenter1+1));
+  cx2 = NUM2DBL(x2) + NUM2DBL(*pcenter2);
+  cy2 = NUM2DBL(y2) + NUM2DBL(*(pcenter2+1));
+  d   = (cx1-cx2) * (cx1-cx2) + (cy1-cy2) * (cy1-cy2);
 
   if(r1 >= r2 && d <= r) return Qtrue;
   return Qfalse;
@@ -344,13 +353,14 @@ static VALUE circlecollision_c_covered(VALUE self, VALUE c1, VALUE pos1, VALUE c
   double r2 = NUM2DBL(rb_iv_get(c2, "@radius"));
   double r = (r1 - r2) * (r1 - r2); // y = (x-a)^2 -> y = x^2 - 2ax + a^2
   VALUE x1, y1, x2, y2;
+  double cx1, cy1, cx2, cy2, d;
   collision_get_position(pos1, &x1, &y1);
   collision_get_position(pos2, &x2, &y2);
-  double cx1 = NUM2DBL(x1) + NUM2DBL(*pcenter1);
-  double cy1 = NUM2DBL(y1) + NUM2DBL(*(pcenter1+1));
-  double cx2 = NUM2DBL(x2) + NUM2DBL(*pcenter2);
-  double cy2 = NUM2DBL(y2) + NUM2DBL(*(pcenter2+1));
-  double d   = (cx1-cx2) * (cx1-cx2) + (cy1-cy2) * (cy1-cy2);
+  cx1 = NUM2DBL(x1) + NUM2DBL(*pcenter1);
+  cy1 = NUM2DBL(y1) + NUM2DBL(*(pcenter1+1));
+  cx2 = NUM2DBL(x2) + NUM2DBL(*pcenter2);
+  cy2 = NUM2DBL(y2) + NUM2DBL(*(pcenter2+1));
+  d   = (cx1-cx2) * (cx1-cx2) + (cy1-cy2) * (cy1-cy2);
 
   if(r1 <= r2 && d <= r) return Qtrue;
   return Qfalse;

data/miyako_diagram.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
@@ -74,10 +74,10 @@ static const char *str_arrow         = "@arrow";
 */
 static VALUE dbody_update_input(int argc, VALUE *argv, VALUE self)
 {
-  VALUE params;
+  VALUE params, node;
   rb_scan_args(argc, argv, "00*", &params);
 
-  VALUE node = rb_iv_get(self, str_node);
+  node = rb_iv_get(self, str_node);
   if(node == Qnil) return Qnil;
   rb_funcall2(node, id_update_input, argc, argv);
   return Qnil;
@@ -88,18 +88,18 @@ static VALUE dbody_update_input(int argc, VALUE *argv, VALUE self)
 */
 static VALUE dbody_update(int argc, VALUE *argv, VALUE self)
 {
-  VALUE params;
+  VALUE params, trigger, ntrigger, node;
   rb_scan_args(argc, argv, "00*", &params);
 
-  VALUE trigger = rb_iv_get(self, str_trigger);
+  trigger = rb_iv_get(self, str_trigger);
   if(rb_funcall(trigger, id_is_update, 0) == Qfalse) return Qnil;
 
-  VALUE node = rb_iv_get(self, str_node);
+  node = rb_iv_get(self, str_node);
   rb_funcall2(node, id_update, argc, argv);
   rb_funcall(trigger, id_post_update, 0);
   rb_funcall(node, id_reset_input, 0);
 
-  VALUE ntrigger = rb_iv_get(self, str_next_trigger);
+  ntrigger = rb_iv_get(self, str_next_trigger);
 
   if(ntrigger == Qnil) return Qnil;
 
@@ -113,9 +113,10 @@ static VALUE dbody_update(int argc, VALUE *argv, VALUE self)
 */
 static VALUE dbody_render(VALUE self)
 {
+  VALUE node;
   VALUE trigger = rb_iv_get(self, str_trigger);
   if(rb_funcall(trigger, id_is_render, 0) == Qfalse) return Qnil;
-  VALUE node = rb_iv_get(self, str_node);
+  node = rb_iv_get(self, str_node);
   rb_funcall(node, id_render, 0);
   rb_funcall(trigger, id_post_render, 0);
   return Qnil;
@@ -126,13 +127,13 @@ static VALUE dbody_render(VALUE self)
 */
 static VALUE dbody_go_next(VALUE self)
 {
+  int i;
   VALUE next_obj = self;
   VALUE arrows = rb_iv_get(self, str_arrow);
   VALUE *arrows_p = RARRAY_PTR(arrows);
   VALUE node = rb_iv_get(self, str_node);
   VALUE call_arg = rb_ary_new();
   rb_ary_push(call_arg, node);
-  int i;
   for(i=0;i<RARRAY_LEN(arrows);i++)
   {
     VALUE arrow = *(arrows_p+i);
@@ -186,10 +187,10 @@ static VALUE dbody_replace_trigger(int argc, VALUE *argv, VALUE self)
 */
 static VALUE manager_update_input(int argc, VALUE *argv, VALUE self)
 {
-  VALUE params;
+  VALUE params, ptr;
   rb_scan_args(argc, argv, "00*", &params);
 
-  VALUE ptr = rb_iv_get(self, str_ptr);
+  ptr = rb_iv_get(self, str_ptr);
   if(ptr == Qnil) return Qnil;
   dbody_update_input(argc, argv, ptr);
   return Qnil;
@@ -200,15 +201,15 @@ static VALUE manager_update_input(int argc, VALUE *argv, VALUE self)
 */
 static VALUE manager_update(int argc, VALUE *argv, VALUE self)
 {
-  VALUE params;
+  VALUE params, ptr, nxt;
   rb_scan_args(argc, argv, "00*", &params);
 
-  VALUE ptr = rb_iv_get(self, str_ptr);
+  ptr = rb_iv_get(self, str_ptr);
   if(ptr == Qnil) return Qnil;
 
   dbody_update(argc, argv, ptr);
 
-  VALUE nxt = rb_funcall(ptr, id_go_next, 0);
+  nxt = rb_funcall(ptr, id_go_next, 0);
 
   if(!rb_eql(ptr, nxt))
   {
@@ -236,13 +237,13 @@ static VALUE manager_render(VALUE self)
 */
 static VALUE processor_update_input(int argc, VALUE *argv, VALUE self)
 {
-  VALUE params;
+  VALUE params, states, diagram;
   rb_scan_args(argc, argv, "00*", &params);
 
-  VALUE states = rb_iv_get(self, str_states);
+  states = rb_iv_get(self, str_states);
   if(rb_hash_lookup(states, symPause) == Qtrue) return Qnil;
 
-  VALUE diagram = rb_iv_get(self, str_diagram);
+  diagram = rb_iv_get(self, str_diagram);
   manager_update_input(argc, argv, diagram);
   return Qnil;
 }
@@ -252,14 +253,14 @@ static VALUE processor_update_input(int argc, VALUE *argv, VALUE self)
 */
 static VALUE processor_update(int argc, VALUE *argv, VALUE self)
 {
-  VALUE params;
+  VALUE params, states, diagram;
   rb_scan_args(argc, argv, "00*", &params);
 
-  VALUE states = rb_iv_get(self, str_states);
+  states = rb_iv_get(self, str_states);
 
   if(rb_hash_lookup(states, symPause) == Qtrue) return Qnil;
 
-  VALUE diagram = rb_iv_get(self, str_diagram);
+  diagram = rb_iv_get(self, str_diagram);
   manager_update(argc, argv, diagram);
 
   if(rb_funcall(diagram, id_finish, 0) == Qtrue){

data/miyako_drawing.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
@@ -92,14 +92,17 @@ static VALUE drawing_draw_polygon(int argc, VALUE *argv, VALUE self)
   VALUE mcolor;
   VALUE fill;
   VALUE aa;
+  VALUE methods;
   Uint8 alpha;
   Uint32 color;
+  Sint16 *px, *py;
   int i, vertexes;
+  SDL_Surface *dst;
 
   rb_scan_args(argc, argv, "32", &vdst, &pairs, &mcolor, &fill, &aa);
 
   // bitmapメソッドを持っていれば、メソッドの値をvdstとする
-  VALUE methods = rb_funcall(vdst, rb_intern("methods"), 0);
+  methods = rb_funcall(vdst, rb_intern("methods"), 0);
   if(rb_ary_includes(methods, rb_str_intern(rb_str_new2("to_unit"))) == Qfalse &&
      rb_ary_includes(methods, rb_str_intern(rb_str_new2("bitmap"))) == Qfalse
     )
@@ -121,15 +124,15 @@ static VALUE drawing_draw_polygon(int argc, VALUE *argv, VALUE self)
     get_position(vertex, &x, &y);
   }
 
-	SDL_Surface  *dst = GetSurface(vdst)->surface;
+	dst = GetSurface(vdst)->surface;
 
   color = value_2_color(rb_funcall(cColor, rb_intern("to_rgb"), 1, mcolor), dst->format, &alpha);
 
   if(RTEST(fill) && RTEST(aa) && alpha < 255)
     rb_raise(eMiyakoError, "can't draw filled antialiased alpha polygon");
 
-  Sint16 *px = (Sint16 *)malloc(sizeof(Sint16) * vertexes);
-  Sint16 *py = (Sint16 *)malloc(sizeof(Sint16) * vertexes);
+  px = (Sint16 *)malloc(sizeof(Sint16) * vertexes);
+  py = (Sint16 *)malloc(sizeof(Sint16) * vertexes);
   for(i=0; i<vertexes; i++)
   {
     VALUE vertex = *(RARRAY_PTR(pairs)+i);