Skip to content

Commit

Permalink
first stage of botlib code removal, refs #3
Browse files Browse the repository at this point in the history
  • Loading branch information
@JanSimek
JanSimek committed Apr 25, 2012
1 parent 93999f7 commit 96f272a
Show file tree
Hide file tree
Showing 10 changed files with 91 additions and 1,132 deletions.
1 change: 0 additions & 1 deletion premake4.lua
View file
Expand Up @@ -377,7 +377,6 @@ project "etmain_game"
defines
{
"GAMEDLL",
"NO_BOT_SUPPORT"
}

--
Expand Down
18 changes: 0 additions & 18 deletions src/game/g_main.c
View file
Expand Up @@ -518,24 +518,6 @@ Q_EXPORT intptr_t vmMain(intptr_t command, intptr_t arg0, intptr_t arg1, intptr_
return 0;
case GAME_CONSOLE_COMMAND:
return ConsoleCommand();
case BOTAI_START_FRAME:
#ifdef NO_BOT_SUPPORT
return 0;
#else
return BotAIStartFrame(arg0);
#endif // NO_BOT_SUPPORT
case BOT_VISIBLEFROMPOS:
#ifdef NO_BOT_SUPPORT
return qfalse;
#else
return BotVisibleFromPos((float *)arg0, arg1, (float *)arg2, arg3, arg4);
#endif // NO_BOT_SUPPORT
case BOT_CHECKATTACKATPOS:
#ifdef NO_BOT_SUPPORT
return qfalse;
#else
return BotCheckAttackAtPos(arg0, arg1, (float *)arg2, arg3, arg4);
#endif // NO_BOT_SUPPORT
case GAME_SNAPSHOT_CALLBACK:
return G_SnapshotCallback(arg0, arg1);
case GAME_MESSAGERECEIVED:
Expand Down
228 changes: 25 additions & 203 deletions src/game/g_public.h
View file
Expand Up @@ -129,7 +129,7 @@ typedef enum
{
//============== general Quake services ==================

G_PRINT, // ( const char *string );
G_PRINT = 0, // ( const char *string );
// print message on the local console

G_ERROR, // ( const char *string );
Expand Down Expand Up @@ -169,7 +169,7 @@ typedef enum
//=========== server specific functionality =============

G_LOCATE_GAME_DATA, // ( gentity_t *gEnts, int numGEntities, int sizeofGEntity_t,
// playerState_t *clients, int sizeofGameClient );
// playerState_t *clients, int sizeofGameClient );
// the game needs to let the server system know where and how big the gentities
// are, so it can look at them directly without going through an interface

Expand Down Expand Up @@ -231,12 +231,10 @@ 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, // ( int clientNum );
G_BOT_ALLOCATE_CLIENT = 36, // ( int clientNum ); - used by OmniBot

G_BOT_FREE_CLIENT, // ( int clientNum );

G_GET_USERCMD, // ( int clientNum, usercmd_t *cmd )
G_GET_USERCMD = 38, // ( int clientNum, usercmd_t *cmd )

G_GET_ENTITY_TOKEN, // qboolean ( char *buffer, int bufferSize )
// Retrieves the next string token from the entity spawn text, returning
Expand Down Expand Up @@ -265,201 +263,27 @@ typedef enum
G_REGISTERSOUND, // xkan, 10/28/2002 - register the sound
G_GET_SOUND_LENGTH, // xkan, 10/28/2002 - get the length of the sound

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_ENTITY_VISIBLE = 300, //FIXME: remove
BOTLIB_AAS_IN_FIELD_OF_VISION, //FIXME: remove
BOTLIB_AAS_VISIBLE_CLIENTS, //FIXME: remove
BOTLIB_AAS_ENTITY_INFO,

BOTLIB_AAS_INITIALIZED,
BOTLIB_AAS_PRESENCE_TYPE_BOUNDING_BOX,
BOTLIB_AAS_TIME,

// Ridah
BOTLIB_AAS_SETCURRENTWORLD,
// done.

BOTLIB_AAS_POINT_AREA_NUM,
BOTLIB_AAS_TRACE_AREAS,
BOTLIB_AAS_BBOX_AREAS,
BOTLIB_AAS_AREA_CENTER,
BOTLIB_AAS_AREA_WAYPOINT,

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_LADDER,

BOTLIB_AAS_AREA_TRAVEL_TIME_TO_GOAL_AREA,

BOTLIB_AAS_SWIMMING,
BOTLIB_AAS_PREDICT_CLIENT_MOVEMENT,

// Ridah, route-tables
BOTLIB_AAS_RT_SHOWROUTE,
//BOTLIB_AAS_RT_GETHIDEPOS,
//BOTLIB_AAS_FINDATTACKSPOTWITHINRANGE,
BOTLIB_AAS_NEARESTHIDEAREA,
BOTLIB_AAS_LISTAREASINRANGE,
BOTLIB_AAS_AVOIDDANGERAREA,
BOTLIB_AAS_RETREAT,
BOTLIB_AAS_ALTROUTEGOALS,
BOTLIB_AAS_SETAASBLOCKINGENTITY,
BOTLIB_AAS_RECORDTEAMDEATHAREA,
// done.

BOTLIB_EA_SAY = 400,
BOTLIB_EA_SAY_TEAM,
BOTLIB_EA_USE_ITEM,
BOTLIB_EA_DROP_ITEM,
BOTLIB_EA_USE_INV,
BOTLIB_EA_DROP_INV,
BOTLIB_EA_GESTURE,
BOTLIB_EA_COMMAND,

BOTLIB_EA_SELECT_WEAPON,
BOTLIB_EA_TALK,
BOTLIB_EA_ATTACK,
BOTLIB_EA_RELOAD,
BOTLIB_EA_USE,
BOTLIB_EA_RESPAWN,
BOTLIB_EA_JUMP,
BOTLIB_EA_DELAYED_JUMP,
BOTLIB_EA_CROUCH,
BOTLIB_EA_WALK,
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_MOVE,
BOTLIB_EA_VIEW,
// START xkan, 9/16/2002
BOTLIB_EA_PRONE,
// END xkan, 9/16/2002

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,
// Ridah
BOTLIB_AI_INIT_AVOID_REACH,
// done.

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,
// used by OmniBot
// 200
BOTLIB_GET_CONSOLE_MESSAGE = 210, // ( int client, char *message, int size );
BOTLIB_USER_COMMAND = 211, // ( int client, usercmd_t *ucmd );

// 400
BOTLIB_EA_COMMAND = 407,
// used by OmniBot end

// 500
// files
BOTLIB_PC_LOAD_SOURCE = 579,
BOTLIB_PC_FREE_SOURCE,
BOTLIB_PC_READ_TOKEN,
BOTLIB_PC_SOURCE_FILE_AND_LINE,
BOTLIB_PC_UNREAD_TOKEN,

PB_STAT_REPORT,
PB_STAT_REPORT = 584, // don't remove, vanilla clients might call this

// zinx
G_SENDMESSAGE,
G_SENDMESSAGE = 585,
G_MESSAGESTATUS,
// -zinx
} gameImport_t;
Expand All @@ -470,7 +294,7 @@ typedef enum
//
typedef enum
{
GAME_INIT, // ( int levelTime, int randomSeed, int restart );
GAME_INIT = 0, // ( int levelTime, int randomSeed, int restart );
// init and shutdown will be called every single level
// The game should call G_GET_ENTITY_TOKEN to parse through all the
// entity configuration text and spawn gentities.
Expand Down Expand Up @@ -499,16 +323,14 @@ typedef enum
// 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.

GAME_SNAPSHOT_CALLBACK, // ( int entityNum, int clientNum ); // return qfalse if you don't want it to be added

BOTAI_START_FRAME, // ( int time );
GAME_SNAPSHOT_CALLBACK = 10, // ( int entityNum, int clientNum ); // return qfalse if you don't want it to be added

// Ridah, Cast AI
BOT_VISIBLEFROMPOS,
BOT_CHECKATTACKATPOS,
// done.
// IRATA: these gameExport_t are not used anymore - kept as reminder
// BOTAI_START_FRAME,
// BOT_VISIBLEFROMPOS,
// BOT_CHECKATTACKATPOS,

// zinx
GAME_MESSAGERECEIVED, // ( int cno, const char *buf, int buflen, int commandTime );
GAME_MESSAGERECEIVED = 14, // ( int cno, const char *buf, int buflen, int commandTime );
// -zinx
} gameExport_t;

0 comments on commit 96f272a

Please sign in to comment.