q2repro support

.github/workflows/cmake.yml

@@ -30,7 +30,7 @@ jobs:
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
     - name: Upload a Build Artifact
-      uses: actions/upload-artifact@v3.1.2
+      uses: actions/upload-artifact@v4
       with:
         name: game-ubuntu-x86_64 # optional, default is artifact
         path: "game*.so"

.gitignore

@@ -1,20 +1,32 @@
-cmake-build-debug/*
-cmake-build-debug
-cmake-build-release
-cmake-build-release/*
-.idea
-/.vscode
-/build
-msvc/*
+# IDEs
+/.idea/
+/.vscode/
+/.vs/
+
+# macOS
+.DS_Store
+
+# Generic build dirs
+/build/
+/out/
+/cmake-build-*/
+/build-clang*/
+/build-*/
+
+# CMake user/generated files
+/CMakeSettings.txt
+/CMakeSettings.json
+/CMakeUserPresets.json
+/CppProperties.json
+/compile_commands.json
+
+# Logs
+*.log
+
+# Utility/generated local files
 util/nomatch.txt
 util/list.lua
 util/settings.txt
-util/v_luasettings_decl.c
-util/v_luasettings_game.c
-util/v_luasettings_game.h
-/.vs
-/out/build/x64-Debug
-/out/build
-CmakeSettings.txt
-/CMakeSettings.json
-/CppProperties.json
+util/v_luasettings_*.c
+util/v_luasettings_*.h
+

CMakeLists.txt

