From 005b7ee93c312a3f9d46d9f9e1c233c6a7104f24 Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Tue, 21 Oct 2008 19:59:40 +0000
Subject: [PATCH] dont' reset sleeps on mapchange (fixes going from multiplayer
 to singleplayer), debug cleanups

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

diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 12072aad..edc333f6 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -669,7 +669,7 @@ COMMAND(gamemodedesc, ARG_2STR);
 
 void resetmap()
 {
-    resetsleep();
+    //resetsleep();
     clearminimap();
     cleardynlights();
     pruneundos();
diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index d3f6634d..4af54535 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -5,7 +5,7 @@
 #include "bot/bot.h"
 
 VARP(networkdebug, 0, 0, 1);
-#define DEBUGCOND (networkdebug)
+#define DEBUGCOND (networkdebug==1)
 
 extern bool c2sinit, senditemstoserver, watchingdemo;
 extern string clientpassword;
diff --git a/source/src/protocol.cpp b/source/src/protocol.cpp
index 137529b1..d7d73dde 100644
--- a/source/src/protocol.cpp
+++ b/source/src/protocol.cpp
@@ -6,8 +6,9 @@
 
 #ifdef _DEBUG
 bool protocoldbg = false;
-#define DEBUGCOND (protocoldbg)
 void protocoldebug(bool enable) { protocoldbg = enable; }
+extern int networkdebug;
+#define DEBUGCOND (protocoldbg && networkdebug==1)
 #endif
 
 // all network traffic is in 32bit ints, which are then compressed using the following simple scheme (assumes that most values are small).