Renamed **game** to **fgame**

2025-04-28 21:57:57 +03:00 · 2023-06-15 23:44:02 +02:00 · 2023-06-15 23:44:02 +02:00 · e4fa0fff3a
commit e4fa0fff3a
parent 55c0366382
227 changed files with 25 additions and 23 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -82,7 +82,7 @@ set(SOURCES_SHARED
 	"code/script/scriptvariable.cpp"
 )

-file(GLOB_RECURSE SOURCES_BG "code/game/bg_*.cpp")
+file(GLOB_RECURSE SOURCES_BG "code/fgame/bg_*.cpp")

 ## For executable

@ -163,12 +163,12 @@ set(SOURCES_APP ${SOURCES_SHARED} ${SOURCES_COMMON} ${SOURCES_SKEL})
 ## Server

 ### Server game library
-file(GLOB_RECURSE SOURCES_GAME "code/game/*.c" "code/game/*.cpp" "code/parser/*.cpp" "code/script/*.cpp")
+file(GLOB_RECURSE SOURCES_GAME "code/fgame/*.c" "code/fgame/*.cpp" "code/parser/*.cpp" "code/script/*.cpp")
 set(SOURCES_GAME_LIB ${SOURCES_SHARED} ${SOURCES_GAME})

 add_library(fgame SHARED ${SOURCES_GAME_LIB})
 target_compile_definitions(fgame PRIVATE GAME_DLL WITH_SCRIPT_ENGINE ARCHIVE_SUPPORTED TARGET_GAME_TYPE=${TARGET_GAME_TYPE})
-target_include_directories(fgame PUBLIC "code/qcommon" "code/script" "code/game")
+target_include_directories(fgame PUBLIC "code/qcommon" "code/script" "code/fgame")
 target_include_directories(fgame PRIVATE "code/parser")
 target_compile_features(fgame PUBLIC cxx_nullptr)
 target_compile_features(fgame PUBLIC c_variadic_macros)
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 #include "q_shared.h"
 #include "tr_types.h"
-#include "../game/bg_public.h"
+#include "../fgame/bg_public.h"
 #include "cm_public.h"
 #include "cg_public.h"

--- a/code/client/client.h
+++ b/code/client/client.h
@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "keys.h"
 #include "snd_public.h"
 #include "../cgame/cg_public.h"
-#include "../game/bg_public.h"
+#include "../fgame/bg_public.h"

 #ifdef USE_CURL
 #include "cl_curl.h"
