From 27a47c5b920973c9a9cc3c3198a3fc6b7d1a436b Mon Sep 17 00:00:00 2001 From: Andrey Nazarov Date: Fri, 18 Aug 2023 15:26:18 +0300 Subject: [PATCH] =?UTF-8?q?Rename=20=E2=80=98src/baseq2=E2=80=99=20subdir?= =?UTF-8?q?=20to=20=E2=80=98src/game=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CMakeLists.txt | 182 ++++++++++++------------ src/{baseq2 => game}/g_ai.c | 0 src/{baseq2 => game}/g_chase.c | 0 src/{baseq2 => game}/g_cmds.c | 0 src/{baseq2 => game}/g_combat.c | 0 src/{baseq2 => game}/g_func.c | 0 src/{baseq2 => game}/g_items.c | 0 src/{baseq2 => game}/g_local.h | 0 src/{baseq2 => game}/g_main.c | 0 src/{baseq2 => game}/g_misc.c | 0 src/{baseq2 => game}/g_monster.c | 0 src/{baseq2 => game}/g_phys.c | 0 src/{baseq2 => game}/g_ptrs.c | 0 src/{baseq2 => game}/g_ptrs.h | 0 src/{baseq2 => game}/g_ptrs_compat_v2.c | 0 src/{baseq2 => game}/g_save.c | 0 src/{baseq2 => game}/g_spawn.c | 0 src/{baseq2 => game}/g_svcmds.c | 0 src/{baseq2 => game}/g_target.c | 0 src/{baseq2 => game}/g_trigger.c | 0 src/{baseq2 => game}/g_turret.c | 0 src/{baseq2 => game}/g_utils.c | 0 src/{baseq2 => game}/g_weapon.c | 0 src/{baseq2 => game}/genptr.py | 0 src/{baseq2 => game}/m_actor.c | 0 src/{baseq2 => game}/m_actor.h | 0 src/{baseq2 => game}/m_berserk.c | 0 src/{baseq2 => game}/m_berserk.h | 0 src/{baseq2 => game}/m_boss2.c | 0 src/{baseq2 => game}/m_boss2.h | 0 src/{baseq2 => game}/m_boss3.c | 0 src/{baseq2 => game}/m_boss31.c | 0 src/{baseq2 => game}/m_boss31.h | 0 src/{baseq2 => game}/m_boss32.c | 0 src/{baseq2 => game}/m_boss32.h | 0 src/{baseq2 => game}/m_brain.c | 0 src/{baseq2 => game}/m_brain.h | 0 src/{baseq2 => game}/m_chick.c | 0 src/{baseq2 => game}/m_chick.h | 0 src/{baseq2 => game}/m_flipper.c | 0 src/{baseq2 => game}/m_flipper.h | 0 src/{baseq2 => game}/m_float.c | 0 src/{baseq2 => game}/m_float.h | 0 src/{baseq2 => game}/m_flyer.c | 0 src/{baseq2 => game}/m_flyer.h | 0 src/{baseq2 => game}/m_gladiator.c | 0 src/{baseq2 => game}/m_gladiator.h | 0 src/{baseq2 => game}/m_gunner.c | 0 src/{baseq2 => game}/m_gunner.h | 0 src/{baseq2 => game}/m_hover.c | 0 src/{baseq2 => game}/m_hover.h | 0 src/{baseq2 => game}/m_infantry.c | 0 src/{baseq2 => game}/m_infantry.h | 0 src/{baseq2 => game}/m_insane.c | 0 src/{baseq2 => game}/m_insane.h | 0 src/{baseq2 => game}/m_medic.c | 0 src/{baseq2 => game}/m_medic.h | 0 src/{baseq2 => game}/m_move.c | 0 src/{baseq2 => game}/m_mutant.c | 0 src/{baseq2 => game}/m_mutant.h | 0 src/{baseq2 => game}/m_parasite.c | 0 src/{baseq2 => game}/m_parasite.h | 0 src/{baseq2 => game}/m_player.h | 0 src/{baseq2 => game}/m_rider.h | 0 src/{baseq2 => game}/m_soldier.c | 0 src/{baseq2 => game}/m_soldier.h | 0 src/{baseq2 => game}/m_supertank.c | 0 src/{baseq2 => game}/m_supertank.h | 0 src/{baseq2 => game}/m_tank.c | 0 src/{baseq2 => game}/m_tank.h | 0 src/{baseq2 => game}/p_client.c | 0 src/{baseq2 => game}/p_hud.c | 0 src/{baseq2 => game}/p_trail.c | 0 src/{baseq2 => game}/p_view.c | 0 src/{baseq2 => game}/p_weapon.c | 0 src/windows/res/{baseq2.rc => game.rc} | 6 +- 76 files changed, 94 insertions(+), 94 deletions(-) rename src/{baseq2 => game}/g_ai.c (100%) rename src/{baseq2 => game}/g_chase.c (100%) rename src/{baseq2 => game}/g_cmds.c (100%) rename src/{baseq2 => game}/g_combat.c (100%) rename src/{baseq2 => game}/g_func.c (100%) rename src/{baseq2 => game}/g_items.c (100%) rename src/{baseq2 => game}/g_local.h (100%) rename src/{baseq2 => game}/g_main.c (100%) rename src/{baseq2 => game}/g_misc.c (100%) rename src/{baseq2 => game}/g_monster.c (100%) rename src/{baseq2 => game}/g_phys.c (100%) rename src/{baseq2 => game}/g_ptrs.c (100%) rename src/{baseq2 => game}/g_ptrs.h (100%) rename src/{baseq2 => game}/g_ptrs_compat_v2.c (100%) rename src/{baseq2 => game}/g_save.c (100%) rename src/{baseq2 => game}/g_spawn.c (100%) rename src/{baseq2 => game}/g_svcmds.c (100%) rename src/{baseq2 => game}/g_target.c (100%) rename src/{baseq2 => game}/g_trigger.c (100%) rename src/{baseq2 => game}/g_turret.c (100%) rename src/{baseq2 => game}/g_utils.c (100%) rename src/{baseq2 => game}/g_weapon.c (100%) rename src/{baseq2 => game}/genptr.py (100%) rename src/{baseq2 => game}/m_actor.c (100%) rename src/{baseq2 => game}/m_actor.h (100%) rename src/{baseq2 => game}/m_berserk.c (100%) rename src/{baseq2 => game}/m_berserk.h (100%) rename src/{baseq2 => game}/m_boss2.c (100%) rename src/{baseq2 => game}/m_boss2.h (100%) rename src/{baseq2 => game}/m_boss3.c (100%) rename src/{baseq2 => game}/m_boss31.c (100%) rename src/{baseq2 => game}/m_boss31.h (100%) rename src/{baseq2 => game}/m_boss32.c (100%) rename src/{baseq2 => game}/m_boss32.h (100%) rename src/{baseq2 => game}/m_brain.c (100%) rename src/{baseq2 => game}/m_brain.h (100%) rename src/{baseq2 => game}/m_chick.c (100%) rename src/{baseq2 => game}/m_chick.h (100%) rename src/{baseq2 => game}/m_flipper.c (100%) rename src/{baseq2 => game}/m_flipper.h (100%) rename src/{baseq2 => game}/m_float.c (100%) rename src/{baseq2 => game}/m_float.h (100%) rename src/{baseq2 => game}/m_flyer.c (100%) rename src/{baseq2 => game}/m_flyer.h (100%) rename src/{baseq2 => game}/m_gladiator.c (100%) rename src/{baseq2 => game}/m_gladiator.h (100%) rename src/{baseq2 => game}/m_gunner.c (100%) rename src/{baseq2 => game}/m_gunner.h (100%) rename src/{baseq2 => game}/m_hover.c (100%) rename src/{baseq2 => game}/m_hover.h (100%) rename src/{baseq2 => game}/m_infantry.c (100%) rename src/{baseq2 => game}/m_infantry.h (100%) rename src/{baseq2 => game}/m_insane.c (100%) rename src/{baseq2 => game}/m_insane.h (100%) rename src/{baseq2 => game}/m_medic.c (100%) rename src/{baseq2 => game}/m_medic.h (100%) rename src/{baseq2 => game}/m_move.c (100%) rename src/{baseq2 => game}/m_mutant.c (100%) rename src/{baseq2 => game}/m_mutant.h (100%) rename src/{baseq2 => game}/m_parasite.c (100%) rename src/{baseq2 => game}/m_parasite.h (100%) rename src/{baseq2 => game}/m_player.h (100%) rename src/{baseq2 => game}/m_rider.h (100%) rename src/{baseq2 => game}/m_soldier.c (100%) rename src/{baseq2 => game}/m_soldier.h (100%) rename src/{baseq2 => game}/m_supertank.c (100%) rename src/{baseq2 => game}/m_supertank.h (100%) rename src/{baseq2 => game}/m_tank.c (100%) rename src/{baseq2 => game}/m_tank.h (100%) rename src/{baseq2 => game}/p_client.c (100%) rename src/{baseq2 => game}/p_hud.c (100%) rename src/{baseq2 => game}/p_trail.c (100%) rename src/{baseq2 => game}/p_view.c (100%) rename src/{baseq2 => game}/p_weapon.c (100%) rename src/windows/res/{baseq2.rc => game.rc} (86%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e344015ce..87651c91c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,83 +4,83 @@ cmake_policy(SET CMP0069 NEW) set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD_REQUIRED ON) -SET(SRC_BASEQ2 - baseq2/g_ai.c - baseq2/g_chase.c - baseq2/g_cmds.c - baseq2/g_combat.c - baseq2/g_func.c - baseq2/g_items.c - baseq2/g_main.c - baseq2/g_misc.c - baseq2/g_monster.c - baseq2/g_phys.c - baseq2/g_ptrs.c - baseq2/g_ptrs_compat_v2.c - baseq2/g_save.c - baseq2/g_spawn.c - baseq2/g_svcmds.c - baseq2/g_target.c - baseq2/g_trigger.c - baseq2/g_turret.c - baseq2/g_utils.c - baseq2/g_weapon.c - baseq2/m_actor.c - baseq2/m_berserk.c - baseq2/m_boss2.c - baseq2/m_boss3.c - baseq2/m_boss31.c - baseq2/m_boss32.c - baseq2/m_brain.c - baseq2/m_chick.c - baseq2/m_flipper.c - baseq2/m_float.c - baseq2/m_flyer.c - baseq2/m_gladiator.c - baseq2/m_gunner.c - baseq2/m_hover.c - baseq2/m_infantry.c - baseq2/m_insane.c - baseq2/m_medic.c - baseq2/m_move.c - baseq2/m_mutant.c - baseq2/m_parasite.c - baseq2/m_soldier.c - baseq2/m_supertank.c - baseq2/m_tank.c - baseq2/p_client.c - baseq2/p_hud.c - baseq2/p_trail.c - baseq2/p_view.c - baseq2/p_weapon.c +SET(SRC_GAME + game/g_ai.c + game/g_chase.c + game/g_cmds.c + game/g_combat.c + game/g_func.c + game/g_items.c + game/g_main.c + game/g_misc.c + game/g_monster.c + game/g_phys.c + game/g_ptrs.c + game/g_ptrs_compat_v2.c + game/g_save.c + game/g_spawn.c + game/g_svcmds.c + game/g_target.c + game/g_trigger.c + game/g_turret.c + game/g_utils.c + game/g_weapon.c + game/m_actor.c + game/m_berserk.c + game/m_boss2.c + game/m_boss3.c + game/m_boss31.c + game/m_boss32.c + game/m_brain.c + game/m_chick.c + game/m_flipper.c + game/m_float.c + game/m_flyer.c + game/m_gladiator.c + game/m_gunner.c + game/m_hover.c + game/m_infantry.c + game/m_insane.c + game/m_medic.c + game/m_move.c + game/m_mutant.c + game/m_parasite.c + game/m_soldier.c + game/m_supertank.c + game/m_tank.c + game/p_client.c + game/p_hud.c + game/p_trail.c + game/p_view.c + game/p_weapon.c ) -SET(HEADERS_BASEQ2 - baseq2/g_local.h - baseq2/g_ptrs.h - baseq2/m_actor.h - baseq2/m_berserk.h - baseq2/m_boss2.h - baseq2/m_boss31.h - baseq2/m_boss32.h - baseq2/m_brain.h - baseq2/m_chick.h - baseq2/m_flipper.h - baseq2/m_float.h - baseq2/m_flyer.h - baseq2/m_gladiator.h - baseq2/m_gunner.h - baseq2/m_hover.h - baseq2/m_infantry.h - baseq2/m_insane.h - baseq2/m_medic.h - baseq2/m_mutant.h - baseq2/m_parasite.h - baseq2/m_player.h - baseq2/m_rider.h - baseq2/m_soldier.h - baseq2/m_supertank.h - baseq2/m_tank.h +SET(HEADERS_GAME + game/g_local.h + game/g_ptrs.h + game/m_actor.h + game/m_berserk.h + game/m_boss2.h + game/m_boss31.h + game/m_boss32.h + game/m_brain.h + game/m_chick.h + game/m_flipper.h + game/m_float.h + game/m_flyer.h + game/m_gladiator.h + game/m_gunner.h + game/m_hover.h + game/m_infantry.h + game/m_insane.h + game/m_medic.h + game/m_mutant.h + game/m_parasite.h + game/m_player.h + game/m_rider.h + game/m_soldier.h + game/m_supertank.h + game/m_tank.h ) @@ -423,10 +423,10 @@ if(NOT MSVC) # CCompilerFlagString(WARN_MISSING_PROTOTYPES "-Wmissing-prototypes") endif() -ADD_LIBRARY(baseq2 SHARED ${SRC_BASEQ2} ${HEADERS_BASEQ2} ${SRC_SHARED}) +ADD_LIBRARY(game SHARED ${SRC_GAME} ${HEADERS_GAME} ${SRC_SHARED}) if(CMAKE_C_COMPILER_ID STREQUAL "GNU") # Workaround for GCC 10 linking shared libgcc by default - target_link_options(baseq2 PRIVATE "-static-libgcc") + target_link_options(game PRIVATE "-static-libgcc") endif() IF(WIN32) @@ -514,8 +514,8 @@ IF (TARGET client) TARGET_LINK_LIBRARIES(client OpenAL) ENDIF() -SOURCE_GROUP("baseq2\\sources" FILES ${SRC_BASEQ2}) -SOURCE_GROUP("baseq2\\headers" FILES ${HEADERS_BASEQ2}) +SOURCE_GROUP("game\\sources" FILES ${SRC_GAME}) +SOURCE_GROUP("game\\headers" FILES ${HEADERS_GAME}) SOURCE_GROUP("client\\sources" FILES ${SRC_CLIENT}) SOURCE_GROUP("client\\headers" FILES ${HEADERS_CLIENT}) SOURCE_GROUP("server\\sources" FILES ${SRC_SERVER}) @@ -539,8 +539,8 @@ IF (WIN32) ENDIF() TARGET_INCLUDE_DIRECTORIES(server PRIVATE ../VC/inc) - TARGET_INCLUDE_DIRECTORIES(baseq2 PRIVATE ../VC/inc) - TARGET_SOURCES(baseq2 PRIVATE windows/res/baseq2.rc) + TARGET_INCLUDE_DIRECTORIES(game PRIVATE ../VC/inc) + TARGET_SOURCES(game PRIVATE windows/res/game.rc) TARGET_LINK_LIBRARIES(server winmm ws2_32) @@ -548,10 +548,10 @@ IF (WIN32) # macro redefinition, deprecation TARGET_COMPILE_OPTIONS(server PRIVATE /wd4005 /wd4996) - TARGET_COMPILE_OPTIONS(baseq2 PRIVATE /wd4005 /wd4996) + TARGET_COMPILE_OPTIONS(game PRIVATE /wd4005 /wd4996) ENDIF() -TARGET_INCLUDE_DIRECTORIES(baseq2 PRIVATE ../inc) +TARGET_INCLUDE_DIRECTORIES(game PRIVATE ../inc) IF(TARGET client) TARGET_INCLUDE_DIRECTORIES(client PRIVATE ../inc) @@ -567,13 +567,13 @@ if (CONFIG_LINUX_STEAM_RUNTIME_SUPPORT) TARGET_LINK_LIBRARIES(client SDL2main SDL2-static z) ENDIF() TARGET_LINK_LIBRARIES(server z) - TARGET_LINK_LIBRARIES(baseq2 z) + TARGET_LINK_LIBRARIES(game z) else() IF(TARGET client) TARGET_LINK_LIBRARIES(client SDL2main SDL2-static zlibstatic) ENDIF() TARGET_LINK_LIBRARIES(server zlibstatic) - TARGET_LINK_LIBRARIES(baseq2 zlibstatic) + TARGET_LINK_LIBRARIES(game zlibstatic) endif() IF(UNIX) @@ -611,7 +611,7 @@ ENDIF() # specify both LIBRARY and RUNTIME because one works only on Windows and another works only on Linux -SET_TARGET_PROPERTIES(baseq2 +SET_TARGET_PROPERTIES(game PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/baseq2" LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_SOURCE_DIR}/baseq2" @@ -629,26 +629,26 @@ SET_TARGET_PROPERTIES(baseq2 IF(IS_64_BIT) IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") - SET_TARGET_PROPERTIES(baseq2 + SET_TARGET_PROPERTIES(game PROPERTIES LIBRARY_OUTPUT_NAME "gameaarch64" RUNTIME_OUTPUT_NAME "gameaarch64" ) ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le") - SET_TARGET_PROPERTIES(baseq2 + SET_TARGET_PROPERTIES(game PROPERTIES LIBRARY_OUTPUT_NAME "gameppc64le" RUNTIME_OUTPUT_NAME "gameppc64le" ) ELSE() - SET_TARGET_PROPERTIES(baseq2 + SET_TARGET_PROPERTIES(game PROPERTIES LIBRARY_OUTPUT_NAME "gamex86_64" RUNTIME_OUTPUT_NAME "gamex86_64" ) ENDIF() ELSE() - SET_TARGET_PROPERTIES(baseq2 + SET_TARGET_PROPERTIES(game PROPERTIES LIBRARY_OUTPUT_NAME "gamex86" RUNTIME_OUTPUT_NAME "gamex86" @@ -669,7 +669,7 @@ IF(CONFIG_LINUX_PACKAGING_SUPPORT) SCRIPT "${CMAKE_SOURCE_DIR}/setup/package_shaders.cmake" COMPONENT shareware) ENDIF() - INSTALL(TARGETS baseq2 DESTINATION share/quake2rtx/baseq2 COMPONENT shareware) + INSTALL(TARGETS game DESTINATION share/quake2rtx/baseq2 COMPONENT shareware) # Package data files, including the shareware pak0 for demo levels set (SHAREWARE_DATA_FILES_LIST diff --git a/src/baseq2/g_ai.c b/src/game/g_ai.c similarity index 100% rename from src/baseq2/g_ai.c rename to src/game/g_ai.c diff --git a/src/baseq2/g_chase.c b/src/game/g_chase.c similarity index 100% rename from src/baseq2/g_chase.c rename to src/game/g_chase.c diff --git a/src/baseq2/g_cmds.c b/src/game/g_cmds.c similarity index 100% rename from src/baseq2/g_cmds.c rename to src/game/g_cmds.c diff --git a/src/baseq2/g_combat.c b/src/game/g_combat.c similarity index 100% rename from src/baseq2/g_combat.c rename to src/game/g_combat.c diff --git a/src/baseq2/g_func.c b/src/game/g_func.c similarity index 100% rename from src/baseq2/g_func.c rename to src/game/g_func.c diff --git a/src/baseq2/g_items.c b/src/game/g_items.c similarity index 100% rename from src/baseq2/g_items.c rename to src/game/g_items.c diff --git a/src/baseq2/g_local.h b/src/game/g_local.h similarity index 100% rename from src/baseq2/g_local.h rename to src/game/g_local.h diff --git a/src/baseq2/g_main.c b/src/game/g_main.c similarity index 100% rename from src/baseq2/g_main.c rename to src/game/g_main.c diff --git a/src/baseq2/g_misc.c b/src/game/g_misc.c similarity index 100% rename from src/baseq2/g_misc.c rename to src/game/g_misc.c diff --git a/src/baseq2/g_monster.c b/src/game/g_monster.c similarity index 100% rename from src/baseq2/g_monster.c rename to src/game/g_monster.c diff --git a/src/baseq2/g_phys.c b/src/game/g_phys.c similarity index 100% rename from src/baseq2/g_phys.c rename to src/game/g_phys.c diff --git a/src/baseq2/g_ptrs.c b/src/game/g_ptrs.c similarity index 100% rename from src/baseq2/g_ptrs.c rename to src/game/g_ptrs.c diff --git a/src/baseq2/g_ptrs.h b/src/game/g_ptrs.h similarity index 100% rename from src/baseq2/g_ptrs.h rename to src/game/g_ptrs.h diff --git a/src/baseq2/g_ptrs_compat_v2.c b/src/game/g_ptrs_compat_v2.c similarity index 100% rename from src/baseq2/g_ptrs_compat_v2.c rename to src/game/g_ptrs_compat_v2.c diff --git a/src/baseq2/g_save.c b/src/game/g_save.c similarity index 100% rename from src/baseq2/g_save.c rename to src/game/g_save.c diff --git a/src/baseq2/g_spawn.c b/src/game/g_spawn.c similarity index 100% rename from src/baseq2/g_spawn.c rename to src/game/g_spawn.c diff --git a/src/baseq2/g_svcmds.c b/src/game/g_svcmds.c similarity index 100% rename from src/baseq2/g_svcmds.c rename to src/game/g_svcmds.c diff --git a/src/baseq2/g_target.c b/src/game/g_target.c similarity index 100% rename from src/baseq2/g_target.c rename to src/game/g_target.c diff --git a/src/baseq2/g_trigger.c b/src/game/g_trigger.c similarity index 100% rename from src/baseq2/g_trigger.c rename to src/game/g_trigger.c diff --git a/src/baseq2/g_turret.c b/src/game/g_turret.c similarity index 100% rename from src/baseq2/g_turret.c rename to src/game/g_turret.c diff --git a/src/baseq2/g_utils.c b/src/game/g_utils.c similarity index 100% rename from src/baseq2/g_utils.c rename to src/game/g_utils.c diff --git a/src/baseq2/g_weapon.c b/src/game/g_weapon.c similarity index 100% rename from src/baseq2/g_weapon.c rename to src/game/g_weapon.c diff --git a/src/baseq2/genptr.py b/src/game/genptr.py similarity index 100% rename from src/baseq2/genptr.py rename to src/game/genptr.py diff --git a/src/baseq2/m_actor.c b/src/game/m_actor.c similarity index 100% rename from src/baseq2/m_actor.c rename to src/game/m_actor.c diff --git a/src/baseq2/m_actor.h b/src/game/m_actor.h similarity index 100% rename from src/baseq2/m_actor.h rename to src/game/m_actor.h diff --git a/src/baseq2/m_berserk.c b/src/game/m_berserk.c similarity index 100% rename from src/baseq2/m_berserk.c rename to src/game/m_berserk.c diff --git a/src/baseq2/m_berserk.h b/src/game/m_berserk.h similarity index 100% rename from src/baseq2/m_berserk.h rename to src/game/m_berserk.h diff --git a/src/baseq2/m_boss2.c b/src/game/m_boss2.c similarity index 100% rename from src/baseq2/m_boss2.c rename to src/game/m_boss2.c diff --git a/src/baseq2/m_boss2.h b/src/game/m_boss2.h similarity index 100% rename from src/baseq2/m_boss2.h rename to src/game/m_boss2.h diff --git a/src/baseq2/m_boss3.c b/src/game/m_boss3.c similarity index 100% rename from src/baseq2/m_boss3.c rename to src/game/m_boss3.c diff --git a/src/baseq2/m_boss31.c b/src/game/m_boss31.c similarity index 100% rename from src/baseq2/m_boss31.c rename to src/game/m_boss31.c diff --git a/src/baseq2/m_boss31.h b/src/game/m_boss31.h similarity index 100% rename from src/baseq2/m_boss31.h rename to src/game/m_boss31.h diff --git a/src/baseq2/m_boss32.c b/src/game/m_boss32.c similarity index 100% rename from src/baseq2/m_boss32.c rename to src/game/m_boss32.c diff --git a/src/baseq2/m_boss32.h b/src/game/m_boss32.h similarity index 100% rename from src/baseq2/m_boss32.h rename to src/game/m_boss32.h diff --git a/src/baseq2/m_brain.c b/src/game/m_brain.c similarity index 100% rename from src/baseq2/m_brain.c rename to src/game/m_brain.c diff --git a/src/baseq2/m_brain.h b/src/game/m_brain.h similarity index 100% rename from src/baseq2/m_brain.h rename to src/game/m_brain.h diff --git a/src/baseq2/m_chick.c b/src/game/m_chick.c similarity index 100% rename from src/baseq2/m_chick.c rename to src/game/m_chick.c diff --git a/src/baseq2/m_chick.h b/src/game/m_chick.h similarity index 100% rename from src/baseq2/m_chick.h rename to src/game/m_chick.h diff --git a/src/baseq2/m_flipper.c b/src/game/m_flipper.c similarity index 100% rename from src/baseq2/m_flipper.c rename to src/game/m_flipper.c diff --git a/src/baseq2/m_flipper.h b/src/game/m_flipper.h similarity index 100% rename from src/baseq2/m_flipper.h rename to src/game/m_flipper.h diff --git a/src/baseq2/m_float.c b/src/game/m_float.c similarity index 100% rename from src/baseq2/m_float.c rename to src/game/m_float.c diff --git a/src/baseq2/m_float.h b/src/game/m_float.h similarity index 100% rename from src/baseq2/m_float.h rename to src/game/m_float.h diff --git a/src/baseq2/m_flyer.c b/src/game/m_flyer.c similarity index 100% rename from src/baseq2/m_flyer.c rename to src/game/m_flyer.c diff --git a/src/baseq2/m_flyer.h b/src/game/m_flyer.h similarity index 100% rename from src/baseq2/m_flyer.h rename to src/game/m_flyer.h diff --git a/src/baseq2/m_gladiator.c b/src/game/m_gladiator.c similarity index 100% rename from src/baseq2/m_gladiator.c rename to src/game/m_gladiator.c diff --git a/src/baseq2/m_gladiator.h b/src/game/m_gladiator.h similarity index 100% rename from src/baseq2/m_gladiator.h rename to src/game/m_gladiator.h diff --git a/src/baseq2/m_gunner.c b/src/game/m_gunner.c similarity index 100% rename from src/baseq2/m_gunner.c rename to src/game/m_gunner.c diff --git a/src/baseq2/m_gunner.h b/src/game/m_gunner.h similarity index 100% rename from src/baseq2/m_gunner.h rename to src/game/m_gunner.h diff --git a/src/baseq2/m_hover.c b/src/game/m_hover.c similarity index 100% rename from src/baseq2/m_hover.c rename to src/game/m_hover.c diff --git a/src/baseq2/m_hover.h b/src/game/m_hover.h similarity index 100% rename from src/baseq2/m_hover.h rename to src/game/m_hover.h diff --git a/src/baseq2/m_infantry.c b/src/game/m_infantry.c similarity index 100% rename from src/baseq2/m_infantry.c rename to src/game/m_infantry.c diff --git a/src/baseq2/m_infantry.h b/src/game/m_infantry.h similarity index 100% rename from src/baseq2/m_infantry.h rename to src/game/m_infantry.h diff --git a/src/baseq2/m_insane.c b/src/game/m_insane.c similarity index 100% rename from src/baseq2/m_insane.c rename to src/game/m_insane.c diff --git a/src/baseq2/m_insane.h b/src/game/m_insane.h similarity index 100% rename from src/baseq2/m_insane.h rename to src/game/m_insane.h diff --git a/src/baseq2/m_medic.c b/src/game/m_medic.c similarity index 100% rename from src/baseq2/m_medic.c rename to src/game/m_medic.c diff --git a/src/baseq2/m_medic.h b/src/game/m_medic.h similarity index 100% rename from src/baseq2/m_medic.h rename to src/game/m_medic.h diff --git a/src/baseq2/m_move.c b/src/game/m_move.c similarity index 100% rename from src/baseq2/m_move.c rename to src/game/m_move.c diff --git a/src/baseq2/m_mutant.c b/src/game/m_mutant.c similarity index 100% rename from src/baseq2/m_mutant.c rename to src/game/m_mutant.c diff --git a/src/baseq2/m_mutant.h b/src/game/m_mutant.h similarity index 100% rename from src/baseq2/m_mutant.h rename to src/game/m_mutant.h diff --git a/src/baseq2/m_parasite.c b/src/game/m_parasite.c similarity index 100% rename from src/baseq2/m_parasite.c rename to src/game/m_parasite.c diff --git a/src/baseq2/m_parasite.h b/src/game/m_parasite.h similarity index 100% rename from src/baseq2/m_parasite.h rename to src/game/m_parasite.h diff --git a/src/baseq2/m_player.h b/src/game/m_player.h similarity index 100% rename from src/baseq2/m_player.h rename to src/game/m_player.h diff --git a/src/baseq2/m_rider.h b/src/game/m_rider.h similarity index 100% rename from src/baseq2/m_rider.h rename to src/game/m_rider.h diff --git a/src/baseq2/m_soldier.c b/src/game/m_soldier.c similarity index 100% rename from src/baseq2/m_soldier.c rename to src/game/m_soldier.c diff --git a/src/baseq2/m_soldier.h b/src/game/m_soldier.h similarity index 100% rename from src/baseq2/m_soldier.h rename to src/game/m_soldier.h diff --git a/src/baseq2/m_supertank.c b/src/game/m_supertank.c similarity index 100% rename from src/baseq2/m_supertank.c rename to src/game/m_supertank.c diff --git a/src/baseq2/m_supertank.h b/src/game/m_supertank.h similarity index 100% rename from src/baseq2/m_supertank.h rename to src/game/m_supertank.h diff --git a/src/baseq2/m_tank.c b/src/game/m_tank.c similarity index 100% rename from src/baseq2/m_tank.c rename to src/game/m_tank.c diff --git a/src/baseq2/m_tank.h b/src/game/m_tank.h similarity index 100% rename from src/baseq2/m_tank.h rename to src/game/m_tank.h diff --git a/src/baseq2/p_client.c b/src/game/p_client.c similarity index 100% rename from src/baseq2/p_client.c rename to src/game/p_client.c diff --git a/src/baseq2/p_hud.c b/src/game/p_hud.c similarity index 100% rename from src/baseq2/p_hud.c rename to src/game/p_hud.c diff --git a/src/baseq2/p_trail.c b/src/game/p_trail.c similarity index 100% rename from src/baseq2/p_trail.c rename to src/game/p_trail.c diff --git a/src/baseq2/p_view.c b/src/game/p_view.c similarity index 100% rename from src/baseq2/p_view.c rename to src/game/p_view.c diff --git a/src/baseq2/p_weapon.c b/src/game/p_weapon.c similarity index 100% rename from src/baseq2/p_weapon.c rename to src/game/p_weapon.c diff --git a/src/windows/res/baseq2.rc b/src/windows/res/game.rc similarity index 86% rename from src/windows/res/baseq2.rc rename to src/windows/res/game.rc index 316ac88bb..41003769c 100644 --- a/src/windows/res/baseq2.rc +++ b/src/windows/res/game.rc @@ -12,7 +12,7 @@ #define VER_FILEFLAGS 0x0L #endif -#define VER_FILEDESCRIPTION_STR "Q2RTX baseq2 Game Module " LONG_VERSION_STRING +#define VER_FILEDESCRIPTION_STR "Q2RTX game Module " LONG_VERSION_STRING #define VER_ORIGINALFILENAME_STR "gamex86_64.dll" LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -34,8 +34,8 @@ BEGIN VALUE "FileDescription", VER_FILEDESCRIPTION_STR VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR VALUE "FileVersion", VERSION_STRING - VALUE "InternalName", "baseq2" - VALUE "LegalCopyright", "Copyright (C) 2019-2020, NVIDIA CORPORATION. All rights reserved." + VALUE "InternalName", "game" + VALUE "LegalCopyright", "Copyright (C) 2019-2023, NVIDIA CORPORATION. All rights reserved." VALUE "ProductName", "Quake II RTX" VALUE "ProductVersion", VERSION_STRING END