diff options
| author | Christopher Page | 2008-05-28 20:30:20 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-05-28 20:30:20 +0000 |
| commit | 8297ead2671e43963098a3dc41e8e75fdbce4ddc (patch) | |
| tree | 72b0e2bb7d03e461cc157ea5f093261ab902fbfb /gui | |
| parent | 3c0e72bb25f83120f0320782793af64213cbd1c2 (diff) | |
| parent | 057af1000f5187a93fc1ac1a5f61a7a6a382bf03 (diff) | |
| download | scummvm-rg350-8297ead2671e43963098a3dc41e8e75fdbce4ddc.tar.gz scummvm-rg350-8297ead2671e43963098a3dc41e8e75fdbce4ddc.tar.bz2 scummvm-rg350-8297ead2671e43963098a3dc41e8e75fdbce4ddc.zip | |
Merged revisions 32124,32126-32128,32131,32133,32135-32144,32146-32153,32155-32163,32165-32168,32170-32173,32175-32179,32181-32191,32193-32202,32204-32205,32209-32214,32216,32218,32220-32235,32237-32266,32269-32271,32273-32290,32292-32295,32297-32317,32319-32323,32325-32328,32330-32331,32334-32338,32343-32347 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r32350
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/about.cpp | 4 | ||||
| -rw-r--r-- | gui/debugger.cpp | 6 | ||||
| -rw-r--r-- | gui/launcher.h | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/gui/about.cpp b/gui/about.cpp index 2afaae9a97..758f3ee6a7 100644 --- a/gui/about.cpp +++ b/gui/about.cpp @@ -128,8 +128,8 @@ AboutDialog::AboutDialog() _lines.push_back(""); addLine("\\C\\c1""Available engines:"); - const EnginePlugin::list &plugins = EngineMan.getPlugins(); - EnginePlugin::list::const_iterator iter = plugins.begin(); + const EnginePlugin::List &plugins = EngineMan.getPlugins(); + EnginePlugin::List::const_iterator iter = plugins.begin(); for (; iter != plugins.end(); ++iter) { Common::String str; str = "\\C"; diff --git a/gui/debugger.cpp b/gui/debugger.cpp index 99aebe9b62..87abe854be 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -406,7 +406,7 @@ bool Debugger::Cmd_Help(int argc, const char **argv) { } bool Debugger::Cmd_DebugFlagsList(int argc, const char **argv) { - const Common::Array<Common::EngineDebugLevel> &debugLevels = Common::listSpecialDebugLevels(); + const Common::DebugLevelContainer &debugLevels = Common::listSpecialDebugLevels(); DebugPrintf("Engine debug levels:\n"); DebugPrintf("--------------------\n"); @@ -414,8 +414,8 @@ bool Debugger::Cmd_DebugFlagsList(int argc, const char **argv) { DebugPrintf("No engine debug levels\n"); return true; } - for (uint i = 0; i < debugLevels.size(); ++i) { - DebugPrintf("'%s' - Description: %s\n", debugLevels[i].option.c_str(), debugLevels[i].description.c_str()); + for (Common::DebugLevelContainer::const_iterator i = debugLevels.begin(); i != debugLevels.end(); ++i) { + DebugPrintf("'%s' - Description: %s\n", i->option.c_str(), i->description.c_str()); } DebugPrintf("\n"); return true; diff --git a/gui/launcher.h b/gui/launcher.h index 164a7e0707..a9d09bf109 100644 --- a/gui/launcher.h +++ b/gui/launcher.h @@ -26,6 +26,7 @@ #define LAUNCHER_DIALOG_H #include "gui/dialog.h" +#include "base/game.h" #include "common/str.h" namespace GUI { |