--- a/code/fgame/VehicleCollisionEntity.cpp
+++ b/code/fgame/VehicleCollisionEntity.cpp
--- a/code/fgame/VehicleCollisionEntity.h
+++ b/code/fgame/VehicleCollisionEntity.h
--- a/code/fgame/VehicleHalfTrack.cpp
+++ b/code/fgame/VehicleHalfTrack.cpp
--- a/code/fgame/VehicleSlot.cpp
+++ b/code/fgame/VehicleSlot.cpp
--- a/code/fgame/VehicleSlot.h
+++ b/code/fgame/VehicleSlot.h
--- a/code/fgame/VehicleSoundEntity.cpp
+++ b/code/fgame/VehicleSoundEntity.cpp
--- a/code/fgame/VehicleSoundEntity.h
+++ b/code/fgame/VehicleSoundEntity.h
--- a/code/fgame/VehicleTank.cpp
+++ b/code/fgame/VehicleTank.cpp
--- a/code/fgame/VehicleWheelsX2.cpp
+++ b/code/fgame/VehicleWheelsX2.cpp
--- a/code/fgame/VehicleWheelsX4.cpp
+++ b/code/fgame/VehicleWheelsX4.cpp
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
--- a/code/fgame/actor.h
+++ b/code/fgame/actor.h
--- a/code/fgame/actor_aim.cpp
+++ b/code/fgame/actor_aim.cpp
--- a/code/fgame/actor_alarm.cpp
+++ b/code/fgame/actor_alarm.cpp
--- a/code/fgame/actor_anim.cpp
+++ b/code/fgame/actor_anim.cpp
--- a/code/fgame/actor_animapi.cpp
+++ b/code/fgame/actor_animapi.cpp
--- a/code/fgame/actor_animcurious.cpp
+++ b/code/fgame/actor_animcurious.cpp
--- a/code/fgame/actor_balcony.cpp
+++ b/code/fgame/actor_balcony.cpp
--- a/code/fgame/actor_cover.cpp
+++ b/code/fgame/actor_cover.cpp
--- a/code/fgame/actor_curious.cpp
+++ b/code/fgame/actor_curious.cpp
--- a/code/fgame/actor_disguise_common.cpp
+++ b/code/fgame/actor_disguise_common.cpp
--- a/code/fgame/actor_disguise_officier.cpp
+++ b/code/fgame/actor_disguise_officier.cpp
--- a/code/fgame/actor_disguise_rover.cpp
+++ b/code/fgame/actor_disguise_rover.cpp
--- a/code/fgame/actor_disguise_salute.cpp
+++ b/code/fgame/actor_disguise_salute.cpp
--- a/code/fgame/actor_disguise_sentry.cpp
+++ b/code/fgame/actor_disguise_sentry.cpp
--- a/code/fgame/actor_dog.cpp
+++ b/code/fgame/actor_dog.cpp
--- a/code/fgame/actor_grenade.cpp
+++ b/code/fgame/actor_grenade.cpp
--- a/code/fgame/actor_idle.cpp
+++ b/code/fgame/actor_idle.cpp
--- a/code/fgame/actor_killed.cpp
+++ b/code/fgame/actor_killed.cpp
--- a/code/fgame/actor_machinegunner.cpp
+++ b/code/fgame/actor_machinegunner.cpp
--- a/code/fgame/actor_noclip.cpp
+++ b/code/fgame/actor_noclip.cpp
--- a/code/fgame/actor_pain.cpp
+++ b/code/fgame/actor_pain.cpp
--- a/code/fgame/actor_patrol.cpp
+++ b/code/fgame/actor_patrol.cpp
--- a/code/fgame/actor_runner.cpp
+++ b/code/fgame/actor_runner.cpp
--- a/code/fgame/actor_turret.cpp
+++ b/code/fgame/actor_turret.cpp
--- a/code/fgame/actor_weaponless.cpp
+++ b/code/fgame/actor_weaponless.cpp
--- a/code/fgame/actorenemy.cpp
+++ b/code/fgame/actorenemy.cpp
--- a/code/fgame/actorenemy.h
+++ b/code/fgame/actorenemy.h
--- a/code/fgame/actorpath.cpp
+++ b/code/fgame/actorpath.cpp
--- a/code/fgame/actorpath.h
+++ b/code/fgame/actorpath.h
--- a/code/fgame/ammo.cpp
+++ b/code/fgame/ammo.cpp
--- a/code/fgame/ammo.h
+++ b/code/fgame/ammo.h
--- a/code/fgame/animate.cpp
+++ b/code/fgame/animate.cpp
@ -90,7 +90,6 @@ Animate::Animate()

 	frame_delta = vec_zero;

