From 8f73605b8db62fa2f8b37fbe488f1bdfa12b66a1 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 7 Jun 2006 00:07:39 +0000
Subject: [PATCH] Misc crap

git-svn-id: https://svn.eduke32.com/eduke32@186 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/actors.c  |  2 +-
 polymer/eduke32/source/game.c    |  7 ++++---
 polymer/eduke32/source/sector.c  |  2 +-
 polymer/eduke32/source/wrapper.c | 12 +++++++-----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c
index d59b6c28a..efaf378a4 100644
--- a/polymer/eduke32/source/actors.c
+++ b/polymer/eduke32/source/actors.c
@@ -3283,7 +3283,7 @@ void movetransports(void)
 
                         ps[p].jumping_toggle = 1;
                         ps[p].jumping_counter = 0;
-                        ps[p].poszv += 1024;
+//                        ps[p].poszv += 1024;
                     }
 
                     if(k == 1)
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index e70833e60..32bccd616 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -477,7 +477,7 @@ if( !(ps[myconnectindex].gm&MODE_GAME) ) { OSD_DispatchQueued(); }
             switch(packbuf[1])
             {
             case 0:
-                if(voting == myconnectindex)
+                if(voting == myconnectindex && gotvote[packbuf[2]] == 0)
                 {
                     gotvote[packbuf[2]] = 1;
                     votes[packbuf[2]] = packbuf[3];
@@ -498,7 +498,7 @@ if( !(ps[myconnectindex].gm&MODE_GAME) ) { OSD_DispatchQueued(); }
                 break;
 
             case 2: // cancel map vote
-                if(packbuf[2] == voting)
+                if(voting == packbuf[2])
                 {
                     voting = -1;
                     i = 0;
@@ -7097,7 +7097,7 @@ void nonsharedkeys(void)
         CONTROL_GetInput( &noshareinfo );
     }
 
-    if(gotvote[myconnectindex] == 0 && voting != -1)
+    if(gotvote[myconnectindex] == 0 && voting != -1 && voting != myconnectindex)
     {
         gametext(160,60,"PRESS F1 TO VOTE YES, F2 TO VOTE NO",0,2);
 
@@ -7117,6 +7117,7 @@ void nonsharedkeys(void)
             gotvote[myconnectindex] = 1;
             KB_ClearKeyDown(sc_F1);
             KB_ClearKeyDown(sc_F2);
+            voting = -1;
         }
     }
 
diff --git a/polymer/eduke32/source/sector.c b/polymer/eduke32/source/sector.c
index 7a869c40e..82a8e03b2 100644
--- a/polymer/eduke32/source/sector.c
+++ b/polymer/eduke32/source/sector.c
@@ -3372,7 +3372,7 @@ void checksectors(short snum)
                 if(j >= 0 && wall[j].overpicnum == 0)
                     if(hittype[neartagsprite].temp_data[0] == 0)
                     {
-                        if(ud.noexits)
+                        if(ud.noexits && ud.multimode > 1)
                         {
                             hittype[p->i].picnum = NUKEBUTTON;
                             hittype[p->i].extra = 250;
diff --git a/polymer/eduke32/source/wrapper.c b/polymer/eduke32/source/wrapper.c
index 77faddf4b..56b952da5 100755
--- a/polymer/eduke32/source/wrapper.c
+++ b/polymer/eduke32/source/wrapper.c
@@ -1,4 +1,4 @@
-// this is a wrapper to launch EDuke32 properly from Dukester X
+// this is a wrapper to launch EDuke32 properly from Dukester X 1.5
 // gcc -o duke3d_w32.exe wrapper.c
 
 #include <windows.h>
@@ -18,6 +18,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
     PROCESS_INFORMATION pi;
 
     strcpy(sCmdLine,lpCmdLine);
+    szFileName[0] = '\0';
 
     while(sCmdLine[i] == ' ') i++;
     while(i < (signed)strlen(sCmdLine))
@@ -36,15 +37,16 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
         }
         else CmdLine[i] = sCmdLine[i];
         i++;
+        CmdLine[i] = '\0';
     }
-
-    if(szFileName[0] && CmdLine[0]) sprintf(sCmdLine,"eduke32.exe %s -rmnet %s",CmdLine,szFileName);
-    else if(CmdLine[0]) sprintf(sCmdLine,"eduke32.exe %s",CmdLine);
+    
+    if(szFileName[0] != '\0' && CmdLine[0] != '\0') sprintf(sCmdLine,"eduke32.exe %s -rmnet %s",CmdLine,szFileName);
+    else if(CmdLine[0] != '\0') sprintf(sCmdLine,"eduke32.exe %s",CmdLine);
     else sprintf(sCmdLine,"eduke32.exe");
 
     szCmdLine = sCmdLine;
 
-    fprintf(fp,"EDuke32 wrapper for Dukester X v0.01\n");
+    fprintf(fp,"EDuke32 wrapper for Dukester X v0.02\n");
     fprintf(fp,"Copyright (c) 2006 EDuke32 team\n\n");
     fprintf(fp,"Args passed to wrapper: %s\n",lpCmdLine);
     fprintf(fp,"Final command line: %s",szCmdLine);