From 7563c7ec1f7cab951d67f1f3741f6cd8879f7823 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 23 Apr 2006 08:23:40 +0000
Subject: [PATCH] Fixes

git-svn-id: https://svn.eduke32.com/eduke32@101 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/build/src/engine.c      | 3 ++-
 polymer/eduke32/source/game.c   | 4 ++--
 polymer/eduke32/source/menus.c  | 4 +++-
 polymer/eduke32/source/premap.c | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/polymer/build/src/engine.c b/polymer/build/src/engine.c
index dd7d614fe..756fd13d5 100644
--- a/polymer/build/src/engine.c
+++ b/polymer/build/src/engine.c
@@ -6173,9 +6173,10 @@ void drawmapview(long dax, long day, long zoome, short ang)
             globalorientation = (long)sec->floorstat;
             if ((globalorientation&1) != 0) continue;
 
+            globalpal = sec->floorpal;
+
             if (palookup[sec->floorpal] != globalpalwritten)
             {
-                globalpal = sec->floorpal;
                 globalpalwritten = palookup[sec->floorpal];
                 if (!globalpalwritten) globalpalwritten = palookup[globalpal];  // JBF: fixes null-pointer crash
                 setpalookupaddress(globalpalwritten);
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 53efbe53d..11a9ef75a 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -9034,7 +9034,7 @@ RECHECK:
         if( (ps[myconnectindex].gm&MODE_MENU) && (ps[myconnectindex].gm&MODE_EOL) )
             goto RECHECK;
 
-        if (KB_KeyPressed(sc_Escape) && (ps[myconnectindex].gm&MODE_MENU) == 0)
+        if (KB_KeyPressed(sc_Escape) && (ps[myconnectindex].gm&MODE_MENU) == 0 && (ps[myconnectindex].gm&MODE_TYPE) == 0)
         {
             KB_ClearKeyDown(sc_Escape);
             FX_StopAllSounds();
@@ -9054,7 +9054,7 @@ RECHECK:
         {
             if(ud.recstat != 2)
                 menus();
-            if( ud.multimode > 1 )
+            if( ud.multimode > 1  && current_menu != 20003 && current_menu != 20005)
             {
                 ControlInfo noshareinfo;
                 CONTROL_GetInput( &noshareinfo );
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index 03dea2aed..4e6b38371 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -711,7 +711,9 @@ void menus(void)
             x = strget(200,50-9,buf,12,0);
             if (x) {
                 if (x == 1) {
-                    Bstrcpy(myname,buf);
+                    if(buf[0]) {
+                        Bstrcpy(myname,buf);
+                    }
                     // send name update
                 }
                 KB_ClearKeyDown(sc_Enter);
diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c
index cc951c809..7da75e61f 100644
--- a/polymer/eduke32/source/premap.c
+++ b/polymer/eduke32/source/premap.c
@@ -1217,7 +1217,7 @@ void resetpspritevars(char g)
                 {
                     int k;
 
-                    for(k=0;k<MAXPLAYERS-1;k++) {
+                    for(k=0;k<MAXPLAYERS;k++) {
                         if(which_palookup == ps[k].palookup) {
                             which_palookup++;
                             if( which_palookup >= 17 )