From 0e55ac91dab5f024be9a5c931e017505cff3bae8 Mon Sep 17 00:00:00 2001
From: zicodxx <zico@dxx-rebirth.com>
Date: Wed, 28 Mar 2012 21:45:40 +0200
Subject: [PATCH] Added forgotten D2 powerup capping code when starting level
 which hopefully fixes massive powerup loss

---
 CHANGELOG.txt   |  1 +
 main/gamesave.c | 11 +++++++++++
 main/net_udp.c  |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bca0c1ce1..d02327276 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -10,6 +10,7 @@ main/net_udp.c: in netgame info screen some setting-descriptions were interchang
 main/net_udp.c: Since the kicked message is shown after player is technically removed from the game we do not know hosts name anymore. Message changed accordingly
 main/multi.c, main/multi.h, main/newdemo.c, main/player.h: Allow a total of 32 different player ship textures and stored N_PLAYER_SHIP_TEXTURES in player.h
 main/config.c: Dynamically allocate line to read from descent.cfg and ensure a safe length
+main/gamesave.c, main/net_udp.c: Added forgotten D2 powerup capping code when starting level which hopefully fixes massive powerup loss
 
 20120324
 --------
diff --git a/main/gamesave.c b/main/gamesave.c
index 977274af8..dc3aea010 100644
--- a/main/gamesave.c
+++ b/main/gamesave.c
@@ -1093,6 +1093,17 @@ int load_level(char * filename_passed)
 	int sig, minedata_offset, gamedata_offset, hostagetext_offset;
 	int mine_err, game_err;
 
+#ifdef NETWORK
+   if (Game_mode & GM_NETWORK)
+	 {
+	  for (i=0;i<MAX_POWERUP_TYPES;i++)
+		{
+			MaxPowerupsAllowed[i]=0;
+			PowerupsInMine[i]=0;
+		}
+	 }
+#endif
+
 	#ifdef COMPACT_SEGS
 	ncache_flush();
 	#endif
diff --git a/main/net_udp.c b/main/net_udp.c
index 3e6940575..21ea7152b 100644
--- a/main/net_udp.c
+++ b/main/net_udp.c
@@ -3834,6 +3834,8 @@ net_udp_level_sync(void)
 	else
 		result = net_udp_wait_for_sync();
 
+	multi_powcap_count_powerups_in_mine();
+
 	if (result)
 	{
 		Players[Player_num].connected = CONNECT_DISCONNECTED;