Skip to content

Commit

Permalink
[9884] Code style fixes thx to hunuza & Wowka321
Browse files Browse the repository at this point in the history
  • Loading branch information
@Laise
Laise committed May 12, 2010
1 parent f2ba61e commit 26ba11a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
5 changes: 2 additions & 3 deletions src/game/Spell.cpp
View file
Expand Up @@ -6556,16 +6556,15 @@ void Spell::SelectMountByAreaAndSkill(Unit* target, uint32 spellId75, uint32 spe
{
if (iter->second.state != PLAYERSPELL_REMOVED)
{
bool changedSpeed = false;
SpellEntry const *spellInfo = sSpellStore.LookupEntry(iter->first);
for(int i = 0; i < MAX_EFFECT_INDEX; ++i)
{
if(spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED)
{
int32 mountSpeed = spellInfo->CalculateSimpleValue(SpellEffectIndex(i));

// speed higher than 300 replace it
if (mountSpeed > 300)
// speed higher than 280 replace it
if (mountSpeed > 280)
target->CastSpell(target, spellIdSpecial, true);
return;
}
Expand Down
6 changes: 3 additions & 3 deletions src/game/SpellAuras.cpp
View file
Expand Up @@ -2291,7 +2291,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
((Player*)m_target)->RemoveAmmo();
return;
case 48025: // Headless Horseman's Mount
Spell::SelectMountByAreaAndSkill(m_target, 51621, 48024, 51617, 48023, NULL);
Spell::SelectMountByAreaAndSkill(m_target, 51621, 48024, 51617, 48023, 0);
return;
case 62061: // Festive Holiday Mount
if (m_target->HasAuraType(SPELL_AURA_MOUNTED))
Expand All @@ -2309,10 +2309,10 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
((Player*)m_target)->removeSpell(63680);
return;
case 72286: // Invincible
Spell::SelectMountByAreaAndSkill(m_target, 72281, 72282, 72283, 72284, NULL);
Spell::SelectMountByAreaAndSkill(m_target, 72281, 72282, 72283, 72284, 0);
return;
case 74856: // Blazing Hippogryph
Spell::SelectMountByAreaAndSkill(m_target, NULL, NULL, 74854, 74855, NULL);
Spell::SelectMountByAreaAndSkill(m_target, 0, 0, 74854, 74855, 0);
return;
case 75614: // Celestial Steed
Spell::SelectMountByAreaAndSkill(m_target, 75619, 75620, 75617, 75618, 76153);
Expand Down
2 changes: 1 addition & 1 deletion src/shared/revision_nr.h
View file
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "9883"
#define REVISION_NR "9884"
#endif // __REVISION_NR_H__

15 comments on commit 26ba11a

@hackworld
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Прошу прощения, что пишу коммент не в тот коммит, проблемы при компиляции, смог излечить этим образом:

SpellEffects.cpp
Было:
for(std::list::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)

Стало:
for(tbb::concurrent_vector::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)

aka Chrno Lawliet

@VladimirMangos
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mangos core not have this problem. Not use broken custom patches.

@3raZar3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its definitely not HSC... i dont even recognize the code... whats that from you think vlad?

@Wowka321
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As is see, hackworld used mtmaps ))

@hackworld
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Жаль, что я не говорю по английски... :) Я не использую MTMaps, только лишь VMAP_Rewrite с репозитария Insider42 (Каратель), также при компиляции Mangosd.exe возникает масса всякой всячины (ошибок), причем это только с x64, с Win32 все нормально...

@VladimirMangos
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ну используете, мангос то тут причем. в нем проблем нет.

@hackworld
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Просто хотел узнать, в чем может быть проблема... Т.к. вы разработчик сего чуда, вы должны знать.
Разумеется пробела не в оригинальных исходниках, я включил пачки Insider42 и Valhalla Project + Vmap Rewrite, на ревизии 9842 все компилилось нормально, как обновил до 9884, все стало именно так как я описывал ранее :)

@insider42
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Просто следите за актуальностью патчей которые вы ставите на ядро и всё будет оке ;) это явно не проблемы разработчиков мангоса

@NoFantasy
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hva er poenget med å skrive russisk? Kanskje alle skal begynne å skrive sitt eget morsmål, sånn som dette, bare for å gjøre ting enda mer vanskelig.

@tomrus88
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

為什麼都寫在俄羅斯？也許每個人都應該開始寫在他們的母語，只是複雜的一切？

@Ligthguard
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NoFantasy-nak igaza van, egész nyugodtan nekiállhatna mindenki az anyanyelvén írni, végülis nem lesz nagy káosz:D
Hackworld: Mangos nekem jelenleg minden lehetséges módon gond nélkül lefordul...

@Laise
Copy link
Contributor Author

@Laise Laise commented on 26ba11a May 13, 2010

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

למה על הקומיט שלי אבל? =\

@DasBlub
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

immer die russe wo s gfühl hän, sie mieste in ihrer eigene sproch statt in änglisch schribe.... tztztz

@Axxus
Copy link

@Axxus Axxus commented on 26ba11a May 14, 2010

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hola que tal?

@hackworld
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

insider42, за патчами я слежу :) все дело оказалось в настройке проекта shared & game, мудил с оптимизаций, кудато тыкнул и все, нарушил линки на библиотеки. Вот и вся проблема :) из за этого тут такой балаган, банально попросил привести хотя бы догадки. как решить проблему...

Please sign in to comment.