mirror of
https://github.com/openmoh/openmohaa.git
synced 2025-04-28 21:57:57 +03:00
Renamed **game** to **fgame**
This commit is contained in:
parent
55c0366382
commit
e4fa0fff3a
227 changed files with 25 additions and 23 deletions
|
@ -82,7 +82,7 @@ set(SOURCES_SHARED
|
||||||
"code/script/scriptvariable.cpp"
|
"code/script/scriptvariable.cpp"
|
||||||
)
|
)
|
||||||
|
|
||||||
file(GLOB_RECURSE SOURCES_BG "code/game/bg_*.cpp")
|
file(GLOB_RECURSE SOURCES_BG "code/fgame/bg_*.cpp")
|
||||||
|
|
||||||
## For executable
|
## For executable
|
||||||
|
|
||||||
|
@ -163,12 +163,12 @@ set(SOURCES_APP ${SOURCES_SHARED} ${SOURCES_COMMON} ${SOURCES_SKEL})
|
||||||
## Server
|
## Server
|
||||||
|
|
||||||
### Server game library
|
### 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})
|
set(SOURCES_GAME_LIB ${SOURCES_SHARED} ${SOURCES_GAME})
|
||||||
|
|
||||||
add_library(fgame SHARED ${SOURCES_GAME_LIB})
|
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_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_include_directories(fgame PRIVATE "code/parser")
|
||||||
target_compile_features(fgame PUBLIC cxx_nullptr)
|
target_compile_features(fgame PUBLIC cxx_nullptr)
|
||||||
target_compile_features(fgame PUBLIC c_variadic_macros)
|
target_compile_features(fgame PUBLIC c_variadic_macros)
|
||||||
|
|
|
@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
|
||||||
#include "q_shared.h"
|
#include "q_shared.h"
|
||||||
#include "tr_types.h"
|
#include "tr_types.h"
|
||||||
#include "../game/bg_public.h"
|
#include "../fgame/bg_public.h"
|
||||||
#include "cm_public.h"
|
#include "cm_public.h"
|
||||||
#include "cg_public.h"
|
#include "cg_public.h"
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
#include "keys.h"
|
#include "keys.h"
|
||||||
#include "snd_public.h"
|
#include "snd_public.h"
|
||||||
#include "../cgame/cg_public.h"
|
#include "../cgame/cg_public.h"
|
||||||
#include "../game/bg_public.h"
|
#include "../fgame/bg_public.h"
|
||||||
|
|
||||||
#ifdef USE_CURL
|
#ifdef USE_CURL
|
||||||
#include "cl_curl.h"
|
#include "cl_curl.h"
|
||||||
|
|
|
@ -90,7 +90,6 @@ Animate::Animate()
|
||||||
|
|
||||||
frame_delta = vec_zero;
|
frame_delta = vec_zero;
|
||||||
|
|
||||||
|
|
||||||
if( !LoadingSavegame )
|
if( !LoadingSavegame )
|
||||||
{
|
{
|
||||||
edict->s.actionWeight = 1.0f;
|
edict->s.actionWeight = 1.0f;
|
|
@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
#include <lz77.h>
|
#include <lz77.h>
|
||||||
|
|
||||||
#ifdef GAME_DLL
|
#ifdef GAME_DLL
|
||||||
#include "../game/entity.h"
|
#include "../fgame/entity.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
enum
|
enum
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue