Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-07-23 00:24:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

more hacking

Browse source
This commit is contained in:
ZappoMan 2015-11-17 08:56:21 -08:00
parent 5f04e4a167
commit f712fae4d2
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/messages/MessagesMixer.cpp
View file

@ -48,8 +48,8 @@ MessagesMixer::MessagesMixer(NLPacket& packet) :
connect(DependencyManager::get<NodeList>().data(), &NodeList::nodeKilled, this, &MessagesMixer::nodeKilled); connect(DependencyManager::get<NodeList>().data(), &NodeList::nodeKilled, this, &MessagesMixer::nodeKilled);
auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver(); auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
packetReceiver.registerListener(PacketType::MessagesData, this, "handleMessagesPacket"); //packetReceiver.registerListener(PacketType::MessagesData, this, "handleMessagesPacket");
packetReceiver.registerListener(PacketType::MessagesData, this, "handleMessagesPacketList"); packetReceiver.registerMessageListener(PacketType::MessagesData, this, "handleMessagesPacketList");
} }
MessagesMixer::~MessagesMixer() { MessagesMixer::~MessagesMixer() {

8
libraries/networking/src/PacketReceiver.cpp
View file

@ -95,6 +95,8 @@ void PacketReceiver::registerDirectListenerForTypes(PacketTypeList types,
} }
bool PacketReceiver::registerMessageListener(PacketType type, QObject* listener, const char* slot) { 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(listener, "PacketReceiver::registerMessageListener", "No object to register");
Q_ASSERT_X(slot, "PacketReceiver::registerMessageListener", "No slot 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 // add the mapping
_packetListListenerMap[type] = ObjectMethodPair(QPointer<QObject>(listener), matchingMethod); _packetListListenerMap[type] = ObjectMethodPair(QPointer<QObject>(listener), matchingMethod);
qCDebug(networking) << "Registering a packet listener for packet list type" << type;
return true; return true;
} else { } else {
qCDebug(networking) << "NOT Registering a packet listener for packet list type" << type;
return false; return false;
} }
} }
@ -352,7 +358,7 @@ void PacketReceiver::handleVerifiedPacketList(std::unique_ptr<udt::PacketList> p
} }
} else if (it == _packetListListenerMap.end()) { } 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 // insert a dummy listener so we don't print this again
_packetListListenerMap.insert(nlPacketList->getType(), { nullptr, QMetaMethod() }); _packetListListenerMap.insert(nlPacketList->getType(), { nullptr, QMetaMethod() });