diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index fdf2599be..03a8c8a96 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -56,28 +56,28 @@ bool ChatHandler::HandleMuteCommand(const char* args) char* nameStr; char* delayStr; extractOptFirstArg((char*)args,&nameStr,&delayStr); - if(!delayStr) + if (!delayStr) return false; Player* target; uint64 target_guid; std::string target_name; - if(!extractPlayerTarget(nameStr,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(nameStr,&target,&target_guid,&target_name)) return false; uint32 account_id = target ? target->GetSession()->GetAccountId() : sObjectMgr.GetPlayerAccountIdByGUID(target_guid); // find only player from same account if any - if(!target) + if (!target) { - if(WorldSession* session = sWorld.FindSession(account_id)) + if (WorldSession* session = sWorld.FindSession(account_id)) target = session->GetPlayer(); } uint32 notspeaktime = (uint32) atoi(delayStr); // must have strong lesser security level - if(HasLowerSecurity (target,target_guid,true)) + if (HasLowerSecurity(target, target_guid, true)) return false; time_t mutetime = time(NULL) + notspeaktime*60; @@ -85,9 +85,9 @@ bool ChatHandler::HandleMuteCommand(const char* args) if (target) target->GetSession()->m_muteTime = mutetime; - LoginDatabase.PExecute("UPDATE account SET mutetime = " UI64FMTD " WHERE id = '%u'",uint64(mutetime), account_id ); + LoginDatabase.PExecute("UPDATE account SET mutetime = " UI64FMTD " WHERE id = '%u'", uint64(mutetime), account_id); - if(target) + if (target) ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notspeaktime); std::string nameLink = playerLink(target_name); @@ -102,25 +102,25 @@ bool ChatHandler::HandleUnmuteCommand(const char* args) Player* target; uint64 target_guid; std::string target_name; - if(!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) return false; uint32 account_id = target ? target->GetSession()->GetAccountId() : sObjectMgr.GetPlayerAccountIdByGUID(target_guid); // find only player from same account if any - if(!target) + if (!target) { - if(WorldSession* session = sWorld.FindSession(account_id)) + if (WorldSession* session = sWorld.FindSession(account_id)) target = session->GetPlayer(); } // must have strong lesser security level - if(HasLowerSecurity (target,target_guid,true)) + if (HasLowerSecurity(target, target_guid, true)) return false; if (target) { - if(target->CanSpeak()) + if (target->CanSpeak()) { SendSysMessage(LANG_CHAT_ALREADY_ENABLED); SetSentErrorMessage(true); @@ -130,9 +130,9 @@ bool ChatHandler::HandleUnmuteCommand(const char* args) target->GetSession()->m_muteTime = 0; } - LoginDatabase.PExecute("UPDATE account SET mutetime = '0' WHERE id = '%u'", account_id ); + LoginDatabase.PExecute("UPDATE account SET mutetime = '0' WHERE id = '%u'", account_id); - if(target) + if (target) ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_ENABLED); std::string nameLink = playerLink(target_name); @@ -154,7 +154,7 @@ bool ChatHandler::HandleGoTriggerCommand(const char* args) int32 i_atId = atoi(atId); - if(!i_atId) + if (!i_atId) return false; AreaTriggerEntry const* at = sAreaTriggerStore.LookupEntry(i_atId); @@ -181,7 +181,7 @@ bool ChatHandler::HandleGoGraveyardCommand(const char* args) int32 i_gyId = atoi(gyId); - if(!i_gyId) + if (!i_gyId) return false; WorldSafeLocsEntry const* gy = sWorldSafeLocsStore.LookupEntry(i_gyId); @@ -430,16 +430,16 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args) Player* pl = m_session->GetPlayer(); QueryResult *result; GameEventMgr::ActiveEvents const& activeEventsList = sGameEventMgr.GetActiveEventList(); - if(*args) + if (*args) { // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r char* cId = extractKeyFromLink((char*)args,"Hgameobject_entry"); - if(!cId) + if (!cId) return false; uint32 id = atol(cId); - if(id) + if (id) result = WorldDatabase.PQuery("SELECT guid, id, position_x, position_y, position_z, orientation, map, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM gameobject WHERE map = '%i' AND id = '%u' ORDER BY order_ ASC LIMIT 1", pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(),id); else @@ -504,7 +504,7 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args) pool_id = sPoolMgr.IsPartOfAPool(lowguid); if (!pool_id || sPoolMgr.IsSpawnedObject(lowguid)) found = true; - } while( result->NextRow() && (!found) ); + } while (result->NextRow() && (!found)); delete result; @@ -529,7 +529,7 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args) if (target) { time_t curRespawnDelay = target->GetRespawnTimeEx()-time(NULL); - if(curRespawnDelay < 0) + if (curRespawnDelay < 0) curRespawnDelay = 0; std::string curRespawnDelayStr = secsToTimeString(curRespawnDelay,true); @@ -547,11 +547,11 @@ bool ChatHandler::HandleGameObjectDeleteCommand(const char* args) { // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r char* cId = extractKeyFromLink((char*)args,"Hgameobject"); - if(!cId) + if (!cId) return false; uint32 lowguid = atoi(cId); - if(!lowguid) + if (!lowguid) return false; GameObject* obj = NULL; @@ -560,7 +560,7 @@ bool ChatHandler::HandleGameObjectDeleteCommand(const char* args) if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid)) obj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id); - if(!obj) + if (!obj) { PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -568,10 +568,10 @@ bool ChatHandler::HandleGameObjectDeleteCommand(const char* args) } uint64 owner_guid = obj->GetOwnerGUID(); - if(owner_guid) + if (owner_guid) { Unit* owner = ObjectAccessor::GetUnit(*m_session->GetPlayer(),owner_guid); - if(!owner || !IS_PLAYER_GUID(owner_guid)) + if (!owner || !IS_PLAYER_GUID(owner_guid)) { PSendSysMessage(LANG_COMMAND_DELOBJREFERCREATURE, GUID_LOPART(owner_guid), obj->GetGUIDLow()); SetSentErrorMessage(true); @@ -595,11 +595,11 @@ bool ChatHandler::HandleGameObjectTurnCommand(const char* args) { // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r char* cId = extractKeyFromLink((char*)args,"Hgameobject"); - if(!cId) + if (!cId) return false; uint32 lowguid = atoi(cId); - if(!lowguid) + if (!lowguid) return false; GameObject* obj = NULL; @@ -608,7 +608,7 @@ bool ChatHandler::HandleGameObjectTurnCommand(const char* args) if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid)) obj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id); - if(!obj) + if (!obj) { PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -649,11 +649,11 @@ bool ChatHandler::HandleGameObjectMoveCommand(const char* args) { // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r char* cId = extractKeyFromLink((char*)args,"Hgameobject"); - if(!cId) + if (!cId) return false; uint32 lowguid = atoi(cId); - if(!lowguid) + if (!lowguid) return false; GameObject* obj = NULL; @@ -662,7 +662,7 @@ bool ChatHandler::HandleGameObjectMoveCommand(const char* args) if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid)) obj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id); - if(!obj) + if (!obj) { PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -686,14 +686,14 @@ bool ChatHandler::HandleGameObjectMoveCommand(const char* args) } else { - if(!py || !pz) + if (!py || !pz) return false; float x = (float)atof(px); float y = (float)atof(py); float z = (float)atof(pz); - if(!MapManager::IsValidMapCoord(obj->GetMapId(),x,y,z)) + if (!MapManager::IsValidMapCoord(obj->GetMapId(),x,y,z)) { PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,obj->GetMapId()); SetSentErrorMessage(true); @@ -724,11 +724,11 @@ bool ChatHandler::HandleGameObjectAddCommand(const char* args) // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r char* cId = extractKeyFromLink((char*)args,"Hgameobject_entry"); - if(!cId) + if (!cId) return false; uint32 id = atol(cId); - if(!id) + if (!id) return false; char* spawntimeSecs = strtok(NULL, " "); @@ -761,13 +761,13 @@ bool ChatHandler::HandleGameObjectAddCommand(const char* args) GameObject* pGameObj = new GameObject; uint32 db_lowGUID = sObjectMgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT); - if(!pGameObj->Create(db_lowGUID, gInfo->id, map, chr->GetPhaseMaskForSpawn(), x, y, z, o, 0.0f, 0.0f, 0.0f, 0.0f, 0, GO_STATE_READY)) + if (!pGameObj->Create(db_lowGUID, gInfo->id, map, chr->GetPhaseMaskForSpawn(), x, y, z, o, 0.0f, 0.0f, 0.0f, 0.0f, 0, GO_STATE_READY)) { delete pGameObj; return false; } - if( spawntimeSecs ) + if (spawntimeSecs) { uint32 value = atoi((char*)spawntimeSecs); pGameObj->SetRespawnTime(value); @@ -778,7 +778,7 @@ bool ChatHandler::HandleGameObjectAddCommand(const char* args) pGameObj->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()),chr->GetPhaseMaskForSpawn()); // this will generate a new guid if the object is in an instance - if(!pGameObj->LoadFromDB(db_lowGUID, map)) + if (!pGameObj->LoadFromDB(db_lowGUID, map)) { delete pGameObj; return false; @@ -800,11 +800,11 @@ bool ChatHandler::HandleGameObjectPhaseCommand(const char* args) { // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r char* cId = extractKeyFromLink((char*)args,"Hgameobject"); - if(!cId) + if (!cId) return false; uint32 lowguid = atoi(cId); - if(!lowguid) + if (!lowguid) return false; GameObject* obj = NULL; @@ -813,7 +813,7 @@ bool ChatHandler::HandleGameObjectPhaseCommand(const char* args) if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid)) obj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id); - if(!obj) + if (!obj) { PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -822,7 +822,7 @@ bool ChatHandler::HandleGameObjectPhaseCommand(const char* args) char* phaseStr = strtok (NULL, " "); uint32 phasemask = phaseStr? atoi(phaseStr) : 0; - if ( phasemask == 0 ) + if (phasemask == 0) { SendSysMessage(LANG_BAD_VALUE); SetSentErrorMessage(true); @@ -896,29 +896,29 @@ bool ChatHandler::HandleLookupFactionCommand(const char* args) return false; // Can be NULL at console call - Player *target = getSelectedPlayer (); + Player *target = getSelectedPlayer(); std::string namepart = args; std::wstring wnamepart; - if (!Utf8toWStr (namepart,wnamepart)) + if (!Utf8toWStr(namepart, wnamepart)) return false; // converting string that we try to find to lower case - wstrToLower (wnamepart); + wstrToLower(wnamepart); uint32 counter = 0; // Counter for figure out that we found smth. for (uint32 id = 0; id < sFactionStore.GetNumRows(); ++id) { - FactionEntry const *factionEntry = sFactionStore.LookupEntry (id); + FactionEntry const *factionEntry = sFactionStore.LookupEntry(id); if (factionEntry) { FactionState const* repState = target ? target->GetReputationMgr().GetState(factionEntry) : NULL; int loc = GetSessionDbcLocale(); std::string name = factionEntry->name[loc]; - if(name.empty()) + if (name.empty()) continue; if (!Utf8FitTo(name, wnamepart)) @@ -926,11 +926,11 @@ bool ChatHandler::HandleLookupFactionCommand(const char* args) loc = 0; for(; loc < MAX_LOCALE; ++loc) { - if(loc==GetSessionDbcLocale()) + if (loc == GetSessionDbcLocale()) continue; name = factionEntry->name[loc]; - if(name.empty()) + if (name.empty()) continue; if (Utf8FitTo(name, wnamepart)) @@ -938,7 +938,7 @@ bool ChatHandler::HandleLookupFactionCommand(const char* args) } } - if(loc < MAX_LOCALE) + if (loc < MAX_LOCALE) { // send faction in "id - [faction] rank reputation [visible] [at war] [own team] [unknown] [invisible] [inactive]" format // or "id - [faction] [no reputation]" format @@ -955,17 +955,17 @@ bool ChatHandler::HandleLookupFactionCommand(const char* args) ss << " " << rankName << "|h|r (" << target->GetReputationMgr().GetReputation(factionEntry) << ")"; - if(repState->Flags & FACTION_FLAG_VISIBLE) + if (repState->Flags & FACTION_FLAG_VISIBLE) ss << GetMangosString(LANG_FACTION_VISIBLE); - if(repState->Flags & FACTION_FLAG_AT_WAR) + if (repState->Flags & FACTION_FLAG_AT_WAR) ss << GetMangosString(LANG_FACTION_ATWAR); - if(repState->Flags & FACTION_FLAG_PEACE_FORCED) + if (repState->Flags & FACTION_FLAG_PEACE_FORCED) ss << GetMangosString(LANG_FACTION_PEACE_FORCED); - if(repState->Flags & FACTION_FLAG_HIDDEN) + if (repState->Flags & FACTION_FLAG_HIDDEN) ss << GetMangosString(LANG_FACTION_HIDDEN); - if(repState->Flags & FACTION_FLAG_INVISIBLE_FORCED) + if (repState->Flags & FACTION_FLAG_INVISIBLE_FORCED) ss << GetMangosString(LANG_FACTION_INVISIBLE_FORCED); - if(repState->Flags & FACTION_FLAG_INACTIVE) + if (repState->Flags & FACTION_FLAG_INACTIVE) ss << GetMangosString(LANG_FACTION_INACTIVE); } else @@ -989,7 +989,7 @@ bool ChatHandler::HandleModifyRepCommand(const char * args) Player* target = NULL; target = getSelectedPlayer(); - if(!target) + if (!target) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -1001,7 +1001,7 @@ bool ChatHandler::HandleModifyRepCommand(const char * args) return false; char* factionTxt = extractKeyFromLink((char*)args,"Hfaction"); - if(!factionTxt) + if (!factionTxt) return false; uint32 factionId = atoi(factionTxt); @@ -1016,25 +1016,25 @@ bool ChatHandler::HandleModifyRepCommand(const char * args) { std::string rankStr = rankTxt; std::wstring wrankStr; - if(!Utf8toWStr(rankStr,wrankStr)) + if (!Utf8toWStr(rankStr, wrankStr)) return false; - wstrToLower( wrankStr ); + wstrToLower(wrankStr); int r = 0; amount = -42000; for (; r < MAX_REPUTATION_RANK; ++r) { std::string rank = GetMangosString(ReputationRankStrIndex[r]); - if(rank.empty()) + if (rank.empty()) continue; std::wstring wrank; - if(!Utf8toWStr(rank,wrank)) + if (!Utf8toWStr(rank, wrank)) continue; wstrToLower(wrank); - if(wrank.substr(0,wrankStr.size())==wrankStr) + if (wrank.substr(0, wrankStr.size()) == wrankStr) { char *deltaTxt = strtok(NULL, " "); if (deltaTxt) @@ -1086,10 +1086,10 @@ bool ChatHandler::HandleModifyRepCommand(const char * args) //add spawn of creature bool ChatHandler::HandleNpcAddCommand(const char* args) { - if(!*args) + if (!*args) return false; char* charID = extractKeyFromLink((char*)args,"Hcreature_entry"); - if(!charID) + if (!charID) return false; char* team = strtok(NULL, " "); @@ -1115,7 +1115,7 @@ bool ChatHandler::HandleNpcAddCommand(const char* args) pCreature->Relocate(x,y,z,o); - if(!pCreature->IsPositionValid()) + if (!pCreature->IsPositionValid()) { sLog.outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY()); delete pCreature; @@ -1167,7 +1167,7 @@ bool ChatHandler::HandleNpcAddVendorItemCommand(const char* args) uint32 vendor_entry = vendor ? vendor->GetEntry() : 0; - if(!sObjectMgr.IsVendorItemValid(vendor_entry,itemId,maxcount,incrtime,extendedcost,m_session->GetPlayer())) + if (!sObjectMgr.IsVendorItemValid(vendor_entry, itemId, maxcount, incrtime, extendedcost, m_session->GetPlayer())) { SetSentErrorMessage(true); return false; @@ -1204,7 +1204,7 @@ bool ChatHandler::HandleNpcDelVendorItemCommand(const char* args) } uint32 itemId = atol(pitem); - if(!sObjectMgr.RemoveVendorItem(vendor->GetEntry(),itemId)) + if (!sObjectMgr.RemoveVendorItem(vendor->GetEntry(), itemId)) { PSendSysMessage(LANG_ITEM_NOT_IN_LIST,itemId); SetSentErrorMessage(true); @@ -1220,7 +1220,7 @@ bool ChatHandler::HandleNpcDelVendorItemCommand(const char* args) //add move for creature bool ChatHandler::HandleNpcAddMoveCommand(const char* args) { - if(!*args) + if (!*args) return false; char* guid_str = strtok((char*)args, " "); @@ -1231,15 +1231,15 @@ bool ChatHandler::HandleNpcAddMoveCommand(const char* args) Creature* pCreature = NULL; /* FIXME: impossible without entry - if(lowguid) + if (lowguid) pCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(),MAKE_GUID(lowguid,HIGHGUID_UNIT)); */ // attempt check creature existence by DB data - if(!pCreature) + if (!pCreature) { CreatureData const* data = sObjectMgr.GetCreatureData(lowguid); - if(!data) + if (!data) { PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -1254,7 +1254,7 @@ bool ChatHandler::HandleNpcAddMoveCommand(const char* args) int wait = wait_str ? atoi(wait_str) : 0; - if(wait < 0) + if (wait < 0) wait = 0; Player* player = m_session->GetPlayer(); @@ -1263,11 +1263,11 @@ bool ChatHandler::HandleNpcAddMoveCommand(const char* args) // update movement type WorldDatabase.PExecuteLog("UPDATE creature SET MovementType = '%u' WHERE guid = '%u'", WAYPOINT_MOTION_TYPE,lowguid); - if(pCreature) + if (pCreature) { pCreature->SetDefaultMovementType(WAYPOINT_MOTION_TYPE); pCreature->GetMotionMaster()->Initialize(); - if(pCreature->isAlive()) // dead creature will reset movement generator at respawn + if (pCreature->isAlive()) // dead creature will reset movement generator at respawn { pCreature->setDeathState(JUST_DIED); pCreature->Respawn(); @@ -1287,7 +1287,7 @@ bool ChatHandler::HandleNpcChangeLevelCommand(const char* args) return false; uint8 lvl = (uint8) atoi((char*)args); - if ( lvl < 1 || lvl > sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL) + 3) + if (lvl < 1 || lvl > sWorld.getConfig(CONFIG_UINT32_MAX_PLAYER_LEVEL) + 3) { SendSysMessage(LANG_BAD_VALUE); SetSentErrorMessage(true); @@ -1295,16 +1295,16 @@ bool ChatHandler::HandleNpcChangeLevelCommand(const char* args) } Creature* pCreature = getSelectedCreature(); - if(!pCreature) + if (!pCreature) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); return false; } - if(pCreature->isPet()) + if (pCreature->isPet()) { - if(((Pet*)pCreature)->getPetType()==HUNTER_PET) + if (((Pet*)pCreature)->getPetType()==HUNTER_PET) { pCreature->SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, sObjectMgr.GetXPForPetLevel(lvl)); pCreature->SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, 0); @@ -1313,9 +1313,9 @@ bool ChatHandler::HandleNpcChangeLevelCommand(const char* args) } else { - pCreature->SetMaxHealth( 100 + 30*lvl); - pCreature->SetHealth( 100 + 30*lvl); - pCreature->SetLevel( lvl); + pCreature->SetMaxHealth(100 + 30*lvl); + pCreature->SetHealth(100 + 30*lvl); + pCreature->SetLevel(lvl); pCreature->SaveToDB(); } @@ -1332,7 +1332,7 @@ bool ChatHandler::HandleNpcFlagCommand(const char* args) Creature* pCreature = getSelectedCreature(); - if(!pCreature) + if (!pCreature) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); @@ -1352,15 +1352,15 @@ bool ChatHandler::HandleNpcDeleteCommand(const char* args) { Creature* unit = NULL; - if(*args) + if (*args) { // number or [name] Shift-click form |color|Hcreature:creature_guid|h[name]|h|r char* cId = extractKeyFromLink((char*)args,"Hcreature"); - if(!cId) + if (!cId) return false; uint32 lowguid = atoi(cId); - if(!lowguid) + if (!lowguid) return false; if (CreatureData const* cr_data = sObjectMgr.GetCreatureData(lowguid)) @@ -1369,7 +1369,7 @@ bool ChatHandler::HandleNpcDeleteCommand(const char* args) else unit = getSelectedCreature(); - if(!unit || unit->isPet() || unit->isTotem() || unit->isVehicle()) + if (!unit || unit->isPet() || unit->isTotem() || unit->isVehicle()) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); @@ -1393,25 +1393,25 @@ bool ChatHandler::HandleNpcMoveCommand(const char* args) Creature* pCreature = getSelectedCreature(); - if(!pCreature) + if (!pCreature) { // number or [name] Shift-click form |color|Hcreature:creature_guid|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hcreature"); - if(!cId) + char* cId = extractKeyFromLink((char*)args, "Hcreature"); + if (!cId) return false; lowguid = atoi(cId); /* FIXME: impossibel without entry - if(lowguid) + if (lowguid) pCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(),MAKE_GUID(lowguid,HIGHGUID_UNIT)); */ // Attempting creature load from DB data - if(!pCreature) + if (!pCreature) { CreatureData const* data = sObjectMgr.GetCreatureData(lowguid); - if(!data) + if (!data) { PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -1420,7 +1420,7 @@ bool ChatHandler::HandleNpcMoveCommand(const char* args) uint32 map_id = data->mapid; - if(m_session->GetPlayer()->GetMapId()!=map_id) + if (m_session->GetPlayer()->GetMapId() != map_id) { PSendSysMessage(LANG_COMMAND_CREATUREATSAMEMAP, lowguid); SetSentErrorMessage(true); @@ -1444,7 +1444,7 @@ bool ChatHandler::HandleNpcMoveCommand(const char* args) if (pCreature) { - if(CreatureData const* data = sObjectMgr.GetCreatureData(pCreature->GetDBTableGUIDLow())) + if (CreatureData const* data = sObjectMgr.GetCreatureData(pCreature->GetDBTableGUIDLow())) { const_cast(data)->posX = x; const_cast(data)->posY = y; @@ -1453,7 +1453,7 @@ bool ChatHandler::HandleNpcMoveCommand(const char* args) } pCreature->GetMap()->CreatureRelocation(pCreature,x, y, z,o); pCreature->GetMotionMaster()->Initialize(); - if(pCreature->isAlive()) // dead creature will reset movement generator at respawn + if (pCreature->isAlive()) // dead creature will reset movement generator at respawn { pCreature->setDeathState(JUST_DIED); pCreature->Respawn(); @@ -1479,7 +1479,7 @@ bool ChatHandler::HandleNpcMoveCommand(const char* args) */ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args) { - if(!*args) + if (!*args) return false; // 3 arguments: @@ -1495,13 +1495,13 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args) bool doNotDelete = false; - if(!guid_str) + if (!guid_str) return false; uint32 lowguid = 0; Creature* pCreature = NULL; - if( dontdel_str ) + if (dontdel_str) { //sLog.outError("DEBUG: All 3 params are set"); @@ -1509,7 +1509,7 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args) // GUID // type // doNotDEL - if( stricmp( dontdel_str, "NODEL" ) == 0 ) + if (stricmp(dontdel_str, "NODEL") == 0) { //sLog.outError("DEBUG: doNotDelete = true;"); doNotDelete = true; @@ -1518,10 +1518,10 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args) else { // Only 2 params - but maybe NODEL is set - if( type_str ) + if (type_str) { sLog.outError("DEBUG: Only 2 params "); - if( stricmp( type_str, "NODEL" ) == 0 ) + if (stricmp(type_str, "NODEL") == 0) { //sLog.outError("DEBUG: type_str, NODEL "); doNotDelete = true; @@ -1530,11 +1530,11 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args) } } - if(!type_str) // case .setmovetype $move_type (with selected creature) + if (!type_str) // case .setmovetype $move_type (with selected creature) { type_str = guid_str; pCreature = getSelectedCreature(); - if(!pCreature || pCreature->isPet()) + if (!pCreature || pCreature->isPet()) return false; lowguid = pCreature->GetDBTableGUIDLow(); } @@ -1543,15 +1543,15 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args) lowguid = atoi((char*)guid_str); /* impossible without entry - if(lowguid) + if (lowguid) pCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(),MAKE_GUID(lowguid,HIGHGUID_UNIT)); */ // attempt check creature existence by DB data - if(!pCreature) + if (!pCreature) { CreatureData const* data = sObjectMgr.GetCreatureData(lowguid); - if(!data) + if (!data) { PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -1571,31 +1571,31 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args) std::string type = type_str; - if(type == "stay") + if (type == "stay") move_type = IDLE_MOTION_TYPE; - else if(type == "random") + else if (type == "random") move_type = RANDOM_MOTION_TYPE; - else if(type == "way") + else if (type == "way") move_type = WAYPOINT_MOTION_TYPE; else return false; // update movement type - if(doNotDelete == false) + if (doNotDelete == false) sWaypointMgr.DeletePath(lowguid); - if(pCreature) + if (pCreature) { pCreature->SetDefaultMovementType(move_type); pCreature->GetMotionMaster()->Initialize(); - if(pCreature->isAlive()) // dead creature will reset movement generator at respawn + if (pCreature->isAlive()) // dead creature will reset movement generator at respawn { pCreature->setDeathState(JUST_DIED); pCreature->Respawn(); } pCreature->SaveToDB(); } - if( doNotDelete == false ) + if (doNotDelete == false) { PSendSysMessage(LANG_MOVE_TYPE_SET,type_str); } @@ -1617,7 +1617,7 @@ bool ChatHandler::HandleNpcSetModelCommand(const char* args) Creature *pCreature = getSelectedCreature(); - if(!pCreature || pCreature->isPet()) + if (!pCreature || pCreature->isPet()) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); @@ -1648,7 +1648,7 @@ bool ChatHandler::HandleNpcFactionIdCommand(const char* args) Creature* pCreature = getSelectedCreature(); - if(!pCreature) + if (!pCreature) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); @@ -1660,7 +1660,7 @@ bool ChatHandler::HandleNpcFactionIdCommand(const char* args) // faction is set in creature_template - not inside creature // update in memory - if(CreatureInfo const *cinfo = pCreature->GetCreatureInfo()) + if (CreatureInfo const *cinfo = pCreature->GetCreatureInfo()) { const_cast(cinfo)->faction_A = factionId; const_cast(cinfo)->faction_H = factionId; @@ -1674,7 +1674,7 @@ bool ChatHandler::HandleNpcFactionIdCommand(const char* args) //set spawn dist of creature bool ChatHandler::HandleNpcSpawnDistCommand(const char* args) { - if(!*args) + if (!*args) return false; float option = (float)atof((char*)args); @@ -1699,7 +1699,7 @@ bool ChatHandler::HandleNpcSpawnDistCommand(const char* args) pCreature->SetRespawnRadius((float)option); pCreature->SetDefaultMovementType(mtype); pCreature->GetMotionMaster()->Initialize(); - if(pCreature->isAlive()) // dead creature will reset movement generator at respawn + if (pCreature->isAlive()) // dead creature will reset movement generator at respawn { pCreature->setDeathState(JUST_DIED); pCreature->Respawn(); @@ -1712,7 +1712,7 @@ bool ChatHandler::HandleNpcSpawnDistCommand(const char* args) //spawn time handling bool ChatHandler::HandleNpcSpawnTimeCommand(const char* args) { - if(!*args) + if (!*args) return false; char* stime = strtok((char*)args, " "); @@ -1749,7 +1749,7 @@ bool ChatHandler::HandleNpcFollowCommand(const char* /*args*/) Player *player = m_session->GetPlayer(); Creature *creature = getSelectedCreature(); - if(!creature) + if (!creature) { PSendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); @@ -1768,7 +1768,7 @@ bool ChatHandler::HandleNpcUnFollowCommand(const char* /*args*/) Player *player = m_session->GetPlayer(); Creature *creature = getSelectedCreature(); - if(!creature) + if (!creature) { PSendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); @@ -1786,7 +1786,7 @@ bool ChatHandler::HandleNpcUnFollowCommand(const char* /*args*/) FollowMovementGenerator const* mgen = static_cast const*>((creature->GetMotionMaster()->top())); - if(mgen->GetTarget()!=player) + if (mgen->GetTarget() != player) { PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU); SetSentErrorMessage(true); @@ -1812,19 +1812,19 @@ bool ChatHandler::HandleNpcTameCommand(const char* /*args*/) Player *player = m_session->GetPlayer (); - if(player->GetPetGUID ()) + if (player->GetPetGUID()) { - SendSysMessage (LANG_YOU_ALREADY_HAVE_PET); - SetSentErrorMessage (true); + SendSysMessage(LANG_YOU_ALREADY_HAVE_PET); + SetSentErrorMessage(true); return false; } CreatureInfo const* cInfo = creatureTarget->GetCreatureInfo(); - if (!cInfo->isTameable (player->CanTameExoticPets())) + if (!cInfo->isTameable(player->CanTameExoticPets())) { - PSendSysMessage (LANG_CREATURE_NON_TAMEABLE,cInfo->Entry); - SetSentErrorMessage (true); + PSendSysMessage(LANG_CREATURE_NON_TAMEABLE,cInfo->Entry); + SetSentErrorMessage(true); return false; } @@ -1873,7 +1873,7 @@ bool ChatHandler::HandleNpcSetPhaseCommand(const char* args) return false; uint32 phasemask = (uint32) atoi((char*)args); - if ( phasemask == 0 ) + if (phasemask == 0) { SendSysMessage(LANG_BAD_VALUE); SetSentErrorMessage(true); @@ -1881,7 +1881,7 @@ bool ChatHandler::HandleNpcSetPhaseCommand(const char* args) } Creature* pCreature = getSelectedCreature(); - if(!pCreature) + if (!pCreature) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); @@ -1890,7 +1890,7 @@ bool ChatHandler::HandleNpcSetPhaseCommand(const char* args) pCreature->SetPhaseMask(phasemask,true); - if(!pCreature->isPet()) + if (!pCreature->isPet()) pCreature->SaveToDB(); return true; @@ -1902,7 +1902,7 @@ bool ChatHandler::HandleNpcSetDeathStateCommand(const char* args) return false; Creature* pCreature = getSelectedCreature(); - if(!pCreature || pCreature->isPet()) + if (!pCreature || pCreature->isPet()) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); @@ -1931,10 +1931,10 @@ bool ChatHandler::HandleNpcSetDeathStateCommand(const char* args) bool ChatHandler::HandleNpcNameCommand(const char* /*args*/) { /* Temp. disabled - if(!*args) + if (!*args) return false; - if(strlen((char*)args)>75) + if (strlen((char*)args)>75) { PSendSysMessage(LANG_TOO_LONG_NAME, strlen((char*)args)-75); return true; @@ -1942,7 +1942,7 @@ bool ChatHandler::HandleNpcNameCommand(const char* /*args*/) for (uint8 i = 0; i < strlen(args); ++i) { - if(!isalpha(args[i]) && args[i]!=' ') + if (!isalpha(args[i]) && args[i]!=' ') { SendSysMessage(LANG_CHARS_ONLY); return false; @@ -1959,7 +1959,7 @@ bool ChatHandler::HandleNpcNameCommand(const char* /*args*/) Creature* pCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(), guid); - if(!pCreature) + if (!pCreature) { SendSysMessage(LANG_SELECT_CREATURE); return true; @@ -1979,10 +1979,10 @@ bool ChatHandler::HandleNpcSubNameCommand(const char* /*args*/) { /* Temp. disabled - if(!*args) + if (!*args) args = ""; - if(strlen((char*)args)>75) + if (strlen((char*)args)>75) { PSendSysMessage(LANG_TOO_LONG_SUBNAME, strlen((char*)args)-75); @@ -1991,7 +1991,7 @@ bool ChatHandler::HandleNpcSubNameCommand(const char* /*args*/) for (uint8 i = 0; i < strlen(args); i++) { - if(!isalpha(args[i]) && args[i]!=' ') + if (!isalpha(args[i]) && args[i]!=' ') { SendSysMessage(LANG_CHARS_ONLY); return false; @@ -2007,7 +2007,7 @@ bool ChatHandler::HandleNpcSubNameCommand(const char* /*args*/) Creature* pCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(), guid); - if(!pCreature) + if (!pCreature) { SendSysMessage(LANG_SELECT_CREATURE); return true; @@ -2024,7 +2024,7 @@ bool ChatHandler::HandleNpcSubNameCommand(const char* /*args*/) //move item to other slot bool ChatHandler::HandleItemMoveCommand(const char* args) { - if(!*args) + if (!*args) return false; uint8 srcslot, dstslot; @@ -2039,20 +2039,20 @@ bool ChatHandler::HandleItemMoveCommand(const char* args) srcslot = (uint8)atoi(pParam1); dstslot = (uint8)atoi(pParam2); - if(srcslot==dstslot) + if (srcslot == dstslot) return true; - if(!m_session->GetPlayer()->IsValidPos(INVENTORY_SLOT_BAG_0, srcslot, true)) + if (!m_session->GetPlayer()->IsValidPos(INVENTORY_SLOT_BAG_0, srcslot, true)) return false; // can be autostore pos - if(!m_session->GetPlayer()->IsValidPos(INVENTORY_SLOT_BAG_0,dstslot, false)) + if (!m_session->GetPlayer()->IsValidPos(INVENTORY_SLOT_BAG_0, dstslot, false)) return false; uint16 src = ((INVENTORY_SLOT_BAG_0 << 8) | srcslot); uint16 dst = ((INVENTORY_SLOT_BAG_0 << 8) | dstslot); - m_session->GetPlayer()->SwapItem( src, dst ); + m_session->GetPlayer()->SwapItem(src, dst); return true; } @@ -2061,7 +2061,7 @@ bool ChatHandler::HandleItemMoveCommand(const char* args) bool ChatHandler::HandleDeMorphCommand(const char* /*args*/) { Unit *target = getSelectedUnit(); - if(!target) + if (!target) target = m_session->GetPlayer(); @@ -2083,7 +2083,7 @@ bool ChatHandler::HandleModifyMorphCommand(const char* args) uint16 display_id = (uint16)atoi((char*)args); Unit *target = getSelectedUnit(); - if(!target) + if (!target) target = m_session->GetPlayer(); // check online security @@ -2099,10 +2099,10 @@ bool ChatHandler::HandleModifyMorphCommand(const char* args) bool ChatHandler::HandleKickPlayerCommand(const char *args) { Player* target; - if(!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args, &target)) return false; - if (m_session && target==m_session->GetPlayer()) + if (m_session && target == m_session->GetPlayer()) { SendSysMessage(LANG_COMMAND_KICKSELF); SetSentErrorMessage(true); @@ -2128,7 +2128,7 @@ bool ChatHandler::HandleModifyPhaseCommand(const char* args) uint32 phasemask = (uint32)atoi((char*)args); Unit *target = getSelectedUnit(); - if(!target) + if (!target) target = m_session->GetPlayer(); // check online security @@ -2146,7 +2146,7 @@ bool ChatHandler::HandlePInfoCommand(const char* args) Player* target; uint64 target_guid; std::string target_name; - if(!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget((char*)args, &target, &target_guid,& target_name)) return false; uint32 accId = 0; @@ -2156,7 +2156,7 @@ bool ChatHandler::HandlePInfoCommand(const char* args) uint32 latency = 0; // get additional information from Player object - if(target) + if (target) { // check online security if (HasLowerSecurity(target, 0)) @@ -2194,13 +2194,13 @@ bool ChatHandler::HandlePInfoCommand(const char* args) std::string last_login = GetMangosString(LANG_ERROR); QueryResult* result = LoginDatabase.PQuery("SELECT username,gmlevel,last_ip,last_login FROM account WHERE id = '%u'",accId); - if(result) + if (result) { Field* fields = result->Fetch(); username = fields[0].GetCppString(); security = (AccountTypes)fields[1].GetUInt32(); - if(GetAccessLevel() >= security) + if (GetAccessLevel() >= security) { last_ip = fields[2].GetCppString(); last_login = fields[3].GetCppString(); @@ -2222,7 +2222,7 @@ bool ChatHandler::HandlePInfoCommand(const char* args) uint32 gold = money /GOLD; uint32 silv = (money % GOLD) / SILVER; uint32 copp = (money % GOLD) % SILVER; - PSendSysMessage(LANG_PINFO_LEVEL, timeStr.c_str(), level, gold,silv,copp ); + PSendSysMessage(LANG_PINFO_LEVEL, timeStr.c_str(), level, gold,silv,copp); return true; } @@ -2231,7 +2231,7 @@ bool ChatHandler::HandlePInfoCommand(const char* args) void ChatHandler::ShowTicket(uint64 guid, char const* text, char const* time) { std::string name; - if(!sObjectMgr.GetPlayerNameByGUID(guid,name)) + if (!sObjectMgr.GetPlayerNameByGUID(guid, name)) name = GetMangosString(LANG_UNKNOWN); std::string nameLink = playerLink(name); @@ -2247,7 +2247,7 @@ bool ChatHandler::HandleTicketCommand(const char* args) // ticket if (!px) { - if(!m_session) + if (!m_session) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -2263,9 +2263,9 @@ bool ChatHandler::HandleTicketCommand(const char* args) } // ticket on - if(strncmp(px,"on",3) == 0) + if (strncmp(px, "on", 3) == 0) { - if(!m_session) + if (!m_session) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -2278,9 +2278,9 @@ bool ChatHandler::HandleTicketCommand(const char* args) } // ticket off - if(strncmp(px,"off",4) == 0) + if (strncmp(px, "off", 4) == 0) { - if(!m_session) + if (!m_session) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -2293,11 +2293,11 @@ bool ChatHandler::HandleTicketCommand(const char* args) } // ticket respond - if(strncmp(px,"respond",8) == 0) + if (strncmp(px, "respond", 8) == 0) { char *name = strtok(NULL, " "); - if(!name) + if (!name) { SendSysMessage(LANG_CMD_SYNTAX); SetSentErrorMessage(true); @@ -2307,7 +2307,7 @@ bool ChatHandler::HandleTicketCommand(const char* args) std::string plName = name; uint64 guid = sObjectMgr.GetPlayerGUIDByName(plName); - if(!guid) + if (!guid) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -2316,7 +2316,7 @@ bool ChatHandler::HandleTicketCommand(const char* args) GMTicket* ticket = sTicketMgr.GetGMTicket(GUID_LOPART(guid)); - if(!ticket) + if (!ticket) { PSendSysMessage(LANG_COMMAND_TICKETNOTEXIST, GUID_LOPART(guid)); SetSentErrorMessage(true); @@ -2325,7 +2325,7 @@ bool ChatHandler::HandleTicketCommand(const char* args) char* response = strtok(NULL, ""); - if(!response) + if (!response) { SendSysMessage(LANG_CMD_SYNTAX); SetSentErrorMessage(true); @@ -2334,7 +2334,7 @@ bool ChatHandler::HandleTicketCommand(const char* args) ticket->SetResponseText(response); - if(Player* pl = sObjectMgr.GetPlayer(guid)) + if (Player* pl = sObjectMgr.GetPlayer(guid)) pl->GetSession()->SendGMResponse(ticket); return true; @@ -2342,11 +2342,11 @@ bool ChatHandler::HandleTicketCommand(const char* args) // ticket #num int num = atoi(px); - if(num > 0) + if (num > 0) { QueryResult *result = CharacterDatabase.PQuery("SELECT guid,ticket_text,ticket_lastchange FROM character_ticket ORDER BY ticket_id ASC "_OFFSET_, num-1); - if(!result) + if (!result) { PSendSysMessage(LANG_COMMAND_TICKETNOTEXIST, num); SetSentErrorMessage(true); @@ -2365,12 +2365,12 @@ bool ChatHandler::HandleTicketCommand(const char* args) } uint64 target_guid; - if(!extractPlayerTarget(px,NULL,&target_guid)) + if (!extractPlayerTarget(px, NULL, &target_guid)) return false; // ticket $char_name GMTicket* ticket = sTicketMgr.GetGMTicket(GUID_LOPART(target_guid)); - if(!ticket) + if (!ticket) return false; std::string time = TimeToTimestampStr(ticket->GetLastUpdate()); @@ -2388,7 +2388,7 @@ bool ChatHandler::HandleDelTicketCommand(const char *args) return false; // delticket all - if(strncmp(px,"all",4) == 0) + if (strncmp(px, "all", 4) == 0) { sTicketMgr.DeleteAll(); SendSysMessage(LANG_COMMAND_ALLTICKETDELETED); @@ -2398,10 +2398,10 @@ bool ChatHandler::HandleDelTicketCommand(const char *args) int num = (uint32)atoi(px); // delticket #num - if(num > 0) + if (num > 0) { QueryResult* result = CharacterDatabase.PQuery("SELECT guid FROM character_ticket ORDER BY ticket_id ASC "_OFFSET_,num-1); - if(!result) + if (!result) { PSendSysMessage(LANG_COMMAND_TICKETNOTEXIST, num); SetSentErrorMessage(true); @@ -2414,7 +2414,7 @@ bool ChatHandler::HandleDelTicketCommand(const char *args) sTicketMgr.Delete(guid); //notify player - if(Player* pl = sObjectMgr.GetPlayer(ObjectGuid(HIGHGUID_PLAYER, guid))) + if (Player* pl = sObjectMgr.GetPlayer(ObjectGuid(HIGHGUID_PLAYER, guid))) { pl->GetSession()->SendGMTicketGetTicket(0x0A, 0); PSendSysMessage(LANG_COMMAND_TICKETPLAYERDEL, GetNameLink(pl).c_str()); @@ -2428,15 +2428,15 @@ bool ChatHandler::HandleDelTicketCommand(const char *args) Player* target; uint64 target_guid; std::string target_name; - if(!extractPlayerTarget(px,&target,&target_guid,&target_name)) + if (!extractPlayerTarget(px, &target, &target_guid, &target_name)) return false; // delticket $char_name sTicketMgr.Delete(GUID_LOPART(target_guid)); // notify players about ticket deleting - if(target) - target->GetSession()->SendGMTicketGetTicket(0x0A,0); + if (target) + target->GetSession()->SendGMTicketGetTicket(0x0A, 0); std::string nameLink = playerLink(target_name); @@ -2472,7 +2472,7 @@ bool ChatHandler::HandleWpAddCommand(const char* args) // optional char* guid_str = NULL; - if(*args) + if (*args) { guid_str = strtok((char*)args, " "); } @@ -2488,20 +2488,20 @@ bool ChatHandler::HandleWpAddCommand(const char* args) // No GUID provided // -> Player must have selected a creature - if(!target || target->isPet()) + if (!target || target->isPet()) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); return false; } - if (target->GetEntry() == VISUAL_WAYPOINT ) + if (target->GetEntry() == VISUAL_WAYPOINT) { DEBUG_LOG("DEBUG: HandleWpAddCommand - target->GetEntry() == VISUAL_WAYPOINT (1) "); QueryResult *result = - WorldDatabase.PQuery( "SELECT id, point FROM creature_movement WHERE wpguid = %u", - target->GetGUIDLow() ); - if(!result) + WorldDatabase.PQuery("SELECT id, point FROM creature_movement WHERE wpguid = %u", + target->GetGUIDLow()); + if (!result) { PSendSysMessage(LANG_WAYPOINT_NOTFOUNDSEARCH, target->GetGUIDLow()); // User selected a visual spawnpoint -> get the NPC @@ -2512,9 +2512,9 @@ bool ChatHandler::HandleWpAddCommand(const char* args) // (0.001) - There is no other way to compare C++ floats with mySQL floats // See also: http://dev.mysql.com/doc/refman/5.0/en/problems-with-float.html const char* maxDIFF = "0.01"; - result = WorldDatabase.PQuery( "SELECT id, point FROM creature_movement WHERE (abs(position_x - %f) <= %s ) and (abs(position_y - %f) <= %s ) and (abs(position_z - %f) <= %s )", + result = WorldDatabase.PQuery("SELECT id, point FROM creature_movement WHERE (abs(position_x - %f) <= %s ) and (abs(position_y - %f) <= %s ) and (abs(position_z - %f) <= %s )", target->GetPositionX(), maxDIFF, target->GetPositionY(), maxDIFF, target->GetPositionZ(), maxDIFF); - if(!result) + if (!result) { PSendSysMessage(LANG_WAYPOINT_NOTFOUNDDBPROBLEM, target->GetGUIDLow()); SetSentErrorMessage(true); @@ -2526,11 +2526,11 @@ bool ChatHandler::HandleWpAddCommand(const char* args) Field *fields = result->Fetch(); lowguid = fields[0].GetUInt32(); point = fields[1].GetUInt32(); - }while( result->NextRow() ); + } while (result->NextRow()); delete result; CreatureData const* data = sObjectMgr.GetCreatureData(lowguid); - if(!data) + if (!data) { PSendSysMessage(LANG_WAYPOINT_CREATNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -2538,7 +2538,7 @@ bool ChatHandler::HandleWpAddCommand(const char* args) } target = m_session->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(lowguid,data->id,HIGHGUID_UNIT)); - if(!target) + if (!target) { PSendSysMessage(LANG_WAYPOINT_NOTFOUNDDBPROBLEM, lowguid); SetSentErrorMessage(true); @@ -2557,14 +2557,14 @@ bool ChatHandler::HandleWpAddCommand(const char* args) // GUID provided // Warn if player also selected a creature // -> Creature selection is ignored <- - if(target) + if (target) { SendSysMessage(LANG_WAYPOINT_CREATSELECTED); } lowguid = atoi((char*)guid_str); CreatureData const* data = sObjectMgr.GetCreatureData(lowguid); - if(!data) + if (!data) { PSendSysMessage(LANG_WAYPOINT_CREATNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -2572,7 +2572,7 @@ bool ChatHandler::HandleWpAddCommand(const char* args) } target = m_session->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(lowguid,data->id,HIGHGUID_UNIT)); - if(!target || target->isPet()) + if (!target || target->isPet()) { PSendSysMessage(LANG_WAYPOINT_CREATNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -2589,11 +2589,11 @@ bool ChatHandler::HandleWpAddCommand(const char* args) sWaypointMgr.AddLastNode(lowguid, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), 0, 0); // update movement type - if(target) + if (target) { target->SetDefaultMovementType(WAYPOINT_MOTION_TYPE); target->GetMotionMaster()->Initialize(); - if(target->isAlive()) // dead creature will reset movement generator at respawn + if (target->isAlive()) // dead creature will reset movement generator at respawn { target->setDeathState(JUST_DIED); target->Respawn(); @@ -2632,7 +2632,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) { DEBUG_LOG("DEBUG: HandleWpModifyCommand"); - if(!*args) + if (!*args) return false; // first arg: add del text emote spell waittime move @@ -2645,7 +2645,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) std::string show = show_str; // Check // Remember: "show" must also be the name of a column! - if( (show != "emote") && (show != "spell") && (show != "textid1") && (show != "textid2") + if ((show != "emote") && (show != "spell") && (show != "textid1") && (show != "textid2") && (show != "textid3") && (show != "textid4") && (show != "textid5") && (show != "waittime") && (show != "del") && (show != "move") && (show != "add") && (show != "model1") && (show != "model2") && (show != "orientation")) @@ -2663,12 +2663,12 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) uint32 wpGuid = 0; Creature* target = getSelectedCreature(); - if(target) + if (target) { DEBUG_LOG("DEBUG: HandleWpModifyCommand - User did select an NPC"); // Did the user select a visual spawnpoint? - if (target->GetEntry() != VISUAL_WAYPOINT ) + if (target->GetEntry() != VISUAL_WAYPOINT) { PSendSysMessage(LANG_WAYPOINT_VP_SELECT); SetSentErrorMessage(true); @@ -2679,9 +2679,9 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) // The visual waypoint QueryResult *result = - WorldDatabase.PQuery( "SELECT id, point FROM creature_movement WHERE wpguid = %u LIMIT 1", - target->GetGUIDLow() ); - if(!result) + WorldDatabase.PQuery("SELECT id, point FROM creature_movement WHERE wpguid = %u LIMIT 1", + target->GetGUIDLow()); + if (!result) { PSendSysMessage(LANG_WAYPOINT_NOTFOUNDDBPROBLEM, wpGuid); SetSentErrorMessage(true); @@ -2702,7 +2702,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) // User did provide char* guid_str = strtok((char*)NULL, " "); - if( !guid_str ) + if (!guid_str) { SendSysMessage(LANG_WAYPOINT_NOGUID); return false; @@ -2710,7 +2710,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) lowguid = atoi((char*)guid_str); CreatureData const* data = sObjectMgr.GetCreatureData(lowguid); - if(!data) + if (!data) { PSendSysMessage(LANG_WAYPOINT_CREATNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -2720,7 +2720,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) PSendSysMessage("DEBUG: GUID provided: %d", lowguid); char* point_str = strtok((char*)NULL, " "); - if( !point_str ) + if (!point_str) { SendSysMessage(LANG_WAYPOINT_NOWAYPOINTGIVEN); return false; @@ -2732,7 +2732,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) // Now we need the GUID of the visual waypoint // -> "del", "move", "add" command - QueryResult *result = WorldDatabase.PQuery( "SELECT wpguid FROM creature_movement WHERE id = '%u' AND point = '%u' LIMIT 1", lowguid, point); + QueryResult *result = WorldDatabase.PQuery("SELECT wpguid FROM creature_movement WHERE id = '%u' AND point = '%u' LIMIT 1", lowguid, point); if (!result) { PSendSysMessage(LANG_WAYPOINT_NOTFOUNDSEARCH, lowguid, point); @@ -2749,15 +2749,15 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) char* arg_str = NULL; // Check for argument - if( (show.find("text") == std::string::npos ) && (show != "del") && (show != "move") && (show != "add")) + if ((show.find("text") == std::string::npos) && (show != "del") && (show != "move") && (show != "add")) { // Text is enclosed in "<>", all other arguments not - if( show.find("text") != std::string::npos ) + if (show.find("text") != std::string::npos) arg_str = strtok((char*)NULL, "<>"); else arg_str = strtok((char*)NULL, " "); - if( !arg_str) + if (!arg_str) { PSendSysMessage(LANG_WAYPOINT_ARGUMENTREQ, show_str); return false; @@ -2773,13 +2773,13 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) // Special functions: // add - move - del -> no args commands // Add a waypoint after the selected visual - if(show == "add" && target) + if (show == "add" && target) { PSendSysMessage("DEBUG: wp modify add, GUID: %u", lowguid); // Get the creature for which we read the waypoint CreatureData const* data = sObjectMgr.GetCreatureData(lowguid); - if(!data) + if (!data) { PSendSysMessage(LANG_WAYPOINT_CREATNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -2788,7 +2788,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) Creature* npcCreature = m_session->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(lowguid, data->id, HIGHGUID_UNIT)); - if( !npcCreature ) + if (!npcCreature) { PSendSysMessage(LANG_WAYPOINT_NPCNOTFOUND); SetSentErrorMessage(true); @@ -2806,10 +2806,10 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) Player* chr = m_session->GetPlayer(); Map *map = chr->GetMap(); - if(npcCreature) + if (npcCreature) { npcCreature->GetMotionMaster()->Initialize(); - if(npcCreature->isAlive()) // dead creature will reset movement generator at respawn + if (npcCreature->isAlive()) // dead creature will reset movement generator at respawn { npcCreature->setDeathState(JUST_DIED); npcCreature->Respawn(); @@ -2828,7 +2828,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) { wpCreature->Relocate(chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), chr->GetOrientation()); - if(!wpCreature->IsPositionValid()) + if (!wpCreature->IsPositionValid()) { sLog.outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",wpCreature->GetGUIDLow(),wpCreature->GetEntry(),wpCreature->GetPositionX(),wpCreature->GetPositionY()); delete wpCreature; @@ -2845,20 +2845,20 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) sWaypointMgr.AddAfterNode(lowguid, point, chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), 0, 0, wpGuid); - if(!wpGuid) + if (!wpGuid) return false; PSendSysMessage(LANG_WAYPOINT_ADDED_NO, point+1); return true; } // add - if(show == "del" && target) + if (show == "del" && target) { PSendSysMessage("DEBUG: wp modify del, GUID: %u", lowguid); // Get the creature for which we read the waypoint CreatureData const* data = sObjectMgr.GetCreatureData(lowguid); - if(!data) + if (!data) { PSendSysMessage(LANG_WAYPOINT_CREATNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -2869,7 +2869,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) // wpCreature Creature* wpCreature = NULL; - if( wpGuid != 0 ) + if (wpGuid != 0) { wpCreature = m_session->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(wpGuid, VISUAL_WAYPOINT, HIGHGUID_UNIT)); wpCreature->DeleteFromDB(); @@ -2883,11 +2883,11 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) sWaypointMgr.DeleteNode(lowguid, point); - if(npcCreature) + if (npcCreature) { // Any waypoints left? - QueryResult *result2 = WorldDatabase.PQuery( "SELECT point FROM creature_movement WHERE id = '%u'",lowguid); - if(!result2) + QueryResult *result2 = WorldDatabase.PQuery("SELECT point FROM creature_movement WHERE id = '%u'",lowguid); + if (!result2) { npcCreature->SetDefaultMovementType(RANDOM_MOTION_TYPE); } @@ -2897,7 +2897,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) delete result2; } npcCreature->GetMotionMaster()->Initialize(); - if(npcCreature->isAlive()) // dead creature will reset movement generator at respawn + if (npcCreature->isAlive()) // dead creature will reset movement generator at respawn { npcCreature->setDeathState(JUST_DIED); npcCreature->Respawn(); @@ -2909,7 +2909,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) return true; } // del - if(show == "move" && target) + if (show == "move" && target) { PSendSysMessage("DEBUG: wp move, GUID: %u", lowguid); @@ -2918,7 +2918,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) { // Get the creature for which we read the waypoint CreatureData const* data = sObjectMgr.GetCreatureData(lowguid); - if(!data) + if (!data) { PSendSysMessage(LANG_WAYPOINT_CREATNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -2932,7 +2932,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) // What to do: // Move the visual spawnpoint // Respawn the owner of the waypoints - if( wpGuid != 0 ) + if (wpGuid != 0) { wpCreature = m_session->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(wpGuid, VISUAL_WAYPOINT, HIGHGUID_UNIT)); wpCreature->DeleteFromDB(); @@ -2948,7 +2948,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) wpCreature2->Relocate(chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), chr->GetOrientation()); - if(!wpCreature2->IsPositionValid()) + if (!wpCreature2->IsPositionValid()) { sLog.outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",wpCreature2->GetGUIDLow(),wpCreature2->GetEntry(),wpCreature2->GetPositionX(),wpCreature2->GetPositionY()); delete wpCreature2; @@ -2964,10 +2964,10 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) sWaypointMgr.SetNodePosition(lowguid, point, chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ()); - if(npcCreature) + if (npcCreature) { npcCreature->GetMotionMaster()->Initialize(); - if(npcCreature->isAlive()) // dead creature will reset movement generator at respawn + if (npcCreature->isAlive()) // dead creature will reset movement generator at respawn { npcCreature->setDeathState(JUST_DIED); npcCreature->Respawn(); @@ -2980,7 +2980,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) // Create creature - npc that has the waypoint CreatureData const* data = sObjectMgr.GetCreatureData(lowguid); - if(!data) + if (!data) { PSendSysMessage(LANG_WAYPOINT_CREATNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -2988,8 +2988,8 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) } // set in game textids not supported - if( show == "textid1" || show == "textid2" || show == "textid3" || - show == "textid4" || show == "textid5" ) + if (show == "textid1" || show == "textid2" || show == "textid3" || + show == "textid4" || show == "textid5") { return false; } @@ -2997,11 +2997,11 @@ bool ChatHandler::HandleWpModifyCommand(const char* args) sWaypointMgr.SetNodeText(lowguid, point, show_str, arg_str); Creature* npcCreature = m_session->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(lowguid, data->id, HIGHGUID_UNIT)); - if(npcCreature) + if (npcCreature) { npcCreature->SetDefaultMovementType(WAYPOINT_MOTION_TYPE); npcCreature->GetMotionMaster()->Initialize(); - if(npcCreature->isAlive()) // dead creature will reset movement generator at respawn + if (npcCreature->isAlive()) // dead creature will reset movement generator at respawn { npcCreature->setDeathState(JUST_DIED); npcCreature->Respawn(); @@ -3041,7 +3041,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) { DEBUG_LOG("DEBUG: HandleWpShowCommand"); - if(!*args) + if (!*args) return false; // first arg: on, off, first, last @@ -3068,7 +3068,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) // No GUID provided // -> Player must have selected a creature - if(!target) + if (!target) { SendSysMessage(LANG_SELECT_CREATURE); SetSentErrorMessage(true); @@ -3081,7 +3081,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) // GUID provided // Warn if player also selected a creature // -> Creature selection is ignored <- - if(target) + if (target) { SendSysMessage(LANG_WAYPOINT_CREATSELECTED); } @@ -3089,7 +3089,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) uint32 lowguid = atoi((char*)guid_str); CreatureData const* data = sObjectMgr.GetCreatureData(lowguid); - if(!data) + if (!data) { PSendSysMessage(LANG_WAYPOINT_CREATNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -3098,7 +3098,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) target = m_session->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(lowguid,data->id,HIGHGUID_UNIT)); - if(!target) + if (!target) { PSendSysMessage(LANG_WAYPOINT_CREATNOTFOUND, lowguid); SetSentErrorMessage(true); @@ -3114,12 +3114,12 @@ bool ChatHandler::HandleWpShowCommand(const char* args) DEBUG_LOG("DEBUG: HandleWpShowCommand: lowguid: %u show: %s", lowguid, show_str); // Show info for the selected waypoint - if(show == "info") + if (show == "info") { PSendSysMessage("DEBUG: wp info, GUID: %u", lowguid); // Check if the user did specify a visual waypoint - if( target->GetEntry() != VISUAL_WAYPOINT ) + if (target->GetEntry() != VISUAL_WAYPOINT) { PSendSysMessage(LANG_WAYPOINT_VP_SELECT); SetSentErrorMessage(true); @@ -3131,9 +3131,9 @@ bool ChatHandler::HandleWpShowCommand(const char* args) //pCreature->GetPositionX(); QueryResult *result = - WorldDatabase.PQuery( "SELECT id, point, waittime, emote, spell, textid1, textid2, textid3, textid4, textid5, model1, model2 FROM creature_movement WHERE wpguid = %u", - target->GetGUIDLow() ); - if(!result) + WorldDatabase.PQuery("SELECT id, point, waittime, emote, spell, textid1, textid2, textid3, textid4, textid5, model1, model2 FROM creature_movement WHERE wpguid = %u", + target->GetGUIDLow()); + if (!result) { // Since we compare float values, we have to deal with // some difficulties. @@ -3143,9 +3143,9 @@ bool ChatHandler::HandleWpShowCommand(const char* args) const char* maxDIFF = "0.01"; PSendSysMessage(LANG_WAYPOINT_NOTFOUNDSEARCH, target->GetGUID()); - result = WorldDatabase.PQuery( "SELECT id, point, waittime, emote, spell, textid1, textid2, textid3, textid4, textid5, model1, model2 FROM creature_movement WHERE (abs(position_x - %f) <= %s ) and (abs(position_y - %f) <= %s ) and (abs(position_z - %f) <= %s )", + result = WorldDatabase.PQuery("SELECT id, point, waittime, emote, spell, textid1, textid2, textid3, textid4, textid5, model1, model2 FROM creature_movement WHERE (abs(position_x - %f) <= %s ) and (abs(position_y - %f) <= %s ) and (abs(position_z - %f) <= %s )", target->GetPositionX(), maxDIFF, target->GetPositionY(), maxDIFF, target->GetPositionZ(), maxDIFF); - if(!result) + if (!result) { PSendSysMessage(LANG_WAYPOINT_NOTFOUNDDBPROBLEM, lowguid); SetSentErrorMessage(true); @@ -3178,26 +3178,26 @@ bool ChatHandler::HandleWpShowCommand(const char* args) for(int i = 0; i < MAX_WAYPOINT_TEXT; ++i) PSendSysMessage(LANG_WAYPOINT_INFO_TEXT, i+1, textid[i], (textid[i] ? GetMangosString(textid[i]) : "")); - }while( result->NextRow() ); + } while (result->NextRow()); // Cleanup memory delete result; return true; } - if(show == "on") + if (show == "on") { PSendSysMessage("DEBUG: wp on, GUID: %u", lowguid); - QueryResult *result = WorldDatabase.PQuery( "SELECT point, position_x,position_y,position_z FROM creature_movement WHERE id = '%u'",lowguid); - if(!result) + QueryResult *result = WorldDatabase.PQuery("SELECT point, position_x,position_y,position_z FROM creature_movement WHERE id = '%u'",lowguid); + if (!result) { PSendSysMessage(LANG_WAYPOINT_NOTFOUND, lowguid); SetSentErrorMessage(true); return false; } // Delete all visuals for this NPC - QueryResult *result2 = WorldDatabase.PQuery( "SELECT wpguid FROM creature_movement WHERE id = '%u' and wpguid <> 0", lowguid); - if(result2) + QueryResult *result2 = WorldDatabase.PQuery("SELECT wpguid FROM creature_movement WHERE id = '%u' and wpguid <> 0", lowguid); + if (result2) { bool hasError = false; do @@ -3206,7 +3206,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) uint32 wpguid = fields[0].GetUInt32(); Creature* pCreature = m_session->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(wpguid,VISUAL_WAYPOINT,HIGHGUID_UNIT)); - if(!pCreature) + if (!pCreature) { PSendSysMessage(LANG_WAYPOINT_NOTREMOVED, wpguid); hasError = true; @@ -3218,9 +3218,9 @@ bool ChatHandler::HandleWpShowCommand(const char* args) pCreature->AddObjectToRemoveList(); } - }while( result2->NextRow() ); + } while (result2->NextRow()); delete result2; - if( hasError ) + if (hasError) { PSendSysMessage(LANG_WAYPOINT_TOOFAR1); PSendSysMessage(LANG_WAYPOINT_TOOFAR2); @@ -3253,7 +3253,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) wpCreature->Relocate(x, y, z, o); - if(!wpCreature->IsPositionValid()) + if (!wpCreature->IsPositionValid()) { sLog.outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",wpCreature->GetGUIDLow(),wpCreature->GetEntry(),wpCreature->GetPositionX(),wpCreature->GetPositionY()); delete wpCreature; @@ -3271,19 +3271,19 @@ bool ChatHandler::HandleWpShowCommand(const char* args) wpCreature->LoadFromDB(wpCreature->GetDBTableGUIDLow(),map); map->Add(wpCreature); //wpCreature->GetMap()->Add(wpCreature); - }while( result->NextRow() ); + } while (result->NextRow()); // Cleanup memory delete result; return true; } - if(show == "first") + if (show == "first") { PSendSysMessage("DEBUG: wp first, GUID: %u", lowguid); - QueryResult *result = WorldDatabase.PQuery( "SELECT position_x,position_y,position_z FROM creature_movement WHERE point='1' AND id = '%u'",lowguid); - if(!result) + QueryResult *result = WorldDatabase.PQuery("SELECT position_x,position_y,position_z FROM creature_movement WHERE point='1' AND id = '%u'",lowguid); + if (!result) { PSendSysMessage(LANG_WAYPOINT_NOTFOUND, lowguid); SetSentErrorMessage(true); @@ -3311,7 +3311,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) pCreature->Relocate(x, y, z, o); - if(!pCreature->IsPositionValid()) + if (!pCreature->IsPositionValid()) { sLog.outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY()); delete pCreature; @@ -3329,12 +3329,12 @@ bool ChatHandler::HandleWpShowCommand(const char* args) return true; } - if(show == "last") + if (show == "last") { PSendSysMessage("DEBUG: wp last, GUID: %u", lowguid); - QueryResult *result = WorldDatabase.PQuery( "SELECT MAX(point) FROM creature_movement WHERE id = '%u'",lowguid); - if( result ) + QueryResult *result = WorldDatabase.PQuery("SELECT MAX(point) FROM creature_movement WHERE id = '%u'", lowguid); + if (result) { Maxpoint = (*result)[0].GetUInt32(); @@ -3343,8 +3343,8 @@ bool ChatHandler::HandleWpShowCommand(const char* args) else Maxpoint = 0; - result = WorldDatabase.PQuery( "SELECT position_x,position_y,position_z FROM creature_movement WHERE point ='%u' AND id = '%u'",Maxpoint, lowguid); - if(!result) + result = WorldDatabase.PQuery("SELECT position_x,position_y,position_z FROM creature_movement WHERE point ='%u' AND id = '%u'", Maxpoint, lowguid); + if (!result) { PSendSysMessage(LANG_WAYPOINT_NOTFOUNDLAST, lowguid); SetSentErrorMessage(true); @@ -3371,7 +3371,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) pCreature->Relocate(x, y, z, o); - if(!pCreature->IsPositionValid()) + if (!pCreature->IsPositionValid()) { sLog.outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY()); delete pCreature; @@ -3388,10 +3388,10 @@ bool ChatHandler::HandleWpShowCommand(const char* args) return true; } - if(show == "off") + if (show == "off") { QueryResult *result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE id = '%d'", VISUAL_WAYPOINT); - if(!result) + if (!result) { SendSysMessage(LANG_WAYPOINT_VP_NOTFOUND); SetSentErrorMessage(true); @@ -3403,7 +3403,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) Field *fields = result->Fetch(); uint32 guid = fields[0].GetUInt32(); Creature* pCreature = m_session->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(guid,VISUAL_WAYPOINT,HIGHGUID_UNIT)); - if(!pCreature) + if (!pCreature) { PSendSysMessage(LANG_WAYPOINT_NOTREMOVED, guid); hasError = true; @@ -3418,7 +3418,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) // set "wpguid" column to "empty" - no visual waypoint spawned WorldDatabase.PExecuteLog("UPDATE creature_movement SET wpguid = '0' WHERE wpguid <> '0'"); - if( hasError ) + if (hasError) { PSendSysMessage(LANG_WAYPOINT_TOOFAR1); PSendSysMessage(LANG_WAYPOINT_TOOFAR2); @@ -3439,7 +3439,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args) bool ChatHandler::HandleWpExportCommand(const char *args) { - if(!*args) + if (!*args) return false; // Next arg is: @@ -3456,7 +3456,7 @@ bool ChatHandler::HandleWpExportCommand(const char *args) lowguid = target->GetGUIDLow(); else { - QueryResult *result = WorldDatabase.PQuery( "SELECT id FROM creature_movement WHERE wpguid = %u LIMIT 1", target->GetGUIDLow() ); + QueryResult *result = WorldDatabase.PQuery("SELECT id FROM creature_movement WHERE wpguid = %u LIMIT 1", target->GetGUIDLow()); if (!result) { PSendSysMessage(LANG_WAYPOINT_NOTFOUNDDBPROBLEM, target->GetGUIDLow()); @@ -3473,7 +3473,7 @@ bool ChatHandler::HandleWpExportCommand(const char *args) { // user provided char* guid_str = strtok((char*)args, " "); - if( !guid_str ) + if (!guid_str) { SendSysMessage(LANG_WAYPOINT_NOGUID); return false; @@ -3483,7 +3483,7 @@ bool ChatHandler::HandleWpExportCommand(const char *args) arg_str = strtok((char*)NULL, " "); } - if( !arg_str) + if (!arg_str) { PSendSysMessage(LANG_WAYPOINT_ARGUMENTREQ, "export"); return false; @@ -3493,7 +3493,7 @@ bool ChatHandler::HandleWpExportCommand(const char *args) QueryResult *result = WorldDatabase.PQuery( // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 - "SELECT point, position_x, position_y, position_z, orientation, model1, model2, waittime, emote, spell, textid1, textid2, textid3, textid4, textid5, id FROM creature_movement WHERE id = '%u' ORDER BY point", lowguid ); + "SELECT point, position_x, position_y, position_z, orientation, model1, model2, waittime, emote, spell, textid1, textid2, textid3, textid4, textid5, id FROM creature_movement WHERE id = '%u' ORDER BY point", lowguid); if (!result) { @@ -3510,7 +3510,7 @@ bool ChatHandler::HandleWpExportCommand(const char *args) Field *fields = result->Fetch(); outfile << "INSERT INTO creature_movement "; - outfile << "( id, point, position_x, position_y, position_z, orientation, model1, model2, waittime, emote, spell, textid1, textid2, textid3, textid4, textid5 ) VALUES "; + outfile << "(id, point, position_x, position_y, position_z, orientation, model1, model2, waittime, emote, spell, textid1, textid2, textid3, textid4, textid5) VALUES "; outfile << "( "; outfile << fields[15].GetUInt32(); // id @@ -3546,7 +3546,7 @@ bool ChatHandler::HandleWpExportCommand(const char *args) outfile << fields[14].GetUInt32(); // textid5 outfile << ");\n "; - } while( result->NextRow() ); + } while (result->NextRow()); delete result; PSendSysMessage(LANG_WAYPOINT_EXPORTED); @@ -3557,7 +3557,7 @@ bool ChatHandler::HandleWpExportCommand(const char *args) bool ChatHandler::HandleWpImportCommand(const char *args) { - if(!*args) + if (!*args) return false; char* arg_str = strtok((char*)args, " "); @@ -3568,7 +3568,7 @@ bool ChatHandler::HandleWpImportCommand(const char *args) std::ifstream infile (arg_str); if (infile.is_open()) { - while (! infile.eof() ) + while (! infile.eof()) { getline (infile,line); //cout << line << endl; @@ -3588,10 +3588,10 @@ bool ChatHandler::HandleCharacterRenameCommand(const char* args) Player* target; uint64 target_guid; std::string target_name; - if(!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget((char*)args, &target, &target_guid, &target_name)) return false; - if(target) + if (target) { // check online security if (HasLowerSecurity(target, 0)) @@ -3622,10 +3622,10 @@ bool ChatHandler::HandleCharacterCustomizeCommand(const char* args) Player* target; uint64 target_guid; std::string target_name; - if(!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) + if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name)) return false; - if(target) + if (target) { PSendSysMessage(LANG_CUSTOMIZE_PLAYER, GetNameLink(target).c_str()); target->SetAtLoginFlag(AT_LOGIN_CUSTOMIZE); @@ -3645,7 +3645,7 @@ bool ChatHandler::HandleCharacterCustomizeCommand(const char* args) bool ChatHandler::HandleCharacterReputationCommand(const char* args) { Player* target; - if(!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args,&target)) return false; LocaleConstant loc = GetSessionDbcLocale(); @@ -3665,17 +3665,17 @@ bool ChatHandler::HandleCharacterReputationCommand(const char* args) ss << " " << rankName << " (" << target->GetReputationMgr().GetReputation(factionEntry) << ")"; - if(itr->second.Flags & FACTION_FLAG_VISIBLE) + if (itr->second.Flags & FACTION_FLAG_VISIBLE) ss << GetMangosString(LANG_FACTION_VISIBLE); - if(itr->second.Flags & FACTION_FLAG_AT_WAR) + if (itr->second.Flags & FACTION_FLAG_AT_WAR) ss << GetMangosString(LANG_FACTION_ATWAR); - if(itr->second.Flags & FACTION_FLAG_PEACE_FORCED) + if (itr->second.Flags & FACTION_FLAG_PEACE_FORCED) ss << GetMangosString(LANG_FACTION_PEACE_FORCED); - if(itr->second.Flags & FACTION_FLAG_HIDDEN) + if (itr->second.Flags & FACTION_FLAG_HIDDEN) ss << GetMangosString(LANG_FACTION_HIDDEN); - if(itr->second.Flags & FACTION_FLAG_INVISIBLE_FORCED) + if (itr->second.Flags & FACTION_FLAG_INVISIBLE_FORCED) ss << GetMangosString(LANG_FACTION_INVISIBLE_FORCED); - if(itr->second.Flags & FACTION_FLAG_INACTIVE) + if (itr->second.Flags & FACTION_FLAG_INACTIVE) ss << GetMangosString(LANG_FACTION_INACTIVE); SendSysMessage(ss.str().c_str()); @@ -3705,7 +3705,7 @@ bool ChatHandler::HandleHonorAddCommand(const char* args) return false; Player *target = getSelectedPlayer(); - if(!target) + if (!target) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -3724,7 +3724,7 @@ bool ChatHandler::HandleHonorAddCommand(const char* args) bool ChatHandler::HandleHonorAddKillCommand(const char* /*args*/) { Unit *target = getSelectedUnit(); - if(!target) + if (!target) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -3742,7 +3742,7 @@ bool ChatHandler::HandleHonorAddKillCommand(const char* /*args*/) bool ChatHandler::HandleHonorUpdateCommand(const char* /*args*/) { Player *target = getSelectedPlayer(); - if(!target) + if (!target) { SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); @@ -3759,14 +3759,14 @@ bool ChatHandler::HandleHonorUpdateCommand(const char* /*args*/) bool ChatHandler::HandleLookupEventCommand(const char* args) { - if(!*args) + if (!*args) return false; std::string namepart = args; std::wstring wnamepart; // converting string that we try to find to lower case - if(!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart,wnamepart)) return false; wstrToLower(wnamepart); @@ -3776,22 +3776,22 @@ bool ChatHandler::HandleLookupEventCommand(const char* args) GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap(); GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr.GetActiveEventList(); - for(uint32 id = 0; id < events.size(); ++id ) + for(uint32 id = 0; id < events.size(); ++id) { GameEventData const& eventData = events[id]; std::string descr = eventData.description; - if(descr.empty()) + if (descr.empty()) continue; if (Utf8FitTo(descr, wnamepart)) { char const* active = activeEvents.find(id) != activeEvents.end() ? GetMangosString(LANG_ACTIVE) : ""; - if(m_session) - PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT,id,id,eventData.description.c_str(),active ); + if (m_session) + PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT, id, id, eventData.description.c_str(), active); else - PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE,id,eventData.description.c_str(),active ); + PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE, id, eventData.description.c_str(), active); ++counter; } @@ -3831,7 +3831,7 @@ bool ChatHandler::HandleEventListCommand(const char* args) GameEventData const& eventData = events[event_id]; - if(m_session) + if (m_session) PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT, event_id, event_id, eventData.description.c_str(), state); else PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE, event_id, eventData.description.c_str(), state); @@ -3847,19 +3847,19 @@ bool ChatHandler::HandleEventListCommand(const char* args) bool ChatHandler::HandleEventInfoCommand(const char* args) { - if(!*args) + if (!*args) return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r char* cId = extractKeyFromLink((char*)args,"Hgameevent"); - if(!cId) + if (!cId) return false; uint32 event_id = atoi(cId); GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap(); - if(event_id >=events.size()) + if (event_id >=events.size()) { SendSysMessage(LANG_EVENT_NOT_EXIST); SetSentErrorMessage(true); @@ -3867,7 +3867,7 @@ bool ChatHandler::HandleEventInfoCommand(const char* args) } GameEventData const& eventData = events[event_id]; - if(!eventData.isValid()) + if (!eventData.isValid()) { SendSysMessage(LANG_EVENT_NOT_EXIST); SetSentErrorMessage(true); @@ -3896,19 +3896,19 @@ bool ChatHandler::HandleEventInfoCommand(const char* args) bool ChatHandler::HandleEventStartCommand(const char* args) { - if(!*args) + if (!*args) return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r char* cId = extractKeyFromLink((char*)args,"Hgameevent"); - if(!cId) + if (!cId) return false; int32 event_id = atoi(cId); GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap(); - if(event_id < 1 || event_id >=(int32)events.size()) + if (event_id < 1 || event_id >=(int32)events.size()) { SendSysMessage(LANG_EVENT_NOT_EXIST); SetSentErrorMessage(true); @@ -3916,7 +3916,7 @@ bool ChatHandler::HandleEventStartCommand(const char* args) } GameEventData const& eventData = events[event_id]; - if(!eventData.isValid()) + if (!eventData.isValid()) { SendSysMessage(LANG_EVENT_NOT_EXIST); SetSentErrorMessage(true); @@ -3924,7 +3924,7 @@ bool ChatHandler::HandleEventStartCommand(const char* args) } GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr.GetActiveEventList(); - if(activeEvents.find(event_id) != activeEvents.end()) + if (activeEvents.find(event_id) != activeEvents.end()) { PSendSysMessage(LANG_EVENT_ALREADY_ACTIVE,event_id); SetSentErrorMessage(true); @@ -3938,19 +3938,19 @@ bool ChatHandler::HandleEventStartCommand(const char* args) bool ChatHandler::HandleEventStopCommand(const char* args) { - if(!*args) + if (!*args) return false; // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r char* cId = extractKeyFromLink((char*)args,"Hgameevent"); - if(!cId) + if (!cId) return false; int32 event_id = atoi(cId); GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap(); - if(event_id < 1 || event_id >=(int32)events.size()) + if (event_id < 1 || event_id >=(int32)events.size()) { SendSysMessage(LANG_EVENT_NOT_EXIST); SetSentErrorMessage(true); @@ -3958,7 +3958,7 @@ bool ChatHandler::HandleEventStopCommand(const char* args) } GameEventData const& eventData = events[event_id]; - if(!eventData.isValid()) + if (!eventData.isValid()) { SendSysMessage(LANG_EVENT_NOT_EXIST); SetSentErrorMessage(true); @@ -3967,7 +3967,7 @@ bool ChatHandler::HandleEventStopCommand(const char* args) GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr.GetActiveEventList(); - if(activeEvents.find(event_id) == activeEvents.end()) + if (activeEvents.find(event_id) == activeEvents.end()) { PSendSysMessage(LANG_EVENT_NOT_ACTIVE,event_id); SetSentErrorMessage(true); @@ -3982,7 +3982,7 @@ bool ChatHandler::HandleEventStopCommand(const char* args) bool ChatHandler::HandleCombatStopCommand(const char* args) { Player* target; - if(!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args,&target)) return false; // check online security @@ -4005,11 +4005,11 @@ void ChatHandler::HandleLearnSkillRecipesHelper(Player* player,uint32 skill_id) continue; // wrong skill - if( skillLine->skillId != skill_id) + if (skillLine->skillId != skill_id) continue; // not high rank - if(skillLine->forward_spellid ) + if (skillLine->forward_spellid) continue; // skip racial skills @@ -4017,11 +4017,11 @@ void ChatHandler::HandleLearnSkillRecipesHelper(Player* player,uint32 skill_id) continue; // skip wrong class skills - if( skillLine->classmask && (skillLine->classmask & classmask) == 0) + if (skillLine->classmask && (skillLine->classmask & classmask) == 0) continue; SpellEntry const* spellInfo = sSpellStore.LookupEntry(skillLine->spellId); - if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo,player,false)) + if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo,player,false)) continue; player->learnSpell(skillLine->spellId, false); @@ -4033,7 +4033,7 @@ bool ChatHandler::HandleLearnAllCraftsCommand(const char* /*args*/) for (uint32 i = 0; i < sSkillLineStore.GetNumRows(); ++i) { SkillLineEntry const *skillInfo = sSkillLineStore.LookupEntry(i); - if( !skillInfo ) + if (!skillInfo) continue; if ((skillInfo->categoryId == SKILL_CATEGORY_PROFESSION || skillInfo->categoryId == SKILL_CATEGORY_SECONDARY) && @@ -4053,22 +4053,22 @@ bool ChatHandler::HandleLearnAllRecipesCommand(const char* args) // Example: .learn all_recipes enchanting Player* target = getSelectedPlayer(); - if( !target ) + if (!target) { SendSysMessage(LANG_PLAYER_NOT_FOUND); return false; } - if(!*args) + if (!*args) return false; std::wstring wnamepart; - if(!Utf8toWStr(args,wnamepart)) + if (!Utf8toWStr(args,wnamepart)) return false; // converting string that we try to find to lower case - wstrToLower( wnamepart ); + wstrToLower(wnamepart); std::string name; @@ -4086,7 +4086,7 @@ bool ChatHandler::HandleLearnAllRecipesCommand(const char* args) int loc = GetSessionDbcLocale(); name = skillInfo->name[loc]; - if(name.empty()) + if (name.empty()) continue; if (!Utf8FitTo(name, wnamepart)) @@ -4094,11 +4094,11 @@ bool ChatHandler::HandleLearnAllRecipesCommand(const char* args) loc = 0; for(; loc < MAX_LOCALE; ++loc) { - if(loc==GetSessionDbcLocale()) + if (loc==GetSessionDbcLocale()) continue; name = skillInfo->name[loc]; - if(name.empty()) + if (name.empty()) continue; if (Utf8FitTo(name, wnamepart)) @@ -4106,14 +4106,14 @@ bool ChatHandler::HandleLearnAllRecipesCommand(const char* args) } } - if(loc < MAX_LOCALE) + if (loc < MAX_LOCALE) { targetSkillInfo = skillInfo; break; } } - if(!targetSkillInfo) + if (!targetSkillInfo) return false; HandleLearnSkillRecipesHelper(target,targetSkillInfo->id); @@ -4201,7 +4201,7 @@ bool ChatHandler::ShowAccountListHelper(QueryResult* result, uint32* limit, bool // check limit if (limit) { - if(*limit == 0) + if (*limit == 0) break; --*limit; } @@ -4213,7 +4213,7 @@ bool ChatHandler::ShowAccountListHelper(QueryResult* result, uint32* limit, bool Player* player = session ? session->GetPlayer() : NULL; char const* char_name = player ? player->GetName() : " - "; - if(m_session) + if (m_session) PSendSysMessage(LANG_ACCOUNT_LIST_LINE_CHAT, account,fields[1].GetString(),char_name,fields[2].GetString(),fields[3].GetUInt32(),fields[4].GetUInt32()); else @@ -4309,7 +4309,7 @@ bool ChatHandler::LookupPlayerSearchCommand(QueryResult* result, uint32* limit) std::string acc_name = fields[1].GetCppString(); ///- Get the characters for account id - QueryResult *chars = CharacterDatabase.PQuery( "SELECT guid, name, race, class, level FROM characters WHERE account = %u", acc_id); + QueryResult *chars = CharacterDatabase.PQuery("SELECT guid, name, race, class, level FROM characters WHERE account = %u", acc_id); if (chars) { if (chars->GetRowCount()) @@ -4324,7 +4324,7 @@ bool ChatHandler::LookupPlayerSearchCommand(QueryResult* result, uint32* limit) delete result; - if (*limit==limit_original) // empty accounts only + if (*limit == limit_original) // empty accounts only { PSendSysMessage(LANG_NO_PLAYERS_FOUND); SetSentErrorMessage(true); @@ -4344,7 +4344,7 @@ bool ChatHandler::HandleServerCorpsesCommand(const char* /*args*/) bool ChatHandler::HandleRepairitemsCommand(const char* args) { Player* target; - if(!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args,&target)) return false; // check online security @@ -4355,19 +4355,19 @@ bool ChatHandler::HandleRepairitemsCommand(const char* args) target->DurabilityRepairAll(false, 0, false); PSendSysMessage(LANG_YOU_REPAIR_ITEMS, GetNameLink(target).c_str()); - if(needReportToTarget(target)) + if (needReportToTarget(target)) ChatHandler(target).PSendSysMessage(LANG_YOUR_ITEMS_REPAIRED, GetNameLink().c_str()); return true; } bool ChatHandler::HandleWaterwalkCommand(const char* args) { - if(!*args) + if (!*args) return false; Player *player = getSelectedPlayer(); - if(!player) + if (!player) { PSendSysMessage(LANG_NO_CHAR_SELECTED); SetSentErrorMessage(true); @@ -4389,14 +4389,14 @@ bool ChatHandler::HandleWaterwalkCommand(const char* args) } PSendSysMessage(LANG_YOU_SET_WATERWALK, args, GetNameLink(player).c_str()); - if(needReportToTarget(player)) + if (needReportToTarget(player)) ChatHandler(player).PSendSysMessage(LANG_YOUR_WATERWALK_SET, args, GetNameLink().c_str()); return true; } bool ChatHandler::HandleLookupTitleCommand(const char* args) { - if(!*args) + if (!*args) return false; // can be NULL in console call @@ -4408,11 +4408,11 @@ bool ChatHandler::HandleLookupTitleCommand(const char* args) std::string namepart = args; std::wstring wnamepart; - if(!Utf8toWStr(namepart,wnamepart)) + if (!Utf8toWStr(namepart,wnamepart)) return false; // converting string that we try to find to lower case - wstrToLower( wnamepart ); + wstrToLower(wnamepart); uint32 counter = 0; // Counter for figure out that we found smth. @@ -4420,11 +4420,11 @@ bool ChatHandler::HandleLookupTitleCommand(const char* args) for (uint32 id = 0; id < sCharTitlesStore.GetNumRows(); id++) { CharTitlesEntry const *titleInfo = sCharTitlesStore.LookupEntry(id); - if(titleInfo) + if (titleInfo) { int loc = GetSessionDbcLocale(); std::string name = titleInfo->name[loc]; - if(name.empty()) + if (name.empty()) continue; if (!Utf8FitTo(name, wnamepart)) @@ -4432,11 +4432,11 @@ bool ChatHandler::HandleLookupTitleCommand(const char* args) loc = 0; for(; loc < MAX_LOCALE; ++loc) { - if(loc==GetSessionDbcLocale()) + if (loc == GetSessionDbcLocale()) continue; name = titleInfo->name[loc]; - if(name.empty()) + if (name.empty()) continue; if (Utf8FitTo(name, wnamepart)) @@ -4444,7 +4444,7 @@ bool ChatHandler::HandleLookupTitleCommand(const char* args) } } - if(loc < MAX_LOCALE) + if (loc < MAX_LOCALE) { char const* knownStr = target && target->HasTitle(titleInfo) ? GetMangosString(LANG_KNOWN) : ""; @@ -4474,7 +4474,7 @@ bool ChatHandler::HandleTitlesAddCommand(const char* args) { // number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r char* id_p = extractKeyFromLink((char*)args,"Htitle"); - if(!id_p) + if (!id_p) return false; int32 id = atoi(id_p); @@ -4486,7 +4486,7 @@ bool ChatHandler::HandleTitlesAddCommand(const char* args) } Player * target = getSelectedPlayer(); - if(!target) + if (!target) { SendSysMessage(LANG_NO_CHAR_SELECTED); SetSentErrorMessage(true); @@ -4498,7 +4498,7 @@ bool ChatHandler::HandleTitlesAddCommand(const char* args) return false; CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(id); - if(!titleInfo) + if (!titleInfo) { PSendSysMessage(LANG_INVALID_TITLE_ID, id); SetSentErrorMessage(true); @@ -4521,7 +4521,7 @@ bool ChatHandler::HandleTitlesRemoveCommand(const char* args) { // number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r char* id_p = extractKeyFromLink((char*)args,"Htitle"); - if(!id_p) + if (!id_p) return false; int32 id = atoi(id_p); @@ -4533,7 +4533,7 @@ bool ChatHandler::HandleTitlesRemoveCommand(const char* args) } Player * target = getSelectedPlayer(); - if(!target) + if (!target) { SendSysMessage(LANG_NO_CHAR_SELECTED); SetSentErrorMessage(true); @@ -4545,7 +4545,7 @@ bool ChatHandler::HandleTitlesRemoveCommand(const char* args) return false; CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(id); - if(!titleInfo) + if (!titleInfo) { PSendSysMessage(LANG_INVALID_TITLE_ID, id); SetSentErrorMessage(true); @@ -4574,7 +4574,7 @@ bool ChatHandler::HandleTitlesRemoveCommand(const char* args) //Edit Player KnownTitles bool ChatHandler::HandleTitlesSetMaskCommand(const char* args) { - if(!*args) + if (!*args) return false; uint64 titles = 0; @@ -4596,7 +4596,7 @@ bool ChatHandler::HandleTitlesSetMaskCommand(const char* args) uint64 titles2 = titles; for(uint32 i = 1; i < sCharTitlesStore.GetNumRows(); ++i) - if(CharTitlesEntry const* tEntry = sCharTitlesStore.LookupEntry(i)) + if (CharTitlesEntry const* tEntry = sCharTitlesStore.LookupEntry(i)) titles2 &= ~(uint64(1) << tEntry->bit_index); titles &= ~titles2; // remove not existed titles @@ -4606,8 +4606,8 @@ bool ChatHandler::HandleTitlesSetMaskCommand(const char* args) if (!target->HasTitle(target->GetInt32Value(PLAYER_CHOSEN_TITLE))) { - target->SetUInt32Value(PLAYER_CHOSEN_TITLE,0); - PSendSysMessage(LANG_CURRENT_TITLE_RESET,GetNameLink(target).c_str()); + target->SetUInt32Value(PLAYER_CHOSEN_TITLE, 0); + PSendSysMessage(LANG_CURRENT_TITLE_RESET, GetNameLink(target).c_str()); } return true; @@ -4616,7 +4616,7 @@ bool ChatHandler::HandleTitlesSetMaskCommand(const char* args) bool ChatHandler::HandleCharacterTitlesCommand(const char* args) { Player* target; - if(!extractPlayerTarget((char*)args,&target)) + if (!extractPlayerTarget((char*)args, &target)) return false; LocaleConstant loc = GetSessionDbcLocale(); @@ -4630,10 +4630,10 @@ bool ChatHandler::HandleCharacterTitlesCommand(const char* args) if (titleInfo && target->HasTitle(titleInfo)) { std::string name = titleInfo->name[loc]; - if(name.empty()) + if (name.empty()) continue; - char const* activeStr = target && target->GetUInt32Value(PLAYER_CHOSEN_TITLE)==titleInfo->bit_index + char const* activeStr = target && target->GetUInt32Value(PLAYER_CHOSEN_TITLE) == titleInfo->bit_index ? GetMangosString(LANG_ACTIVE) : ""; @@ -4642,9 +4642,9 @@ bool ChatHandler::HandleCharacterTitlesCommand(const char* args) // send title in "id (idx:idx) - [namedlink locale]" format if (m_session) - PSendSysMessage(LANG_TITLE_LIST_CHAT,id,titleInfo->bit_index,id,titleNameStr,localeNames[loc],knownStr,activeStr); + PSendSysMessage(LANG_TITLE_LIST_CHAT, id, titleInfo->bit_index, id, titleNameStr, localeNames[loc], knownStr, activeStr); else - PSendSysMessage(LANG_TITLE_LIST_CONSOLE,id,titleInfo->bit_index,name.c_str(),localeNames[loc],knownStr,activeStr); + PSendSysMessage(LANG_TITLE_LIST_CONSOLE, id, titleInfo->bit_index, name.c_str(), localeNames[loc], knownStr, activeStr); } } return true; @@ -4653,8 +4653,8 @@ bool ChatHandler::HandleCharacterTitlesCommand(const char* args) bool ChatHandler::HandleTitlesCurrentCommand(const char* args) { // number or [name] Shift-click form |color|Htitle:title_id|h[name]|h|r - char* id_p = extractKeyFromLink((char*)args,"Htitle"); - if(!id_p) + char* id_p = extractKeyFromLink((char*)args, "Htitle"); + if (!id_p) return false; int32 id = atoi(id_p); @@ -4666,7 +4666,7 @@ bool ChatHandler::HandleTitlesCurrentCommand(const char* args) } Player * target = getSelectedPlayer(); - if(!target) + if (!target) { SendSysMessage(LANG_NO_CHAR_SELECTED); SetSentErrorMessage(true); @@ -4678,7 +4678,7 @@ bool ChatHandler::HandleTitlesCurrentCommand(const char* args) return false; CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(id); - if(!titleInfo) + if (!titleInfo) { PSendSysMessage(LANG_INVALID_TITLE_ID, id); SetSentErrorMessage(true); diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 791397a4f..54deb42d6 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -2468,16 +2468,16 @@ bool ChatHandler::HandleListItemCommand(const char* args) bool ChatHandler::HandleListObjectCommand(const char* args) { - if(!*args) + if (!*args) return false; // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hgameobject_entry"); - if(!cId) + char* cId = extractKeyFromLink((char*)args, "Hgameobject_entry"); + if (!cId) return false; uint32 go_id = atol(cId); - if(!go_id) + if (!go_id) { PSendSysMessage(LANG_COMMAND_LISTOBJINVALIDID, go_id); SetSentErrorMessage(true); @@ -2485,7 +2485,7 @@ bool ChatHandler::HandleListObjectCommand(const char* args) } GameObjectInfo const * gInfo = ObjectMgr::GetGameObjectInfo(go_id); - if(!gInfo) + if (!gInfo) { PSendSysMessage(LANG_COMMAND_LISTOBJINVALIDID, go_id); SetSentErrorMessage(true); @@ -2495,20 +2495,20 @@ bool ChatHandler::HandleListObjectCommand(const char* args) char* c_count = strtok(NULL, " "); int count = c_count ? atol(c_count) : 10; - if(count < 0) + if (count < 0) return false; QueryResult *result; uint32 obj_count = 0; - result=WorldDatabase.PQuery("SELECT COUNT(guid) FROM gameobject WHERE id='%u'",go_id); - if(result) + result = WorldDatabase.PQuery("SELECT COUNT(guid) FROM gameobject WHERE id='%u'", go_id); + if (result) { obj_count = (*result)[0].GetUInt32(); delete result; } - if(m_session) + if (m_session) { Player* pl = m_session->GetPlayer(); result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM gameobject WHERE id = '%u' ORDER BY order_ ASC LIMIT %u", @@ -2538,22 +2538,22 @@ bool ChatHandler::HandleListObjectCommand(const char* args) delete result; } - PSendSysMessage(LANG_COMMAND_LISTOBJMESSAGE,go_id,obj_count); + PSendSysMessage(LANG_COMMAND_LISTOBJMESSAGE, go_id, obj_count); return true; } bool ChatHandler::HandleListCreatureCommand(const char* args) { - if(!*args) + if (!*args) return false; // number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r - char* cId = extractKeyFromLink((char*)args,"Hcreature_entry"); - if(!cId) + char* cId = extractKeyFromLink((char*)args, "Hcreature_entry"); + if (!cId) return false; uint32 cr_id = atol(cId); - if(!cr_id) + if (!cr_id) { PSendSysMessage(LANG_COMMAND_INVALIDCREATUREID, cr_id); SetSentErrorMessage(true); @@ -2561,7 +2561,7 @@ bool ChatHandler::HandleListCreatureCommand(const char* args) } CreatureInfo const* cInfo = ObjectMgr::GetCreatureTemplate(cr_id); - if(!cInfo) + if (!cInfo) { PSendSysMessage(LANG_COMMAND_INVALIDCREATUREID, cr_id); SetSentErrorMessage(true); @@ -2571,20 +2571,20 @@ bool ChatHandler::HandleListCreatureCommand(const char* args) char* c_count = strtok(NULL, " "); int count = c_count ? atol(c_count) : 10; - if(count < 0) + if (count < 0) return false; QueryResult *result; uint32 cr_count = 0; - result=WorldDatabase.PQuery("SELECT COUNT(guid) FROM creature WHERE id='%u'",cr_id); - if(result) + result = WorldDatabase.PQuery("SELECT COUNT(guid) FROM creature WHERE id='%u'",cr_id); + if (result) { cr_count = (*result)[0].GetUInt32(); delete result; } - if(m_session) + if (m_session) { Player* pl = m_session->GetPlayer(); result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM creature WHERE id = '%u' ORDER BY order_ ASC LIMIT %u", @@ -2614,7 +2614,7 @@ bool ChatHandler::HandleListCreatureCommand(const char* args) delete result; } - PSendSysMessage(LANG_COMMAND_LISTCREATUREMESSAGE,cr_id,cr_count); + PSendSysMessage(LANG_COMMAND_LISTCREATUREMESSAGE, cr_id, cr_count); return true; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index be24888bd..cd2fa963d 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 "10125" + #define REVISION_NR "10126" #endif // __REVISION_NR_H__