From 5c2a282a9fc373434c4908299885464ee4cadff1 Mon Sep 17 00:00:00 2001
From: flowtron <flowtron@users.sourceforge.net>
Date: Sat, 7 Aug 2010 18:23:12 +0000
Subject: [PATCH] finishing the previous fix - thanks to stef for alerting us
 of the problem

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5555 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/cube.h       | 1 +
 source/src/server.cpp   | 3 ++-
 source/src/serverms.cpp | 4 +---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/src/cube.h b/source/src/cube.h
index 05ca7d6a..3f094e49 100644
--- a/source/src/cube.h
+++ b/source/src/cube.h
@@ -35,6 +35,7 @@ extern vector<int> eh_ents;             // edithide entities
 extern vec worldpos, camup, camright, camdir; // current target of the crosshair in the world
 extern int lastmillis, totalmillis;     // last time
 extern int curtime;                     // current frame time
+extern int interm;
 extern int gamemode, nextmode;
 extern int gamespeed;
 extern int xtraverts;
diff --git a/source/src/server.cpp b/source/src/server.cpp
index 57c852c7..fe20d918 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -45,7 +45,8 @@ bool custom_servdesc = false;
 // current game
 string smapname, nextmapname;
 int smode = 0, nextgamemode;
-static int interm = 0, minremain = 0, gamemillis = 0, gamelimit = 0, /*lmsitemtype = 0,*/ nextsendscore = 0;
+int interm = 0;
+static int minremain = 0, gamemillis = 0, gamelimit = 0, /*lmsitemtype = 0,*/ nextsendscore = 0;
 mapstats smapstats;
 vector<server_entity> sents;
 char *maplayout = NULL, *testlayout = NULL;
diff --git a/source/src/serverms.cpp b/source/src/serverms.cpp
index 789024d5..fa2e9e00 100644
--- a/source/src/serverms.cpp
+++ b/source/src/serverms.cpp
@@ -87,7 +87,6 @@ bool requestmasterf(const char *fmt, ...)
 }
 
 extern void processmasterinput(const char *cmd, int cmdlen, const char *args);
-extern bool msreg;
 
 void processmasterinput()
 {
@@ -107,7 +106,6 @@ void processmasterinput()
             logline(ACLOG_WARNING, "master server registration failed: %s", args);
         else if(!strncmp(input, "succreg", cmdlen))
         {
-            msreg = false;
             logline(ACLOG_INFO, "master server registration succeeded");
         }
         else processmasterinput(input, cmdlen, args);
@@ -162,7 +160,7 @@ void flushmasterinput()
 }
 
 extern char *global_name;
-extern int interm
+extern int interm;
 
 // send alive signal to masterserver after 40 minutes of uptime and during an intermission (so theoretically <= 1 hour) - after 1 hour at the latest.
 static inline void updatemasterserver(int millis, int port)