From 6bc3460294a2045b20a075c06253a0ffad8d8e7c Mon Sep 17 00:00:00 2001 From: Jonas Kulla Date: Sat, 6 Sep 2014 02:01:20 +0200 Subject: [PATCH] Core, MRI: Don't expose RGSS3 functionality in 2 --- binding-mri/windowvx-binding.cpp | 22 ++++++++++++++-------- src/windowvx.cpp | 9 ++++++--- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/binding-mri/windowvx-binding.cpp b/binding-mri/windowvx-binding.cpp index 50ee979..c9bcee3 100644 --- a/binding-mri/windowvx-binding.cpp +++ b/binding-mri/windowvx-binding.cpp @@ -53,9 +53,11 @@ RB_METHOD(windowVXInitialize) w->initDynAttribs(); - wrapProperty(self, w->getTone(), "tone", ToneType); wrapProperty(self, w->getCursorRect(), "cursor_rect", RectType); + if (rgssVer >= 3) + wrapProperty(self, w->getTone(), "tone", ToneType); + Bitmap *contents = new Bitmap(1, 1); VALUE contentsObj = wrapObject(contents, BitmapType); bitmapInitProps(contents, contentsObj); @@ -138,17 +140,12 @@ windowVXBindingInit() viewportElementBindingInit(klass); _rb_define_method(klass, "initialize", windowVXInitialize); - _rb_define_method(klass, "update", windowVXUpdate); - _rb_define_method(klass, "move", windowVXMove); - _rb_define_method(klass, "open?", windowVXIsOpen); - _rb_define_method(klass, "close?", windowVXIsClosed); INIT_PROP_BIND( WindowVX, Windowskin, "windowskin" ); INIT_PROP_BIND( WindowVX, Contents, "contents" ); INIT_PROP_BIND( WindowVX, CursorRect, "cursor_rect" ); INIT_PROP_BIND( WindowVX, Active, "active" ); - INIT_PROP_BIND( WindowVX, ArrowsVisible, "arrows_visible" ); INIT_PROP_BIND( WindowVX, Pause, "pause" ); INIT_PROP_BIND( WindowVX, X, "x" ); INIT_PROP_BIND( WindowVX, Y, "y" ); @@ -156,11 +153,20 @@ windowVXBindingInit() INIT_PROP_BIND( WindowVX, Height, "height" ); INIT_PROP_BIND( WindowVX, OX, "ox" ); INIT_PROP_BIND( WindowVX, OY, "oy" ); - INIT_PROP_BIND( WindowVX, Padding, "padding" ); - INIT_PROP_BIND( WindowVX, PaddingBottom, "padding_bottom" ); INIT_PROP_BIND( WindowVX, Opacity, "opacity" ); INIT_PROP_BIND( WindowVX, BackOpacity, "back_opacity" ); INIT_PROP_BIND( WindowVX, ContentsOpacity, "contents_opacity" ); INIT_PROP_BIND( WindowVX, Openness, "openness" ); + + if (rgssVer >= 3) + { + _rb_define_method(klass, "move", windowVXMove); + _rb_define_method(klass, "open?", windowVXIsOpen); + _rb_define_method(klass, "close?", windowVXIsClosed); + + INIT_PROP_BIND( WindowVX, ArrowsVisible, "arrows_visible" ); + INIT_PROP_BIND( WindowVX, Padding, "padding" ); + INIT_PROP_BIND( WindowVX, PaddingBottom, "padding_bottom" ); INIT_PROP_BIND( WindowVX, Tone, "tone" ); + } } diff --git a/src/windowvx.cpp b/src/windowvx.cpp index 103bc44..399e7b0 100644 --- a/src/windowvx.cpp +++ b/src/windowvx.cpp @@ -1044,10 +1044,13 @@ void WindowVX::setOpenness(int value) void WindowVX::initDynAttribs() { p->cursorRect = new Rect; - p->tone = new Tone; - p->refreshCursorRectCon(); - p->refreshToneCon(); + + if (rgssVer >= 3) + { + p->tone = new Tone; + p->refreshToneCon(); + } } void WindowVX::draw()