More tabs2spaces
--HG-- branch : trunk
This commit is contained in:
+12
-12
@@ -7566,35 +7566,35 @@ CreatureInfo const *GetCreatureInfo(uint32 id)
|
||||
void ObjectMgr::LoadTransportEvents()
|
||||
{
|
||||
|
||||
QueryResult *result = WorldDatabase.Query("SELECT entry, waypoint_id, event_id FROM transport_events");
|
||||
QueryResult *result = WorldDatabase.Query("SELECT entry, waypoint_id, event_id FROM transport_events");
|
||||
|
||||
if( !result )
|
||||
{
|
||||
barGoLink bar1( 1 );
|
||||
bar1.step();
|
||||
sLog.outString( "\n>> Transport events table is empty \n" );
|
||||
sLog.outString( "\n>> Transport events table is empty \n" );
|
||||
return;
|
||||
}
|
||||
|
||||
barGoLink bar1( result->GetRowCount() );
|
||||
barGoLink bar1( result->GetRowCount() );
|
||||
|
||||
do
|
||||
{
|
||||
bar1.step();
|
||||
|
||||
Field *fields = result->Fetch();
|
||||
Field *fields = result->Fetch();
|
||||
|
||||
//Load event values
|
||||
//Load event values
|
||||
uint32 entry = fields[0].GetUInt32();
|
||||
uint32 waypoint_id = fields[1].GetUInt32();
|
||||
uint32 event_id = fields[2].GetUInt32();
|
||||
uint32 event_id = fields[2].GetUInt32();
|
||||
|
||||
uint32 event_count = (entry*100)+waypoint_id;
|
||||
TransportEventMap[event_count] = event_id;
|
||||
}
|
||||
while(result->NextRow());
|
||||
uint32 event_count = (entry*100)+waypoint_id;
|
||||
TransportEventMap[event_count] = event_id;
|
||||
}
|
||||
while(result->NextRow());
|
||||
|
||||
sLog.outString( "\n>> Loaded %u transport events \n", result->GetRowCount() );
|
||||
sLog.outString( "\n>> Loaded %u transport events \n", result->GetRowCount() );
|
||||
|
||||
delete result;
|
||||
delete result;
|
||||
}
|
||||
|
||||
+1
-1
@@ -2246,7 +2246,7 @@ void Spell::cast(bool skipCheck)
|
||||
if (IsAffectedBy(auraSpellInfo, auraSpellIdx))
|
||||
{
|
||||
if(SpellEntry const *spellInfo = sSpellStore.LookupEntry(auraSpellInfo->EffectTriggerSpell[auraSpellIdx]))
|
||||
{
|
||||
{
|
||||
// Calculate chance at that moment (can be depend for example from combo points)
|
||||
int32 chance = m_caster->CalculateSpellDamage(auraSpellInfo, auraSpellIdx, (*i)->GetBasePoints(), NULL);
|
||||
m_ChanceTriggerSpells.push_back(std::make_pair(spellInfo, chance * (*i)->GetStackAmount()));
|
||||
|
||||
@@ -2187,7 +2187,7 @@ void SpellMgr::LoadSpellCustomAttr()
|
||||
case 41635: // Prayer of Mending
|
||||
case 44869: // Spectral Blast
|
||||
case 45027: // Revitalize
|
||||
case 45976: // Muru Portal Channel
|
||||
case 45976: // Muru Portal Channel
|
||||
spellInfo->MaxAffectedTargets = 1;
|
||||
break;
|
||||
case 41376: // Spite
|
||||
|
||||
Reference in New Issue
Block a user