Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r24531) -Fix: Max script chance was too big.

Browse Source
This commit is contained in:
alberth 2012-09-18 19:29:29 +00:00
parent af4529bdaa
commit bdc57ddf23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/script/api/script_base.cpp
View File

@ -11,6 +11,7 @@
#include "../../stdafx.h" #include "../../stdafx.h"
#include "script_base.hpp" #include "script_base.hpp"
#include "script_error.hpp"
#include "../../network/network.h" #include "../../network/network.h"
#include "../../core/random_func.hpp" #include "../../core/random_func.hpp"
@ -42,7 +43,8 @@
/* static */ bool ScriptBase::Chance(uint out, uint max) /* static */ bool ScriptBase::Chance(uint out, uint max)
{ {
return (uint16)Rand() <= (uint16)((65536 * out) / max); EnforcePrecondition(false, out <= max);
return (uint16)Rand() <= (uint16)((65535 * out) / max);
} }
/* static */ bool ScriptBase::ChanceItem(int unused_param, uint out, uint max) /* static */ bool ScriptBase::ChanceItem(int unused_param, uint out, uint max)

1
src/script/api/script_base.hpp
View File

@ -59,6 +59,7 @@ public:
* After all, it is a random function. * After all, it is a random function.
* @param out How many times it should return true. * @param out How many times it should return true.
* @param max Out of this many times. * @param max Out of this many times.
* @pre \a out is at most equal to \a max.
* @return True if the chance worked out. * @return True if the chance worked out.
*/ */
static bool Chance(uint out, uint max); static bool Chance(uint out, uint max);