mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10202] Rename isInFlight() to IsTaxiFlying() and UNIT_STAT_IN_FLIGHT to UNIT_STAT_TAXI_FLIGHT.

Browse source 
Also add IsFreeFlying() function to Player class.
This commit is contained in:
Lynx3d 2010-07-17 01:37:40 +02:00
parent e47e9a2218
commit 01d326b90d
25 changed files with 68 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/game/Level1.cpp
View file

@ -438,7 +438,7 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
ChatHandler(target).PSendSysMessage(LANG_SUMMONED_BY, playerLink(_player->GetName()).c_str());
// stop flight if need
if (target->isInFlight())
if (target->IsTaxiFlying())
{
target->GetMotionMaster()->MovementExpired();
target->m_taxi.ClearTaxiDestinations();
@ -576,7 +576,7 @@ bool ChatHandler::HandleGonameCommand(const char* args)
ChatHandler(target).PSendSysMessage(LANG_APPEARING_TO, GetNameLink().c_str());
// stop flight if need
if (_player->isInFlight())
if (_player->IsTaxiFlying())
{
_player->GetMotionMaster()->MovementExpired();
_player->m_taxi.ClearTaxiDestinations();
@ -1121,7 +1121,7 @@ bool ChatHandler::HandleModifyASpeedCommand(const char* args)
std::string chrNameLink = GetNameLink(chr);
if(chr->isInFlight())
if(chr->IsTaxiFlying())
{
PSendSysMessage(LANG_CHAR_IN_FLIGHT,chrNameLink.c_str());
SetSentErrorMessage(true);
@ -1169,7 +1169,7 @@ bool ChatHandler::HandleModifySpeedCommand(const char* args)
std::string chrNameLink = GetNameLink(chr);
if(chr->isInFlight())
if(chr->IsTaxiFlying())
{
PSendSysMessage(LANG_CHAR_IN_FLIGHT,chrNameLink.c_str());
SetSentErrorMessage(true);
@ -1214,7 +1214,7 @@ bool ChatHandler::HandleModifySwimCommand(const char* args)
std::string chrNameLink = GetNameLink(chr);
if(chr->isInFlight())
if(chr->IsTaxiFlying())
{
PSendSysMessage(LANG_CHAR_IN_FLIGHT,chrNameLink.c_str());
SetSentErrorMessage(true);
@ -1259,7 +1259,7 @@ bool ChatHandler::HandleModifyBWalkCommand(const char* args)
std::string chrNameLink = GetNameLink(chr);
if(chr->isInFlight())
if(chr->IsTaxiFlying())
{
PSendSysMessage(LANG_CHAR_IN_FLIGHT,chrNameLink.c_str());
SetSentErrorMessage(true);
@ -2089,7 +2089,7 @@ bool ChatHandler::HandleTeleGroupCommand(const char * args)
ChatHandler(pl).PSendSysMessage(LANG_TELEPORTED_TO_BY, nameLink.c_str());
// stop flight if need
if(pl->isInFlight())
if(pl->IsTaxiFlying())
{
pl->GetMotionMaster()->MovementExpired();
pl->m_taxi.ClearTaxiDestinations();
@ -2178,7 +2178,7 @@ bool ChatHandler::HandleGroupgoCommand(const char* args)
ChatHandler(pl).PSendSysMessage(LANG_SUMMONED_BY, nameLink.c_str());
// stop flight if need
if(pl->isInFlight())
if(pl->IsTaxiFlying())
{
pl->GetMotionMaster()->MovementExpired();
pl->m_taxi.ClearTaxiDestinations();
@ -2231,7 +2231,7 @@ bool ChatHandler::HandleGoHelper( Player* player, uint32 mapid, float x, float y
}
// stop flight if need
if(player->isInFlight())
if(player->IsTaxiFlying())
{
player->GetMotionMaster()->MovementExpired();
player->m_taxi.ClearTaxiDestinations();