diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index 4fd0277f8..aa51092ba 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -148,11 +148,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 656cd34c8..7b3f44de8 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -100,8 +100,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); @@ -109,9 +107,6 @@ class ChatHandler bool HandleRecallCommand(const char* args); bool HandleAnnounceCommand(const char* args); bool HandleNotifyCommand(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); @@ -127,6 +122,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); @@ -412,7 +414,6 @@ class ChatHandler bool HandleWpShowCommand(const char* args); bool HandleWpExportCommand(const char* args); bool HandleWpImportCommand(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 c630dedbf..30efd6464 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -149,7 +149,7 @@ bool ChatHandler::HandleNotifyCommand(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 af451ebc0..8c9bbc483 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -5609,7 +5609,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; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8355515a6..e7b2caf6d 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7612" + #define REVISION_NR "7613" #endif // __REVISION_NR_H__