diff options
| -rw-r--r-- | TODO | 15 | ||||
| -rw-r--r-- | base/gameDetector.cpp | 13 | ||||
| -rw-r--r-- | base/gameDetector.h | 1 | ||||
| -rw-r--r-- | base/main.cpp | 1 | ||||
| -rw-r--r-- | scumm/sound.h | 5 |
5 files changed, 16 insertions, 19 deletions
@@ -23,6 +23,9 @@ General some kind of main loop, which, besides many other things, also polls and dispatches events. The idea is to turn this around: the event loop frequently gives the engine time to do these "other things". +* Remove various parts from GameSettings struct: "id", "version", "detectname". + Those are only needed internally by the plugins, and hence shouldn't be + exported. On the long run, "midi" and "features" might be removed, too. GUI === @@ -61,6 +64,18 @@ Config In particular: -w and -l (those were kind of oddball switches, IMHO); also -z should be split into two seperate functions (see TODO comment in GameDetector::list_games()) +* Reconsider and reevaluate our command line options. I propose some changes: + - add long alternatives for (almost?) all options. There should be some generic way + to specify this, in order to avoid code duplication and to simplify the code + - some more obscure options which currently have a single-letter options assigned + really don't need it. E.g. the "-t<NUM>" option probably is rarely used, and anybody + who needs it should still be happy with "--tempo=NUM" + This will make room in the ranks of single-letter options for other more useful options + (for example, "-t" could stand for "List (T)argets") + - -y, -t, -c, -j all are candidates for this, IMHO: their settings are rather obscure, + and anybody who needs them always should put them into the config file anyway + + SCUMM ===== diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index 45edfb1363..b2447f1c18 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -48,17 +48,6 @@ current_option = NULL // DONT FIXME: DO NOT ORDER ALPHABETICALY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :) -// FIXME: Reconsider and reevaluate our command line options. I propose some changes: -// * add long alternatives for (almost?) all options. There should be some generic way -// to specify this, in order to avoid code duplication and to simplify the code -// * some more obscure options which currently have a single-letter options assigned -// really don't need it. E.g. the "-t<NUM>" option probably is rarely used, and anybody -// who needs it should still be happy with "--tempo=NUM" -// This will make room in the ranks of single-letter options for other more useful options -// (for example, "-t" could stand for "List (T)argets") -// * -y, -t, -c, -j all are candidates for this, IMHO: their settings are rather obscure, -// and anybody who needs them always should put them into the config file anyway -// #ifdef __PALM_OS__ static const char USAGE_STRING[] = "NoUsageString"; // save more data segment space #else @@ -201,8 +190,6 @@ GameDetector::GameDetector() { _dumpScripts = false; _midi_driver = MD_AUTO; - _saveconfig = false; - _game.features = 0; _plugin = 0; } diff --git a/base/gameDetector.h b/base/gameDetector.h index bb2d9bdae9..d105e1d20a 100644 --- a/base/gameDetector.h +++ b/base/gameDetector.h @@ -70,7 +70,6 @@ public: const Plugin *_plugin; bool _dumpScripts; - bool _saveconfig; int _midi_driver; diff --git a/base/main.cpp b/base/main.cpp index 2faeb873e8..7c4c9e4a24 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -241,7 +241,6 @@ int main(int argc, char *argv[]) { // Parse the command line information GameDetector detector; - detector._saveconfig = false; detector.parseCommandLine(argc, argv); // Create the system object diff --git a/scumm/sound.h b/scumm/sound.h index de2a4c4e21..d37a907c11 100644 --- a/scumm/sound.h +++ b/scumm/sound.h @@ -38,11 +38,10 @@ class Sound { protected: int16 _soundQuePos, _soundQue[0x100]; int16 _soundQue2Pos, _soundQue2[10]; - bool _soundsPaused2; - bool _soundVolumePreset; public: const char *_nameBundleMusic; + int32 _bundleMusicPosition; protected: const char *_newNameBundleMusic; @@ -98,8 +97,6 @@ protected: ScummEngine *_scumm; public: - int32 _bundleMusicPosition; - PlayingSoundHandle _talkChannelHandle; // Handle of mixer channel actor is talking on bool _soundsPaused; byte _sfxMode; |