From e92840c84996097e899f21aa0e7812f85be0a6e0 Mon Sep 17 00:00:00 2001
From: Max-Wilhelm Bruker <m.bruker@digitalmedia.de>
Date: Thu, 23 Sep 2010 15:43:39 +0200
Subject: [PATCH] moved call to rng constructor to main()

---
 cockatrice/src/main.cpp |  4 ++++
 common/rng_abstract.cpp |  3 ---
 servatrice/src/main.cpp | 12 ++++++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index 4bf0c48a..5b872b69 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -35,12 +35,14 @@
 #include "carddatabase.h"
 #include "settingscache.h"
 #include "pixmapgenerator.h"
+#include "rng_sfmt.h"
 
 //Q_IMPORT_PLUGIN(qjpeg)
 
 CardDatabase *db;
 QTranslator *translator, *qtTranslator;
 SettingsCache *settingsCache;
+RNG_Abstract *rng;
 
 void myMessageOutput(QtMsgType /*type*/, const char *msg)
 {
@@ -84,6 +86,7 @@ int main(int argc, char *argv[])
 	QCoreApplication::setOrganizationDomain("cockatrice.de");
 	QCoreApplication::setApplicationName("Cockatrice");
 	
+	rng = new RNG_SFMT;
 	settingsCache = new SettingsCache;
 	db = new CardDatabase;
 
@@ -125,6 +128,7 @@ int main(int argc, char *argv[])
 
 	delete db;
 	delete settingsCache;
+	delete rng;
 	PingPixmapGenerator::clear();
 	CountryPixmapGenerator::clear();
 	UserLevelPixmapGenerator::clear();
diff --git a/common/rng_abstract.cpp b/common/rng_abstract.cpp
index 229d2592..2919d437 100644
--- a/common/rng_abstract.cpp
+++ b/common/rng_abstract.cpp
@@ -1,9 +1,6 @@
 #include "rng_abstract.h"
-#include "rng_qt.h"
-#include "rng_sfmt.h"
 #include <QDebug>
 
-RNG_Abstract *rng = new RNG_SFMT;
 
 QVector<int> RNG_Abstract::makeNumbersVector(int n, int min, int max)
 {
diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp
index 00920757..386e82fd 100644
--- a/servatrice/src/main.cpp
+++ b/servatrice/src/main.cpp
@@ -22,7 +22,9 @@
 #include <QTextCodec>
 #include <iostream>
 #include "servatrice.h"
-#include "rng_abstract.h"
+#include "rng_sfmt.h"
+
+RNG_Abstract *rng;
 
 void myMessageOutput(QtMsgType /*type*/, const char *msg)
 {
@@ -76,6 +78,8 @@ int main(int argc, char *argv[])
 	app.setApplicationName("Servatrice");
 	
 	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+
+	rng = new RNG_SFMT;
 	
 	std::cerr << "Servatrice " << Servatrice::versionString.toStdString() << " starting." << std::endl;
 	std::cerr << "-------------------------" << std::endl;
@@ -87,5 +91,9 @@ int main(int argc, char *argv[])
 	std::cerr << "-------------------------" << std::endl;
 	std::cerr << "Server initialized." << std::endl;
 	
-	return app.exec();
+	int retval = app.exec();
+
+	delete rng;
+
+	return retval;
 }