diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Chat.cpp | 4 | ||||
| -rw-r--r-- | src/game/Chat.h | 14 | ||||
| -rw-r--r-- | src/game/Level1.cpp | 2 | ||||
| -rw-r--r-- | src/game/Level3.cpp | 2 |
4 files changed, 12 insertions, 10 deletions
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index e28da9d0063..5b5c3e782d9 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -152,11 +152,11 @@ ChatCommand * ChatHandler::getCommandTable() static ChatCommand gmCommandTable[] = { { "chat", SEC_MODERATOR, false, &ChatHandler::HandleGMChatCommand, "", NULL }, + { "fly", SEC_ADMINISTRATOR, false, &ChatHandler::HandleGMFlyCommand, "", NULL }, { "ingame", SEC_PLAYER, true, &ChatHandler::HandleGMListIngameCommand, "", NULL }, { "list", SEC_ADMINISTRATOR, true, &ChatHandler::HandleGMListFullCommand, "", NULL }, { "visible", SEC_MODERATOR, false, &ChatHandler::HandleGMVisibleCommand, "", NULL }, - { "fly", SEC_ADMINISTRATOR, false, &ChatHandler::HandleGMFlyModeCommand, "", NULL }, - { "", SEC_MODERATOR, false, &ChatHandler::HandleGMmodeCommand, "", NULL }, + { "", SEC_MODERATOR, false, &ChatHandler::HandleGMCommand, "", NULL }, { NULL, 0, false, NULL, "", NULL } }; diff --git a/src/game/Chat.h b/src/game/Chat.h index 4a4f0df5c56..cedb889f9bd 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -106,8 +106,6 @@ class ChatHandler bool HandleStartCommand(const char* args); bool HandleDismountCommand(const char* args); bool HandleSaveCommand(const char* args); - bool HandleGMListIngameCommand(const char* args); - bool HandleGMListFullCommand(const char* args); bool HandleNamegoCommand(const char* args); bool HandleGonameCommand(const char* args); @@ -119,9 +117,7 @@ class ChatHandler bool HandleGMAnnounceCommand(const char* args); bool HandleNotifyCommand(const char* args); bool HandleGMNotifyCommand(const char* args); - bool HandleGMmodeCommand(const char* args); - bool HandleGMChatCommand(const char* args); - bool HandleGMVisibleCommand(const char* args); + bool HandleGPSCommand(const char* args); bool HandleTaxiCheatCommand(const char* args); bool HandleWhispersCommand(const char* args); @@ -137,6 +133,13 @@ class ChatHandler bool HandleEventStopCommand(const char* args); bool HandleEventInfoCommand(const char* args); + bool HandleGMCommand(const char* args); + bool HandleGMChatCommand(const char* args); + bool HandleGMFlyCommand(const char* args); + bool HandleGMListFullCommand(const char* args); + bool HandleGMListIngameCommand(const char* args); + bool HandleGMVisibleCommand(const char* args); + bool HandleLearnCommand(const char* args); bool HandleLearnAllCommand(const char* args); bool HandleLearnAllGMCommand(const char* args); @@ -460,7 +463,6 @@ class ChatHandler bool HandleWpEventCommand(const char* args); bool HandleWpShowCommand(const char* args); bool HandleReloadAllPaths(const char *args); - bool HandleGMFlyModeCommand(const char* args); bool HandleDebugSendOpcodeCommand(const char* args); bool HandleDebugSellErrorCommand(const char* args); bool HandleDebugBuyErrorCommand(const char* args); diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index d52a6854328..bf15da9f7f6 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -199,7 +199,7 @@ bool ChatHandler::HandleGMNotifyCommand(const char* args) } //Enable\Dissable GM Mode -bool ChatHandler::HandleGMmodeCommand(const char* args) +bool ChatHandler::HandleGMCommand(const char* args) { if(!*args) { diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index b20c1ffb02b..d085e059a99 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -6179,7 +6179,7 @@ bool ChatHandler::HandleRespawnCommand(const char* /*args*/) return true; } -bool ChatHandler::HandleGMFlyModeCommand(const char* args) +bool ChatHandler::HandleGMFlyCommand(const char* args) { if (!*args) return false; |