From f812d7194beed8e006b3ae15b42cb42e0431253a Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sun, 1 Apr 2018 19:36:02 -0400 Subject: [PATCH] fix obscure division by 0 issue that only QuanTech would ever be affected by --- src/simulation/elements/MERC.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/simulation/elements/MERC.cpp b/src/simulation/elements/MERC.cpp index e3d36a94a..9e33dc534 100644 --- a/src/simulation/elements/MERC.cpp +++ b/src/simulation/elements/MERC.cpp @@ -48,7 +48,11 @@ Element_MERC::Element_MERC() int Element_MERC::update(UPDATE_FUNC_ARGS) { int r, rx, ry, trade, np; - const int absorbScale = 10000;// max number of particles that can be condensed into one + // Max number of particles that can be condensed into one + const int absorbScale = 10000; + // Obscure division by 0 fix + if (parts[i].temp + 1 == 0) + parts[i].temp = 0; int maxtmp = ((absorbScale/(parts[i].temp + 1))-1); if ((absorbScale%((int)parts[i].temp+1))>rand()%((int)parts[i].temp+1)) maxtmp ++;