Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts: src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
This commit is contained in:
commit
f7d3600e7e
128 files changed
+2862
-2459
No files matched your search
@@ -201,8 +201,8 @@ public:
|
||||
float z = player->GetPositionZ();
|
||||
float ang = player->GetOrientation();
|
||||
|
||||
float rot2 = sin(ang/2);
|
||||
float rot3 = cos(ang/2);
|
||||
float rot2 = std::sin(ang/2);
|
||||
float rot3 = std::cos(ang/2);
|
||||
|
||||
uint32 objectId = atoi(id);
|
||||
|
||||
|
||||
@@ -39,12 +39,12 @@ public:
|
||||
{ "complete", SEC_ADMINISTRATOR, false, &HandleQuestComplete, "", NULL },
|
||||
{ "remove", SEC_ADMINISTRATOR, false, &HandleQuestRemove, "", NULL },
|
||||
{ "reward", SEC_ADMINISTRATOR, false, &HandleQuestReward, "", NULL },
|
||||
{ NULL, 0, false, NULL, "", NULL }
|
||||
{ NULL, SEC_PLAYER, false, NULL, "", NULL }
|
||||
};
|
||||
static ChatCommand commandTable[] =
|
||||
{
|
||||
{ "quest", SEC_ADMINISTRATOR, false, NULL, "", questCommandTable },
|
||||
{ NULL, 0, false, NULL, "", NULL }
|
||||
{ NULL, SEC_PLAYER, false, NULL, "", NULL }
|
||||
};
|
||||
return commandTable;
|
||||
}
|
||||
|
||||
@@ -408,9 +408,9 @@ public:
|
||||
if (!*args)
|
||||
return false;
|
||||
|
||||
Tokens entries(std::string(args), ' ');
|
||||
Tokenizer entries(std::string(args), ' ');
|
||||
|
||||
for (Tokens::const_iterator itr = entries.begin(); itr != entries.end(); ++itr)
|
||||
for (Tokenizer::const_iterator itr = entries.begin(); itr != entries.end(); ++itr)
|
||||
{
|
||||
uint32 entry = uint32(atoi(*itr));
|
||||
|
||||
|
||||
Reference in new issue
Block a user