Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 18:40:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2493 from birarda/master

Browse source 
seed random number generator in ScriptEngine
This commit is contained in:
Philip Rosedale 2014-03-25 14:30:31 -07:00
commit e6e10f7b77
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -236,6 +236,11 @@ void ScriptEngine::init() {
_voxelsScriptingInterface.getVoxelPacketSender()->setProcessCallIntervalHint(SCRIPT_DATA_CALLBACK_USECS); _voxelsScriptingInterface.getVoxelPacketSender()->setProcessCallIntervalHint(SCRIPT_DATA_CALLBACK_USECS);
_particlesScriptingInterface.getParticlePacketSender()->setProcessCallIntervalHint(SCRIPT_DATA_CALLBACK_USECS); _particlesScriptingInterface.getParticlePacketSender()->setProcessCallIntervalHint(SCRIPT_DATA_CALLBACK_USECS);
// call srand to seed the random number generator
srand(QDateTime::currentMSecsSinceEpoch()
+ QCoreApplication::applicationPid()
+ NodeList::getInstance()->getNodeSocket().localPort());
} }
void ScriptEngine::registerGlobalObject(const QString& name, QObject* object) { void ScriptEngine::registerGlobalObject(const QString& name, QObject* object) {

1
libraries/shared/src/ThreadedAssignment.cpp
View file

@ -84,7 +84,6 @@ void ThreadedAssignment::checkInWithDomainServerOrExit() {
if (NodeList::getInstance()->getNumNoReplyDomainCheckIns() == MAX_SILENT_DOMAIN_SERVER_CHECK_INS) { if (NodeList::getInstance()->getNumNoReplyDomainCheckIns() == MAX_SILENT_DOMAIN_SERVER_CHECK_INS) {
setFinished(true); setFinished(true);
} else { } else {
qDebug() << "Sending DS check in. There are" << NodeList::getInstance()->getNumNoReplyDomainCheckIns() << "unreplied.";
NodeList::getInstance()->sendDomainServerCheckIn(); NodeList::getInstance()->sendDomainServerCheckIn();
} }
} }