From 1bb161a0cb6768ba625f2c048e4906386e6aecef Mon Sep 17 00:00:00 2001
From: flowtron <flowtron@users.sourceforge.net>
Date: Fri, 25 Jun 2010 19:26:21 +0000
Subject: [PATCH] minor code tweaks

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

diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 127522a2..c98de324 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -878,6 +878,7 @@ void startmap(const char *name, bool reset)   // called just after a map load
     if(mapstartonce && mapstartonce[0])
     {
         addsleep(0, mapstartonce); // do this as a sleep to make sure map changes don't recurse inside a welcome packet
+        // BTW: in v1.0.4 sleep 1 was required to make it work on initial mapload [flowtron:2010jun25]
         alias("mapstartonce", "");
     }
 }
diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index bdd8a590..d56e8ca4 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -311,7 +311,8 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
                 if(prot!=CUR_PROTOCOL_VERSION && !(watchingdemo && prot == -PROTOCOL_VERSION))
                 {
                     conoutf(_("\f3you are using a different game protocol (you: %d, server: %d)"), CUR_PROTOCOL_VERSION, prot);
-                    disconnect();
+                    if(watchingdemo) conoutf("breaking loop : \f3this demo is using a different protocol\f5 : end it now!"); // SVN-WiP-bug: causes endless retry loop else!
+                    else disconnect();
                     return;
                 }
                 sessionid = getint(p);
diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp
index 4232bced..d9309988 100644
--- a/source/src/renderhud.cpp
+++ b/source/src/renderhud.cpp
@@ -7,7 +7,7 @@ void drawicon(Texture *tex, float x, float y, float s, int col, int row, float t
     if(tex && tex->xs == tex->ys) quad(tex->id, x, y, s, ts*col, ts*row, ts);
 }
 
-VARP(equiptransparency, 0, 0, 1); // ft: 2010jun12 : seems it's not needed - the opaque/orig items.png works with it on or off - delete if no graphics guy has any objection
+VARP(equiptransparency, 0, 1, 1); // ft: 2010jun12 : seems it's not needed - the opaque/orig items.png works with it on or off - delete if no graphics guy has any objection
 
 void drawequipicon(float x, float y, int col, int row, float blend)
 {