vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'remotes/james/netreplays-responder-fix' into new_netreplays

This commit is contained in:
fickleheart 2019-02-16 15:50:46 -06:00
parent fcfce0bd49 1b604273d4
commit 450efc3180
2 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/g_game.c
View File

@ -1827,50 +1827,6 @@ static INT32 spectatedelay, spectatedelay2, spectatedelay3, spectatedelay4 = 0;
// //
boolean G_Responder(event_t *ev) boolean G_Responder(event_t *ev)
{ {
// allow spy mode changes even during the demo
if (gamestate == GS_LEVEL && ev->type == ev_keydown
&& (ev->data1 == KEY_F12 || ev->data1 == gamecontrol[gc_viewpoint][0] || ev->data1 == gamecontrol[gc_viewpoint][1]))
{
if (!demoplayback && (splitscreen || !netgame))
displayplayer = consoleplayer;
else
{
displayplayer++;
G_ResetView(1);
// change statusbar also if playing back demo
if (singledemo)
ST_changeDemoView();
return true;
}
}
if (gamestate == GS_LEVEL && ev->type == ev_keydown && multiplayer && demoplayback)
{
if (ev->data1 == gamecontrolbis[gc_viewpoint][0] || ev->data1 == gamecontrolbis[gc_viewpoint][1])
{
secondarydisplayplayer++;
G_ResetView(2);
return true;
}
else if (ev->data1 == gamecontrol3[gc_viewpoint][0] || ev->data1 == gamecontrol3[gc_viewpoint][1])
{
thirddisplayplayer++;
G_ResetView(3);
return true;
}
else if (ev->data1 == gamecontrol4[gc_viewpoint][0] || ev->data1 == gamecontrol4[gc_viewpoint][1])
{
fourthdisplayplayer++;
G_ResetView(4);
return true;
}
}
// any other key pops up menu if in demos // any other key pops up menu if in demos
if (gameaction == ga_nothing && !singledemo && if (gameaction == ga_nothing && !singledemo &&
((demoplayback && !modeattacking && !titledemo && !multiplayer) || gamestate == GS_TITLESCREEN)) ((demoplayback && !modeattacking && !titledemo && !multiplayer) || gamestate == GS_TITLESCREEN))
@ -1948,6 +1904,50 @@ boolean G_Responder(event_t *ev)
if (HU_Responder(ev)) if (HU_Responder(ev))
return true; // chat ate the event return true; // chat ate the event
// allow spy mode changes even during the demo
if (gamestate == GS_LEVEL && ev->type == ev_keydown
&& (ev->data1 == KEY_F12 || ev->data1 == gamecontrol[gc_viewpoint][0] || ev->data1 == gamecontrol[gc_viewpoint][1]))
{
if (!demoplayback && (splitscreen || !netgame))
displayplayer = consoleplayer;
else
{
displayplayer++;
G_ResetView(1);
// change statusbar also if playing back demo
if (singledemo)
ST_changeDemoView();
return true;
}
}
if (gamestate == GS_LEVEL && ev->type == ev_keydown && multiplayer && demoplayback)
{
if (ev->data1 == gamecontrolbis[gc_viewpoint][0] || ev->data1 == gamecontrolbis[gc_viewpoint][1])
{
secondarydisplayplayer++;
G_ResetView(2);
return true;
}
else if (ev->data1 == gamecontrol3[gc_viewpoint][0] || ev->data1 == gamecontrol3[gc_viewpoint][1])
{
thirddisplayplayer++;
G_ResetView(3);
return true;
}
else if (ev->data1 == gamecontrol4[gc_viewpoint][0] || ev->data1 == gamecontrol4[gc_viewpoint][1])
{
fourthdisplayplayer++;
G_ResetView(4);
return true;
}
}
// update keys current state // update keys current state
G_MapEventsToControls(ev); G_MapEventsToControls(ev);

2
src/m_menu.c
View File

@ -7113,7 +7113,7 @@ static void M_ExitGameResponse(INT32 ch)
static void M_EndGame(INT32 choice) static void M_EndGame(INT32 choice)
{ {
(void)choice; (void)choice;
if (demoplayback || demorecording) if (demoplayback || ( demorecording && !multiplayer ))/* hack for now */
return; return;
if (!Playing()) if (!Playing())