Skip to content

Simplify cvar and command declaration to a single line of each #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ add_executable(${CRYMP_CLIENT_EXE} WIN32
Code/CryGame/GameActions.h
Code/CryGame/GameCVars.cpp
Code/CryGame/GameCVars.h
Code/CryGame/GameCVarsLib.h
Code/CryGame/GameFactory.cpp
Code/CryGame/GameFactory.h
Code/CryGame/GameRules.cpp
Expand Down
2 changes: 0 additions & 2 deletions Code/CryGame/Game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,6 @@ bool CGame::Init(IGameFramework* pFramework)

m_pConsole = gEnv->pConsole;

RegisterConsoleVars();
RegisterConsoleCommands();
RegisterGameObjectEvents();

// Initialize static item strings
Expand Down
29 changes: 0 additions & 29 deletions Code/CryGame/Game.h
Original file line number Diff line number Diff line change
Expand Up @@ -209,39 +209,10 @@ class CGame :
virtual void CheckReloadLevel();

// These funcs live in GameCVars.cpp
virtual void RegisterConsoleVars();
virtual void RegisterConsoleCommands();
virtual void UnregisterConsoleCommands();

virtual void RegisterGameObjectEvents();

// marcok: this is bad and evil ... should be removed soon
static void CmdRestartGame(IConsoleCmdArgs *pArgs);

static void CmdDumpSS(IConsoleCmdArgs *pArgs);

static void CmdLastInv(IConsoleCmdArgs *pArgs);
static void CmdName(IConsoleCmdArgs *pArgs);
static void CmdTeam(IConsoleCmdArgs *pArgs);
static void CmdLoadLastSave(IConsoleCmdArgs *pArgs);
static void CmdSpectator(IConsoleCmdArgs *pArgs);
static void CmdJoinGame(IConsoleCmdArgs *pArgs);
static void CmdKill(IConsoleCmdArgs *pArgs);
static void CmdVehicleKill(IConsoleCmdArgs *pArgs);
static void CmdRestart(IConsoleCmdArgs *pArgs);
static void CmdSay(IConsoleCmdArgs *pArgs);
static void CmdReloadItems(IConsoleCmdArgs *pArgs);
static void CmdLoadActionmap(IConsoleCmdArgs *pArgs);
static void CmdReloadGameRules(IConsoleCmdArgs *pArgs);
static void CmdNextLevel(IConsoleCmdArgs* pArgs);
static void CmdStartKickVoting(IConsoleCmdArgs* pArgs);
static void CmdStartNextMapVoting(IConsoleCmdArgs* pArgs);
static void CmdVote(IConsoleCmdArgs* pArgs);
static void CmdListPlayers(IConsoleCmdArgs* pArgs);

static void CmdQuickGame(IConsoleCmdArgs* pArgs);
static void CmdQuickGameStop(IConsoleCmdArgs* pArgs);
static void CmdBattleDustReload(IConsoleCmdArgs* pArgs);

IGameFramework *m_pFramework;
IConsole *m_pConsole;
Expand Down
Loading