aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

moved call to rng constructor to main()

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-09-23 15:43:39 +02:00
parent a5d73a9a60
commit e92840c849
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/main.cpp
View file

@ -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();

3
common/rng_abstract.cpp
View file

@ -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)
{

12
servatrice/src/main.cpp
View file

@ -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;
}