josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

Browse Source
This commit is contained in:
Subv
2012-04-12 05:51:50 -05:00
parent 70922eef2e 74b5b3bd8e
commit f7aadf51ee
5 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/world/2012_04_12_04_world_creature_template.sql
+2
View File
@@ -0,0 +1,2 @@
-- Update modelid for Invincible (with not bugged animation)
UPDATE `creature_template` SET `modelid1`=31007,`modelid2`=0,`WDBVerified`=-12340 WHERE `entry`=38545;
src/server/game/Chat/Chat.cpp
-1
View File
@@ -382,7 +382,6 @@ ChatCommand* ChatHandler::getCommandTable()
{ "linkgrave", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleLinkGraveCommand>, "", NULL }, { "linkgrave", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleLinkGraveCommand>, "", NULL },
{ "neargrave", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleNearGraveCommand>, "", NULL }, { "neargrave", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleNearGraveCommand>, "", NULL },
{ "explorecheat", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleExploreCheatCommand>, "", NULL }, { "explorecheat", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleExploreCheatCommand>, "", NULL },
{ "hover", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleHoverCommand>, "", NULL },
{ "levelup", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleLevelUpCommand>, "", NULL }, { "levelup", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleLevelUpCommand>, "", NULL },
{ "showarea", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleShowAreaCommand>, "", NULL }, { "showarea", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleShowAreaCommand>, "", NULL },
{ "hidearea", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleHideAreaCommand>, "", NULL }, { "hidearea", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleHideAreaCommand>, "", NULL },
src/server/game/Chat/Chat.h
-1
View File
@@ -286,7 +286,6 @@ class ChatHandler
bool HandleActivateObjectCommand(const char* args); bool HandleActivateObjectCommand(const char* args);
bool HandleSpawnTransportCommand(const char* args); bool HandleSpawnTransportCommand(const char* args);
bool HandleExploreCheatCommand(const char* args); bool HandleExploreCheatCommand(const char* args);
bool HandleHoverCommand(const char* args);
bool HandleWaterwalkCommand(const char* args); bool HandleWaterwalkCommand(const char* args);
bool HandleLevelUpCommand(const char* args); bool HandleLevelUpCommand(const char* args);
bool HandleShowAreaCommand(const char* args); bool HandleShowAreaCommand(const char* args);
src/server/game/Chat/Commands/Level3.cpp
-19
View File
@@ -2158,25 +2158,6 @@ bool ChatHandler::HandleExploreCheatCommand(const char *args)
return true; return true;
} }
bool ChatHandler::HandleHoverCommand(const char *args)
{
char* px = strtok((char*)args, " ");
uint32 flag;
if (!px)
flag = 1;
else
flag = atoi(px);
m_session->GetPlayer()->SetHover(flag);
if (flag)
SendSysMessage(LANG_HOVER_ENABLED);
else
SendSysMessage(LANG_HOVER_DISABLED);
return true;
}
void ChatHandler::HandleCharacterLevel(Player* player, uint64 playerGuid, uint32 oldLevel, uint32 newLevel) void ChatHandler::HandleCharacterLevel(Player* player, uint64 playerGuid, uint32 oldLevel, uint32 newLevel)
{ {
if (player) if (player)
src/server/game/Miscellaneous/Language.h
+4 -2
View File
@@ -522,8 +522,10 @@ enum TrinityStrings
LANG_YOURS_EXPLORE_SET_ALL = 553, LANG_YOURS_EXPLORE_SET_ALL = 553,
LANG_YOURS_EXPLORE_SET_NOTHING = 554, LANG_YOURS_EXPLORE_SET_NOTHING = 554,
LANG_HOVER_ENABLED = 555, //! Old ones now free:
LANG_HOVER_DISABLED = 556, // LANG_HOVER_ENABLED = 555,
// LANG_HOVER_DISABLED = 556,
LANG_YOURS_LEVEL_UP = 557, LANG_YOURS_LEVEL_UP = 557,
LANG_YOURS_LEVEL_DOWN = 558, LANG_YOURS_LEVEL_DOWN = 558,
LANG_YOURS_LEVEL_PROGRESS_RESET = 559, LANG_YOURS_LEVEL_PROGRESS_RESET = 559,