From f52a022e6456c6cbc01f57b8644fc3d2ae27ccb9 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Tue, 19 Aug 2014 01:48:48 +1000
Subject: [PATCH] Bugfixes, read more

* Manual modifications to the database caused the map to act unusual
* The server's packet must be created and deleted as a char array
* removed UnloadAll() from several singleton destructors
* added SDL_Delay() to BaseScene::RenderFrame(), to reduce heavy CPU use in menus
---
 client/scenes/base_scene.cpp            | 1 +
 rsc/scripts/setup_server.lua            | 1 +
 server/accounts/account_manager.hpp     | 2 +-
 server/characters/character_manager.hpp | 2 +-
 server/server_application.cpp           | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/scenes/base_scene.cpp b/client/scenes/base_scene.cpp
index 48512ec..e4e8043 100644
--- a/client/scenes/base_scene.cpp
+++ b/client/scenes/base_scene.cpp
@@ -86,6 +86,7 @@ void BaseScene::RenderFrame() {
 	SDL_FillRect(screen, 0, 0);
 	Render(screen);
 	SDL_Flip(screen);
+	SDL_Delay(10);
 }
 
 //-------------------------
diff --git a/rsc/scripts/setup_server.lua b/rsc/scripts/setup_server.lua
index e73d5f7..8b43720 100644
--- a/rsc/scripts/setup_server.lua
+++ b/rsc/scripts/setup_server.lua
@@ -17,6 +17,7 @@ tiles = {
 
 --custom generation systems here
 function islandGenerator(region)
+	io.write("Generating (", Region.GetX(region), ", ", Region.GetY(region), ")\n")
 	for i = 1, Region.GetWidth(region) do
 		for j = 1, Region.GetHeight(region) do
 			local dist = math.dist(0, 0, i + Region.GetX(region) -1, j + Region.GetY(region) -1)
diff --git a/server/accounts/account_manager.hpp b/server/accounts/account_manager.hpp
index 060f0d7..2e631b5 100644
--- a/server/accounts/account_manager.hpp
+++ b/server/accounts/account_manager.hpp
@@ -51,7 +51,7 @@ private:
 	friend Singleton<AccountManager>;
 
 	AccountManager() = default;
-	~AccountManager() { UnloadAll(); };
+	~AccountManager() = default;
 
 	std::map<int, AccountData> accountMap;
 	sqlite3* database = nullptr;
diff --git a/server/characters/character_manager.hpp b/server/characters/character_manager.hpp
index 4f97615..084d595 100644
--- a/server/characters/character_manager.hpp
+++ b/server/characters/character_manager.hpp
@@ -54,7 +54,7 @@ private:
 	friend Singleton<CharacterManager>;
 
 	CharacterManager() = default;
-	~CharacterManager() { UnloadAll(); };
+	~CharacterManager() = default;
 
 	std::map<int, CharacterData> characterMap;
 	sqlite3* database = nullptr;
diff --git a/server/server_application.cpp b/server/server_application.cpp
index 8be21db..b7c9839 100644
--- a/server/server_application.cpp
+++ b/server/server_application.cpp
@@ -150,7 +150,7 @@ void ServerApplication::Proc() {
 		//give the computer a break
 		SDL_Delay(10);
 	}
-	delete packetBuffer;
+	delete reinterpret_cast<char*>(packetBuffer);
 }
 
 void ServerApplication::Quit() {