mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-10 23:02:03 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@369 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
4f17d1299b
commit
69505e1cc2
2 changed files with 2 additions and 2 deletions
|
@ -2752,7 +2752,7 @@ void getinput(short snum)
|
||||||
momx = momy = 0;
|
momx = momy = 0;
|
||||||
p = &ps[snum];
|
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);
|
CONTROL_GetInput(&info);
|
||||||
memset(&lastinfo, 0, sizeof(lastinfo));
|
memset(&lastinfo, 0, sizeof(lastinfo));
|
||||||
|
|
|
@ -1588,6 +1588,7 @@ int enterlevel(char g)
|
||||||
KB_ClearKeysDown();
|
KB_ClearKeysDown();
|
||||||
handleevents();
|
handleevents();
|
||||||
getpackets();
|
getpackets();
|
||||||
|
waitforeverybody();
|
||||||
ready2send = 0;
|
ready2send = 0;
|
||||||
|
|
||||||
if ((g&MODE_DEMO) != MODE_DEMO) ud.recstat = ud.m_recstat;
|
if ((g&MODE_DEMO) != MODE_DEMO) ud.recstat = ud.m_recstat;
|
||||||
|
@ -1632,7 +1633,6 @@ int enterlevel(char g)
|
||||||
|
|
||||||
if (!VOLUMEONE)
|
if (!VOLUMEONE)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (boardfilename[0] != 0 && ud.m_level_number == 7 && ud.m_volume_number == 0)
|
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)
|
if (loadboard(boardfilename,0,&ps[0].posx, &ps[0].posy, &ps[0].posz, &ps[0].ang,&ps[0].cursectnum) == -1)
|
||||||
|
|
Loading…
Reference in a new issue