OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'thereisnospoon' of https://github.com/jewalky/gzdoom

Browse source 
# Conflicts:
#	src/dobject.h
This commit is contained in:
Christoph Oelckers 2017-02-14 19:10:02 +01:00
commit 2234d36c7a
40 changed files with 1970 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/d_net.cpp
View file

@ -64,6 +64,7 @@
#include "a_keys.h"
#include "intermission/intermission.h"
#include "g_levellocals.h"
#include "events.h"
EXTERN_CVAR (Int, disableautosave)
EXTERN_CVAR (Int, autosavecount)
@ -2678,6 +2679,17 @@ void Net_DoCommand (int type, BYTE **stream, int player)
G_ChangeLevel(NULL, 0, 0);
break;
case DEM_NETEVENT:
{
FString ename = ReadString(stream);
int argn = ReadByte(stream);
int arg[3] = { 0, 0, 0 };
for (int i = 0; i < argn; i++)
arg[i] = ReadLong(stream);
E_Console(player, ename, arg[0], arg[1], arg[2]);
}
break;
default:
I_Error ("Unknown net command: %d", type);
break;