upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 06:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increase of WML random values.

Browse Source
This commit is contained in:
Mark de Wever 2012-01-30 19:55:08 +00:00
parent 7c0090b77f
commit af2ad24e4e
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog
View File

@ -15,6 +15,7 @@ Version 1.11.0-svn:
* new key: [set_menu_item][command]delayed_variable_substitution=yes|no
* Removed support for the deprecated "colour=", "debug_border_colour=",
and [colour_adjust]
* Fixed bug #18996: Increase random number generation range.
* Miscellaneous and bug fixes:
* Fix wrong preferences path suffix (1.1 instead of 1.10) on Linux and other
platforms using XDG layout (no compiled-in preferences path override,

19
src/game_events.cpp
View File

@ -1411,7 +1411,24 @@ WML_HANDLER_FUNCTION(set_variable, /*event_info*/, cfg)
}
}
int choice = state_of_game->rng().get_next_random() % num_choices;
/*
* Choice gets a value in the range [0..32768).
* So need to add a second set of random values when a value
* outside the range is requested.
*/
if(num_choices > 0x3fffffff) {
WRN_NG << "Requested random number with an upper bound of "
<< num_choices
<< " however the maximum number generated will be "
<< 0x3fffffff
<< ".\n";
}
int choice = state_of_game->rng().get_next_random();
if(num_choices >= 32768) {
choice <<= 15;
choice += state_of_game->rng().get_next_random();
}
choice %= num_choices;
int tmp = 0;
for(size_t i = 0; i < ranges.size(); ++i) {
tmp += (ranges[i].second - ranges[i].first) + 1;