From a541cb12051c1d2d58e0dea4d576d402a7c2a7fc Mon Sep 17 00:00:00 2001 From: Jonas Kulla Date: Sun, 13 Jul 2014 05:34:18 +0200 Subject: [PATCH] Some RGSS2/RGSS3 compile fixes --- binding-mri/binding-mri.cpp | 2 ++ binding-mri/sprite-binding.cpp | 4 ++-- src/graphics.cpp | 2 +- src/tilemap.cpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/binding-mri/binding-mri.cpp b/binding-mri/binding-mri.cpp index ac54a07..0bd1d96 100644 --- a/binding-mri/binding-mri.cpp +++ b/binding-mri/binding-mri.cpp @@ -70,7 +70,9 @@ RB_METHOD(mriP); RB_METHOD(mriDataDirectory); RB_METHOD(mkxpPuts); +#ifndef RGSS3 RB_METHOD(_kernelCaller); +#endif static void mriBindingInit() { diff --git a/binding-mri/sprite-binding.cpp b/binding-mri/sprite-binding.cpp index 2d515cd..94d8ee3 100644 --- a/binding-mri/sprite-binding.cpp +++ b/binding-mri/sprite-binding.cpp @@ -77,7 +77,7 @@ RB_METHOD(spriteWidth) Sprite *s = getPrivateData(self); - int value; + int value = 0; GUARD_EXC( value = s->getWidth(); ) return rb_fix_new(value); @@ -89,7 +89,7 @@ RB_METHOD(spriteHeight) Sprite *s = getPrivateData(self); - int value; + int value = 0; GUARD_EXC( value = s->getHeight(); ) return rb_fix_new(value); diff --git a/src/graphics.cpp b/src/graphics.cpp index b573e8a..7e0264d 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -797,7 +797,7 @@ void Graphics::resizeScreen(int width, int height) RBO::bind(p->transBuffer.rbo); RBO::allocEmpty(width, height); - p->updateScreenResoRatio(); + p->updateScreenResoRatio(p->threadData); } DEF_ATTR_RD_SIMPLE(Graphics, Brightness, int, p->brightness) diff --git a/src/tilemap.cpp b/src/tilemap.cpp index e2a8854..89cc7dd 100644 --- a/src/tilemap.cpp +++ b/src/tilemap.cpp @@ -1295,7 +1295,7 @@ void Tilemap::setViewport(Viewport *value) p->elem.ground->setViewport(value); - for (size_t i = 0; i < p->elem.scanrows.size(); ++i) + for (size_t i = 0; i < scanrowsMax; ++i) p->elem.scanrows[i]->setViewport(value); }