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() = default; - ~AccountManager() { UnloadAll(); }; + ~AccountManager() = default; std::map 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() = default; - ~CharacterManager() { UnloadAll(); }; + ~CharacterManager() = default; std::map 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(packetBuffer); } void ServerApplication::Quit() {