X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FSettings.cpp;h=dce0e0ec24951e58038e312765ea6b6bba9676fc;hb=bbf8873b80baf3cb468ac12b3f62b0938320fef1;hp=754c2ac4e316ec2c0a995dcebfd741227ba3009d;hpb=c0a6dc9211fd7855250be34151a70ec4bceb5126;p=lugaru.git

diff --git a/Source/Settings.cpp b/Source/Settings.cpp
index 754c2ac..dce0e0e 100644
--- a/Source/Settings.cpp
+++ b/Source/Settings.cpp
@@ -1,6 +1,6 @@
 #include "Settings.h"
 #include "Game.h"
-
+#include "Input.h"
 
 void DefaultSettings(Game &game) {
 	detail=1;
@@ -23,23 +23,24 @@ void DefaultSettings(Game &game) {
 	texttoggle=1;
 	alwaysblur=0;
 	showpoints=0;
+	showdamagebar=0;
 	immediate=0;
 	velocityblur=0;
 	volume = 0.8f;
 	ambientsound=1;
-	vblsync=0;
+	vblsync=1;
 	debugmode=0;
 	
-	game.crouchkey=MAC_SHIFT_KEY;
-	game.jumpkey=MAC_SPACE_KEY;
-	game.leftkey=MAC_A_KEY;
-	game.forwardkey=MAC_W_KEY;
-	game.backkey=MAC_S_KEY;
-	game.rightkey=MAC_D_KEY;
-	game.drawkey=MAC_E_KEY;
-	game.throwkey=MAC_Q_KEY;
-	game.attackkey=MAC_MOUSEBUTTON1;
-	game.chatkey=MAC_T_KEY;
+	game.crouchkey=SDLK_LSHIFT;
+	game.jumpkey=SDLK_SPACE;
+	game.leftkey=SDLK_a;
+	game.forwardkey=SDLK_w;
+	game.backkey=SDLK_s;
+	game.rightkey=SDLK_d;
+	game.drawkey=SDLK_e;
+	game.throwkey=SDLK_q;
+	game.attackkey=MOUSEBUTTON1;
+	game.chatkey=SDLK_t;
 }
 
 void SaveSettings(Game &game) {
@@ -98,32 +99,33 @@ void SaveSettings(Game &game) {
 	opstream << "\nVolume:\n";
 	opstream << volume;
 	opstream << "\nForward key:\n";
-	opstream << KeyToChar(game.forwardkey);
+	opstream << Input::keyToChar(game.forwardkey);
 	opstream << "\nBack key:\n";
-	opstream << KeyToChar(game.backkey);
+	opstream << Input::keyToChar(game.backkey);
 	opstream << "\nLeft key:\n";
-	opstream << KeyToChar(game.leftkey);
+	opstream << Input::keyToChar(game.leftkey);
 	opstream << "\nRight key:\n";
-	opstream << KeyToChar(game.rightkey);
+	opstream << Input::keyToChar(game.rightkey);
 	opstream << "\nJump key:\n";
-	opstream << KeyToChar(game.jumpkey);
+	opstream << Input::keyToChar(game.jumpkey);
 	opstream << "\nCrouch key:\n";
-	opstream << KeyToChar(game.crouchkey);
+	opstream << Input::keyToChar(game.crouchkey);
 	opstream << "\nDraw key:\n";
-	opstream << KeyToChar(game.drawkey);
+	opstream << Input::keyToChar(game.drawkey);
 	opstream << "\nThrow key:\n";
-	opstream << KeyToChar(game.throwkey);
+	opstream << Input::keyToChar(game.throwkey);
 	opstream << "\nAttack key:\n";
-	opstream << KeyToChar(game.attackkey);
+	opstream << Input::keyToChar(game.attackkey);
 	opstream << "\nChat key:\n";
-	opstream << KeyToChar(game.chatkey);
+	opstream << Input::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();
 }
 
@@ -143,6 +145,7 @@ bool LoadSettings(Game &game) {
 		// skip blank lines
 		// assume lines starting with spaces are all blank
 		if ( strlen(setting) == 0 || setting[0] == ' ' || setting[0] == '\t') continue;
+		printf("setting : %s\n",setting);
 
 		if ( ipstream.eof() || ipstream.fail() ) {
 			fprintf(stderr, "Error reading config file: Got setting name '%s', but value can't be read\n", setting);
@@ -211,35 +214,37 @@ bool LoadSettings(Game &game) {
 		} else if ( !strncmp(setting, "Volume", 6) ) {
 			ipstream >> volume;
 		} else if ( !strncmp(setting, "Forward key", 11) ) {
-			ipstream >> string;
-			game.forwardkey = CharToKey(string);
+			ipstream.getline( string, sizeof(string) );
+			game.forwardkey = Input::CharToKey(string);
 		} else if ( !strncmp(setting, "Back key", 8) ) {
-			ipstream >> string;
-			game.backkey = CharToKey(string);
+			ipstream.getline( string, sizeof(string) );
+			game.backkey = Input::CharToKey(string);
 		} else if ( !strncmp(setting, "Left key", 8) ) {
-			ipstream >> string;
-			game.leftkey = CharToKey(string);
+			ipstream.getline( string, sizeof(string) );
+			game.leftkey = Input::CharToKey(string);
 		} else if ( !strncmp(setting, "Right key", 9) ) {
-			ipstream >> string;
-			game.rightkey = CharToKey(string);
+			ipstream.getline( string, sizeof(string) );
+			game.rightkey = Input::CharToKey(string);
 		} else if ( !strncmp(setting, "Jump key", 8) ) {
-			ipstream >> string;
-			game.jumpkey = CharToKey(string);
+			ipstream.getline( string, sizeof(string) );
+			game.jumpkey = Input::CharToKey(string);
 		} else if ( !strncmp(setting, "Crouch key", 10) ) {
-			ipstream >> string;
-			game.crouchkey = CharToKey(string);
+			ipstream.getline( string, sizeof(string) );
+			game.crouchkey = Input::CharToKey(string);
 		} else if ( !strncmp(setting, "Draw key", 8) ) {
-			ipstream >> string;
-			game.drawkey = CharToKey(string);
+			ipstream.getline( string, sizeof(string) );
+			game.drawkey = Input::CharToKey(string);
 		} else if ( !strncmp(setting, "Throw key", 9) ) {
-			ipstream >> string;
-			game.throwkey = CharToKey(string);
+			ipstream.getline( string, sizeof(string) );
+			game.throwkey = Input::CharToKey(string);
 		} else if ( !strncmp(setting, "Attack key", 10) ) {
-			ipstream >> string;
-			game.attackkey = CharToKey(string);
+			ipstream.getline( string, sizeof(string) );
+			game.attackkey = Input::CharToKey(string);
 		} else if ( !strncmp(setting, "Chat key", 8) ) {
-			ipstream >> string;
-			game.chatkey = CharToKey(string);
+			ipstream.getline( string, sizeof(string) );
+			game.chatkey = Input::CharToKey(string);
+		} else if ( !strncmp(setting, "Damage bar", 10) ) {
+			ipstream >> showdamagebar;
 		} else if ( !strncmp(setting, "StereoMode", 10) ) {
 			int i;
 			ipstream >> i;