0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix issue in rng class...

Browse source 
...where get_results and set_results tried to use the next [random]
child rather than the current one.
This commit is contained in:
Bruno Wolff III 2005-11-13 14:50:45 +00:00
parent a4afe7e280
commit b49fe3bc50
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/random.cpp
View file

@ -46,8 +46,8 @@ const config* rng::get_random_results()
wassert(random_ != NULL);
const config::child_list random(random_->get_children("random"));
if (random_child_ >= random.size()) return NULL;
return random[random_child_]->child("results");
if (random_child_ < 0 ||random_child_ > random.size()) return NULL;
return random[random_child_-1]->child("results");
}
void rng::set_random_results(const config& cfg)
@ -55,9 +55,9 @@ void rng::set_random_results(const config& cfg)
wassert(random_ != NULL);
const config::child_list random(random_->get_children("random"));
if (random_child_ >= random.size()) return;
random[random_child_]->clear_children("results");
random[random_child_]->add_child("results",cfg);
if (random_child_ < 0 || random_child_ > random.size()) return;
random[random_child_-1]->clear_children("results");
random[random_child_-1]->add_child("results",cfg);
}
config* rng::random()
@ -65,11 +65,11 @@ config* rng::random()
return random_;
}
config* rng::set_random(config* random)
void rng::set_random(config* random)
{
config* old = random_;
random_ = random;
return old;
random_child_ = 0;
return;
}
namespace {

2
src/random.hpp
View file

@ -32,7 +32,7 @@ public:
void add_random_separator();
protected:
config* random();
config* set_random(config*);
void set_random(config*);
private:
config* random_;