aboutsummaryrefslogtreecommitdiff
path: root/backends/wince/wince-sdl.cpp
diff options
context:
space:
mode:
authorMax Horn2006-04-15 17:39:14 +0000
committerMax Horn2006-04-15 17:39:14 +0000
commitad45318328e23b76e346414c62ef4c22d8ebe059 (patch)
tree9956847a38797471f73fd26ec3203dbbae6efd78 /backends/wince/wince-sdl.cpp
parentdc5f513bcf7b6177a4d8f7e10fb4ed4dd55d7588 (diff)
downloadscummvm-rg350-ad45318328e23b76e346414c62ef4c22d8ebe059.tar.gz
scummvm-rg350-ad45318328e23b76e346414c62ef4c22d8ebe059.tar.bz2
scummvm-rg350-ad45318328e23b76e346414c62ef4c22d8ebe059.zip
Removed GameDetector::_gameid in favor of using a config manager entry
svn-id: r21915
Diffstat (limited to 'backends/wince/wince-sdl.cpp')
-rw-r--r--backends/wince/wince-sdl.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/backends/wince/wince-sdl.cpp b/backends/wince/wince-sdl.cpp
index 885e2ce242..1f877e77ba 100644
--- a/backends/wince/wince-sdl.cpp
+++ b/backends/wince/wince-sdl.cpp
@@ -522,7 +522,7 @@ bool OSystem_WINCE3::checkOggHighSampleRate() {
void OSystem_WINCE3::get_sample_rate() {
// Force at least medium quality FM synthesis for FOTAQ
- Common::String gameid(GUI::Actions::Instance()->_gameid);
+ Common::String gameid(ConfMan.get("gameid"));
if (gameid == "queen") {
if (!((ConfMan.hasKey("FM_high_quality") && ConfMan.getBool("FM_high_quality")) ||
(ConfMan.hasKey("FM_medium_quality") && ConfMan.getBool("FM_medium_quality")))) {
@@ -653,9 +653,9 @@ bool OSystem_WINCE3::setSoundCallback(SoundProc proc, void *param) {
void OSystem_WINCE3::check_mappings() {
CEActionsPocket *instance;
- Common::String gameid(GUI::Actions::Instance()->_gameid);
+ Common::String gameid(ConfMan.get("gameid"));
- if (!gameid.size() || GUI_Actions::Instance()->initialized())
+ if (gameid.empty() || GUI_Actions::Instance()->initialized())
return;
GUI_Actions::Instance()->initInstanceGame();
@@ -707,10 +707,10 @@ void OSystem_WINCE3::check_mappings() {
}
void OSystem_WINCE3::update_game_settings() {
- Common::String gameid(GUI::Actions::Instance()->_gameid);
+ Common::String gameid(ConfMan.get("gameid"));
// Finish panel initialization
- if (!_panelInitialized && gameid.size()) {
+ if (!_panelInitialized && !gameid.empty()) {
Panel *panel;
_panelInitialized = true;
// Add the main panel