Ancurio/mkxp-freebird
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Bindings: Viewport: Don't dispose children in RGSS2/3

Browse source
This commit is contained in:
Jonas Kulla 2014-10-24 18:55:03 +02:00
parent 1a489aafaf
commit 5549ff78f0
4 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
binding-mruby/disposable-binding.h
View file

@ -74,7 +74,8 @@ MRB_METHOD(disposableDispose)
if (d->isDisposed())
return mrb_nil_value();
disposableDisposeChildren(mrb, self);
if (rgssVer == 1)
disposableDisposeChildren(mrb, self);
d->dispose();
@ -100,8 +101,9 @@ static void disposableBindingInit(mrb_state *mrb, RClass *klass)
mrb_define_method(mrb, klass, "dispose", disposableDispose<C>, MRB_ARGS_NONE());
mrb_define_method(mrb, klass, "disposed?", disposableIsDisposed<C>, MRB_ARGS_NONE());
mrb_alias_method(mrb, klass, getMrbData(mrb)->symbols[CS_mkxp_dispose_alias],
mrb_intern_lit(mrb, "dispose"));
if (rgssVer == 1)
mrb_alias_method(mrb, klass, getMrbData(mrb)->symbols[CS_mkxp_dispose_alias],
mrb_intern_lit(mrb, "dispose"));
}
template<class C>

4
binding-mruby/viewportelement-binding.h
View file

@ -50,7 +50,9 @@ viewportElementInitialize(mrb_state *mrb, mrb_value self)
if (!mrb_nil_p(viewportObj))
{
viewport = getPrivateDataCheck<Viewport>(mrb, viewportObj, ViewportType);
disposableAddChild(mrb, viewportObj, self);
if (rgssVer == 1)
disposableAddChild(mrb, viewportObj, self);
}
/* Construct object */