diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-05 23:24:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-05 23:24:57 +0300 |
| commit | 78ee4491892b8fae778b913a0b8db52b9876dabe (patch) | |
| tree | 36aff4faa6fa229313483cedd30676c5eb37b349 | |
| parent | bfa7b90207d3671c6e98129be9ce82b1fbe5b419 (diff) | |
| download | manaverse-78ee4491892b8fae778b913a0b8db52b9876dabe.tar.gz manaverse-78ee4491892b8fae778b913a0b8db52b9876dabe.tar.bz2 manaverse-78ee4491892b8fae778b913a0b8db52b9876dabe.tar.xz manaverse-78ee4491892b8fae778b913a0b8db52b9876dabe.zip | |
Fix code style.
| -rw-r--r-- | src/main.cpp | 3 | ||||
| -rw-r--r-- | src/test/testlauncher.cpp | 2 | ||||
| -rw-r--r-- | src/test/testmain.cpp | 9 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp index 5507cce7e..f704d68c7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -71,7 +71,8 @@ static void printHelp() " directory") << endl << _(" --screenshot-dir : Directory to store screenshots") << endl << _(" --safemode : Start game in safe mode") << endl - << _(" -T --tests : Start testing drivers and auto configuring") << endl + << _(" -T --tests : Start testing drivers and " + "auto configuring") << endl #ifdef USE_OPENGL << _(" --no-opengl : Disable OpenGL for this session") << endl #endif diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index e06174127..6f2f7a612 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -103,7 +103,7 @@ int TestLauncher::testRescale() { Wallpaper::loadWallpapers(); const std::string wallpaperName = Wallpaper::getWallpaper(800, 600); - Image *img = Theme::getImageFromTheme(wallpaperName); + volatile Image *img = Theme::getImageFromTheme(wallpaperName); if (!img) return 1; diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp index 687006d4a..712133d41 100644 --- a/src/test/testmain.cpp +++ b/src/test/testmain.cpp @@ -78,9 +78,6 @@ int TestMain::exec() int safeOpenGLTest = invokeSafeOpenGLRenderTest("3"); int soundTest = invokeTest4(); int rescaleTest[3]; - int softFpsTest = -1; - int fastOpenGLFpsTest = -1; - int safeOpenGLFpsTest = -1; int softFps = 0; int fastOpenGLFps = 0; int safeOpenGLFps = 0; @@ -97,7 +94,7 @@ int TestMain::exec() if (!softwareTest) { - softFpsTest = invokeSoftwareRenderTest("8"); + int softFpsTest = invokeSoftwareRenderTest("8"); info += strprintf ("%d", softFpsTest); if (!softFpsTest) { @@ -122,7 +119,7 @@ int TestMain::exec() info += "."; if (!fastOpenGLTest) { - fastOpenGLFpsTest = invokeFastOpenGLRenderTest("9"); + int fastOpenGLFpsTest = invokeFastOpenGLRenderTest("9"); info += strprintf ("%d", fastOpenGLFpsTest); if (!fastOpenGLFpsTest) { @@ -147,7 +144,7 @@ int TestMain::exec() info += "."; if (!safeOpenGLTest) { - safeOpenGLFpsTest = invokeSafeOpenGLRenderTest("10"); + int safeOpenGLFpsTest = invokeSafeOpenGLRenderTest("10"); info += strprintf ("%d", safeOpenGLFpsTest); if (!safeOpenGLFpsTest) { |