From efced4e7637eacf803592e530149788c75c67c4d Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Fri, 3 May 2024 15:54:36 +0200
Subject: [PATCH] Allow less than 3 emerald shards instead of crashing
---
src/p_setup.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/p_setup.c b/src/p_setup.c
index 41487d702f..f6d9604d51 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -831,13 +831,15 @@ void P_ScanThings(INT16 mapnum, INT16 wadnum, INT16 lumpnum)
static void P_SpawnEmeraldHunt(void)
{
- INT32 emer[3], num[MAXHUNTEMERALDS], i, randomkey;
+ INT32 emer[3], num[MAXHUNTEMERALDS], i, amount, randomkey;
fixed_t x, y, z;
for (i = 0; i < numhuntemeralds; i++)
num[i] = i;
- for (i = 0; i < 3; i++)
+ amount = min(numhuntemeralds, 3);
+
+ for (i = 0; i < amount; i++)
{
// generate random index, shuffle afterwards
randomkey = P_RandomKey(numhuntemeralds--);
--
GitLab