Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Warning fixes and some random cleanup here and there

Browse Source
This commit is contained in:
Spp
2012-03-07 14:08:30 +01:00
parent e5d23103f3
commit f495e0efe4
123 changed files with 682 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/server/game/Scripting/MapScripts.cpp
View File

@@ -375,22 +375,22 @@ void Map::ScriptsProcess()
}
if (step.script->Talk.Flags & SF_TALK_USE_PLAYER)
{
if (Player* pSource = _GetScriptPlayerSourceOrTarget(source, target, step.script))
if (Player* player = _GetScriptPlayerSourceOrTarget(source, target, step.script))
{
LocaleConstant loc_idx = pSource->GetSession()->GetSessionDbLocaleIndex();
LocaleConstant loc_idx = player->GetSession()->GetSessionDbLocaleIndex();
std::string text(sObjectMgr->GetTrinityString(step.script->Talk.TextID, loc_idx));
switch (step.script->Talk.ChatType)
{
case CHAT_TYPE_SAY:
pSource->Say(text, LANG_UNIVERSAL);
player->Say(text, LANG_UNIVERSAL);
break;
case CHAT_TYPE_YELL:
pSource->Yell(text, LANG_UNIVERSAL);
player->Yell(text, LANG_UNIVERSAL);
break;
case CHAT_TYPE_TEXT_EMOTE:
case CHAT_TYPE_BOSS_EMOTE:
pSource->TextEmote(text);
player->TextEmote(text);
break;
case CHAT_TYPE_WHISPER:
case CHAT_MSG_RAID_BOSS_WHISPER:
@@ -399,7 +399,7 @@ void Map::ScriptsProcess()
if (!targetGUID || !IS_PLAYER_GUID(targetGUID))
sLog->outError("%s attempt to whisper to non-player unit, skipping.", step.script->GetDebugInfo().c_str());
else
pSource->Whisper(text, LANG_UNIVERSAL, targetGUID);
player->Whisper(text, LANG_UNIVERSAL, targetGUID);
break;
}
default:
@@ -524,8 +524,8 @@ void Map::ScriptsProcess()
else
{
// Source or target must be Player.
if (Player* pSource = _GetScriptPlayerSourceOrTarget(source, target, step.script))
pSource->TeleportTo(step.script->TeleportTo.MapID, step.script->TeleportTo.DestX, step.script->TeleportTo.DestY, step.script->TeleportTo.DestZ, step.script->TeleportTo.Orientation);
if (Player* player = _GetScriptPlayerSourceOrTarget(source, target, step.script))
player->TeleportTo(step.script->TeleportTo.MapID, step.script->TeleportTo.DestX, step.script->TeleportTo.DestY, step.script->TeleportTo.DestZ, step.script->TeleportTo.Orientation);
}
break;
@@ -544,8 +544,8 @@ void Map::ScriptsProcess()
// when script called for item spell casting then target == (unit or GO) and source is player
WorldObject* worldObject;
Player* plrTarget = target->ToPlayer();
if (plrTarget)
Player* player = target->ToPlayer();
if (player)
{
if (source->GetTypeId() != TYPEID_UNIT && source->GetTypeId() != TYPEID_GAMEOBJECT && source->GetTypeId() != TYPEID_PLAYER)
{
@@ -557,8 +557,8 @@ void Map::ScriptsProcess()
}
else
{
plrTarget = source->ToPlayer();
if (plrTarget)
player = source->ToPlayer();
if (player)
{
if (target->GetTypeId() != TYPEID_UNIT && target->GetTypeId() != TYPEID_GAMEOBJECT && target->GetTypeId() != TYPEID_PLAYER)
{
@@ -579,22 +579,22 @@ void Map::ScriptsProcess()
// quest id and flags checked at script loading
if ((worldObject->GetTypeId() != TYPEID_UNIT || ((Unit*)worldObject)->isAlive()) &&
(step.script->QuestExplored.Distance == 0 || worldObject->IsWithinDistInMap(plrTarget, float(step.script->QuestExplored.Distance))))
plrTarget->AreaExploredOrEventHappens(step.script->QuestExplored.QuestID);
(step.script->QuestExplored.Distance == 0 || worldObject->IsWithinDistInMap(player, float(step.script->QuestExplored.Distance))))
player->AreaExploredOrEventHappens(step.script->QuestExplored.QuestID);
else
plrTarget->FailQuest(step.script->QuestExplored.QuestID);
player->FailQuest(step.script->QuestExplored.QuestID);
break;
}
case SCRIPT_COMMAND_KILL_CREDIT:
// Source or target must be Player.
if (Player* pSource = _GetScriptPlayerSourceOrTarget(source, target, step.script))
if (Player* player = _GetScriptPlayerSourceOrTarget(source, target, step.script))
{
if (step.script->KillCredit.Flags & SF_KILLCREDIT_REWARD_GROUP)
pSource->RewardPlayerAndGroupAtEvent(step.script->KillCredit.CreatureEntry, pSource);
player->RewardPlayerAndGroupAtEvent(step.script->KillCredit.CreatureEntry, player);
else
pSource->KilledMonsterCredit(step.script->KillCredit.CreatureEntry, 0);
player->KilledMonsterCredit(step.script->KillCredit.CreatureEntry, 0);
}
break;
@@ -665,7 +665,7 @@ void Map::ScriptsProcess()
case SCRIPT_COMMAND_ACTIVATE_OBJECT:
// Source must be Unit.
if (Unit* pSource = _GetScriptUnit(source, true, step.script))
if (Unit* unit = _GetScriptUnit(source, true, step.script))
{
// Target must be GameObject.
if (!target)
@@ -682,7 +682,7 @@ void Map::ScriptsProcess()
}
if (GameObject* pGO = target->ToGameObject())
pGO->Use(pSource);
pGO->Use(unit);
}
break;
@@ -690,8 +690,8 @@ void Map::ScriptsProcess()
{
// Source (datalong2 != 0) or target (datalong2 == 0) must be Unit.
bool bReverse = step.script->RemoveAura.Flags & SF_REMOVEAURA_REVERSE;
if (Unit* pTarget = _GetScriptUnit(bReverse ? source : target, bReverse, step.script))
pTarget->RemoveAurasDueToSpell(step.script->RemoveAura.SpellID);
if (Unit* unit = _GetScriptUnit(bReverse ? source : target, bReverse, step.script))
unit->RemoveAurasDueToSpell(step.script->RemoveAura.SpellID);
break;
}
@@ -752,23 +752,23 @@ void Map::ScriptsProcess()
case SCRIPT_COMMAND_PLAY_SOUND:
// Source must be WorldObject.
if (WorldObject* pSource = _GetScriptWorldObject(source, true, step.script))
if (WorldObject* object = _GetScriptWorldObject(source, true, step.script))
{
// PlaySound.Flags bitmask: 0/1=anyone/target
Player* pTarget = NULL;
Player* player = NULL;
if (step.script->PlaySound.Flags & SF_PLAYSOUND_TARGET_PLAYER)
{
// Target must be Player.
pTarget = _GetScriptPlayer(target, false, step.script);
if (!pTarget)
player = _GetScriptPlayer(target, false, step.script);
if (!target)
break;
}
// PlaySound.Flags bitmask: 0/2=without/with distance dependent
if (step.script->PlaySound.Flags & SF_PLAYSOUND_DISTANCE_SOUND)
pSource->PlayDistanceSound(step.script->PlaySound.SoundID, pTarget);
object->PlayDistanceSound(step.script->PlaySound.SoundID, player);
else
pSource->PlayDirectSound(step.script->PlaySound.SoundID, pTarget);
object->PlayDirectSound(step.script->PlaySound.SoundID, player);
}
break;
@@ -796,12 +796,12 @@ void Map::ScriptsProcess()
case SCRIPT_COMMAND_LOAD_PATH:
// Source must be Unit.
if (Unit* pSource = _GetScriptUnit(source, true, step.script))
if (Unit* unit = _GetScriptUnit(source, true, step.script))
{
if (!sWaypointMgr->GetPath(step.script->LoadPath.PathID))
sLog->outError("%s source object has an invalid path (%u), skipping.", step.script->GetDebugInfo().c_str(), step.script->LoadPath.PathID);
else
pSource->GetMotionMaster()->MovePath(step.script->LoadPath.PathID, step.script->LoadPath.IsRepeatable);
unit->GetMotionMaster()->MovePath(step.script->LoadPath.PathID, step.script->LoadPath.IsRepeatable);
}
break;
@@ -876,21 +876,21 @@ void Map::ScriptsProcess()
case SCRIPT_COMMAND_ORIENTATION:
// Source must be Unit.
if (Unit* pSource = _GetScriptUnit(source, true, step.script))
if (Unit* sourceUnit = _GetScriptUnit(source, true, step.script))
{
if (step.script->Orientation.Flags& SF_ORIENTATION_FACE_TARGET)
if (step.script->Orientation.Flags & SF_ORIENTATION_FACE_TARGET)
{
// Target must be Unit.
Unit* pTarget = _GetScriptUnit(target, false, step.script);
if (!pTarget)
Unit* targetUnit = _GetScriptUnit(target, false, step.script);
if (!targetUnit)
break;
pSource->SetInFront(pTarget);
sourceUnit->SetInFront(targetUnit);
}
else
pSource->SetOrientation(step.script->Orientation.Orientation);
sourceUnit->SetOrientation(step.script->Orientation.Orientation);
pSource->SendMovementFlagUpdate();
sourceUnit->SendMovementFlagUpdate();
}
break;
@@ -908,14 +908,14 @@ void Map::ScriptsProcess()
case SCRIPT_COMMAND_CLOSE_GOSSIP:
// Source must be Player.
if (Player* pSource = _GetScriptPlayer(source, true, step.script))
pSource->PlayerTalkClass->SendCloseGossip();
if (Player* player = _GetScriptPlayer(source, true, step.script))
player->PlayerTalkClass->SendCloseGossip();
break;
case SCRIPT_COMMAND_PLAYMOVIE:
// Source must be Player.
if (Player* pSource = _GetScriptPlayer(source, true, step.script))
pSource->SendMovieStart(step.script->PlayMovie.MovieID);
if (Player* player = _GetScriptPlayer(source, true, step.script))
player->SendMovieStart(step.script->PlayMovie.MovieID);
break;
default: