Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Strip out QRandomGenerator because it's "too new" of a module (linux build does not compile with it)

Browse Source 
Add QPluginLoader checks for qapng and qwebp
This commit is contained in:
Crystalwarrior 2019-09-28 22:00:16 +03:00
parent 709ebb7e18
commit b0f11e53df
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/courtroom.h
View File

@ -55,7 +55,7 @@
#include <QPropertyAnimation> #include <QPropertyAnimation>
#include <QParallelAnimationGroup> #include <QParallelAnimationGroup>
#include <QMessageBox> #include <QMessageBox>
#include <QRandomGenerator> //#include <QRandomGenerator>
#include <stack> #include <stack>

4
src/courtroom.cpp
View File

@ -44,6 +44,8 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
} }
#endif #endif
qsrand(static_cast<uint>(QDateTime::currentMSecsSinceEpoch() / 1000));
keepalive_timer = new QTimer(this); keepalive_timer = new QTimer(this);
keepalive_timer->start(60000); keepalive_timer->start(60000);
@ -1933,7 +1935,7 @@ void Courtroom::do_screenshake()
for (int frame=0; frame < maxframes; frame++) for (int frame=0; frame < maxframes; frame++)
{ {
double fraction = double(frame*frequency)/duration; double fraction = double(frame*frequency)/duration;
quint32 rng = QRandomGenerator::global()->generate(); int rng = qrand();//QRandomGenerator::global()->generate();
int rand_x = int(rng) % max_x; int rand_x = int(rng) % max_x;
int rand_y = int(rng+100) % max_y; int rand_y = int(rng+100) % max_y;
screenshake_animation->setKeyValueAt(fraction, QPoint(pos_default.x() + rand_x, pos_default.y() + rand_y)); screenshake_animation->setKeyValueAt(fraction, QPoint(pos_default.x() + rand_x, pos_default.y() + rand_y));

8
src/main.cpp
View File

@ -22,6 +22,14 @@ int main(int argc, char *argv[])
QSettings *configini = main_app.configini; QSettings *configini = main_app.configini;
QPluginLoader apngPlugin("imageformats/qapng");
if (!apngPlugin.load())
qCritical() << "QApng plugin could not be loaded";
QPluginLoader webpPlugin("imageformats/qwebp");
if (!webpPlugin.load())
qCritical() << "QWebp plugin could not be loaded";
QString p_language = configini->value("language", QLocale::system().name()).toString(); QString p_language = configini->value("language", QLocale::system().name()).toString();
if (p_language == " " || p_language == "") if (p_language == " " || p_language == "")
p_language = QLocale::system().name(); p_language = QLocale::system().name();