vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

monstermaker: Make sure limits only get respected when they're actually set

Browse source
This commit is contained in:
Marco Cawthorne 2020-04-01 20:15:10 +02:00
parent 54e982bc14
commit 479048bda8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gs-entbase/server/monstermaker.cpp
View file

@ -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":