From 479048bda82d82f3c4f536d02024a8141ebd180f Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Wed, 1 Apr 2020 20:15:10 +0200 Subject: [PATCH] monstermaker: Make sure limits only get respected when they're actually set --- src/gs-entbase/server/monstermaker.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gs-entbase/server/monstermaker.cpp b/src/gs-entbase/server/monstermaker.cpp index 47a8f68a..124a0dac 100644 --- a/src/gs-entbase/server/monstermaker.cpp +++ b/src/gs-entbase/server/monstermaker.cpp @@ -45,7 +45,7 @@ class monstermaker:CBaseTrigger { string m_strMonster; int m_iMonsterSpawned; - int m_iMonsterCount; + int m_iTotalMonsters; float m_flDelay; int m_iMaxChildren; int m_iEnabled; @@ -116,7 +116,7 @@ monstermaker::Spawner(void) } /* too many alive at a time */ - if ((c >= m_iMaxChildren) || (m_flDelay == 0 && c >= 1)) { + if ((m_iMaxChildren > 0) && c >= m_iMaxChildren) || (m_flDelay == 0 && c >= 1)) { nextthink = time + m_flDelay; return; } @@ -145,7 +145,7 @@ monstermaker::Spawner(void) } /* shut off for good when we've spawned all we ever wanted */ - if (m_iMonsterSpawned >= m_iMonsterCount) { + if ((m_iTotalMonsters > 0) && m_iMonsterSpawned >= m_iTotalMonsters) { think = __NULL__; return; } @@ -190,7 +190,7 @@ monstermaker::monstermaker(void) m_strMonster = argv(i+1); break; case "monstercount": - m_iMonsterCount = stoi(argv(i+1)); + m_iTotalMonsters = stoi(argv(i+1)); break; case "child_alivemax": case "m_imaxlivechildren":