diff --git a/binding-sandbox/bitmap-binding.h b/binding-sandbox/bitmap-binding.h index 058328cf..1998d6c7 100644 --- a/binding-sandbox/bitmap-binding.h +++ b/binding-sandbox/bitmap-binding.h @@ -193,7 +193,7 @@ namespace mkxp_sandbox { BOOST_ASIO_CORO_REENTER (this) { SANDBOX_AWAIT_AND_SET(id, rb_intern, "Rect"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass); set_private_data(obj, new Rect(get_private_data(self)->rect())); } @@ -216,7 +216,7 @@ namespace mkxp_sandbox { SANDBOX_AWAIT_AND_SET(str, rb_string_value_cstr, &text); SANDBOX_AWAIT_AND_SET(id, rb_intern, "Rect"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass); set_private_data(obj, new Rect(get_private_data(self)->textSize((const char *)(**sb() + str)))); } diff --git a/binding-sandbox/font-binding.h b/binding-sandbox/font-binding.h index 01c82988..83e74d6f 100644 --- a/binding-sandbox/font-binding.h +++ b/binding-sandbox/font-binding.h @@ -40,7 +40,7 @@ namespace mkxp_sandbox { BOOST_ASIO_CORO_REENTER (this) { SANDBOX_AWAIT_AND_SET(id, rb_intern, "Color"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass); set_private_data(obj, new Color()); SANDBOX_AWAIT(rb_iv_set, self, "color", obj); } diff --git a/binding-sandbox/plane-binding.h b/binding-sandbox/plane-binding.h index 3501c601..be082d18 100644 --- a/binding-sandbox/plane-binding.h +++ b/binding-sandbox/plane-binding.h @@ -68,13 +68,13 @@ namespace mkxp_sandbox { SANDBOX_AWAIT_AND_SET(id, rb_intern, "Color"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass); set_private_data(obj, &plane->getColor()); SANDBOX_AWAIT(rb_iv_set, self, "color", obj); SANDBOX_AWAIT_AND_SET(id, rb_intern, "Tone"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass); set_private_data(obj, &plane->getTone()); SANDBOX_AWAIT(rb_iv_set, self, "tone", obj); diff --git a/binding-sandbox/sprite-binding.h b/binding-sandbox/sprite-binding.h index 59038808..53d16d5b 100644 --- a/binding-sandbox/sprite-binding.h +++ b/binding-sandbox/sprite-binding.h @@ -63,19 +63,19 @@ namespace mkxp_sandbox { SANDBOX_AWAIT_AND_SET(id, rb_intern, "Rect"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass); set_private_data(obj, &sprite->getSrcRect()); SANDBOX_AWAIT(rb_iv_set, self, "src_rect", obj); SANDBOX_AWAIT_AND_SET(id, rb_intern, "Color"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass); set_private_data(obj, &sprite->getColor()); SANDBOX_AWAIT(rb_iv_set, self, "color", obj); SANDBOX_AWAIT_AND_SET(id, rb_intern, "Tone"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass); set_private_data(obj, &sprite->getTone()); SANDBOX_AWAIT(rb_iv_set, self, "tone", obj); diff --git a/binding-sandbox/tilemap-binding.h b/binding-sandbox/tilemap-binding.h index ee9e2929..19a0d76d 100644 --- a/binding-sandbox/tilemap-binding.h +++ b/binding-sandbox/tilemap-binding.h @@ -144,19 +144,19 @@ namespace mkxp_sandbox { SANDBOX_AWAIT_AND_SET(id, rb_intern, "TilemapAutotiles"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass); set_private_data(obj, &tilemap->getAutotiles()); SANDBOX_AWAIT(rb_iv_set, self, "autotiles", obj); SANDBOX_AWAIT_AND_SET(id, rb_intern, "Color"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass); set_private_data(obj, &tilemap->getColor()); SANDBOX_AWAIT(rb_iv_set, self, "color", obj); SANDBOX_AWAIT_AND_SET(id, rb_intern, "Tone"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass); set_private_data(obj, &tilemap->getTone()); SANDBOX_AWAIT(rb_iv_set, self, "tone", obj); diff --git a/binding-sandbox/viewport-binding.h b/binding-sandbox/viewport-binding.h index f21addd0..b0b9a6a1 100644 --- a/binding-sandbox/viewport-binding.h +++ b/binding-sandbox/viewport-binding.h @@ -65,19 +65,19 @@ namespace mkxp_sandbox { SANDBOX_AWAIT_AND_SET(id, rb_intern, "Rect"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass); set_private_data(obj, &viewport->getRect()); SANDBOX_AWAIT(rb_iv_set, self, "rect", obj); SANDBOX_AWAIT_AND_SET(id, rb_intern, "Color"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass); set_private_data(obj, &viewport->getColor()); SANDBOX_AWAIT(rb_iv_set, self, "color", obj); SANDBOX_AWAIT_AND_SET(id, rb_intern, "Tone"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(obj, rb_obj_alloc, klass); set_private_data(obj, &viewport->getTone()); SANDBOX_AWAIT(rb_iv_set, self, "tone", obj); diff --git a/binding-sandbox/window-binding.h b/binding-sandbox/window-binding.h index 94682184..9b1ff5e3 100644 --- a/binding-sandbox/window-binding.h +++ b/binding-sandbox/window-binding.h @@ -61,7 +61,7 @@ namespace mkxp_sandbox { window->initDynAttribs(); SANDBOX_AWAIT_AND_SET(id, rb_intern, "Rect"); SANDBOX_AWAIT_AND_SET(klass, rb_const_get, sb()->rb_cObject(), id); - SANDBOX_AWAIT_AND_SET(cursor_obj, rb_class_new_instance, 0, NULL, klass); + SANDBOX_AWAIT_AND_SET(cursor_obj, rb_obj_alloc, klass); set_private_data(cursor_obj, &window->getCursorRect()); SANDBOX_AWAIT(rb_iv_set, self, "cursor_rect", cursor_obj); GFX_UNLOCK