From a2dac43833cc66c30d545ef7e8e7a3c938b65661 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 28 Aug 2015 15:12:20 -0400 Subject: [PATCH] Remove CCommand from the logic bridge. --- core/logic/intercom.h | 6 +----- core/logic_bridge.cpp | 12 ------------ 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/core/logic/intercom.h b/core/logic/intercom.h index a597f6b7..32784e15 100644 --- a/core/logic/intercom.h +++ b/core/logic/intercom.h @@ -52,7 +52,7 @@ using namespace SourceHook; * Add 1 to the RHS of this expression to bump the intercom file * This is to prevent mismatching core/logic binaries */ -#define SM_LOGIC_MAGIC (0x0F47C0DE - 38) +#define SM_LOGIC_MAGIC (0x0F47C0DE - 39) #if defined SM_LOGIC class IVEngineServer @@ -275,8 +275,6 @@ private: const CVector *list_; }; -class CCommand; - struct sm_core_t { /* Objects */ @@ -303,8 +301,6 @@ struct sm_core_t const char * (*GetCoreConfigValue)(const char*); bool (*IsMapLoading)(); bool (*IsMapRunning)(); - int (*Argc)(const CCommand &args); - const char * (*Arg)(const CCommand &args, int arg); int (*LoadMMSPlugin)(const char *file, bool *ok, char *error, size_t maxlength); void (*UnloadMMSPlugin)(int id); void (*DoGlobalPluginLoads)(); diff --git a/core/logic_bridge.cpp b/core/logic_bridge.cpp index 802dcdcf..e0923df1 100644 --- a/core/logic_bridge.cpp +++ b/core/logic_bridge.cpp @@ -466,16 +466,6 @@ static bool look_for_cmd_admin_flags(const char *cmd, FlagBits *pFlags) return g_ConCmds.LookForCommandAdminFlags(cmd, pFlags); } -int read_cmd_argc(const CCommand &args) -{ - return args.ArgC(); -} - -static const char *read_cmd_arg(const CCommand &args, int arg) -{ - return args.Arg(arg); -} - static int load_mms_plugin(const char *file, bool *ok, char *error, size_t maxlength) { bool ignore_already; @@ -644,8 +634,6 @@ static sm_core_t core_bridge = get_core_config_value, is_map_loading, is_map_running, - read_cmd_argc, - read_cmd_arg, load_mms_plugin, unload_mms_plugin, do_global_plugin_loads,