aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-09-24 16:17:25 +0000
committerJohannes Schickel2009-09-24 16:17:25 +0000
commite56dbf68be864d9617b01e72f55d93025a490893 (patch)
treec9b386e77246c783b62e0bf6c98b5381068155d3
parentf2a07d7ae931fa32b609ea03160fcdb13a9cb940 (diff)
downloadscummvm-rg350-e56dbf68be864d9617b01e72f55d93025a490893.tar.gz
scummvm-rg350-e56dbf68be864d9617b01e72f55d93025a490893.tar.bz2
scummvm-rg350-e56dbf68be864d9617b01e72f55d93025a490893.zip
Changed some code to follow our guidelines.
svn-id: r44307
-rw-r--r--engines/engine.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/engine.cpp b/engines/engine.cpp
index a64a2fd1f3..11e46e893a 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -134,8 +134,8 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, const Graphics:
if (format)
g_system->initSize(width, height, format);
else {
- Graphics::PixelFormat Format = g_system->getSupportedFormats().front();
- g_system->initSize(width, height, &Format);
+ Graphics::PixelFormat bestFormat = g_system->getSupportedFormats().front();
+ g_system->initSize(width, height, &bestFormat);
}
#else
g_system->initSize(width, height);
@@ -188,13 +188,15 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, const Graphics:
dialog.runModal();
}
}
+
void initGraphics(int width, int height, bool defaultTo1xScaler, const Common::List<Graphics::PixelFormat> &formatList) {
- Graphics::PixelFormat format = Graphics::findCompatibleFormat(g_system->getSupportedFormats(),formatList);
- initGraphics(width,height,defaultTo1xScaler,&format);
+ Graphics::PixelFormat format = Graphics::findCompatibleFormat(g_system->getSupportedFormats(), formatList);
+ initGraphics(width, height, defaultTo1xScaler, &format);
}
+
void initGraphics(int width, int height, bool defaultTo1xScaler) {
Graphics::PixelFormat format = Graphics::PixelFormat::createFormatCLUT8();
- initGraphics(width,height,defaultTo1xScaler,&format);
+ initGraphics(width, height, defaultTo1xScaler, &format);
}
void GUIErrorMessage(const Common::String msg) {