diff options
| author | Max Horn | 2010-07-12 23:19:56 +0000 |
|---|---|---|
| committer | Max Horn | 2010-07-12 23:19:56 +0000 |
| commit | dcd520ce310a593e7dbc5ecac60c5f3f3e8363a6 (patch) | |
| tree | 53e470c5f78cd2fc6cb3170f0f7acf7b94945d9b /backends/platform/sdl | |
| parent | 4f914e7a9f1379f06749b1f01fa83b8464c13d7f (diff) | |
| download | scummvm-rg350-dcd520ce310a593e7dbc5ecac60c5f3f3e8363a6.tar.gz scummvm-rg350-dcd520ce310a593e7dbc5ecac60c5f3f3e8363a6.tar.bz2 scummvm-rg350-dcd520ce310a593e7dbc5ecac60c5f3f3e8363a6.zip | |
Get rid of yet another global object with constructor
svn-id: r50835
Diffstat (limited to 'backends/platform/sdl')
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 18c529092d..6686249416 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -96,11 +96,11 @@ AspectRatio::AspectRatio(int w, int h) { } #if !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) && defined(USE_SCALERS) -static const size_t AR_COUNT = 4; -static const char* desiredAspectRatioAsStrings[AR_COUNT] = { "auto", "4/3", "16/9", "16/10" }; -static const AspectRatio desiredAspectRatios[AR_COUNT] = { AspectRatio(0, 0), AspectRatio(4,3), AspectRatio(16,9), AspectRatio(16,10) }; - static AspectRatio getDesiredAspectRatio() { + const size_t AR_COUNT = 4; + const char* desiredAspectRatioAsStrings[AR_COUNT] = { "auto", "4/3", "16/9", "16/10" }; + const AspectRatio desiredAspectRatios[AR_COUNT] = { AspectRatio(0, 0), AspectRatio(4,3), AspectRatio(16,9), AspectRatio(16,10) }; + //TODO : We could parse an arbitrary string, if we code enough proper validation Common::String desiredAspectRatio = ConfMan.get("desired_screen_aspect_ratio"); |