diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/scriptapi.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp index 944b81a5e..70ca6c86a 100644 --- a/src/scriptapi.cpp +++ b/src/scriptapi.cpp @@ -3157,12 +3157,23 @@ private: return 0; } - // next(self) -> get next value + // next(self, min=0, max=32767) -> get next value static int l_next(lua_State *L) { LuaPseudoRandom *o = checkobject(L, 1); + int min = 0; + int max = 32767; + lua_settop(L, 3); // Fill 2 and 3 with nil if they don't exist + if(!lua_isnil(L, 2)) + min = luaL_checkinteger(L, 2); + if(!lua_isnil(L, 3)) + max = luaL_checkinteger(L, 3); + if(max - min != 32767 && max - min > 32767/5) + throw LuaError(L, "PseudoRandom.next() max-min is not 32767 and is > 32768/5. This is disallowed due to the bad random distribution the implementation would otherwise make."); PseudoRandom &pseudo = o->m_pseudo; - lua_pushinteger(L, pseudo.next()); + int val = pseudo.next(); + val = (val % (max-min+1)) + min; + lua_pushinteger(L, val); return 1; } |