From ba9a852d9df51523da4d59d36d32e51f783ebd90 Mon Sep 17 00:00:00 2001 From: Spoike Date: Tue, 8 Mar 2022 05:33:52 +0000 Subject: [PATCH] Move the q3 files into the plugins subdir. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6216 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- CMakeLists.txt | 78 +++++++++---------- engine/Makefile | 16 ++-- engine/client/quakedef.h | 2 + engine/server/botlib.h | 1 - plugins/Makefile | 68 ++++++++-------- {engine => plugins/quake3}/botlib/aasfile.h | 0 {engine => plugins/quake3}/botlib/be_aas.h | 0 .../quake3}/botlib/be_aas_bsp.h | 0 .../quake3}/botlib/be_aas_bspq3.c | 0 .../quake3}/botlib/be_aas_cluster.c | 0 .../quake3}/botlib/be_aas_cluster.h | 0 .../quake3}/botlib/be_aas_debug.c | 0 .../quake3}/botlib/be_aas_debug.h | 0 .../quake3}/botlib/be_aas_def.h | 0 .../quake3}/botlib/be_aas_entity.c | 0 .../quake3}/botlib/be_aas_entity.h | 0 .../quake3}/botlib/be_aas_file.c | 0 .../quake3}/botlib/be_aas_file.h | 0 .../quake3}/botlib/be_aas_funcs.h | 0 .../quake3}/botlib/be_aas_main.c | 0 .../quake3}/botlib/be_aas_main.h | 0 .../quake3}/botlib/be_aas_move.c | 0 .../quake3}/botlib/be_aas_move.h | 0 .../quake3}/botlib/be_aas_optimize.c | 0 .../quake3}/botlib/be_aas_optimize.h | 0 .../quake3}/botlib/be_aas_reach.c | 0 .../quake3}/botlib/be_aas_reach.h | 0 .../quake3}/botlib/be_aas_route.c | 0 .../quake3}/botlib/be_aas_route.h | 0 .../quake3}/botlib/be_aas_routealt.c | 0 .../quake3}/botlib/be_aas_routealt.h | 0 .../quake3}/botlib/be_aas_sample.c | 0 .../quake3}/botlib/be_aas_sample.h | 0 .../quake3}/botlib/be_ai_char.c | 0 .../quake3}/botlib/be_ai_char.h | 0 .../quake3}/botlib/be_ai_chat.c | 0 .../quake3}/botlib/be_ai_chat.h | 0 {engine => plugins/quake3}/botlib/be_ai_gen.c | 0 {engine => plugins/quake3}/botlib/be_ai_gen.h | 0 .../quake3}/botlib/be_ai_goal.c | 0 .../quake3}/botlib/be_ai_goal.h | 0 .../quake3}/botlib/be_ai_move.c | 0 .../quake3}/botlib/be_ai_move.h | 0 .../quake3}/botlib/be_ai_weap.c | 0 .../quake3}/botlib/be_ai_weap.h | 0 .../quake3}/botlib/be_ai_weight.c | 0 .../quake3}/botlib/be_ai_weight.h | 0 {engine => plugins/quake3}/botlib/be_ea.c | 0 {engine => plugins/quake3}/botlib/be_ea.h | 0 .../quake3}/botlib/be_interface.c | 0 .../quake3}/botlib/be_interface.h | 0 {engine => plugins/quake3}/botlib/botlib.h | 0 {engine => plugins/quake3}/botlib/l_crc.c | 0 {engine => plugins/quake3}/botlib/l_crc.h | 0 {engine => plugins/quake3}/botlib/l_libvar.c | 0 {engine => plugins/quake3}/botlib/l_libvar.h | 0 {engine => plugins/quake3}/botlib/l_log.c | 0 {engine => plugins/quake3}/botlib/l_log.h | 0 {engine => plugins/quake3}/botlib/l_memory.c | 0 {engine => plugins/quake3}/botlib/l_memory.h | 0 {engine => plugins/quake3}/botlib/l_precomp.c | 0 {engine => plugins/quake3}/botlib/l_precomp.h | 0 {engine => plugins/quake3}/botlib/l_script.c | 0 {engine => plugins/quake3}/botlib/l_script.h | 0 {engine => plugins/quake3}/botlib/l_struct.c | 0 {engine => plugins/quake3}/botlib/l_struct.h | 0 {engine => plugins/quake3}/botlib/l_utils.h | 0 .../quake3}/botlib/q_platform.h | 0 {engine => plugins/quake3}/botlib/q_shared.h | 0 .../quake3}/botlib/standalone.c | 0 .../quake3}/botlib/surfaceflags.h | 0 .../cl_cg.c => plugins/quake3/clq3_cg.c | 0 .../client => plugins/quake3}/clq3_parse.c | 0 .../cl_ui.c => plugins/quake3/clq3_ui.c | 2 +- {engine/client => plugins/quake3}/clq3defs.h | 0 {engine/common => plugins/quake3}/q3common.c | 0 {engine/common => plugins/quake3}/q3common.h | 0 .../server => plugins/quake3}/q3g_public.h | 0 {engine/server => plugins/quake3}/svq3_game.c | 2 +- 79 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 engine/server/botlib.h rename {engine => plugins/quake3}/botlib/aasfile.h (100%) rename {engine => plugins/quake3}/botlib/be_aas.h (100%) rename {engine => plugins/quake3}/botlib/be_aas_bsp.h (100%) rename {engine => plugins/quake3}/botlib/be_aas_bspq3.c (100%) rename {engine => plugins/quake3}/botlib/be_aas_cluster.c (100%) rename {engine => plugins/quake3}/botlib/be_aas_cluster.h (100%) rename {engine => plugins/quake3}/botlib/be_aas_debug.c (100%) rename {engine => plugins/quake3}/botlib/be_aas_debug.h (100%) rename {engine => plugins/quake3}/botlib/be_aas_def.h (100%) rename {engine => plugins/quake3}/botlib/be_aas_entity.c (100%) rename {engine => plugins/quake3}/botlib/be_aas_entity.h (100%) rename {engine => plugins/quake3}/botlib/be_aas_file.c (100%) rename {engine => plugins/quake3}/botlib/be_aas_file.h (100%) rename {engine => plugins/quake3}/botlib/be_aas_funcs.h (100%) rename {engine => plugins/quake3}/botlib/be_aas_main.c (100%) rename {engine => plugins/quake3}/botlib/be_aas_main.h (100%) rename {engine => plugins/quake3}/botlib/be_aas_move.c (100%) rename {engine => plugins/quake3}/botlib/be_aas_move.h (100%) rename {engine => plugins/quake3}/botlib/be_aas_optimize.c (100%) rename {engine => plugins/quake3}/botlib/be_aas_optimize.h (100%) rename {engine => plugins/quake3}/botlib/be_aas_reach.c (100%) rename {engine => plugins/quake3}/botlib/be_aas_reach.h (100%) rename {engine => plugins/quake3}/botlib/be_aas_route.c (100%) rename {engine => plugins/quake3}/botlib/be_aas_route.h (100%) rename {engine => plugins/quake3}/botlib/be_aas_routealt.c (100%) rename {engine => plugins/quake3}/botlib/be_aas_routealt.h (100%) rename {engine => plugins/quake3}/botlib/be_aas_sample.c (100%) rename {engine => plugins/quake3}/botlib/be_aas_sample.h (100%) rename {engine => plugins/quake3}/botlib/be_ai_char.c (100%) rename {engine => plugins/quake3}/botlib/be_ai_char.h (100%) rename {engine => plugins/quake3}/botlib/be_ai_chat.c (100%) rename {engine => plugins/quake3}/botlib/be_ai_chat.h (100%) rename {engine => plugins/quake3}/botlib/be_ai_gen.c (100%) rename {engine => plugins/quake3}/botlib/be_ai_gen.h (100%) rename {engine => plugins/quake3}/botlib/be_ai_goal.c (100%) rename {engine => plugins/quake3}/botlib/be_ai_goal.h (100%) rename {engine => plugins/quake3}/botlib/be_ai_move.c (100%) rename {engine => plugins/quake3}/botlib/be_ai_move.h (100%) rename {engine => plugins/quake3}/botlib/be_ai_weap.c (100%) rename {engine => plugins/quake3}/botlib/be_ai_weap.h (100%) rename {engine => plugins/quake3}/botlib/be_ai_weight.c (100%) rename {engine => plugins/quake3}/botlib/be_ai_weight.h (100%) rename {engine => plugins/quake3}/botlib/be_ea.c (100%) rename {engine => plugins/quake3}/botlib/be_ea.h (100%) rename {engine => plugins/quake3}/botlib/be_interface.c (100%) rename {engine => plugins/quake3}/botlib/be_interface.h (100%) rename {engine => plugins/quake3}/botlib/botlib.h (100%) rename {engine => plugins/quake3}/botlib/l_crc.c (100%) rename {engine => plugins/quake3}/botlib/l_crc.h (100%) rename {engine => plugins/quake3}/botlib/l_libvar.c (100%) rename {engine => plugins/quake3}/botlib/l_libvar.h (100%) rename {engine => plugins/quake3}/botlib/l_log.c (100%) rename {engine => plugins/quake3}/botlib/l_log.h (100%) rename {engine => plugins/quake3}/botlib/l_memory.c (100%) rename {engine => plugins/quake3}/botlib/l_memory.h (100%) rename {engine => plugins/quake3}/botlib/l_precomp.c (100%) rename {engine => plugins/quake3}/botlib/l_precomp.h (100%) rename {engine => plugins/quake3}/botlib/l_script.c (100%) rename {engine => plugins/quake3}/botlib/l_script.h (100%) rename {engine => plugins/quake3}/botlib/l_struct.c (100%) rename {engine => plugins/quake3}/botlib/l_struct.h (100%) rename {engine => plugins/quake3}/botlib/l_utils.h (100%) rename {engine => plugins/quake3}/botlib/q_platform.h (100%) rename {engine => plugins/quake3}/botlib/q_shared.h (100%) rename {engine => plugins/quake3}/botlib/standalone.c (100%) rename {engine => plugins/quake3}/botlib/surfaceflags.h (100%) rename engine/client/cl_cg.c => plugins/quake3/clq3_cg.c (100%) rename {engine/client => plugins/quake3}/clq3_parse.c (100%) rename engine/client/cl_ui.c => plugins/quake3/clq3_ui.c (99%) rename {engine/client => plugins/quake3}/clq3defs.h (100%) rename {engine/common => plugins/quake3}/q3common.c (100%) rename {engine/common => plugins/quake3}/q3common.h (100%) rename {engine/server => plugins/quake3}/q3g_public.h (100%) rename {engine/server => plugins/quake3}/svq3_game.c (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index df85cfc3..21da7183 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -759,48 +759,46 @@ SET(FTE_CLIENT_FILES ${FTE_VK_FILES} ) -SET(FTE_BOTLIB_FILES - engine/botlib/be_aas_bspq3.c - engine/botlib/be_aas_entity.c - engine/botlib/be_aas_move.c - engine/botlib/be_aas_routealt.c - engine/botlib/be_ai_char.c - engine/botlib/be_ai_goal.c - engine/botlib/be_ai_weight.c - engine/botlib/l_crc.c - engine/botlib/l_memory.c - engine/botlib/l_struct.c - engine/botlib/be_aas_cluster.c - engine/botlib/be_aas_file.c - engine/botlib/be_aas_optimize.c - engine/botlib/be_aas_route.c - engine/botlib/be_ai_chat.c - engine/botlib/be_ai_move.c - engine/botlib/be_ea.c - engine/botlib/l_libvar.c - engine/botlib/l_precomp.c - engine/botlib/be_aas_debug.c - engine/botlib/be_aas_main.c - engine/botlib/be_aas_reach.c - engine/botlib/be_aas_sample.c - engine/botlib/be_ai_gen.c - engine/botlib/be_ai_weap.c - engine/botlib/be_interface.c - engine/botlib/l_log.c - engine/botlib/l_script.c - engine/botlib/standalone.c -) SET(FTE_Q3_FILES - ${FTE_BOTLIB_FILES} - engine/client/cl_cg.c - engine/client/cl_ui.c - engine/client/clq3_parse.c - engine/server/svq3_game.c - engine/common/q3common.c - engine/common/q3common.h + plugins/quake3/botlib/be_aas_bspq3.c + plugins/quake3/botlib/be_aas_entity.c + plugins/quake3/botlib/be_aas_move.c + plugins/quake3/botlib/be_aas_routealt.c + plugins/quake3/botlib/be_ai_char.c + plugins/quake3/botlib/be_ai_goal.c + plugins/quake3/botlib/be_ai_weight.c + plugins/quake3/botlib/l_crc.c + plugins/quake3/botlib/l_memory.c + plugins/quake3/botlib/l_struct.c + plugins/quake3/botlib/be_aas_cluster.c + plugins/quake3/botlib/be_aas_file.c + plugins/quake3/botlib/be_aas_optimize.c + plugins/quake3/botlib/be_aas_route.c + plugins/quake3/botlib/be_ai_chat.c + plugins/quake3/botlib/be_ai_move.c + plugins/quake3/botlib/be_ea.c + plugins/quake3/botlib/l_libvar.c + plugins/quake3/botlib/l_precomp.c + plugins/quake3/botlib/be_aas_debug.c + plugins/quake3/botlib/be_aas_main.c + plugins/quake3/botlib/be_aas_reach.c + plugins/quake3/botlib/be_aas_sample.c + plugins/quake3/botlib/be_ai_gen.c + plugins/quake3/botlib/be_ai_weap.c + plugins/quake3/botlib/be_interface.c + plugins/quake3/botlib/l_log.c + plugins/quake3/botlib/l_script.c + plugins/quake3/botlib/standalone.c - engine/client/clq3defs.h - engine/server/q3g_public.h + plugins/quake3/clq3_cg.c + plugins/quake3/clq3_ui.c + plugins/quake3/clq3_parse.c + plugins/quake3/svq3_game.c + plugins/quake3/q3common.c + plugins/quake3/q3common.h + + plugins/quake3/clq3defs.h + plugins/quake3/q3g_public.h ) SET(FTE_PLUG_QUAKE3 true CACHE BOOL "Compile Quake3 plugin.") diff --git a/engine/Makefile b/engine/Makefile index 68af7b19..b93d8d1c 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -570,7 +570,6 @@ HTTP_DIR=$(BASE_DIR)/http LIBS_DIR?=. PROGS_DIR=$(BASE_DIR)/qclib NACL_DIR=$(BASE_DIR)/nacl -BOTLIB_DIR=$(BASE_DIR)/botlib ifeq ($(NOCOMPAT),1) NCCFLAGS=-DNOLEGACY -DOMIT_QCC @@ -713,6 +712,8 @@ ifeq ($(FTE_TARGET),SDL2) BASE_CFLAGS+=-DLIBJPEG_STATIC -DLIBJPEG_STATIC -DLIBPNG_STATIC -DOPUS_STATIC -DSPEEX_STATIC -DFREETYPE_STATIC -DLIBVORBISFILE_STATIC endif +VPATH := $(BASE_DIR) : $(CLIENT_DIR) : $(GL_DIR) : $(SW_DIR) : $(COMMON_DIR) : $(SERVER_DIR) : $(HTTP_DIR) : $(QUX_DIR) : $(PROGS_DIR) : $(NACL_DIR) : $(D3D_DIR) : $(VK_DIR) : $(BASE_DIR)/web + PROFILE_CFLAGS=-pg DX7SDK=-I./libs/dxsdk7/include/ @@ -945,13 +946,14 @@ COMMON_OBJS = \ q2pmove.o ifeq (1,$(LINK_QUAKE3)) - ALL_CFLAGS+=-I$(BOTLIB_DIR) -DBOTLIB -DBOTLIB_STATIC -DSTATIC_Q3 - COMMON_OBJS += \ + VPATH := $(VPATH) : $(BASE_DIR)/../plugins/quake3 : $(BASE_DIR)/../plugins/quake3/botlib + ALL_CFLAGS+=-DBOTLIB -DBOTLIB_STATIC -DSTATIC_Q3 + COMMON_OBJS += \ clq3_parse.o \ - cl_ui.o \ - cl_cg.o \ + clq3_ui.o \ + clq3_cg.o \ svq3_game.o \ - q3common.o \ + q3common.o \ be_aas_bspq3.o \ be_aas_cluster.o \ be_aas_debug.o \ @@ -1888,8 +1890,6 @@ ifneq ($(OUT_DIR),) endif -VPATH = $(BASE_DIR) : $(CLIENT_DIR) : $(GL_DIR) : $(SW_DIR) : $(COMMON_DIR) : $(SERVER_DIR) : $(HTTP_DIR) : $(BASE_DIR)/irc : $(BASE_DIR)/email : $(QUX_DIR) : $(PROGS_DIR) : $(NACL_DIR) : $(D3D_DIR) : $(VK_DIR) : $(BOTLIB_DIR) : $(BASE_DIR)/web - DO_WINDRES?=$(DO_ECHO) $(WINDRES) $(BRANDFLAGS) -I$(CLIENT_DIR) -O coff $< $@ # This is for linking the FTE icon to the MinGW target diff --git a/engine/client/quakedef.h b/engine/client/quakedef.h index bd8a2d50..7b267e3c 100644 --- a/engine/client/quakedef.h +++ b/engine/client/quakedef.h @@ -207,7 +207,9 @@ extern "C" { #endif #endif +#if defined(Q3CLIENT) || defined(Q3SERVER) #include "q3api.h" +#endif #ifdef __cplusplus #define q_max(a,b) ((a) > (b) ? (a) : (b)) diff --git a/engine/server/botlib.h b/engine/server/botlib.h deleted file mode 100644 index 69eb333f..00000000 --- a/engine/server/botlib.h +++ /dev/null @@ -1 +0,0 @@ -#include "../botlib/botlib.h" diff --git a/plugins/Makefile b/plugins/Makefile index 29d6379b..3ab95eb1 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -360,42 +360,42 @@ endif ###################################### #quake3 -BOTLIBFILES=../engine/botlib/be_aas_bspq3.c \ - ../engine/botlib/be_aas_cluster.c \ - ../engine/botlib/be_aas_debug.c \ - ../engine/botlib/be_aas_entity.c \ - ../engine/botlib/be_aas_file.c \ - ../engine/botlib/be_aas_main.c \ - ../engine/botlib/be_aas_move.c \ - ../engine/botlib/be_aas_optimize.c \ - ../engine/botlib/be_aas_reach.c \ - ../engine/botlib/be_aas_routealt.c \ - ../engine/botlib/be_aas_route.c \ - ../engine/botlib/be_aas_sample.c \ - ../engine/botlib/be_ai_char.c \ - ../engine/botlib/be_ai_chat.c \ - ../engine/botlib/be_ai_gen.c \ - ../engine/botlib/be_ai_goal.c \ - ../engine/botlib/be_ai_move.c \ - ../engine/botlib/be_ai_weap.c \ - ../engine/botlib/be_ai_weight.c \ - ../engine/botlib/be_ea.c \ - ../engine/botlib/be_interface.c \ - ../engine/botlib/l_crc.c \ - ../engine/botlib/l_libvar.c \ - ../engine/botlib/l_log.c \ - ../engine/botlib/l_memory.c \ - ../engine/botlib/l_precomp.c \ - ../engine/botlib/l_script.c \ - ../engine/botlib/l_struct.c \ - ../engine/botlib/standalone.c +BOTLIBFILES=quake3/botlib/be_aas_bspq3.c \ + quake3/botlib/be_aas_cluster.c \ + quake3/botlib/be_aas_debug.c \ + quake3/botlib/be_aas_entity.c \ + quake3/botlib/be_aas_file.c \ + quake3/botlib/be_aas_main.c \ + quake3/botlib/be_aas_move.c \ + quake3/botlib/be_aas_optimize.c \ + quake3/botlib/be_aas_reach.c \ + quake3/botlib/be_aas_routealt.c \ + quake3/botlib/be_aas_route.c \ + quake3/botlib/be_aas_sample.c \ + quake3/botlib/be_ai_char.c \ + quake3/botlib/be_ai_chat.c \ + quake3/botlib/be_ai_gen.c \ + quake3/botlib/be_ai_goal.c \ + quake3/botlib/be_ai_move.c \ + quake3/botlib/be_ai_weap.c \ + quake3/botlib/be_ai_weight.c \ + quake3/botlib/be_ea.c \ + quake3/botlib/be_interface.c \ + quake3/botlib/l_crc.c \ + quake3/botlib/l_libvar.c \ + quake3/botlib/l_log.c \ + quake3/botlib/l_memory.c \ + quake3/botlib/l_precomp.c \ + quake3/botlib/l_script.c \ + quake3/botlib/l_struct.c \ + quake3/botlib/standalone.c QUAKE3FILES=$(BOTLIBFILES) \ plugin.c \ - ../engine/client/cl_cg.c \ - ../engine/client/cl_ui.c \ - ../engine/client/clq3_parse.c \ - ../engine/server/svq3_game.c \ - ../engine/common/q3common.c + quake3/clq3_cg.c \ + quake3/clq3_ui.c \ + quake3/clq3_parse.c \ + quake3/svq3_game.c \ + quake3/q3common.c $(PLUG_PREFIX)quake3$(PLUG_NATIVE_EXT): ${QUAKE3FILES} $(CC) $(BASE_CFLAGS) $(CFLAGS) -DFTEPLUGIN -DBOTLIB -DBOTLIB_STATIC -o $@ -shared $(PLUG_CFLAGS) $^ $(PLUG_DEFFILE) $(PLUG_LDFLAGS_ZLIB) $(PLUG_LDFLAGS) $(call EMBEDMETA,quake3,$@,Quake3 Compat,Quake3 Gamecode Compatibility) diff --git a/engine/botlib/aasfile.h b/plugins/quake3/botlib/aasfile.h similarity index 100% rename from engine/botlib/aasfile.h rename to plugins/quake3/botlib/aasfile.h diff --git a/engine/botlib/be_aas.h b/plugins/quake3/botlib/be_aas.h similarity index 100% rename from engine/botlib/be_aas.h rename to plugins/quake3/botlib/be_aas.h diff --git a/engine/botlib/be_aas_bsp.h b/plugins/quake3/botlib/be_aas_bsp.h similarity index 100% rename from engine/botlib/be_aas_bsp.h rename to plugins/quake3/botlib/be_aas_bsp.h diff --git a/engine/botlib/be_aas_bspq3.c b/plugins/quake3/botlib/be_aas_bspq3.c similarity index 100% rename from engine/botlib/be_aas_bspq3.c rename to plugins/quake3/botlib/be_aas_bspq3.c diff --git a/engine/botlib/be_aas_cluster.c b/plugins/quake3/botlib/be_aas_cluster.c similarity index 100% rename from engine/botlib/be_aas_cluster.c rename to plugins/quake3/botlib/be_aas_cluster.c diff --git a/engine/botlib/be_aas_cluster.h b/plugins/quake3/botlib/be_aas_cluster.h similarity index 100% rename from engine/botlib/be_aas_cluster.h rename to plugins/quake3/botlib/be_aas_cluster.h diff --git a/engine/botlib/be_aas_debug.c b/plugins/quake3/botlib/be_aas_debug.c similarity index 100% rename from engine/botlib/be_aas_debug.c rename to plugins/quake3/botlib/be_aas_debug.c diff --git a/engine/botlib/be_aas_debug.h b/plugins/quake3/botlib/be_aas_debug.h similarity index 100% rename from engine/botlib/be_aas_debug.h rename to plugins/quake3/botlib/be_aas_debug.h diff --git a/engine/botlib/be_aas_def.h b/plugins/quake3/botlib/be_aas_def.h similarity index 100% rename from engine/botlib/be_aas_def.h rename to plugins/quake3/botlib/be_aas_def.h diff --git a/engine/botlib/be_aas_entity.c b/plugins/quake3/botlib/be_aas_entity.c similarity index 100% rename from engine/botlib/be_aas_entity.c rename to plugins/quake3/botlib/be_aas_entity.c diff --git a/engine/botlib/be_aas_entity.h b/plugins/quake3/botlib/be_aas_entity.h similarity index 100% rename from engine/botlib/be_aas_entity.h rename to plugins/quake3/botlib/be_aas_entity.h diff --git a/engine/botlib/be_aas_file.c b/plugins/quake3/botlib/be_aas_file.c similarity index 100% rename from engine/botlib/be_aas_file.c rename to plugins/quake3/botlib/be_aas_file.c diff --git a/engine/botlib/be_aas_file.h b/plugins/quake3/botlib/be_aas_file.h similarity index 100% rename from engine/botlib/be_aas_file.h rename to plugins/quake3/botlib/be_aas_file.h diff --git a/engine/botlib/be_aas_funcs.h b/plugins/quake3/botlib/be_aas_funcs.h similarity index 100% rename from engine/botlib/be_aas_funcs.h rename to plugins/quake3/botlib/be_aas_funcs.h diff --git a/engine/botlib/be_aas_main.c b/plugins/quake3/botlib/be_aas_main.c similarity index 100% rename from engine/botlib/be_aas_main.c rename to plugins/quake3/botlib/be_aas_main.c diff --git a/engine/botlib/be_aas_main.h b/plugins/quake3/botlib/be_aas_main.h similarity index 100% rename from engine/botlib/be_aas_main.h rename to plugins/quake3/botlib/be_aas_main.h diff --git a/engine/botlib/be_aas_move.c b/plugins/quake3/botlib/be_aas_move.c similarity index 100% rename from engine/botlib/be_aas_move.c rename to plugins/quake3/botlib/be_aas_move.c diff --git a/engine/botlib/be_aas_move.h b/plugins/quake3/botlib/be_aas_move.h similarity index 100% rename from engine/botlib/be_aas_move.h rename to plugins/quake3/botlib/be_aas_move.h diff --git a/engine/botlib/be_aas_optimize.c b/plugins/quake3/botlib/be_aas_optimize.c similarity index 100% rename from engine/botlib/be_aas_optimize.c rename to plugins/quake3/botlib/be_aas_optimize.c diff --git a/engine/botlib/be_aas_optimize.h b/plugins/quake3/botlib/be_aas_optimize.h similarity index 100% rename from engine/botlib/be_aas_optimize.h rename to plugins/quake3/botlib/be_aas_optimize.h diff --git a/engine/botlib/be_aas_reach.c b/plugins/quake3/botlib/be_aas_reach.c similarity index 100% rename from engine/botlib/be_aas_reach.c rename to plugins/quake3/botlib/be_aas_reach.c diff --git a/engine/botlib/be_aas_reach.h b/plugins/quake3/botlib/be_aas_reach.h similarity index 100% rename from engine/botlib/be_aas_reach.h rename to plugins/quake3/botlib/be_aas_reach.h diff --git a/engine/botlib/be_aas_route.c b/plugins/quake3/botlib/be_aas_route.c similarity index 100% rename from engine/botlib/be_aas_route.c rename to plugins/quake3/botlib/be_aas_route.c diff --git a/engine/botlib/be_aas_route.h b/plugins/quake3/botlib/be_aas_route.h similarity index 100% rename from engine/botlib/be_aas_route.h rename to plugins/quake3/botlib/be_aas_route.h diff --git a/engine/botlib/be_aas_routealt.c b/plugins/quake3/botlib/be_aas_routealt.c similarity index 100% rename from engine/botlib/be_aas_routealt.c rename to plugins/quake3/botlib/be_aas_routealt.c diff --git a/engine/botlib/be_aas_routealt.h b/plugins/quake3/botlib/be_aas_routealt.h similarity index 100% rename from engine/botlib/be_aas_routealt.h rename to plugins/quake3/botlib/be_aas_routealt.h diff --git a/engine/botlib/be_aas_sample.c b/plugins/quake3/botlib/be_aas_sample.c similarity index 100% rename from engine/botlib/be_aas_sample.c rename to plugins/quake3/botlib/be_aas_sample.c diff --git a/engine/botlib/be_aas_sample.h b/plugins/quake3/botlib/be_aas_sample.h similarity index 100% rename from engine/botlib/be_aas_sample.h rename to plugins/quake3/botlib/be_aas_sample.h diff --git a/engine/botlib/be_ai_char.c b/plugins/quake3/botlib/be_ai_char.c similarity index 100% rename from engine/botlib/be_ai_char.c rename to plugins/quake3/botlib/be_ai_char.c diff --git a/engine/botlib/be_ai_char.h b/plugins/quake3/botlib/be_ai_char.h similarity index 100% rename from engine/botlib/be_ai_char.h rename to plugins/quake3/botlib/be_ai_char.h diff --git a/engine/botlib/be_ai_chat.c b/plugins/quake3/botlib/be_ai_chat.c similarity index 100% rename from engine/botlib/be_ai_chat.c rename to plugins/quake3/botlib/be_ai_chat.c diff --git a/engine/botlib/be_ai_chat.h b/plugins/quake3/botlib/be_ai_chat.h similarity index 100% rename from engine/botlib/be_ai_chat.h rename to plugins/quake3/botlib/be_ai_chat.h diff --git a/engine/botlib/be_ai_gen.c b/plugins/quake3/botlib/be_ai_gen.c similarity index 100% rename from engine/botlib/be_ai_gen.c rename to plugins/quake3/botlib/be_ai_gen.c diff --git a/engine/botlib/be_ai_gen.h b/plugins/quake3/botlib/be_ai_gen.h similarity index 100% rename from engine/botlib/be_ai_gen.h rename to plugins/quake3/botlib/be_ai_gen.h diff --git a/engine/botlib/be_ai_goal.c b/plugins/quake3/botlib/be_ai_goal.c similarity index 100% rename from engine/botlib/be_ai_goal.c rename to plugins/quake3/botlib/be_ai_goal.c diff --git a/engine/botlib/be_ai_goal.h b/plugins/quake3/botlib/be_ai_goal.h similarity index 100% rename from engine/botlib/be_ai_goal.h rename to plugins/quake3/botlib/be_ai_goal.h diff --git a/engine/botlib/be_ai_move.c b/plugins/quake3/botlib/be_ai_move.c similarity index 100% rename from engine/botlib/be_ai_move.c rename to plugins/quake3/botlib/be_ai_move.c diff --git a/engine/botlib/be_ai_move.h b/plugins/quake3/botlib/be_ai_move.h similarity index 100% rename from engine/botlib/be_ai_move.h rename to plugins/quake3/botlib/be_ai_move.h diff --git a/engine/botlib/be_ai_weap.c b/plugins/quake3/botlib/be_ai_weap.c similarity index 100% rename from engine/botlib/be_ai_weap.c rename to plugins/quake3/botlib/be_ai_weap.c diff --git a/engine/botlib/be_ai_weap.h b/plugins/quake3/botlib/be_ai_weap.h similarity index 100% rename from engine/botlib/be_ai_weap.h rename to plugins/quake3/botlib/be_ai_weap.h diff --git a/engine/botlib/be_ai_weight.c b/plugins/quake3/botlib/be_ai_weight.c similarity index 100% rename from engine/botlib/be_ai_weight.c rename to plugins/quake3/botlib/be_ai_weight.c diff --git a/engine/botlib/be_ai_weight.h b/plugins/quake3/botlib/be_ai_weight.h similarity index 100% rename from engine/botlib/be_ai_weight.h rename to plugins/quake3/botlib/be_ai_weight.h diff --git a/engine/botlib/be_ea.c b/plugins/quake3/botlib/be_ea.c similarity index 100% rename from engine/botlib/be_ea.c rename to plugins/quake3/botlib/be_ea.c diff --git a/engine/botlib/be_ea.h b/plugins/quake3/botlib/be_ea.h similarity index 100% rename from engine/botlib/be_ea.h rename to plugins/quake3/botlib/be_ea.h diff --git a/engine/botlib/be_interface.c b/plugins/quake3/botlib/be_interface.c similarity index 100% rename from engine/botlib/be_interface.c rename to plugins/quake3/botlib/be_interface.c diff --git a/engine/botlib/be_interface.h b/plugins/quake3/botlib/be_interface.h similarity index 100% rename from engine/botlib/be_interface.h rename to plugins/quake3/botlib/be_interface.h diff --git a/engine/botlib/botlib.h b/plugins/quake3/botlib/botlib.h similarity index 100% rename from engine/botlib/botlib.h rename to plugins/quake3/botlib/botlib.h diff --git a/engine/botlib/l_crc.c b/plugins/quake3/botlib/l_crc.c similarity index 100% rename from engine/botlib/l_crc.c rename to plugins/quake3/botlib/l_crc.c diff --git a/engine/botlib/l_crc.h b/plugins/quake3/botlib/l_crc.h similarity index 100% rename from engine/botlib/l_crc.h rename to plugins/quake3/botlib/l_crc.h diff --git a/engine/botlib/l_libvar.c b/plugins/quake3/botlib/l_libvar.c similarity index 100% rename from engine/botlib/l_libvar.c rename to plugins/quake3/botlib/l_libvar.c diff --git a/engine/botlib/l_libvar.h b/plugins/quake3/botlib/l_libvar.h similarity index 100% rename from engine/botlib/l_libvar.h rename to plugins/quake3/botlib/l_libvar.h diff --git a/engine/botlib/l_log.c b/plugins/quake3/botlib/l_log.c similarity index 100% rename from engine/botlib/l_log.c rename to plugins/quake3/botlib/l_log.c diff --git a/engine/botlib/l_log.h b/plugins/quake3/botlib/l_log.h similarity index 100% rename from engine/botlib/l_log.h rename to plugins/quake3/botlib/l_log.h diff --git a/engine/botlib/l_memory.c b/plugins/quake3/botlib/l_memory.c similarity index 100% rename from engine/botlib/l_memory.c rename to plugins/quake3/botlib/l_memory.c diff --git a/engine/botlib/l_memory.h b/plugins/quake3/botlib/l_memory.h similarity index 100% rename from engine/botlib/l_memory.h rename to plugins/quake3/botlib/l_memory.h diff --git a/engine/botlib/l_precomp.c b/plugins/quake3/botlib/l_precomp.c similarity index 100% rename from engine/botlib/l_precomp.c rename to plugins/quake3/botlib/l_precomp.c diff --git a/engine/botlib/l_precomp.h b/plugins/quake3/botlib/l_precomp.h similarity index 100% rename from engine/botlib/l_precomp.h rename to plugins/quake3/botlib/l_precomp.h diff --git a/engine/botlib/l_script.c b/plugins/quake3/botlib/l_script.c similarity index 100% rename from engine/botlib/l_script.c rename to plugins/quake3/botlib/l_script.c diff --git a/engine/botlib/l_script.h b/plugins/quake3/botlib/l_script.h similarity index 100% rename from engine/botlib/l_script.h rename to plugins/quake3/botlib/l_script.h diff --git a/engine/botlib/l_struct.c b/plugins/quake3/botlib/l_struct.c similarity index 100% rename from engine/botlib/l_struct.c rename to plugins/quake3/botlib/l_struct.c diff --git a/engine/botlib/l_struct.h b/plugins/quake3/botlib/l_struct.h similarity index 100% rename from engine/botlib/l_struct.h rename to plugins/quake3/botlib/l_struct.h diff --git a/engine/botlib/l_utils.h b/plugins/quake3/botlib/l_utils.h similarity index 100% rename from engine/botlib/l_utils.h rename to plugins/quake3/botlib/l_utils.h diff --git a/engine/botlib/q_platform.h b/plugins/quake3/botlib/q_platform.h similarity index 100% rename from engine/botlib/q_platform.h rename to plugins/quake3/botlib/q_platform.h diff --git a/engine/botlib/q_shared.h b/plugins/quake3/botlib/q_shared.h similarity index 100% rename from engine/botlib/q_shared.h rename to plugins/quake3/botlib/q_shared.h diff --git a/engine/botlib/standalone.c b/plugins/quake3/botlib/standalone.c similarity index 100% rename from engine/botlib/standalone.c rename to plugins/quake3/botlib/standalone.c diff --git a/engine/botlib/surfaceflags.h b/plugins/quake3/botlib/surfaceflags.h similarity index 100% rename from engine/botlib/surfaceflags.h rename to plugins/quake3/botlib/surfaceflags.h diff --git a/engine/client/cl_cg.c b/plugins/quake3/clq3_cg.c similarity index 100% rename from engine/client/cl_cg.c rename to plugins/quake3/clq3_cg.c diff --git a/engine/client/clq3_parse.c b/plugins/quake3/clq3_parse.c similarity index 100% rename from engine/client/clq3_parse.c rename to plugins/quake3/clq3_parse.c diff --git a/engine/client/cl_ui.c b/plugins/quake3/clq3_ui.c similarity index 99% rename from engine/client/cl_ui.c rename to plugins/quake3/clq3_ui.c index e1b362ac..2ee17322 100644 --- a/engine/client/cl_ui.c +++ b/plugins/quake3/clq3_ui.c @@ -7,7 +7,7 @@ static int keycatcher; -#include "botlib.h" +#include "botlib/botlib.h" void SV_InitBotLib(void); extern botlib_export_t *botlib; qboolean CG_GetLimboString(int index, char *outbuf); diff --git a/engine/client/clq3defs.h b/plugins/quake3/clq3defs.h similarity index 100% rename from engine/client/clq3defs.h rename to plugins/quake3/clq3defs.h diff --git a/engine/common/q3common.c b/plugins/quake3/q3common.c similarity index 100% rename from engine/common/q3common.c rename to plugins/quake3/q3common.c diff --git a/engine/common/q3common.h b/plugins/quake3/q3common.h similarity index 100% rename from engine/common/q3common.h rename to plugins/quake3/q3common.h diff --git a/engine/server/q3g_public.h b/plugins/quake3/q3g_public.h similarity index 100% rename from engine/server/q3g_public.h rename to plugins/quake3/q3g_public.h diff --git a/engine/server/svq3_game.c b/plugins/quake3/svq3_game.c similarity index 99% rename from engine/server/svq3_game.c rename to plugins/quake3/svq3_game.c index c75302d8..97eae787 100644 --- a/engine/server/svq3_game.c +++ b/plugins/quake3/svq3_game.c @@ -13,7 +13,7 @@ #define fileHandle_t int #define fsMode_t int #define pc_token_t void -#include "botlib.h" +#include "botlib/botlib.h" #define Z_TAG_BOTLIB 221726 static zonegroup_t botlibmem;