From: Côme BERNIGAUD <come.bernigaud@gmail.com>
Date: Mon, 24 May 2010 19:37:39 +0000 (+0200)
Subject: merge
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=1a0ad4362ed618c1a25508530dfeeb4a0f6ef345;p=lugaru.git

merge
---

1a0ad4362ed618c1a25508530dfeeb4a0f6ef345
diff --cc Data/config.txt
index fc8049b,203c615..4759143
--- a/Data/config.txt
+++ b/Data/config.txt
@@@ -70,5 -70,9 +70,11 @@@ Attack key
  mouse1
  Chat key:
  unknown
 +Damage bar:
 +1
+ StereoMode:
+ 0
+ StereoSeparation:
+ 0.05
+ StereoReverse:
+ 0
diff --cc Source/Settings.cpp
index 7f90a07,754c2ac..b2c761d
--- a/Source/Settings.cpp
+++ b/Source/Settings.cpp
@@@ -118,8 -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();
  }
  
@@@ -236,8 -240,14 +242,16 @@@ 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;
+ 			stereomode = (StereoMode)i;
+ 		} else if ( !strncmp(setting, "StereoSeparation", 16) ) {
+ 			ipstream >> stereoseparation;
+ 		} else if ( !strncmp(setting, "StereoReverse", 13) ) {
+ 			ipstream >> stereoreverse;
  		} else {
  			ipstream >> string;
  			fprintf(stderr, "Unknown config option '%s' with value '%s'. Ignoring.\n", setting, string);