History

Fix duplicate UUID length constant

Ryan Huffman committed 9 years ago

Commit 7fc946f1 parent c015ac11 file · +2 −3Browse files

Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 1 file). Show all

Unified · Split

assignment-client/src/scripts/EntityScriptServer.cpp+2−3
@@ -24,10 +24,9 @@ · 23 unmodified lines
24#include <ScriptCache.h>24#include <ScriptCache.h>
25#include <ScriptEngines.h>25#include <ScriptEngines.h>
26#include <SoundCache.h>26#include <SoundCache.h>
27#include <UUID.h>
27#include <WebSocketServerClass.h>28#include <WebSocketServerClass.h>
28 29
29const size_t UUID_LENGTH_BYTES = 16;
30
31int EntityScriptServer::_entitiesScriptEngineCount = 0;30int EntityScriptServer::_entitiesScriptEngineCount = 0;
32 31
33EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssignment(message) {32EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssignment(message) {
@@ -63,7 +62,7 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig · 29 unmodified lines
63static const QString ENTITY_SCRIPT_SERVER_LOGGING_NAME = "entity-script-server";62static const QString ENTITY_SCRIPT_SERVER_LOGGING_NAME = "entity-script-server";
64 63
65void EntityScriptServer::handleReloadEntityServerScriptPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {64void EntityScriptServer::handleReloadEntityServerScriptPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
66 auto entityID = QUuid::fromRfc4122(message->read(UUID_LENGTH_BYTES));65 auto entityID = QUuid::fromRfc4122(message->read(NUM_BYTES_RFC4122_UUID));
67 66
68 if (_entityViewer.getTree() && !_shuttingDown) {67 if (_entityViewer.getTree() && !_shuttingDown) {
69 qDebug() << "Reloading: " << entityID;68 qDebug() << "Reloading: " << entityID;