* Removal of bot code

* Refactored botlib parsing code into qcommon

1 files changed, 9 insertions, 175 deletions

diff --git a/src/game/g_public.h b/src/game/g_public.h
index ba7a6e69..fc6b7df3 100644
--- a/src/game/g_public.h
+++ b/src/game/g_public.h
@@ -35,7 +35,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=551
 #define SVF_CLIENTMASK 0x00000002
 
-#define SVF_BOT                 0x00000008
 #define SVF_BROADCAST           0x00000020  // send to all connected clients
 #define SVF_PORTAL              0x00000040  // merge a second pvs at origin2 into snapshots
 #define SVF_USE_CURRENT_ORIGIN  0x00000080  // entity->r.currentOrigin instead of entity->s.origin
@@ -200,11 +199,6 @@ typedef enum {
   G_ENTITY_CONTACT, // ( const vec3_t mins, const vec3_t maxs, const gentity_t *ent );
   // perform an exact check against inline brush models of non-square shape
 
-  // access for bots to get and free a server client (FIXME?)
-  G_BOT_ALLOCATE_CLIENT,  // ( void );
-
-  G_BOT_FREE_CLIENT,  // ( int clientNum );
-
   G_GET_USERCMD,  // ( int clientNum, usercmd_t *cmd )
 
   G_GET_ENTITY_TOKEN, // qboolean ( char *buffer, int bufferSize )
@@ -213,8 +207,6 @@ typedef enum {
   // This should only be done at GAME_INIT time.
 
   G_FS_GETFILELIST,
-  G_DEBUG_POLYGON_CREATE,
-  G_DEBUG_POLYGON_DELETE,
   G_REAL_TIME,
   G_SNAPVECTOR,
 
@@ -224,169 +216,13 @@ typedef enum {
   // 1.32
   G_FS_SEEK,
 
-  G_SEND_GAMESTAT,
-
-  BOTLIB_SETUP = 200,       // ( void );
-  BOTLIB_SHUTDOWN,        // ( void );
-  BOTLIB_LIBVAR_SET,
-  BOTLIB_LIBVAR_GET,
-  BOTLIB_PC_ADD_GLOBAL_DEFINE,
-  BOTLIB_START_FRAME,
-  BOTLIB_LOAD_MAP,
-  BOTLIB_UPDATENTITY,
-  BOTLIB_TEST,
-
-  BOTLIB_GET_SNAPSHOT_ENTITY,   // ( int client, int ent );
-  BOTLIB_GET_CONSOLE_MESSAGE,   // ( int client, char *message, int size );
-  BOTLIB_USER_COMMAND,      // ( int client, usercmd_t *ucmd );
-
-  BOTLIB_AAS_ENABLE_ROUTING_AREA = 300,
-  BOTLIB_AAS_BBOX_AREAS,
-  BOTLIB_AAS_AREA_INFO,
-  BOTLIB_AAS_ENTITY_INFO,
-
-  BOTLIB_AAS_INITIALIZED,
-  BOTLIB_AAS_PRESENCE_TYPE_BOUNDING_BOX,
-  BOTLIB_AAS_TIME,
-
-  BOTLIB_AAS_POINT_AREA_NUM,
-  BOTLIB_AAS_TRACE_AREAS,
-
-  BOTLIB_AAS_POINT_CONTENTS,
-  BOTLIB_AAS_NEXT_BSP_ENTITY,
-  BOTLIB_AAS_VALUE_FOR_BSP_EPAIR_KEY,
-  BOTLIB_AAS_VECTOR_FOR_BSP_EPAIR_KEY,
-  BOTLIB_AAS_FLOAT_FOR_BSP_EPAIR_KEY,
-  BOTLIB_AAS_INT_FOR_BSP_EPAIR_KEY,
-
-  BOTLIB_AAS_AREA_REACHABILITY,
-
-  BOTLIB_AAS_AREA_TRAVEL_TIME_TO_GOAL_AREA,
-
-  BOTLIB_AAS_SWIMMING,
-  BOTLIB_AAS_PREDICT_CLIENT_MOVEMENT,
-
-
-
-  BOTLIB_EA_SAY = 400,
-  BOTLIB_EA_SAY_TEAM,
-  BOTLIB_EA_COMMAND,
-
-  BOTLIB_EA_ACTION,
-  BOTLIB_EA_GESTURE,
-  BOTLIB_EA_TALK,
-  BOTLIB_EA_ATTACK,
-  BOTLIB_EA_USE,
-  BOTLIB_EA_RESPAWN,
-  BOTLIB_EA_CROUCH,
-  BOTLIB_EA_MOVE_UP,
-  BOTLIB_EA_MOVE_DOWN,
-  BOTLIB_EA_MOVE_FORWARD,
-  BOTLIB_EA_MOVE_BACK,
-  BOTLIB_EA_MOVE_LEFT,
-  BOTLIB_EA_MOVE_RIGHT,
-
-  BOTLIB_EA_SELECT_WEAPON,
-  BOTLIB_EA_JUMP,
-  BOTLIB_EA_DELAYED_JUMP,
-  BOTLIB_EA_MOVE,
-  BOTLIB_EA_VIEW,
-
-  BOTLIB_EA_END_REGULAR,
-  BOTLIB_EA_GET_INPUT,
-  BOTLIB_EA_RESET_INPUT,
-
-
-
-  BOTLIB_AI_LOAD_CHARACTER = 500,
-  BOTLIB_AI_FREE_CHARACTER,
-  BOTLIB_AI_CHARACTERISTIC_FLOAT,
-  BOTLIB_AI_CHARACTERISTIC_BFLOAT,
-  BOTLIB_AI_CHARACTERISTIC_INTEGER,
-  BOTLIB_AI_CHARACTERISTIC_BINTEGER,
-  BOTLIB_AI_CHARACTERISTIC_STRING,
-
-  BOTLIB_AI_ALLOC_CHAT_STATE,
-  BOTLIB_AI_FREE_CHAT_STATE,
-  BOTLIB_AI_QUEUE_CONSOLE_MESSAGE,
-  BOTLIB_AI_REMOVE_CONSOLE_MESSAGE,
-  BOTLIB_AI_NEXT_CONSOLE_MESSAGE,
-  BOTLIB_AI_NUM_CONSOLE_MESSAGE,
-  BOTLIB_AI_INITIAL_CHAT,
-  BOTLIB_AI_REPLY_CHAT,
-  BOTLIB_AI_CHAT_LENGTH,
-  BOTLIB_AI_ENTER_CHAT,
-  BOTLIB_AI_STRING_CONTAINS,
-  BOTLIB_AI_FIND_MATCH,
-  BOTLIB_AI_MATCH_VARIABLE,
-  BOTLIB_AI_UNIFY_WHITE_SPACES,
-  BOTLIB_AI_REPLACE_SYNONYMS,
-  BOTLIB_AI_LOAD_CHAT_FILE,
-  BOTLIB_AI_SET_CHAT_GENDER,
-  BOTLIB_AI_SET_CHAT_NAME,
-
-  BOTLIB_AI_RESET_GOAL_STATE,
-  BOTLIB_AI_RESET_AVOID_GOALS,
-  BOTLIB_AI_PUSH_GOAL,
-  BOTLIB_AI_POP_GOAL,
-  BOTLIB_AI_EMPTY_GOAL_STACK,
-  BOTLIB_AI_DUMP_AVOID_GOALS,
-  BOTLIB_AI_DUMP_GOAL_STACK,
-  BOTLIB_AI_GOAL_NAME,
-  BOTLIB_AI_GET_TOP_GOAL,
-  BOTLIB_AI_GET_SECOND_GOAL,
-  BOTLIB_AI_CHOOSE_LTG_ITEM,
-  BOTLIB_AI_CHOOSE_NBG_ITEM,
-  BOTLIB_AI_TOUCHING_GOAL,
-  BOTLIB_AI_ITEM_GOAL_IN_VIS_BUT_NOT_VISIBLE,
-  BOTLIB_AI_GET_LEVEL_ITEM_GOAL,
-  BOTLIB_AI_AVOID_GOAL_TIME,
-  BOTLIB_AI_INIT_LEVEL_ITEMS,
-  BOTLIB_AI_UPDATE_ENTITY_ITEMS,
-  BOTLIB_AI_LOAD_ITEM_WEIGHTS,
-  BOTLIB_AI_FREE_ITEM_WEIGHTS,
-  BOTLIB_AI_SAVE_GOAL_FUZZY_LOGIC,
-  BOTLIB_AI_ALLOC_GOAL_STATE,
-  BOTLIB_AI_FREE_GOAL_STATE,
-
-  BOTLIB_AI_RESET_MOVE_STATE,
-  BOTLIB_AI_MOVE_TO_GOAL,
-  BOTLIB_AI_MOVE_IN_DIRECTION,
-  BOTLIB_AI_RESET_AVOID_REACH,
-  BOTLIB_AI_RESET_LAST_AVOID_REACH,
-  BOTLIB_AI_REACHABILITY_AREA,
-  BOTLIB_AI_MOVEMENT_VIEW_TARGET,
-  BOTLIB_AI_ALLOC_MOVE_STATE,
-  BOTLIB_AI_FREE_MOVE_STATE,
-  BOTLIB_AI_INIT_MOVE_STATE,
-
-  BOTLIB_AI_CHOOSE_BEST_FIGHT_WEAPON,
-  BOTLIB_AI_GET_WEAPON_INFO,
-  BOTLIB_AI_LOAD_WEAPON_WEIGHTS,
-  BOTLIB_AI_ALLOC_WEAPON_STATE,
-  BOTLIB_AI_FREE_WEAPON_STATE,
-  BOTLIB_AI_RESET_WEAPON_STATE,
-
-  BOTLIB_AI_GENETIC_PARENTS_AND_CHILD_SELECTION,
-  BOTLIB_AI_INTERBREED_GOAL_FUZZY_LOGIC,
-  BOTLIB_AI_MUTATE_GOAL_FUZZY_LOGIC,
-  BOTLIB_AI_GET_NEXT_CAMP_SPOT_GOAL,
-  BOTLIB_AI_GET_MAP_LOCATION_GOAL,
-  BOTLIB_AI_NUM_INITIAL_CHATS,
-  BOTLIB_AI_GET_CHAT_MESSAGE,
-  BOTLIB_AI_REMOVE_FROM_AVOID_GOALS,
-  BOTLIB_AI_PREDICT_VISIBLE_POSITION,
-
-  BOTLIB_AI_SET_AVOID_GOAL_TIME,
-  BOTLIB_AI_ADD_AVOID_SPOT,
-  BOTLIB_AAS_ALTERNATIVE_ROUTE_GOAL,
-  BOTLIB_AAS_PREDICT_ROUTE,
-  BOTLIB_AAS_POINT_REACHABILITY_AREA_INDEX,
-
-  BOTLIB_PC_LOAD_SOURCE,
-  BOTLIB_PC_FREE_SOURCE,
-  BOTLIB_PC_READ_TOKEN,
-  BOTLIB_PC_SOURCE_FILE_AND_LINE
+  G_PARSE_ADD_GLOBAL_DEFINE,
+  G_PARSE_LOAD_SOURCE,
+  G_PARSE_FREE_SOURCE,
+  G_PARSE_READ_TOKEN,
+  G_PARSE_SOURCE_FILE_AND_LINE,
+
+  G_SEND_GAMESTAT
 } gameImport_t;
 
 
@@ -401,7 +237,7 @@ typedef enum {
 
   GAME_SHUTDOWN,  // (void);
 
-  GAME_CLIENT_CONNECT,  // ( int clientNum, qboolean firstTime, qboolean isBot );
+  GAME_CLIENT_CONNECT,  // ( int clientNum, qboolean firstTime );
   // return NULL if the client is allowed to connect, otherwise return
   // a text string with the reason for denial
 
@@ -417,12 +253,10 @@ typedef enum {
 
   GAME_RUN_FRAME,         // ( int levelTime );
 
-  GAME_CONSOLE_COMMAND,     // ( void );
+  GAME_CONSOLE_COMMAND      // ( void );
   // ConsoleCommand will be called when a command has been issued
   // that is not recognized as a builtin function.
   // The game can issue trap_argc() / trap_argv() commands to get the command
   // and parameters.  Return qfalse if the game doesn't recognize it as a command.
-
-  BOTAI_START_FRAME       // ( int time );
 } gameExport_t;