foxygit / doom Log in
commit aedc1c2d8c8eecfc609b291b9fe2983e03a744fe
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Thu Jan 24 19:09:47 2008 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Thu Jan 24 19:09:47 2008 +0000

    Fix fast / respawning monsters parameter not exchanged when starting
    netgames (thanks GhostlyDeath).

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 1014
---
 src/net_client.c   | 4 ++++
 src/net_defs.h     | 2 ++
 src/net_structrw.c | 4 ++++
 3 files changed, 10 insertions(+)

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)