@@ -17,19 +17,35 @@ option(VRX_USEHASH "Use hashing on commands instead of iterating through the lis
 option(VRX_Q2PRO "Use map/gamemap differentiation (for q2pro)." TRUE)
 option(VRX_OLD_NOLAG "Use old NOLAG style. Not recommended." FALSE)
 option(VRX_OLD_VOTE "Use old vote system." FALSE)
+option(VRX_REPRO "Support q2repro (remaster, EXPERIMENTAL)" TRUE)
 
-set(CMAKE_C_STANDARD 11)
+set(CMAKE_C_STANDARD 23)
 set(CMAKE_C_STANDARD_REQUIRED TRUE)
 
 # Source files
-file(GLOB_RECURSE VRX_FILES ./src/*.c)
+file(GLOB_RECURSE VRX_FILES CONFIGURE_DEPENDS ./src/*.c)
+
+if (NOT VRX_USE_MYSQL)
+    list(FILTER VRX_FILES EXCLUDE REGEX ".*/src/characters/io/v_mysql_gds\\.c$")
+endif ()
+
+if (NOT VRX_REPRO)
+    set(GAME_NAME game)
+else ()
+    # serraboof comments: game_ is the remaster's convention for game dlls
+    set(GAME_NAME game_)
+endif ()
 
 # Set the platform-specific library name and use platform-specific files.
 if (WIN32)
-    if (CMAKE_CL_64)
-        set(CC_LIB_NAME gamex86_64)
+    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+        if (VRX_REPRO)
+            set(CC_LIB_NAME ${GAME_NAME}x64)
+        else ()
+            set(CC_LIB_NAME ${GAME_NAME}x86_64)
+        endif ()
     else ()
-        set(CC_LIB_NAME gamex86)
+        set(CC_LIB_NAME ${GAME_NAME}x86)
     endif ()
 
     add_definitions(-DWIN32)
@@ -38,7 +54,7 @@ elseif (UNIX)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-return-mismatch -Wno-incompatible-pointer-types -Wno-implicit-function-declaration")
     # Get machine hardware name (arch), force 386 (if applicable), strip newlines, and store in ARCH
     execute_process(COMMAND uname -m COMMAND sed s/i.86/i386/ COMMAND tr -d \n OUTPUT_VARIABLE ARCH)
-    set(CC_LIB_NAME game${ARCH})
+    set(CC_LIB_NAME ${GAME_NAME}${ARCH})
     #file (GLOB CC_PLATFORM_FILES source/Platform/unix/*)
     link_libraries(dl m)
 else ()
@@ -49,14 +65,22 @@ include_directories(./src/)
 
 # Specify the source files for the game library
 add_library(${CC_LIB_NAME} SHARED ${VRX_FILES})
+set_target_properties(${CC_LIB_NAME} PROPERTIES PREFIX "")
+
+if (WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    target_compile_options(${CC_LIB_NAME} PRIVATE
+        -Wno-incompatible-function-pointer-types
+        -Wno-incompatible-pointer-types
+    )
+endif ()
 
 if (VRX_USE_MYSQL)
     find_library(MYSQL_LIBRARY_CLIENT
             NAMES libmysqlclient mysqlclient
             PATHS
             $ENV{ProgramFiles}/MySQL/*/lib
             /usr/lib/mysql
-            )
+    )
 
     find_path(
             MYSQL_INCLUDE_DIR
@@ -76,7 +100,6 @@ endif ()
 if (WIN32)
     set(CC_LINK_LIBS ${CC_LINK_LIBS} Wininet Winmm Ws2_32)
 
-
     if (MSVC)
         FetchContent_Declare(
                 pthreads
@@ -86,9 +109,23 @@ if (WIN32)
         FetchContent_MakeAvailable(pthreads)
         target_include_directories(${CC_LIB_NAME} PRIVATE ${pthreads_SOURCE_DIR})
         target_link_libraries(${CC_LIB_NAME} pthreadVC3)
-    else()
-        target_link_libraries(${CC_LIB_NAME} pthread)
-    endif()
+    else ()
+        if (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
+            execute_process(
+                COMMAND ${CMAKE_C_COMPILER} --print-file-name=libwinpthread.a
+                OUTPUT_VARIABLE WINPTHREAD_STATIC
+                OUTPUT_STRIP_TRAILING_WHITESPACE
+            )
+
+            if (EXISTS "${WINPTHREAD_STATIC}")
+                target_link_libraries(${CC_LIB_NAME} "${WINPTHREAD_STATIC}")
+            else ()
+                target_link_libraries(${CC_LIB_NAME} pthread)
+            endif ()
+        else ()
+            target_link_libraries(${CC_LIB_NAME} pthread)
+        endif ()
+    endif ()
 
     # add /fsanitize=address to the compiler flags
     # if (SANITIZE_ADDRESS)
@@ -133,29 +170,36 @@ if (VRX_LOCKDEFAULTS)
     add_definitions(-DLOCK_DEFAULTS)
 endif ()
 
+if (VRX_REPRO)
+    add_definitions(-DVRX_REPRO)
+endif ()
+
+set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+set(MSGPACK_ENABLE_SHARED OFF CACHE BOOL "" FORCE)
+set(MSGPACK_ENABLE_STATIC ON CACHE BOOL "" FORCE)
+set(MSGPACK_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+set(MSGPACK_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+
 FetchContent_Declare(
-    MsgPack
-    GIT_REPOSITORY https://github.com/msgpack/msgpack-c/
-    GIT_TAG c_master
+        MsgPack
+        GIT_REPOSITORY https://github.com/msgpack/msgpack-c/
+        GIT_TAG c_master
 )
 
 FetchContent_MakeAvailable(MsgPack)
 
 set(CC_LINK_LIBS ${CC_LINK_LIBS} msgpack-c)
-target_include_directories(${CC_LIB_NAME} PRIVATE ${msgpack_SOURCE_DIR}/include ${msgpack_BINARY_DIR}/include/msgpack ${msgpack_BINARY_DIR}/include )
+target_include_directories(${CC_LIB_NAME} PRIVATE
+    ${msgpack_SOURCE_DIR}/include
+    ${msgpack_BINARY_DIR}/include/msgpack
+    ${msgpack_BINARY_DIR}/include
+)
 target_link_libraries(${CC_LIB_NAME} ${CC_LINK_LIBS})
 
-include (TestBigEndian)
+include(TestBigEndian)
 TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
-if(IS_BIG_ENDIAN)
+if (IS_BIG_ENDIAN)
     target_compile_definitions(${CC_LIB_NAME} PRIVATE BIG_ENDIAN)
-else()
-    target_compile_definitions(${CC_LIB_NAME} PRIVATE LITTLE_ENDIAN)
-endif()
-
-# If host is Unix-like, remove "lib" prefix from the library's file name
-if (UNIX)
-    add_custom_command(TARGET ${CC_LIB_NAME} POST_BUILD COMMAND mv lib${CC_LIB_NAME}.so ${CC_LIB_NAME}.so)
 else ()
-    # add_custom_command (TARGET ${CC_LIB_NAME} POST_BUILD COMMAND copy lib${CC_LIB_NAME}.dll ${CC_LIB_NAME}.dll)
+    target_compile_definitions(${CC_LIB_NAME} PRIVATE LITTLE_ENDIAN)
 endif ()

src/ai/AStar.c

@@ -222,7 +222,7 @@ static int AStar_FindInOpen_BestF ( void )
 
 	for ( i=0; i<alist_numNodes; i++ )
 	{
-		int node = alist[i];
+		const int node = alist[i];
 
 		if( astarnodes[node].list != OPENLIST )
 			continue;