Merge branch 'upstream' into dev

1 files changed, 10 insertions, 3 deletions

diff --git a/src/misc.c b/src/misc.c
index 64c2af5..d5b57c5 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -5,6 +5,7 @@
 #include "defines.h"
 #include "interface.h"
 #include "graphics.h"
+#include "powder.h"
 
 //Signum function
 #if defined(WIN32) && !defined(__GNUC__)
@@ -95,7 +96,9 @@ void save_presets(int do_update)
 		return;
 	fwrite(sig, 1, 4, f);
 	save_string(f, svf_user);
-	save_string(f, svf_pass);
+	//save_string(f, svf_pass);
+	save_string(f, svf_user_id);
+	save_string(f, svf_session_id);
 	fwrite(&tmp, 1, 1, f);
 	tmp = cmode;
 	fwrite(&tmp, 1, 1, f);
@@ -144,7 +147,11 @@ void load_presets(void)
 	}
 	if (load_string(f, svf_user, 63))
 		goto fail;
-	if (load_string(f, svf_pass, 63))
+	//if (load_string(f, svf_pass, 63))
+	//goto fail;
+	if (load_string(f, svf_user_id, 63))
+		goto fail;
+	if (load_string(f, svf_session_id, 63))
 		goto fail;
 	svf_login = !!svf_user[0];
 	if (fread(&tmp, 1, 1, f) != 1)
@@ -152,7 +159,7 @@ void load_presets(void)
 	sdl_scale = (tmp == 2) ? 2 : 1;
 	if (fread(&tmp, 1, 1, f) != 1)
 		goto fail;
-	cmode = tmp%7;
+	cmode = tmp%CM_COUNT;
 	if (fread(&tmp, 1, 1, f) != 1)
 		goto fail;
 	svf_admin = tmp;