Moved packets into their own namespace
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
static SDL_sem* lock = SDL_CreateSemaphore(1);
|
||||
static SDL_Thread* queueThread = nullptr;
|
||||
|
||||
static std::deque<Packet> queue;
|
||||
static std::deque<Packet::Packet> queue;
|
||||
|
||||
static bool running = false;
|
||||
|
||||
@@ -41,8 +41,8 @@ static int networkQueue(void*) {
|
||||
while(running) {
|
||||
SDL_SemWait(lock);
|
||||
while(netUtil->Receive()) {
|
||||
Packet p;
|
||||
memcpy(&p, netUtil->GetInData(), sizeof(Packet));
|
||||
Packet::Packet p;
|
||||
memcpy(&p, netUtil->GetInData(), sizeof(Packet::Packet));
|
||||
p.meta.address = netUtil->GetInPacket()->address;
|
||||
queue.push_back(p);
|
||||
}
|
||||
@@ -80,19 +80,19 @@ void killQueueThread() {
|
||||
queueThread = nullptr;
|
||||
}
|
||||
|
||||
Packet peekNetworkPacket() {
|
||||
Packet::Packet peekNetworkPacket() {
|
||||
SDL_SemWait(lock);
|
||||
Packet p;
|
||||
Packet::Packet p;
|
||||
if (queue.size() > 0) {
|
||||
Packet p = queue[0];
|
||||
Packet::Packet p = queue[0];
|
||||
}
|
||||
SDL_SemPost(lock);
|
||||
return p;
|
||||
}
|
||||
|
||||
Packet popNetworkPacket() {
|
||||
Packet::Packet popNetworkPacket() {
|
||||
SDL_SemWait(lock);
|
||||
Packet p;
|
||||
Packet::Packet p;
|
||||
if (queue.size() > 0) {
|
||||
p = queue[0];
|
||||
queue.pop_front();
|
||||
|
||||
Reference in New Issue
Block a user