Changeset 26 for trunk/Classes/preferences.cpp

Timestamp:

2010-05-28 07:39:52 (2 years ago)

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/preferences.cpp (modified) (6 diffs)

trunk/Classes/preferences.cpp

@@ -241 +241 @@
 int idle_anim_rate()
 {
-    return lexical_cast_default<int>(get("idle_anim_rate"), 0);
+    return lexical_cast_default<int>(get("idle_anim_rate"), -20);
 }
 
@@ -378 +378 @@
         preferences::set("turn_bell", "no");
         sound::stop_bell();
-        if(!music_on() && !sound_on() && !UI_sound_on())
-            sound::close_sound();
+//      if(!music_on() && !sound_on() && !UI_sound_on())
+//          sound::close_sound();
     }
     return true;
@@ -402 +402 @@
         preferences::set("UI_sound", "no");
         sound::stop_UI_sound();
-        if(!music_on() && !sound_on() && !turn_bell())
-            sound::close_sound();
+//      if(!music_on() && !sound_on() && !turn_bell())
+//          sound::close_sound();
     }
     return true;
@@ -430 +430 @@
         preferences::set("sound", "no");
         sound::stop_sound();
-        if(!music_on() && !turn_bell() && !UI_sound_on())
-            sound::close_sound();
+//      if(!music_on() && !turn_bell() && !UI_sound_on())
+//          sound::close_sound();
     }
     return true;
@@ -454 +454 @@
     } else if(music_on() && !ison) {
         preferences::set("music", "no");
-        if(!sound_on() && !turn_bell() && !UI_sound_on())
-            sound::close_sound();
-        else
+//      if(!sound_on() && !turn_bell() && !UI_sound_on())
+//          sound::close_sound();
+//      else
             sound::stop_music();
     }
@@ -511 +511 @@
 int scroll_speed()
 {
-    const int value = lexical_cast_in_range<int>(get("scroll"), 50, 1, 100);
+    const int value = lexical_cast_in_range<int>(get("scroll"), 100, 1, 100);
     scroll = value/100.0;