From 5b2fd80a61c56f1f923a088e20e1f36b35978f6a Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Mon, 17 Jun 2013 11:01:00 +1000 Subject: [PATCH] Fixed the Packet::type bug In popNetworkPacket(), a second Packet p was being created, which was destroyed when it went out of scope, and the original Packet p was being returned. --- libs/common/network_queue.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libs/common/network_queue.cpp b/libs/common/network_queue.cpp index e97e2fd..a452dbc 100644 --- a/libs/common/network_queue.cpp +++ b/libs/common/network_queue.cpp @@ -7,19 +7,12 @@ #include -#ifdef DEBUG -#include -#endif - static SDL_sem* lock = SDL_CreateSemaphore(1); static std::deque queue; int networkQueue(void*) { UDPNetworkUtility* netUtil = ServiceLocator::Get(); -#ifdef DEBUG - std::cout << "int networkQueue(void*) active" << std::endl; -#endif for(;;) { SDL_SemWait(lock); while(netUtil->Receive()) { @@ -46,7 +39,7 @@ Packet popNetworkPacket() { SDL_SemWait(lock); Packet p; if (queue.size() > 0) { - Packet p = queue[0]; + p = queue[0]; queue.pop_front(); } SDL_SemPost(lock);