From ff6a1a2fb3a8bb79168dc68177353b825f592cc6 Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Sat, 2 Jun 2007 18:05:57 +0000
Subject: [PATCH] no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1090 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/clientgame.cpp   | 2 --
 source/src/cube.h           | 2 +-
 source/src/protocol.h       | 2 +-
 source/src/savegamedemo.cpp | 9 +++++++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index ec2f152e..ba3161de 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -642,8 +642,6 @@ void *kickmenu = NULL, *banmenu = NULL, *forceteammenu = NULL, *givemastermenu =
 
 void refreshsopmenu(void *menu, bool init)
 {
-    if(!init) return;
-
     int item = 0;
     mlines.setsize(0);
     loopv(players) if(players[i])
diff --git a/source/src/cube.h b/source/src/cube.h
index c772b1b3..6e89afff 100644
--- a/source/src/cube.h
+++ b/source/src/cube.h
@@ -97,7 +97,7 @@ extern int VIRTW;                       // virtual screen size for text & HUD
 
 #include "protos.h"				// external function decls
 
-#define AC_VERSION 920
+#define AC_VERSION 930
 
 #endif
 
diff --git a/source/src/protocol.h b/source/src/protocol.h
index ba3bcd15..8c1055eb 100644
--- a/source/src/protocol.h
+++ b/source/src/protocol.h
@@ -4,7 +4,7 @@
 #define CUBE_SERVER_PORT 28763
 #define CUBE_SERVINFO_PORT 28764
 #define PROTOCOL_VERSION 1125           // bump when protocol changes
-#define SAVEGAMEVERSION 1007            // bump if dynent/netprotocol changes or any other savegame/demo data bumped from 5
+#define SAVEGAMEVERSION 1008            // bump if dynent/netprotocol changes or any other savegame/demo data bumped from 5
 
 // network messages codes, c2s, c2c, s2c
 enum
diff --git a/source/src/savegamedemo.cpp b/source/src/savegamedemo.cpp
index 67d745cf..c5ca6f2a 100644
--- a/source/src/savegamedemo.cpp
+++ b/source/src/savegamedemo.cpp
@@ -201,8 +201,16 @@ void incomingdemodata(int chan, uchar *buf, int len, bool extras)
     }
 }
 
+void settingsbackup(bool save)
+{
+    static string name;
+    if(save) s_strcpy(name, player1->name);
+    else s_strcpy(player1->name, name);
+}
+
 void demo(char *name)
 {
+    settingsbackup(true);
     s_sprintfd(fn)("demos/%s.cdgz", name);
     loadstate(fn);
     demoloading = true;
@@ -213,6 +221,7 @@ void stopreset()
     conoutf("demo stopped (%d msec elapsed)", lastmillis-starttime);
     player1 = newplayerent();
     disconnect(0, 0);
+    settingsbackup(false);
 }
 
 VAR(demoplaybackspeed, 10, 100, 1000);