Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -1091,15 +1091,15 @@ static Avatar* processAvatarMessageHeader(unsigned char*& packetData, size_t& da · 1090 unmodified lines | |||
| 1091 | // make sure the node exists | 1091 | // make sure the node exists |
| 1092 | Node* node = NodeList::getInstance()->nodeWithID(nodeID); | 1092 | Node* node = NodeList::getInstance()->nodeWithID(nodeID); |
| 1093 | if (!node || !node->getLinkedData()) { | 1093 | if (!node || !node->getLinkedData()) { |
| 1094 | return 0; | 1094 | return NULL; |
| 1095 | } | 1095 | } |
| 1096 | Avatar* avatar = static_cast<Avatar*>(node->getLinkedData()); | 1096 | Avatar* avatar = static_cast<Avatar*>(node->getLinkedData()); |
| 1097 | return avatar->isInitialized() ? avatar : 0; | 1097 | return avatar->isInitialized() ? avatar : NULL; |
| 1098 | } | 1098 | } |
| 1099 | 1099 | ||
| 1100 | void Application::processAvatarVoxelURLMessage(unsigned char* packetData, size_t dataBytes) { | 1100 | void Application::processAvatarVoxelURLMessage(unsigned char* packetData, size_t dataBytes) { |
| 1101 | Avatar* avatar = processAvatarMessageHeader(packetData, dataBytes); | 1101 | Avatar* avatar = processAvatarMessageHeader(packetData, dataBytes); |
| 1102 | if (avatar == 0) { | 1102 | if (!avatar) { |
| 1103 | return; | 1103 | return; |
| 1104 | } | 1104 | } |
| 1105 | QUrl url = QUrl::fromEncoded(QByteArray((char*)packetData, dataBytes)); | 1105 | QUrl url = QUrl::fromEncoded(QByteArray((char*)packetData, dataBytes)); |
| @@ -1110,7 +1110,7 @@ void Application::processAvatarVoxelURLMessage(unsigned char* packetData, size_t · 4 unmodified lines | |||
| 1110 | 1110 | ||
| 1111 | void Application::processAvatarFaceVideoMessage(unsigned char* packetData, size_t dataBytes) { | 1111 | void Application::processAvatarFaceVideoMessage(unsigned char* packetData, size_t dataBytes) { |
| 1112 | Avatar* avatar = processAvatarMessageHeader(packetData, dataBytes); | 1112 | Avatar* avatar = processAvatarMessageHeader(packetData, dataBytes); |
| 1113 | if (avatar == 0) { | 1113 | if (!avatar) { |
| 1114 | return; | 1114 | return; |
| 1115 | } | 1115 | } |
| 1116 | avatar->getHead().getFace().processVideoMessage(packetData, dataBytes); | 1116 | avatar->getHead().getFace().processVideoMessage(packetData, dataBytes); |