Author: oracle
Date: Thu Jul 24 16:39:17 2008
New Revision: 28174
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28174&view=rev
Log:
Minor code clean up. Added namespace 'rand_rng' to random.[ch]pp and
changed callers accordingly. Functions declared in random.[ch]pp are
left in default namespace.
This was part of a potential RNG bug hunt which turned up empty.
The namespace helps prevent some potential ambiguities as we have
classes declared using lower case and methods of the same name and
case. The namespace allows for non-ambiguous reference with the
class.
Modified:
trunk/src/gamestatus.hpp
trunk/src/multiplayer.cpp
trunk/src/play_controller.hpp
trunk/src/playcampaign.cpp
trunk/src/race.cpp
trunk/src/race.hpp
trunk/src/random.cpp
trunk/src/random.hpp
trunk/src/replay.cpp
trunk/src/replay.hpp
trunk/src/unit.hpp
Modified: trunk/src/gamestatus.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gamestatus.hpp?rev=28174&r1=28173&r2=28174&view=diff
==============================================================================
--- trunk/src/gamestatus.hpp (original)
+++ trunk/src/gamestatus.hpp Thu Jul 24 16:39:17 2008
@@ -144,8 +144,8 @@
void clear_variable(const std::string& varname);
void clear_variable_cfg(const std::string& varname); // Clears only the
config children
- const simple_rng& rng() const { return rng_; }
- simple_rng& rng() { return rng_; }
+ const rand_rng::simple_rng& rng() const { return rng_; }
+ rand_rng::simple_rng& rng() { return rng_; }
std::string difficulty; //!< The difficulty level the game is being
played on.
@@ -167,7 +167,7 @@
gamemap::location last_selected;
private:
- simple_rng rng_;
+ rand_rng::simple_rng rng_ ;
config variables;
mutable config temporaries; // lengths of arrays, etc.
friend struct variable_info;
Modified: trunk/src/multiplayer.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/multiplayer.cpp?rev=28174&r1=28173&r2=28174&view=diff
==============================================================================
--- trunk/src/multiplayer.cpp (original)
+++ trunk/src/multiplayer.cpp Thu Jul 24 16:39:17 2008
@@ -487,7 +487,7 @@
void start_server(game_display& disp, const config& game_config,
mp::controller default_controller, bool is_server)
{
- const set_random_generator generator_setter(&recorder);
+ const rand_rng::set_random_generator generator_setter(&recorder);
mp::chat chat;
config gamelist;
playmp_controller::set_replay_last_turn(0);
@@ -498,7 +498,7 @@
void start_client(game_display& disp, const config& game_config,
const std::string host)
{
- const set_random_generator generator_setter(&recorder);
+ const rand_rng::set_random_generator generator_setter(&recorder);
const network::manager net_manager(1,1);
mp::chat chat;
Modified: trunk/src/play_controller.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.hpp?rev=28174&r1=28173&r2=28174&view=diff
==============================================================================
--- trunk/src/play_controller.hpp (original)
+++ trunk/src/play_controller.hpp Thu Jul 24 16:39:17 2008
@@ -130,7 +130,7 @@
//other objects
game_display* gui_;
- const set_random_generator generator_setter;
+ const rand_rng::set_random_generator generator_setter;
const statistics::scenario_context statistics_context_;
const config& level_;
std::vector<team> teams_;
Modified: trunk/src/playcampaign.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playcampaign.cpp?rev=28174&r1=28173&r2=28174&view=diff
==============================================================================
--- trunk/src/playcampaign.cpp (original)
+++ trunk/src/playcampaign.cpp Thu Jul 24 16:39:17 2008
@@ -325,7 +325,7 @@
bool save_game_after_scenario = true;
- const set_random_generator generator_setter(&recorder);
+ const rand_rng::set_random_generator
generator_setter(&recorder);
LEVEL_RESULT res = LEVEL_CONTINUE;
try {
Modified: trunk/src/race.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/race.cpp?rev=28174&r1=28173&r2=28174&view=diff
==============================================================================
--- trunk/src/race.cpp (original)
+++ trunk/src/race.cpp Thu Jul 24 16:39:17 2008
@@ -53,7 +53,7 @@
}
static wide_string markov_generate_name(const markov_prefix_map& prefixes,
- size_t chain_size, size_t max_len, simple_rng* rng)
+ size_t chain_size, size_t max_len, rand_rng::simple_rng* rng)
{
if(chain_size == 0)
return wide_string();
@@ -187,7 +187,7 @@
}
std::string unit_race::generate_name(
- unit_race::GENDER gender, simple_rng* rng) const
+ unit_race::GENDER gender, rand_rng::simple_rng* rng) const
{
return utils::wstring_to_string(
markov_generate_name(next_[gender], chain_size_, 12, rng));
Modified: trunk/src/race.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/race.hpp?rev=28174&r1=28173&r2=28174&view=diff
==============================================================================
--- trunk/src/race.hpp (original)
+++ trunk/src/race.hpp Thu Jul 24 16:39:17 2008
@@ -21,8 +21,7 @@
#include "serialization/string_utils.hpp"
#include "config.hpp"
-
-class simple_rng;
+#include "random.hpp"
typedef std::map<wide_string, std::vector<wchar_t> > markov_prefix_map;
@@ -39,7 +38,7 @@
const t_string& plural_name() const { return plural_name_; };
const t_string& description() const { return description_; };
- std::string generate_name(GENDER gender, simple_rng* rng = 0) const;
+ std::string generate_name(GENDER gender, rand_rng::simple_rng* rng = 0)
const;
bool uses_global_traits() const;
Modified: trunk/src/random.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/random.cpp?rev=28174&r1=28173&r2=28174&view=diff
==============================================================================
--- trunk/src/random.cpp (original)
+++ trunk/src/random.cpp Thu Jul 24 16:39:17 2008
@@ -46,6 +46,36 @@
#include <cassert>
#include <cstdio>
#include <sstream>
+
+namespace {
+ rand_rng::rng *random_generator = NULL ;
+}
+
+
+int get_random()
+{
+ assert(random_generator!=NULL);
+ int r = random_generator->get_random();
+ return r ;
+}
+
+
+const config* get_random_results()
+{
+ assert(random_generator!=NULL);
+ return random_generator->get_random_results();
+}
+
+
+void set_random_results(const config& cfg)
+{
+ assert(random_generator!=NULL);
+ random_generator->set_random_results(cfg);
+}
+
+
+namespace rand_rng
+{
rng::rng() : random_(NULL), random_child_(0)
{}
@@ -97,9 +127,6 @@
return;
}
-namespace {
-rng* random_generator = NULL;
-}
set_random_generator::set_random_generator(rng* r) : old_(random_generator)
{
@@ -111,29 +138,11 @@
random_generator = old_;
}
-int get_random()
-{
- assert(random_generator!=NULL);
- return random_generator->get_random();
-}
-
-const config* get_random_results()
-{
- assert(random_generator!=NULL);
- return random_generator->get_random_results();
-}
-
-void set_random_results(const config& cfg)
-{
- assert(random_generator!=NULL);
- random_generator->set_random_results(cfg);
-}
-
simple_rng::simple_rng() :
random_seed_(rand()),
random_pool_(random_seed_),
random_calls_(0)
-{}
+{ }
simple_rng::simple_rng(const config& cfg) :
/**
@@ -180,3 +189,6 @@
random_pool_ = random_pool_ * 1103515245 + 12345;
}
+
+} // ends rand_rng namespace
+
Modified: trunk/src/random.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/random.hpp?rev=28174&r1=28173&r2=28174&view=diff
==============================================================================
--- trunk/src/random.hpp (original)
+++ trunk/src/random.hpp Thu Jul 24 16:39:17 2008
@@ -15,8 +15,8 @@
/** @file random.hpp */
-#ifndef RANDOM_H_INCLUDED
-#define RANDOM_H_INCLUDED
+#ifndef RANDOM_HPP_INCLUDED
+#define RANDOM_HPP_INCLUDED
#include "SDL_types.h"
@@ -25,6 +25,9 @@
int get_random();
const config* get_random_results();
void set_random_results(const config& cfg);
+
+namespace rand_rng
+{
class rng
{
@@ -108,4 +111,6 @@
void random_next();
};
+} // ends rand_rng namespace
+
#endif
Modified: trunk/src/replay.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/replay.cpp?rev=28174&r1=28173&r2=28174&view=diff
==============================================================================
--- trunk/src/replay.cpp (original)
+++ trunk/src/replay.cpp Thu Jul 24 16:39:17 2008
@@ -784,7 +784,7 @@
disp.recalculate_minimap();
}
- const set_random_generator generator_setter(&get_replay_source());
+ const rand_rng::set_random_generator
generator_setter(&get_replay_source());
update_locker
lock_update(disp.video(),get_replay_source().is_skipping());
return do_replay_handle(disp, map, units, teams, team_num, state,
state_of_game,
Modified: trunk/src/replay.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/replay.hpp?rev=28174&r1=28173&r2=28174&view=diff
==============================================================================
--- trunk/src/replay.hpp (original)
+++ trunk/src/replay.hpp Thu Jul 24 16:39:17 2008
@@ -36,7 +36,7 @@
~verification_manager();
};
-class replay: public rng
+class replay: public rand_rng::rng
{
public:
replay();
Modified: trunk/src/unit.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.hpp?rev=28174&r1=28173&r2=28174&view=diff
==============================================================================
--- trunk/src/unit.hpp (original)
+++ trunk/src/unit.hpp Thu Jul 24 16:39:17 2008
@@ -288,7 +288,7 @@
void remove_temporary_modifications();
void generate_traits(bool musthaveonly=false, game_state* state = 0);
void generate_traits_description();
- std::string generate_name( simple_rng* rng = 0) const
+ std::string generate_name( rand_rng::simple_rng* rng = 0) const
{ return race_->generate_name(string_gender(cfg_["gender"]),
rng); }
// Only see_all=true use caching
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
