Attempt att syncing random generation

The default rand() and srand() differ between msvc and gcc.
Attempting to fix this by implementing a custom C++ library.

.vimrc

@@ -5,5 +5,5 @@ nnoremap <F4> :ter ++close env LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./ ./_build/debu
 
 packadd termdebug
 let g:termdebug_wide = 1
-let g:syntastic_c_include_dirs = [ '_build/debug', '/usr/include/SDL2', 'steamworks_c_wrapper/src', 'physfs-3.0/src' ]
+let g:syntastic_c_include_dirs = [ '_build/debug', '/usr/include/SDL2', 'steamworks_c_wrapper/src', 'physfs-3.0/src', 'bh_random/src' ]
-let g:syntastic_cpp_include_dirs = [ 'steamworks_c_wrapper/sdk/public/steam' ]
+let g:syntastic_cpp_include_dirs = [ 'steamworks_c_wrapper/sdk/public/steam', 'bh_random/src' ]

CMakeLists.txt

@@ -39,6 +39,7 @@ endif()
 if (STEAM)
 	add_subdirectory(steamworks_c_wrapper)
 endif()
+add_subdirectory(bh_random)
 
 if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
 	set(CLANG 1)
@@ -126,6 +127,7 @@ include_directories(
 	${PHYSFS_INCLUDE_DIR}
 	${LUA_INCLUDE_DIR}
 	sqlite3
+	bh_random/src
 	)
 
 if (CMOCKA_FOUND)
@@ -239,6 +241,7 @@ target_link_libraries(breakhack
 	${SDL2_MIXER_LIBRARY}
 	${LUA_LIBRARIES}
 	${PHYSFS_LIBRARY}
+	bh_random
 	)
 
 if (STEAM)

bh_random/CMakeLists.txt

@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.1)
+project(bh_random)
+
+if (NOT CMAKE_BUILD_TYPE)
+	set(CMAKE_BUILD_TYPE Release)
+endif ()
+
+add_library(bh_random STATIC
+	src/bh_random
+	)
+
+IF ( MSVC )
+    MESSAGE ( STATUS "Setting MSVC MT switches")
+    SET (
+      CMAKE_CXX_FLAGS_DEBUG
+        "${CMAKE_CXX_FLAGS_DEBUG} /MTd"
+        CACHE STRING "MSVC MT flags " FORCE
+    )
+    SET (
+      CMAKE_CXX_FLAGS_RELEASE
+        "${CMAKE_CXX_FLAGS_RELEASE} /MT"
+        CACHE STRING "MSVC MT flags " FORCE
+    )
+endif ()
+

bh_random/src/bh_random.cpp

@@ -0,0 +1,39 @@
+/*
+ * BreakHack - A dungeone crawler RPG
+ * Copyright (C) 2018  Linus Probert <linus.probert@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <random>
+#include <climits>
+extern "C" {
+#include "bh_random.h"
+}
+
+static std::mt19937 generator;
+static std::uniform_int_distribution<int> distribution(0, INT_MAX);
+
+extern "C" void
+bh_srand(unsigned int seed)
+{
+	generator.seed(seed);
+}
+
+
+extern "C" unsigned int
+bh_rand(void)
+{
+	return distribution(generator);
+}

bh_random/src/bh_random.h

@@ -0,0 +1,25 @@
+/*
+ * BreakHack - A dungeone crawler RPG
+ * Copyright (C) 2018  Linus Probert <linus.probert@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+void
+bh_srand(unsigned int);
+
+unsigned int
+bh_rand(void);

src/random.c

@@ -20,6 +20,7 @@
 #include <time.h>
 #include <stdbool.h>
 #include "random.h"
+#include "bh_random.h"
 #include "util.h"
 
 static unsigned int seed = 0;
@@ -30,15 +31,15 @@ static void
 generate_random_seeds(void)
 {
 	// Use seed for generating map seeds
-	srand(seed);
+	bh_srand(seed);
 	info("Core random seed: %d", seed);
 	for (int i = 0; i < 20; ++i) {
-		map_seeds[i] = rand();
+		map_seeds[i] = bh_rand();
 	}
 
 	// Set a more random seed for runtime random
 	runtime_seed = (unsigned int) time(NULL);
-	srand(runtime_seed);
+	bh_srand(runtime_seed);
 	info("Runtime random seed: %d", runtime_seed);
 }
 
@@ -75,5 +76,5 @@ unsigned int
 get_random(unsigned int max)
 {
 	init_seed();
-	return rand() % (max + 1);
+	return bh_rand() % (max + 1);
 }

src/time.c

@@ -1,3 +1,21 @@
+/*
+ * BreakHack - A dungeone crawler RPG
+ * Copyright (C) 2018  Linus Probert <linus.probert@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "time.h"
 #include "util.h"
 

src/time.h

@@ -1,3 +1,21 @@
+/*
+ * BreakHack - A dungeone crawler RPG
+ * Copyright (C) 2018  Linus Probert <linus.probert@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include <time.h>