put simple_rng methods in own file.

src/CMakeLists.txt

@@ -937,6 +937,7 @@ set(libwesnoth-game_STAT_SRC
 	reports.cpp
 	sdl_utils.cpp
 	show_dialog.cpp
+	simple_rng.cpp
 	sound.cpp
 	soundsource.cpp
 	sound_music_track.cpp

src/SConscript

@@ -108,7 +108,8 @@ libwesnoth_sources = Split("""
     random.cpp
     reports.cpp
     show_dialog.cpp
-    sound.cpp
+    simple_rng.cpp
+	sound.cpp
     soundsource.cpp
     sound_music_track.cpp
     terrain.cpp

src/random.cpp

@@ -239,60 +239,4 @@ set_random_generator::~set_random_generator()
 {
 	random_generator = old_;
 }
-
+}
-simple_rng::simple_rng() :
-	random_seed_(rand() & 0x7FFFFFFF),
-	random_pool_(random_seed_),
-	random_calls_(0)
-{
-}
-
-simple_rng::simple_rng(const config& cfg) :
-	random_seed_(cfg["random_seed"]),
-	random_pool_(random_seed_),
-	random_calls_(cfg["random_calls"].to_int(0))
-{
-	for ( unsigned calls = 0; calls < random_calls_; ++calls )
-		random_next();
-}
-
-int simple_rng::get_next_random()
-{
-	random_next();
-	++random_calls_;
-	DBG_RND << "pulled user random " << random_pool_
-		<< " for call " << random_calls_
-		<< " with seed " << random_seed_ << '\n';
-
-	return (random_pool_ / 65536) % 32768;
-}
-
-void simple_rng::rotate_random()
-{
-	random_seed_ = random_pool_ & 0x7FFFFFFF;
-	random_calls_ = 0;
-}
-
-void simple_rng::seed_random(const int seed, const unsigned call_count)
-{
-	random_pool_ = seed;
-	random_seed_ = seed;
-	for(random_calls_ = 0; random_calls_ < call_count; ++random_calls_) {
-		random_next();
-	}
-	DBG_RND << "Seeded random with " << random_seed_ << " with "
-		<< random_calls_ << " calls, pool is now at "
-		<< random_pool_ << '\n';
-}
-
-void simple_rng::random_next()
-{
-	// Use the simple random generator as shown in man rand(3).
-	// The division is done separately since we also want to
-	// quickly go the the wanted index in the random list.
-	random_pool_ = random_pool_ * 1103515245 + 12345;
-}
-
-
-} // ends rand_rng namespace
-

src/simple_rng.cpp

@@ -0,0 +1,84 @@
+/*
+   Copyright (C) 2003 by David White <dave@whitevine.net>
+   Copyright (C) 2005 - 2014 by Yann Dirson <ydirson@altern.org>
+   Part of the Battle for Wesnoth Project http://www.wesnoth.org/
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY.
+
+   See the COPYING file for more details.
+*/
+
+#include "simple_rng.hpp"
+#include "config.hpp"
+#include "log.hpp"
+#include <stdlib.h>
+static lg::log_domain log_random("random");
+#define DBG_RND LOG_STREAM(debug, log_random)
+#define LOG_RND LOG_STREAM(info, log_random)
+#define WRN_RND LOG_STREAM(warn, log_random)
+#define ERR_RND LOG_STREAM(err, log_random)
+
+
+namespace rand_rng
+{
+simple_rng::simple_rng() :
+	random_seed_(rand() & 0x7FFFFFFF),
+	random_pool_(random_seed_),
+	random_calls_(0)
+{
+}
+
+simple_rng::simple_rng(const config& cfg) :
+	random_seed_(cfg["random_seed"]),
+	random_pool_(random_seed_),
+	random_calls_(cfg["random_calls"].to_int(0))
+{
+	for ( unsigned calls = 0; calls < random_calls_; ++calls )
+		random_next();
+}
+
+int simple_rng::get_next_random()
+{
+	random_next();
+	++random_calls_;
+	DBG_RND << "pulled user random " << random_pool_
+		<< " for call " << random_calls_
+		<< " with seed " << random_seed_ << '\n';
+
+	return (random_pool_ / 65536) % 32768;
+}
+
+void simple_rng::rotate_random()
+{
+	random_seed_ = random_pool_ & 0x7FFFFFFF;
+	random_calls_ = 0;
+}
+
+void simple_rng::seed_random(const int seed, const unsigned call_count)
+{
+	random_pool_ = seed;
+	random_seed_ = seed;
+	for(random_calls_ = 0; random_calls_ < call_count; ++random_calls_) {
+		random_next();
+	}
+	DBG_RND << "Seeded random with " << random_seed_ << " with "
+		<< random_calls_ << " calls, pool is now at "
+		<< random_pool_ << '\n';
+}
+
+void simple_rng::random_next()
+{
+	// Use the simple random generator as shown in man rand(3).
+	// The division is done separately since we also want to
+	// quickly go the the wanted index in the random list.
+	random_pool_ = random_pool_ * 1103515245 + 12345;
+}
+
+
+} // ends rand_rng namespace
+