From 69505e1cc20036a3a1c41a5f4840d8249d40b1e9 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Thu, 30 Nov 2006 06:54:01 +0000
Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@369
 1a8010ca-5511-0410-912e-c29ae57300e0

---
 polymer/eduke32/source/player.c | 2 +-
 polymer/eduke32/source/premap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c
index f50f59c7c..6f103b5ee 100644
--- a/polymer/eduke32/source/player.c
+++ b/polymer/eduke32/source/player.c
@@ -2752,7 +2752,7 @@ void getinput(short snum)
     momx = momy = 0;
     p = &ps[snum];
 
-    if ((p->gm&MODE_MENU) || (p->gm&MODE_TYPE) || (ud.pause_on && !KB_KeyPressed(sc_Pause)))
+    if ((p->gm&MODE_MENU) || (p->gm&MODE_TYPE) || (ud.pause_on && !KB_KeyPressed(sc_Pause)) || p->player_par < 10)
     {
         CONTROL_GetInput(&info);
         memset(&lastinfo, 0, sizeof(lastinfo));
diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c
index db2337472..6d25c46ba 100644
--- a/polymer/eduke32/source/premap.c
+++ b/polymer/eduke32/source/premap.c
@@ -1588,6 +1588,7 @@ int enterlevel(char g)
     KB_ClearKeysDown();
     handleevents();
     getpackets();
+    waitforeverybody();
     ready2send = 0; 
   
     if ((g&MODE_DEMO) != MODE_DEMO) ud.recstat = ud.m_recstat;
@@ -1632,7 +1633,6 @@ int enterlevel(char g)
 
     if (!VOLUMEONE)
     {
-
         if (boardfilename[0] != 0 && ud.m_level_number == 7 && ud.m_volume_number == 0)
         {
             if (loadboard(boardfilename,0,&ps[0].posx, &ps[0].posy, &ps[0].posz, &ps[0].ang,&ps[0].cursectnum) == -1)