summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorPhilipp Sehmisch <crush@themanaworld.org>2009-12-16 18:49:09 +0100
committerPhilipp Sehmisch <crush@themanaworld.org>2009-12-16 20:09:13 +0100
commitf862b7ecb1fc9c410a693eac0accf5081830ab5e (patch)
tree660f1c07d9260349edf83738825408a598097b4d /src/gui
parent6b7833deee20e3abb5856d64d7f359d754fea4ca (diff)
downloadMana-f862b7ecb1fc9c410a693eac0accf5081830ab5e.tar.gz
Mana-f862b7ecb1fc9c410a693eac0accf5081830ab5e.tar.bz2
Mana-f862b7ecb1fc9c410a693eac0accf5081830ab5e.tar.xz
Mana-f862b7ecb1fc9c410a693eac0accf5081830ab5e.zip
Stored the cached config value which says if non-crucial particle effects are enabled or not in a static member of class Particle instead of an instanced member of Being.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/charselectdialog.cpp2
-rw-r--r--src/gui/setup_video.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 4f3619ae..8dc292ab 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -226,7 +226,7 @@ void CharSelectDialog::keyPressed(gcn::KeyEvent &keyEvent)
if (key.getValue() == Key::ESCAPE)
{
- action(gcn::ActionEvent(NULL, mSwitchLoginButton->getActionEventId()));
+ action(gcn::ActionEvent(mSwitchLoginButton, mSwitchLoginButton->getActionEventId()));
}
}
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index a4bd6864..b1d40575 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -484,6 +484,8 @@ void Setup_Video::action(const gcn::ActionEvent &event)
{
config.setValue("particleeffects",
mParticleEffectsCheckBox->isSelected());
+ Particle::enabled = mParticleEffectsCheckBox->isSelected();
+
if (engine)
{
new OkDialog(_("Particle Effect Settings Changed."),