summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Howard2006-03-01 20:02:53 +0000
committerSimon Howard2006-03-01 20:02:53 +0000
commitf4979b794bf64ffbcac164032d0e7d85b6072c58 (patch)
tree4de17dcc27a75f12a42f443e133cdc4dd7fb9336 /src
parentf8dacfd9684438959ea3f17b8fe379fa1359ec35 (diff)
downloadchocolate-doom-f4979b794bf64ffbcac164032d0e7d85b6072c58.tar.gz
chocolate-doom-f4979b794bf64ffbcac164032d0e7d85b6072c58.tar.bz2
chocolate-doom-f4979b794bf64ffbcac164032d0e7d85b6072c58.zip
Send the nomonsters flag on netgame start.
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 401
Diffstat (limited to 'src')
-rw-r--r--src/net_client.c4
-rw-r--r--src/net_defs.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/net_client.c b/src/net_client.c
index c47beb6d..38e40017 100644
--- a/src/net_client.c
+++ b/src/net_client.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: net_client.c 398 2006-02-27 20:11:14Z fraggle $
+// $Id: net_client.c 401 2006-03-01 20:02:53Z fraggle $
//
// Copyright(C) 2005 Simon Howard
//
@@ -462,6 +462,7 @@ void NET_CL_StartGame(void)
settings.map = startmap;
settings.skill = startskill;
settings.gameversion = gameversion;
+ settings.nomonsters = nomonsters;
i = M_CheckParm("-extratics");
@@ -659,6 +660,7 @@ static void NET_CL_ParseGameStart(net_packet_t *packet)
startmap = settings.map;
startskill = settings.skill;
lowres_turn = settings.lowres_turn;
+ nomonsters = settings.nomonsters;
memset(recvwindow, 0, sizeof(recvwindow));
recvwindow_start = 0;
diff --git a/src/net_defs.h b/src/net_defs.h
index 8854317c..856a113c 100644
--- a/src/net_defs.h
+++ b/src/net_defs.h
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: net_defs.h 394 2006-02-27 16:31:08Z fraggle $
+// $Id: net_defs.h 401 2006-03-01 20:02:53Z fraggle $
//
// Copyright(C) 2005 Simon Howard
//
@@ -174,6 +174,7 @@ typedef struct
int extratics;
int deathmatch;
int episode;
+ int nomonsters;
int map;
int skill;
int gameversion;