-
 	if( !LoadingSavegame )
 	{
 		edict->s.actionWeight = 1.0f;
--- a/code/fgame/animate.h
+++ b/code/fgame/animate.h
--- a/code/fgame/archive.cpp
+++ b/code/fgame/archive.cpp
@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <lz77.h>

 #ifdef GAME_DLL
-#include "../game/entity.h"
+#include "../fgame/entity.h"
 #endif

 enum
--- a/code/fgame/archive.h
+++ b/code/fgame/archive.h
--- a/code/fgame/armor.cpp
+++ b/code/fgame/armor.cpp
--- a/code/fgame/armor.h
+++ b/code/fgame/armor.h
--- a/code/fgame/barrels.cpp
+++ b/code/fgame/barrels.cpp
--- a/code/fgame/barrels.h
+++ b/code/fgame/barrels.h
--- a/code/fgame/baseimp.h
+++ b/code/fgame/baseimp.h
--- a/code/fgame/beam.cpp
+++ b/code/fgame/beam.cpp
--- a/code/fgame/beam.h
+++ b/code/fgame/beam.h
--- a/code/fgame/bg_lib.cpp
+++ b/code/fgame/bg_lib.cpp
--- a/code/fgame/bg_local.h
+++ b/code/fgame/bg_local.h
--- a/code/fgame/bg_misc.cpp
+++ b/code/fgame/bg_misc.cpp
--- a/code/fgame/bg_pmove.cpp
+++ b/code/fgame/bg_pmove.cpp
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
--- a/code/fgame/bg_slidemove.cpp
+++ b/code/fgame/bg_slidemove.cpp
--- a/code/fgame/body.cpp
+++ b/code/fgame/body.cpp
--- a/code/fgame/body.h
+++ b/code/fgame/body.h
--- a/code/fgame/botlib.h
+++ b/code/fgame/botlib.h
--- a/code/fgame/botmenudef.h
+++ b/code/fgame/botmenudef.h
--- a/code/fgame/bspline.cpp
+++ b/code/fgame/bspline.cpp
--- a/code/fgame/bspline.h
+++ b/code/fgame/bspline.h
--- a/code/fgame/camera.cpp
+++ b/code/fgame/camera.cpp
--- a/code/fgame/camera.h
+++ b/code/fgame/camera.h
--- a/code/fgame/characterstate.cpp
+++ b/code/fgame/characterstate.cpp
--- a/code/fgame/characterstate.h
+++ b/code/fgame/characterstate.h
--- a/code/fgame/chars.h
+++ b/code/fgame/chars.h
--- a/code/fgame/consoleevent.cpp
+++ b/code/fgame/consoleevent.cpp
--- a/code/fgame/consoleevent.h
+++ b/code/fgame/consoleevent.h
--- a/code/fgame/crateobject.cpp
+++ b/code/fgame/crateobject.cpp
--- a/code/fgame/crateobject.h
+++ b/code/fgame/crateobject.h
--- a/code/fgame/crc32.h
+++ b/code/fgame/crc32.h
--- a/code/fgame/debuglines.cpp
+++ b/code/fgame/debuglines.cpp
--- a/code/fgame/debuglines.h
+++ b/code/fgame/debuglines.h
--- a/code/fgame/decals.cpp
+++ b/code/fgame/decals.cpp
--- a/code/fgame/decals.h
+++ b/code/fgame/decals.h
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
--- a/code/fgame/dm_manager.h
+++ b/code/fgame/dm_manager.h
--- a/code/fgame/dm_team.cpp
+++ b/code/fgame/dm_team.cpp
--- a/code/fgame/dm_team.h
+++ b/code/fgame/dm_team.h
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
--- a/code/fgame/doors.h
+++ b/code/fgame/doors.h
--- a/code/fgame/earthquake.cpp
+++ b/code/fgame/earthquake.cpp
--- a/code/fgame/earthquake.h
+++ b/code/fgame/earthquake.h
--- a/code/fgame/effectentity.cpp
+++ b/code/fgame/effectentity.cpp
--- a/code/fgame/effectentity.h
+++ b/code/fgame/effectentity.h
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
--- a/code/fgame/entity.h
+++ b/code/fgame/entity.h
--- a/code/fgame/explosion.cpp
+++ b/code/fgame/explosion.cpp
--- a/code/fgame/explosion.h
+++ b/code/fgame/explosion.h
--- a/code/fgame/g_active.cpp
+++ b/code/fgame/g_active.cpp
--- a/code/fgame/g_arenas.cpp
+++ b/code/fgame/g_arenas.cpp
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
--- a/Show more
+++ b/Show more