Fixes infinite loop issue in trapgen

Vertical coridoors before level 4 wouldn't leave enough space to place
4 traps since there is only 10 rows of tiles eligible for a trap and
every trap ocupies 3 rows and requires at least 2 spare rows. This could
cause an infinite loop situation.

* Also fixes linux build warnings and other stuff.

.vimrc

@@ -5,4 +5,4 @@ nnoremap <F4> :ter ++close ./_build/breakhack<cr>
 
 packadd termdebug
 let g:termdebug_wide = 1
-let g:syntastic_c_include_dirs = [ '_build', '/usr/include/SDL2' ]
+let g:syntastic_c_include_dirs = [ '_build', '/usr/include/SDL2', 'steamworks_c_wrapper/src', 'steamworks_c_wrapper/sdk/public/steam' ]

data/trapgen.lua

@@ -31,6 +31,7 @@ function module.add_traps_to_room(room)
 	end
 
 	local count = random(4)
+	local attempts = 0;
 	local i = 0
 	while i < count do
 		local rx = random(13) + 1
@@ -55,6 +56,8 @@ function module.add_traps_to_room(room)
 				i = i + 1
 			end
 		end
+		attempts = attempts + 1
+		if attempts > 100 then break end
 	end
 end
 

src/steam/steamworks_api_wrapper.c

@@ -62,8 +62,9 @@ void
 steam_init()
 {
 	m_AppID = c_SteamAPI_Init();
-	c_SteamAPI_SetCallbacks(stats_received, stats_stored, leaderboard_received);
 	m_Initiated = m_AppID != 0;
+	if (m_Initiated)
+		c_SteamAPI_SetCallbacks(stats_received, stats_stored, leaderboard_received);
 	requestDataTimer = timer_create();
 }
 
@@ -73,7 +74,7 @@ void steam_shutdown(void)
 	timer_destroy(requestDataTimer);
 }
 
-void
+static void
 request_data_queue_run(void)
 {
 	if (!timer_started(requestDataTimer))

steamworks_c_wrapper/CMakeLists.txt

@@ -34,6 +34,7 @@ else ()
 	add_library(steamworks_c_wrapper
 		SHARED
 		src/steamworks_c_wrapper
+		src/CallbackHandler
 		)
 endif()
 

steamworks_c_wrapper/src/CallbackHandler.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <steam_api.h>
+#include <cstdint>
 
 class CallbackHandler
 {
@@ -16,7 +17,7 @@ public:
 
 	void(*statsReceivedCb)() = nullptr;
 	void(*statsStoredCb)() = nullptr;
-	void(*leaderboardReceivedCb)(int64, const char*) = nullptr;
+	void(*leaderboardReceivedCb)(int64_t, const char*) = nullptr;
 
 	bool CallbackReceived() const;
 

steamworks_c_wrapper/src/steamworks_c_wrapper.cpp

@@ -12,9 +12,9 @@ static CallbackHandler *m_CallbackHandler = NULL;
 extern "C" int64_t
 c_SteamAPI_Init()
 {
+	m_CallbackHandler = new CallbackHandler(m_AppId);
 	if (SteamAPI_Init()) {
 		m_AppId = SteamUtils()->GetAppID();
-		m_CallbackHandler = new CallbackHandler(m_AppId);
 		m_Initiated = true;
 		return m_AppId;
 	}