summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Howard2008-01-24 19:09:47 +0000
committerSimon Howard2008-01-24 19:09:47 +0000
commitaedc1c2d8c8eecfc609b291b9fe2983e03a744fe (patch)
tree53679e5c7d33543c42980111d02c0f217b728cac /src
parenta802be4c5cb24fba9baadd17fc6bd9a27108c8d1 (diff)
downloadchocolate-doom-aedc1c2d8c8eecfc609b291b9fe2983e03a744fe.tar.gz
chocolate-doom-aedc1c2d8c8eecfc609b291b9fe2983e03a744fe.tar.bz2
chocolate-doom-aedc1c2d8c8eecfc609b291b9fe2983e03a744fe.zip
Fix fast / respawning monsters parameter not exchanged when starting
netgames (thanks GhostlyDeath). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1014
Diffstat (limited to 'src')
-rw-r--r--src/net_client.c4
-rw-r--r--src/net_defs.h2
-rw-r--r--src/net_structrw.c4
3 files changed, 10 insertions, 0 deletions
diff --git a/src/net_client.c b/src/net_client.c
index 956d962a..870d98ef 100644
--- a/src/net_client.c
+++ b/src/net_client.c
@@ -387,6 +387,8 @@ void NET_CL_StartGame(void)
settings.loadgame = startloadgame;
settings.gameversion = gameversion;
settings.nomonsters = nomonsters;
+ settings.fast_monsters = fastparm;
+ settings.respawn_monsters = respawnparm;
settings.timelimit = timelimit;
//!
@@ -685,6 +687,8 @@ static void NET_CL_ParseGameStart(net_packet_t *packet)
startloadgame = settings.loadgame;
lowres_turn = settings.lowres_turn;
nomonsters = settings.nomonsters;
+ fastparm = settings.fast_monsters;
+ respawnparm = settings.respawn_monsters;
net_cl_new_sync = settings.new_sync != 0;
timelimit = settings.timelimit;
diff --git a/src/net_defs.h b/src/net_defs.h
index 665d0e7b..c575020f 100644
--- a/src/net_defs.h
+++ b/src/net_defs.h
@@ -120,6 +120,8 @@ typedef struct
int deathmatch;
int episode;
int nomonsters;
+ int fast_monsters;
+ int respawn_monsters;
int map;
int skill;
int gameversion;
diff --git a/src/net_structrw.c b/src/net_structrw.c
index 78b15f63..c2e878fa 100644
--- a/src/net_structrw.c
+++ b/src/net_structrw.c
@@ -35,6 +35,8 @@ void NET_WriteSettings(net_packet_t *packet, net_gamesettings_t *settings)
NET_WriteInt8(packet, settings->extratics);
NET_WriteInt8(packet, settings->deathmatch);
NET_WriteInt8(packet, settings->nomonsters);
+ NET_WriteInt8(packet, settings->fast_monsters);
+ NET_WriteInt8(packet, settings->respawn_monsters);
NET_WriteInt8(packet, settings->episode);
NET_WriteInt8(packet, settings->map);
NET_WriteInt8(packet, settings->skill);
@@ -51,6 +53,8 @@ boolean NET_ReadSettings(net_packet_t *packet, net_gamesettings_t *settings)
&& NET_ReadInt8(packet, (unsigned int *) &settings->extratics)
&& NET_ReadInt8(packet, (unsigned int *) &settings->deathmatch)
&& NET_ReadInt8(packet, (unsigned int *) &settings->nomonsters)
+ && NET_ReadInt8(packet, (unsigned int *) &settings->fast_monsters)
+ && NET_ReadInt8(packet, (unsigned int *) &settings->respawn_monsters)
&& NET_ReadInt8(packet, (unsigned int *) &settings->episode)
&& NET_ReadInt8(packet, (unsigned int *) &settings->map)
&& NET_ReadSInt8(packet, &settings->skill)