diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-02-05 22:15:43 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-02-06 21:25:37 +0100 |
commit | 242e3bb8d92def67d5c30f2f2fd974cfb117ec04 (patch) | |
tree | 7f247e04e238a0edc0281ec8ed85539b2be81137 /src/gui/setup_video.cpp | |
parent | 51e14c9d7aab75fe60f68d4943759eef66eafe9a (diff) | |
download | mana-242e3bb8d92def67d5c30f2f2fd974cfb117ec04.tar.gz mana-242e3bb8d92def67d5c30f2f2fd974cfb117ec04.tar.bz2 mana-242e3bb8d92def67d5c30f2f2fd974cfb117ec04.tar.xz mana-242e3bb8d92def67d5c30f2f2fd974cfb117ec04.zip |
Merged the Engine class into the Game class
There was little point in keeping the Engine class separate. It wasn't
an engine at all, but only kept track of the currently active map, a job
more suitable for the Game class anyway.
Diffstat (limited to 'src/gui/setup_video.cpp')
-rw-r--r-- | src/gui/setup_video.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index aaa3ea35..f5bff9ba 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -22,7 +22,7 @@ #include "gui/setup_video.h" #include "configuration.h" -#include "engine.h" +#include "game.h" #include "graphics.h" #include "localplayer.h" #include "log.h" @@ -502,7 +502,7 @@ void Setup_Video::action(const gcn::ActionEvent &event) mParticleEffectsCheckBox->isSelected()); Particle::enabled = mParticleEffectsCheckBox->isSelected(); - if (engine) + if (Game::instance()) { new OkDialog(_("Particle Effect Settings Changed."), _("Changes will take effect on map change.")); |