Merge branch 'tw06mod-harmony' of github.com:teeworldsmods2/teeworlds…

…-mods into tw06mod-harmony
teeworldsmods2 · Mar 26, 2022 · 7ae6a64 · 7ae6a64
2 parents 8f04538 + af8a011
commit 7ae6a64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/bam.lua b/bam.lua
@@ -271,7 +271,7 @@ function build(settings)
 
 	-- build server
 	server_exe = Link(server_settings, "teeworlds_srv", engine, server,
-		game_shared, game_server, zlib, server_link_other, teeuniverses, json, md5)
+		game_shared, game_server, zlib, md5, server_link_other, json, teeuniverses)
 
 	serverlaunch = {}
 	if platform == "macosx" then

diff --git a/src/game/server/gamecontext.h b/src/game/server/gamecontext.h
@@ -87,7 +87,8 @@ class CGameContext : public IGameServer
 
 	int m_ConsoleOutputHandle_ChatPrint;
 	int m_ConsoleOutput_Target;
-
+
+public:
 	int m_ZoneHandle_TeeWorlds;
 
 public: