mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-10 17:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

always use RGSS method of checking private data

Browse source
This commit is contained in:
Inori 2019-12-21 04:51:54 -05:00
parent 7f08ce1b36
commit 0888ab6750
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
binding/binding-util.h
View file

@ -180,13 +180,12 @@ getPrivateDataCheck(VALUE self, const rb_data_type_t &type)
getPrivateDataCheck(VALUE self, const char *type) getPrivateDataCheck(VALUE self, const char *type)
#endif #endif
{ {
#ifndef OLD_RUBY rb_check_type(self, T_DATA);
void *obj = Check_TypedStruct(self, &type); #ifdef OLD_RUBY
#else // RGSS1 works in a more permissive way than the above, VALUE otherObj = rb_const_get(rb_cObject, rb_intern(type));
// See the function at ram:10012AB0 in RGSS104E for an example #else
// This isn't an exact replica, but should have pretty much the same result VALUE otherObj = rb_const_get(rb_cObject, rb_intern(type.wrap_struct_name));
rb_check_type(self, T_DATA); #endif
VALUE otherObj = rb_const_get(rb_cObject, rb_intern(type));
const char *ownname, *othername; const char *ownname, *othername;
if (!rb_obj_is_kind_of(self, otherObj)) if (!rb_obj_is_kind_of(self, otherObj))
{ {
@ -194,9 +193,8 @@ getPrivateDataCheck(VALUE self, const char *type)
othername = rb_obj_classname(otherObj); othername = rb_obj_classname(otherObj);
rb_raise(rb_eTypeError, "Can't convert %s into %s", othername, ownname); rb_raise(rb_eTypeError, "Can't convert %s into %s", othername, ownname);
} }
void *obj = DATA_PTR(self); void *obj = DATA_PTR(self);
#endif
return static_cast<C*>(obj); return static_cast<C*>(obj);
} }