From d3d4e5357d2e3b742c75fd85ea1b27b99d43e19a Mon Sep 17 00:00:00 2001
From: BjossiAlfreds <bjornalfredsson@yahoo.com>
Date: Sat, 24 Sep 2022 13:59:50 +0000
Subject: [PATCH] Fix coop power cube related bugs

---
 src/g_items.c    | 2 +-
 src/player/hud.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/g_items.c b/src/g_items.c
index 4561147..1333373 100644
--- a/src/g_items.c
+++ b/src/g_items.c
@@ -1713,7 +1713,7 @@ SpawnItem(edict_t *ent, gitem_t *item)
 		}
 	}
 
-	if (coop->value && (strcmp(ent->classname, "key_power_cube") == 0))
+	if (coop->value && !(ent->spawnflags & ITEM_NO_TOUCH) && (strcmp(ent->classname, "key_power_cube") == 0))
 	{
 		ent->spawnflags |= (1 << (8 + level.power_cubes));
 		level.power_cubes++;
diff --git a/src/player/hud.c b/src/player/hud.c
index e621085..5be294a 100644
--- a/src/player/hud.c
+++ b/src/player/hud.c
@@ -112,13 +112,15 @@ BeginIntermission(edict_t *targ)
 				}
 
 				/* strip players of all keys between units */
-				for (n = 0; n < MAX_ITEMS; n++)
+				for (n = 0; n < game.num_items; n++)
 				{
 					if (itemlist[n].flags & IT_KEY)
 					{
 						client->client->pers.inventory[n] = 0;
 					}
 				}
+
+				client->client->pers.power_cubes = 0;
 			}
 		}
 	}