From f712fae4d26df69c9d7e82c3e1824f20d49d01c4 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 17 Nov 2015 08:56:21 -0800 Subject: [PATCH] more hacking --- assignment-client/src/messages/MessagesMixer.cpp | 4 ++-- libraries/networking/src/PacketReceiver.cpp | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/messages/MessagesMixer.cpp b/assignment-client/src/messages/MessagesMixer.cpp index 988e2bfeac..d9cc772eb2 100644 --- a/assignment-client/src/messages/MessagesMixer.cpp +++ b/assignment-client/src/messages/MessagesMixer.cpp @@ -48,8 +48,8 @@ MessagesMixer::MessagesMixer(NLPacket& packet) : connect(DependencyManager::get().data(), &NodeList::nodeKilled, this, &MessagesMixer::nodeKilled); auto& packetReceiver = DependencyManager::get()->getPacketReceiver(); - packetReceiver.registerListener(PacketType::MessagesData, this, "handleMessagesPacket"); - packetReceiver.registerListener(PacketType::MessagesData, this, "handleMessagesPacketList"); + //packetReceiver.registerListener(PacketType::MessagesData, this, "handleMessagesPacket"); + packetReceiver.registerMessageListener(PacketType::MessagesData, this, "handleMessagesPacketList"); } MessagesMixer::~MessagesMixer() { diff --git a/libraries/networking/src/PacketReceiver.cpp b/libraries/networking/src/PacketReceiver.cpp index 9d25724f6c..81d8c5ee73 100644 --- a/libraries/networking/src/PacketReceiver.cpp +++ b/libraries/networking/src/PacketReceiver.cpp @@ -95,6 +95,8 @@ void PacketReceiver::registerDirectListenerForTypes(PacketTypeList types, } bool PacketReceiver::registerMessageListener(PacketType type, QObject* listener, const char* slot) { + qCDebug(networking) << "PacketReceiver::registerMessageListener() packet list type" << type; + Q_ASSERT_X(listener, "PacketReceiver::registerMessageListener", "No object to register"); Q_ASSERT_X(slot, "PacketReceiver::registerMessageListener", "No slot to register"); @@ -110,8 +112,12 @@ bool PacketReceiver::registerMessageListener(PacketType type, QObject* listener, // add the mapping _packetListListenerMap[type] = ObjectMethodPair(QPointer(listener), matchingMethod); + + qCDebug(networking) << "Registering a packet listener for packet list type" << type; + return true; } else { + qCDebug(networking) << "NOT Registering a packet listener for packet list type" << type; return false; } } @@ -352,7 +358,7 @@ void PacketReceiver::handleVerifiedPacketList(std::unique_ptr p } } else if (it == _packetListListenerMap.end()) { - qCWarning(networking) << "No listener found for packet type" << nlPacketList->getType(); + qCWarning(networking) << "No listener found for packet list type" << nlPacketList->getType(); // insert a dummy listener so we don't print this again _packetListListenerMap.insert(nlPacketList->getType(), { nullptr, QMetaMethod() });