diff --git a/src/xrEngine/xr_ioc_cmd.cpp b/src/xrEngine/xr_ioc_cmd.cpp index bf67c74183d..00d80f0024b 100644 --- a/src/xrEngine/xr_ioc_cmd.cpp +++ b/src/xrEngine/xr_ioc_cmd.cpp @@ -4,8 +4,9 @@ #include "x_ray.h" #include "XR_IOConsole.h" #include "xr_ioc_cmd.h" +#include "xrSASH.h" -#include "cameramanager.h" +#include "CameraManager.h" #include "Environment.h" #include "xr_input.h" #include "CustomHUD.h" @@ -16,6 +17,18 @@ xr_vector vid_quality_token; const xr_token vid_bpp_token[] = {{"16", 16}, {"32", 32}, {0, 0}}; + +void IConsole_Command::InvalidSyntax() +{ + TInfo I; + Info(I); + Msg("~ Invalid syntax in call to '%s'", cName); + Msg("~ Valid arguments: %s", I); + + g_SASH.OnConsoleInvalidSyntax(false, "~ Invalid syntax in call to '%s'", cName); + g_SASH.OnConsoleInvalidSyntax(true, "~ Valid arguments: %s", I); +} + //----------------------------------------------------------------------- void IConsole_Command::add_to_LRU(shared_str const& arg) diff --git a/src/xrEngine/xr_ioc_cmd.h b/src/xrEngine/xr_ioc_cmd.h index 13e642740f3..be61a9e7085 100644 --- a/src/xrEngine/xr_ioc_cmd.h +++ b/src/xrEngine/xr_ioc_cmd.h @@ -26,7 +26,6 @@ Console->AddCommand(&x##cls); \ } -#include "xrSASH.h" #include "xrCore/xrCore_benchmark_macros.h" #include "xrCore/xr_token.h" @@ -68,16 +67,7 @@ class ENGINE_API IConsole_Command BENCH_SEC_SCRAMBLEVTBL3 LPCSTR Name() { return cName; } - void InvalidSyntax() - { - TInfo I; - Info(I); - Msg("~ Invalid syntax in call to '%s'", cName); - Msg("~ Valid arguments: %s", I); - - g_SASH.OnConsoleInvalidSyntax(false, "~ Invalid syntax in call to '%s'", cName); - g_SASH.OnConsoleInvalidSyntax(true, "~ Valid arguments: %s", I); - } + void InvalidSyntax(); virtual void Execute(LPCSTR args) = 0; virtual void Status(TStatus& S) { S[0] = 0; } virtual void Info(TInfo& I) { xr_strcpy(I, "(no arguments)"); }