libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 09:18:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Prefix class variables with underscores

Browse Source
This commit is contained in:
Filippos Karapetis 2011-11-17 22:05:46 +02:00
parent 877d22652f
commit 10e14367ec
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/sci/graphics/coordadjuster.cpp
View File

@ -86,8 +86,8 @@ Common::Rect GfxCoordAdjuster16::pictureGetDisplayArea() {
#ifdef ENABLE_SCI32
GfxCoordAdjuster32::GfxCoordAdjuster32(SegManager *segMan)
: _segMan(segMan) {
scriptsRunningWidth = 0;
scriptsRunningHeight = 0;
_scriptsRunningWidth = 0;
_scriptsRunningHeight = 0;
}
GfxCoordAdjuster32::~GfxCoordAdjuster32() {
@ -109,18 +109,18 @@ void GfxCoordAdjuster32::kernelLocalToGlobal(int16 &x, int16 &y, reg_t planeObje
}
void GfxCoordAdjuster32::setScriptsResolution(uint16 width, uint16 height) {
scriptsRunningWidth = width;
scriptsRunningHeight = height;
_scriptsRunningWidth = width;
_scriptsRunningHeight = height;
}
void GfxCoordAdjuster32::fromDisplayToScript(int16 &y, int16 &x) {
y = ((y * scriptsRunningHeight) / g_sci->_gfxScreen->getHeight());
x = ((x * scriptsRunningWidth) / g_sci->_gfxScreen->getWidth());
y = ((y * _scriptsRunningHeight) / g_sci->_gfxScreen->getHeight());
x = ((x * _scriptsRunningWidth) / g_sci->_gfxScreen->getWidth());
}
void GfxCoordAdjuster32::fromScriptToDisplay(int16 &y, int16 &x) {
y = ((y * g_sci->_gfxScreen->getHeight()) / scriptsRunningHeight);
x = ((x * g_sci->_gfxScreen->getWidth()) / scriptsRunningWidth);
y = ((y * g_sci->_gfxScreen->getHeight()) / _scriptsRunningHeight);
x = ((x * g_sci->_gfxScreen->getWidth()) / _scriptsRunningWidth);
}
void GfxCoordAdjuster32::pictureSetDisplayArea(Common::Rect displayArea) {

4
engines/sci/graphics/coordadjuster.h
View File

@ -96,8 +96,8 @@ private:
Common::Rect _pictureDisplayArea;
uint16 scriptsRunningWidth;
uint16 scriptsRunningHeight;
uint16 _scriptsRunningWidth;
uint16 _scriptsRunningHeight;
};
#endif