aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicola Mettifogo2007-02-12 19:47:42 +0000
committerNicola Mettifogo2007-02-12 19:47:42 +0000
commit852803d6e0f3a29f04692a09feabe60a89ff4356 (patch)
treee2bfc6719b4e3042614370c77074044a2e5f0422
parent7d1e5b15ce69bcd86261b15abc9536cf0bb99b34 (diff)
downloadscummvm-rg350-852803d6e0f3a29f04692a09feabe60a89ff4356.tar.gz
scummvm-rg350-852803d6e0f3a29f04692a09feabe60a89ff4356.tar.bz2
scummvm-rg350-852803d6e0f3a29f04692a09feabe60a89ff4356.zip
removed warnings
svn-id: r25534
-rw-r--r--engines/engine.cpp6
-rw-r--r--gui/object.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/engine.cpp b/engines/engine.cpp
index 6749b9027e..b6837d5ee2 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -42,8 +42,8 @@ Engine::Engine(OSystem *syst)
_mixer(_system->getMixer()),
_timer(_system->getTimerManager()),
_saveFileMan(_system->getSavefileManager()),
- _gameDataPath(ConfMan.get("path")),
- _targetName(ConfMan.getActiveDomainName()) {
+ _targetName(ConfMan.getActiveDomainName()),
+ _gameDataPath(ConfMan.get("path")) {
g_engine = this;
_autosavePeriod = ConfMan.getInt("autosave_period");
@@ -88,7 +88,7 @@ void Engine::initCommonGFX(bool defaultTo1XScaler) {
// settings: Via the config file, via the command line, and via in-game
// hotkeys.
// Any global or command line settings already have been applied at the time
- // we get here. Hence we only do something
+ // we get here. Hence we only do something
// (De)activate aspect-ratio correction as determined by the config settings
if (gameDomain && gameDomain->contains("aspect_ratio"))
diff --git a/gui/object.h b/gui/object.h
index b328b852f9..f6702921a1 100644
--- a/gui/object.h
+++ b/gui/object.h
@@ -64,7 +64,7 @@ protected:
Widget *_firstWidget;
public:
- GuiObject(int x, int y, int w, int h) : _x(x), _y(y), _w(w), _h(h), _firstWidget(0), _name("") { }
+ GuiObject(int x, int y, int w, int h) : _x(x), _y(y), _w(w), _h(h), _name(""), _firstWidget(0) { }
GuiObject(const Common::String &name);
virtual int16 getAbsX() const { return _x; }