Kayne Ruse
baadf554cd
Cause: server/server_application.cpp: line 93 The last argument to std::pair was simply a call to WorldRoom's contructor. This created a temporary object that fufilled this line, but after the new std::pair object was added to worldRoomMap, this WorldRoom object went out of scope. server/server_application.cpp: line 96 When OpenRoom() was called using an object that was out of scope, the entire server simply failed. Solution: Changed worldRoomMap to hold a pointer to a WorldRoom object, rather than the object itself. The new and delete operators should be used to create and delete WorldRoom objects respectfully.
95 lines
2.0 KiB
C++
95 lines
2.0 KiB
C++
/* Copyright: (c) Kayne Ruse 2013
|
|
*
|
|
* This software is provided 'as-is', without any express or implied
|
|
* warranty. In no event will the authors be held liable for any damages
|
|
* arising from the use of this software.
|
|
*
|
|
* Permission is granted to anyone to use this software for any purpose,
|
|
* including commercial applications, and to alter it and redistribute it
|
|
* freely, subject to the following restrictions:
|
|
*
|
|
* 1. The origin of this software must not be misrepresented; you must not
|
|
* claim that you wrote the original software. If you use this software
|
|
* in a product, an acknowledgment in the product documentation would be
|
|
* appreciated but is not required.
|
|
*
|
|
* 2. Altered source versions must be plainly marked as such, and must not be
|
|
* misrepresented as being the original software.
|
|
*
|
|
* 3. This notice may not be removed or altered from any source
|
|
* distribution.
|
|
*/
|
|
#include "world_room.hpp"
|
|
|
|
#include <iostream>
|
|
#include <stdexcept>
|
|
|
|
using namespace std;
|
|
|
|
int worldRoomThread(void* arg) {
|
|
WorldRoom* room = reinterpret_cast<WorldRoom*>(arg);
|
|
try {
|
|
room->Init();
|
|
room->Loop();
|
|
room->Quit();
|
|
}
|
|
catch(exception& e) {
|
|
cerr << "Fatal room error: " << e.what() << endl;
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
WorldRoom::WorldRoom(PlayerMap const& arg1):
|
|
playerMap(arg1)
|
|
{
|
|
//
|
|
}
|
|
|
|
WorldRoom::~WorldRoom() {
|
|
//
|
|
}
|
|
|
|
void WorldRoom::OpenRoom() {
|
|
if (running) {
|
|
throw(std::runtime_error("Cannot open a room that is already running"));
|
|
}
|
|
|
|
running = true;
|
|
|
|
if (!(thread = SDL_CreateThread(worldRoomThread, this))) {
|
|
throw(std::runtime_error("Failed to open the room thread"));
|
|
}
|
|
}
|
|
|
|
void WorldRoom::CloseRoom() {
|
|
running = false;
|
|
SDL_WaitThread(thread, nullptr);
|
|
}
|
|
|
|
void WorldRoom::KillRoom() {
|
|
running = false;
|
|
SDL_KillThread(thread);
|
|
}
|
|
|
|
void WorldRoom::Init() {
|
|
//
|
|
}
|
|
|
|
void WorldRoom::Loop() {
|
|
while(running) {
|
|
while(networkInQueue.Size() > 0) {
|
|
HandlePacket(networkInQueue.PopFront());
|
|
}
|
|
SDL_Delay(10);
|
|
}
|
|
}
|
|
|
|
void WorldRoom::Quit() {
|
|
//
|
|
}
|
|
|
|
void WorldRoom::HandlePacket(NetworkPacket packet) {
|
|
cout << "packet received" << endl;
|
|
}
|