From 4276901071930d65d69b42c9eee50e8fea97941c Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 19 Apr 2006 23:48:43 +0000
Subject: [PATCH] Fixes for a couple of map mode issues that pop up when you
 pause the game with the map showing as well as a couple more menu tweaks

git-svn-id: https://svn.eduke32.com/eduke32@73 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/config.c |  3 ++-
 polymer/eduke32/source/game.c   | 13 +++++++------
 polymer/eduke32/source/menus.c  | 16 ++++++++--------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/polymer/eduke32/source/config.c b/polymer/eduke32/source/config.c
index b48e2ab20..fa721a9d1 100644
--- a/polymer/eduke32/source/config.c
+++ b/polymer/eduke32/source/config.c
@@ -585,7 +585,8 @@ void CONFIG_ReadSetup( void )
         SCRIPT_GetNumber( scripthandle, "Misc", "Crosshairs",&ud.crosshair);
         SCRIPT_GetNumber( scripthandle, "Misc", "StatusBarScale",&ud.statusbarscale);
         SCRIPT_GetNumber( scripthandle, "Misc", "ShowLevelStats",&ud.levelstats);
-        SCRIPT_GetNumber( scripthandle, "Misc", "ShowOpponentWeapons",&ShowOpponentWeapons);
+        SCRIPT_GetNumber( scripthandle, "Misc", "ShowOpponentWeapons",(int32 *)&ud.showweapons);
+        ShowOpponentWeapons = ud.showweapons;
         SCRIPT_GetNumber( scripthandle, "Misc", "ShowViewWeapon",&ud.drawweapon);
         SCRIPT_GetNumber( scripthandle, "Misc", "BrightSkins",&ud.brightskins);
         SCRIPT_GetNumber( scripthandle, "Misc", "DemoCams",&ud.democams);
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 2d357aa36..cab837ed1 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -2659,7 +2659,7 @@ void displayrest(long smoothratio)
             dointerpolations(smoothratio);
             if( ud.scrollmode == 0 )
             {
-                if(pp->newowner == -1)
+                if(pp->newowner == -1 && !ud.pause_on)
                 {
                     if (screenpeek == myconnectindex && numplayers > 1)
                     {
@@ -2683,11 +2683,12 @@ void displayrest(long smoothratio)
             }
             else
             {
-
-                ud.fola += ud.folavel>>3;
-                ud.folx += (ud.folfvel*sintable[(512+2048-ud.fola)&2047])>>14;
-                ud.foly += (ud.folfvel*sintable[(512+1024-512-ud.fola)&2047])>>14;
-
+                if(!ud.pause_on)
+                {
+                    ud.fola += ud.folavel>>3;
+                    ud.folx += (ud.folfvel*sintable[(512+2048-ud.fola)&2047])>>14;
+                    ud.foly += (ud.folfvel*sintable[(512+1024-512-ud.fola)&2047])>>14;
+                }
                 cposx = ud.folx;
                 cposy = ud.foly;
                 cang = ud.fola;
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index 203c386ef..3d4164b1b 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -2709,7 +2709,7 @@ cheat_for_port_credits:
         if (probey < (MAXMOUSEBUTTONS-2)*2+2)
             x = probesm(73,40,8,(MAXMOUSEBUTTONS-2)*2+2+2+2);
         else
-            x = probesm(40,124-((MAXMOUSEBUTTONS-2)*2+2)*9,9,(MAXMOUSEBUTTONS-2)*2+2+2+2);
+            x = probesm(40,128-((MAXMOUSEBUTTONS-2)*2+2)*9,9,(MAXMOUSEBUTTONS-2)*2+2+2+2);
 
         if (x==-1) {
             cmenu(202);
@@ -2765,23 +2765,23 @@ cheat_for_port_credits:
             }
         }
 
-        gametextpal(40,119,"SENSITIVITY",5,2);
-        gametextpal(40,119+9,"MOUSE AIMING TOGGLE",!ud.mouseaiming?5:15,2);
-        gametextpal(40,119+9+9,"INVERT MOUSE AIM",5,2);
-        gametextpal(40,119+9+9+9,"ADVANCED...",5,2);
+        gametextpal(40,122,"SENSITIVITY",5,2);
+        gametextpal(40,122+9,"MOUSE AIMING TOGGLE",!ud.mouseaiming?5:15,2);
+        gametextpal(40,122+9+9,"INVERT MOUSE AIM",5,2);
+        gametextpal(40,122+9+9+9,"ADVANCED...",5,2);
 
         {
             short sense;
             sense = CONTROL_GetMouseSensitivity()>>10;
-            barsm(248,125,&sense,4,x==(MAXMOUSEBUTTONS-2)*2+2,SHX(-7),PHX(-7));
+            barsm(248,128,&sense,4,x==(MAXMOUSEBUTTONS-2)*2+2,SHX(-7),PHX(-7));
             CONTROL_SetMouseSensitivity( sense<<10 );
         }
 
         if (!ud.mouseaiming) modval(0,1,(int *)&myaimmode,1,probey == (MAXMOUSEBUTTONS-2)*2+2+1);
         modval(0,1,(int *)&ud.mouseflip,1,probey == (MAXMOUSEBUTTONS-2)*2+2+2);
 
-        gametextpal(240,119+9, myaimmode && !ud.mouseaiming ? "On" : "Off", !ud.mouseaiming?0:10, 0);
-        gametextpal(240,119+9+9, ud.mouseflip ? "On" : "Off", 0, 0);
+        gametextpal(240,122+9, myaimmode && !ud.mouseaiming ? "On" : "Off", !ud.mouseaiming?0:10, 0);
+        gametextpal(240,122+9+9, ud.mouseflip ? "On" : "Off", 0, 0);
 
         if (probey < (MAXMOUSEBUTTONS-2)*2+2) {
             gametext(160,164,"UP/DOWN = SELECT BUTTON",0,2+8+16);