diff options
| author | Arnaud Boutonné | 2010-10-01 09:13:47 +0000 |
|---|---|---|
| committer | Arnaud Boutonné | 2010-10-01 09:13:47 +0000 |
| commit | 5727cab0f1f1a420a36afb7f524bd64015628861 (patch) | |
| tree | d7be96f6596fb78ce95c2816093c75e55ca4a7fa | |
| parent | 2efaedb29b3436c1eae03dad0fba59e2c72747d4 (diff) | |
| download | scummvm-rg350-5727cab0f1f1a420a36afb7f524bd64015628861.tar.gz scummvm-rg350-5727cab0f1f1a420a36afb7f524bd64015628861.tar.bz2 scummvm-rg350-5727cab0f1f1a420a36afb7f524bd64015628861.zip | |
HUGO: Remove viewport variables from _config
svn-id: r52963
| -rw-r--r-- | engines/hugo/engine.cpp | 15 | ||||
| -rw-r--r-- | engines/hugo/game.h | 2 |
2 files changed, 2 insertions, 15 deletions
diff --git a/engines/hugo/engine.cpp b/engines/hugo/engine.cpp index 28ffd40649..4e90f24a03 100644 --- a/engines/hugo/engine.cpp +++ b/engines/hugo/engine.cpp @@ -110,9 +110,6 @@ void HugoEngine::initStatus() { // Initialize default config values. Must be done before Initialize(). // Reset needed to save config.cx,cy which get splatted during OnFileNew() void HugoEngine::initConfig(inst_t action) { - static int16 cx, cy; // Save window size, pos - int16 i; - debugC(1, kDebugEngine, "initConfig(%d)", action); switch (action) { @@ -121,24 +118,15 @@ void HugoEngine::initConfig(inst_t action) { _config.soundFl = true; // Sound state initially on _config.turboFl = false; // Turbo state initially off _config.backgroundMusicFl = false; // No music when inactive - _config.cx = VIEW_DX * 2; // Window view size - _config.cy = VIEW_DY * 2; - _config.musicVolume = 85; // Music volume % _config.soundVolume = 100; // Sound volume % initPlaylist(_config.playlist); // Initialize default tune playlist file().readBootFile(); // Read startup structure - - cx = _config.cx; // Save these around OnFileNew() - cy = _config.cy; break; case RESET: - _config.cx = cx; // Restore cx, cy - _config.cy = cy; - // Find first tune and play it - for (i = 0; i < MAX_TUNES; i++) + for (int16 i = 0; i < MAX_TUNES; i++) if (_config.playlist[i]) { sound().playMusic(i); break; @@ -151,6 +139,7 @@ void HugoEngine::initConfig(inst_t action) { break; } } + void HugoEngine::initialize() { debugC(1, kDebugEngine, "initialize"); diff --git a/engines/hugo/game.h b/engines/hugo/game.h index 2138e123b0..fd019e9084 100644 --- a/engines/hugo/game.h +++ b/engines/hugo/game.h @@ -817,8 +817,6 @@ struct config_t { // User's config (saved) bool musicFl; // State of Music button/menu item bool soundFl; // State of Sound button/menu item bool turboFl; // State of Turbo button/menu item -// int16 wx, wy; // Position of viewport - int16 cx, cy; // Size of viewport bool backgroundMusicFl; // Continue music when task inactive byte musicVolume; // Music volume percentage byte soundVolume; // Sound volume percentage |