diff options
author | Alejandro Marzini | 2010-06-27 05:12:37 +0000 |
---|---|---|
committer | Alejandro Marzini | 2010-06-27 05:12:37 +0000 |
commit | 936f5585794972bb76b25164890315786dbe3401 (patch) | |
tree | aa62535f9a9d2cf760ea18f4c869871ea053ed66 /backends/platform/sdl/win32/win32.cpp | |
parent | 62ac3982aa5ba81a29ff4bf5b1ac1e3d2647eb9b (diff) | |
download | scummvm-rg350-936f5585794972bb76b25164890315786dbe3401.tar.gz scummvm-rg350-936f5585794972bb76b25164890315786dbe3401.tar.bz2 scummvm-rg350-936f5585794972bb76b25164890315786dbe3401.zip |
Improved getDefaultConfigFileName(). Code cleanup.
svn-id: r50364
Diffstat (limited to 'backends/platform/sdl/win32/win32.cpp')
-rw-r--r-- | backends/platform/sdl/win32/win32.cpp | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp index 907059feaf..28cb13def4 100644 --- a/backends/platform/sdl/win32/win32.cpp +++ b/backends/platform/sdl/win32/win32.cpp @@ -30,22 +30,9 @@ #undef ARRAYSIZE #include "backends/platform/sdl/win32/win32.h" -#include "common/archive.h" -#include "common/config-manager.h" -#include "common/debug.h" -#include "common/util.h" - -#include "backends/saves/default/default-saves.h" -#include "backends/audiocd/sdl/sdl-audiocd.h" -#include "backends/events/sdl/sdl-events.h" -#include "backends/mutex/sdl/sdl-mutex.h" -#include "backends/mixer/sdl/sdl-mixer.h" -#include "backends/timer/sdl/sdl-timer.h" - #include "backends/fs/windows/windows-fs-factory.h" -OSystem_Win32::OSystem_Win32() { -} +#define DEFAULT_CONFIG_FILE "scummvm.ini" void OSystem_Win32::init() { // Initialze File System Factory @@ -55,10 +42,6 @@ void OSystem_Win32::init() { OSystem_SDL::init(); } -const char *OSystem_Win32::getConfigFileNameString() { - return "\\scummvm.ini"; -} - Common::String OSystem_Win32::getDefaultConfigFileName() { char configFile[MAXPATHLEN]; @@ -82,14 +65,14 @@ Common::String OSystem_Win32::getDefaultConfigFileName() { strcat(configFile, "\\ScummVM"); CreateDirectory(configFile, NULL); - strcat(configFile, getConfigFileNameString()); + strcat(configFile, "\\" DEFAULT_CONFIG_FILE); FILE *tmp = NULL; if ((tmp = fopen(configFile, "r")) == NULL) { // Check windows directory char oldConfigFile[MAXPATHLEN]; GetWindowsDirectory(oldConfigFile, MAXPATHLEN); - strcat(oldConfigFile, getConfigFileNameString()); + strcat(oldConfigFile, "\\" DEFAULT_CONFIG_FILE); if ((tmp = fopen(oldConfigFile, "r"))) { strcpy(configFile, oldConfigFile); @@ -101,7 +84,7 @@ Common::String OSystem_Win32::getDefaultConfigFileName() { } else { // Check windows directory GetWindowsDirectory(configFile, MAXPATHLEN); - strcat(configFile, getConfigFileNameString()); + strcat(configFile, "\\" DEFAULT_CONFIG_FILE); } return configFile; |