From 09f56dc233324a7611554912c5483e20e0684104 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Thu, 26 Sep 2002 12:29:10 +0000 Subject: some fixes for the message dialog; added some comments svn-id: r5021 --- backends/wince/findgame.cpp | 20 ++++++++++---------- backends/wince/pocketpc.cpp | 38 +++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'backends/wince') diff --git a/backends/wince/findgame.cpp b/backends/wince/findgame.cpp index 3157397d54..a1bc96b7de 100644 --- a/backends/wince/findgame.cpp +++ b/backends/wince/findgame.cpp @@ -31,7 +31,7 @@ #include "scumm.h" #include "config-file.h" -extern Config *scummcfg; +extern Config *g_config; #define MAX_GAMES 20 @@ -211,14 +211,14 @@ bool loadGameSettings() { prescanning = FALSE; - current = scummcfg->get("GamesInstalled", "wince"); + current = g_config->get("GamesInstalled", "wince"); if (!current) return FALSE; index = atoi(current); installedGamesNumber = index; - current = scummcfg->get("GamesReferences", "wince"); + current = g_config->get("GamesReferences", "wince"); if (!current) return FALSE; for (i=0; iget("BasePath", "wince"); + current = g_config->get("BasePath", "wince"); if (!current) return FALSE; MultiByteToWideChar(CP_ACP, 0, current, strlen(current) + 1, basePath, sizeof(basePath)); @@ -241,7 +241,7 @@ bool loadGameSettings() { char keyName[100]; sprintf(keyName, "GamesDirectory%d", i); - current = scummcfg->get(keyName, "wince"); + current = g_config->get(keyName, "wince"); if (!current) return FALSE; MultiByteToWideChar(CP_ACP, 0, current, strlen(current) + 1, gamesInstalled[i].directory, sizeof(gamesInstalled[i].directory)); @@ -416,7 +416,7 @@ void startFindGame() { // Save the results in the registry SetDlgItemText(hwndDlg, IDC_FILEPATH, TEXT("Saving the results")); - scummcfg->set("GamesInstalled", index, "wince"); + g_config->set("GamesInstalled", index, "wince"); tempo[0] = '\0'; for (i=0; iset("GamesReferences", tempo, "wince"); + g_config->set("GamesReferences", tempo, "wince"); WideCharToMultiByte(CP_ACP, 0, basePath, wcslen(basePath) + 1, workdir, sizeof(workdir), NULL, NULL); - scummcfg->set("BasePath", workdir, "wince"); + g_config->set("BasePath", workdir, "wince"); for (i=0; iset(keyName, workdir, "wince"); + g_config->set(keyName, workdir, "wince"); } - scummcfg->flush(); + g_config->flush(); SetDlgItemText(hwndDlg, IDC_FILEPATH, TEXT("Scan finished")); diff --git a/backends/wince/pocketpc.cpp b/backends/wince/pocketpc.cpp index 4d4406a3a6..ba8f273c2a 100644 --- a/backends/wince/pocketpc.cpp +++ b/backends/wince/pocketpc.cpp @@ -57,7 +57,7 @@ typedef int (*tTimeCallback)(int); typedef void SoundProc(void *param, byte *buf, int len); GameDetector detector; -Config *scummcfg; +Config *g_config; tTimeCallback timer_callback; int timer_interval; @@ -283,9 +283,9 @@ extern void own_soundProc(void *buffer, byte *samples, int len); bool monkey2_keyboard; void do_quit() { - scummcfg->set("Sound", sound_activated, "wince"); - scummcfg->set("DisplayMode", GetScreenMode(), "wince"); - scummcfg->flush(); + g_config->set("Sound", sound_activated, "wince"); + g_config->set("DisplayMode", GetScreenMode(), "wince"); + g_config->flush(); GXCloseInput(); GXCloseDisplay(); SDL_AudioQuit(); @@ -402,10 +402,10 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLin hide_toolbar = false; - scummcfg = new Config("scummvm.ini", "scummvm"); - scummcfg->set_writing(true); + g_config = new Config("scummvm.ini", "scummvm"); + g_config->set_writing(true); - sound = scummcfg->get("Sound", "wince"); + sound = g_config->get("Sound", "wince"); if (sound) sound_activated = (atoi(sound) == 1); else @@ -881,9 +881,9 @@ void load_key_mapping() { memset(actions_keys, 0, sizeof(actions_keys)); - version = scummcfg->get("KeysVersion", "wince"); + version = g_config->get("KeysVersion", "wince"); - current = scummcfg->get("ActionKeys", "wince"); + current = g_config->get("ActionKeys", "wince"); if (current && version) { for (i=0; iget("ActionTypes", "wince"); + current = g_config->get("ActionTypes", "wince"); if (current && version) { for (i=0; iset("KeysVersion", "2", "wince"); - scummcfg->flush(); + g_config->set("KeysVersion", "2", "wince"); + g_config->flush(); } } @@ -938,7 +938,7 @@ void save_key_mapping() { sprintf(x, "%.4x ", work_keys[i]); strcat(tempo, x); } - scummcfg->set("ActionKeys", tempo, "wince"); + g_config->set("ActionKeys", tempo, "wince"); tempo[0] = '\0'; work = getActionTypes(); for (i=0; iset("ActionTypes", tempo, "wince"); + g_config->set("ActionTypes", tempo, "wince"); - scummcfg->flush(); + g_config->flush(); } /*************** Hardware keys support ***********/ @@ -1001,9 +1001,9 @@ void action_quit() { void action_boss() { SHELLEXECUTEINFO se; - scummcfg->set("Sound", sound_activated, "wince"); - scummcfg->set("DisplayMode", GetScreenMode(), "wince"); - scummcfg->flush(); + g_config->set("Sound", sound_activated, "wince"); + g_config->set("DisplayMode", GetScreenMode(), "wince"); + g_config->flush(); sound_activated = false; toolbar_drawn = false; hide_toolbar = true; @@ -1159,7 +1159,7 @@ OSystem *OSystem_WINCE3::create(int gfx_mode, bool full_screen) { drawWait(); // Set mode, portrait or landscape - display_mode = scummcfg->get("DisplayMode", "wince"); + display_mode = g_config->get("DisplayMode", "wince"); if (display_mode) SetScreenMode(atoi(display_mode)); -- cgit v1.2.3