merge

[lugaru.git] / Source / Settings.cpp

diff --git a/Source/Settings.cpp b/Source/Settings.cpp
index 754c2ac4e316ec2c0a995dcebfd741227ba3009d..b2c761ddbe312dbe1fabc825ab2d19b100ac8aa4 100644 (file)
--- a/Source/Settings.cpp
+++ b/Source/Settings.cpp
@@ -23,6 +23,7 @@ void DefaultSettings(Game &game) {
        texttoggle=1;
        alwaysblur=0;
        showpoints=0;
+       showdamagebar=0;
        immediate=0;
        velocityblur=0;
        volume = 0.8f;
@@ -117,13 +118,14 @@ void SaveSettings(Game &game) {
        opstream << KeyToChar(game.attackkey);
        opstream << "\nChat key:\n";
        opstream << KeyToChar(game.chatkey);
+       opstream << "\nDamage bar:\n";
+       opstream << showdamagebar;
        opstream << "\nStereoMode:\n";
        opstream << stereomode;
        opstream << "\nStereoSeparation:\n";
        opstream << stereoseparation;
        opstream << "\nStereoReverse:\n";
        opstream << stereoreverse;
-       
        opstream.close();
 }
 
@@ -240,6 +242,8 @@ bool LoadSettings(Game &game) {
                } else if ( !strncmp(setting, "Chat key", 8) ) {
                        ipstream >> string;
                        game.chatkey = CharToKey(string);
+               } else if ( !strncmp(setting, "Damage bar", 10) ) {
+                       ipstream >> showdamagebar;
                } else if ( !strncmp(setting, "StereoMode", 10) ) {
                        int i;
                        ipstream >> i;