Context Navigation

← Previous Changeset
Next Changeset →

Changeset 229

Timestamp:

11/19/08 13:48:34 (17 years ago)

Author:

yumileroy

Message:

[svn] *** Source: MaNGOS ***
* Fixed build extractor at Windows Vista. Author: Vladimir
* Fixed comment text and code indentifiers spelling. Author: Vladimir & Paradox.
* Access cached member lists in guild handlers instead of querying the DB. Author: Hunuza
* Small fixes in send/received packet and simple code cleanup also. Author: Vladimir
* Not output error at loading empty character_ticket table. Author: Vladimir
* Not reset display model at shapeshift aura remove if it not set at apply. Author: Arthorius
* Applied props to few files.

Original author: visagalis
Date: 2008-11-14 16:28:45-06:00

Location:

trunk

Files:

: 77 modified

contrib/extractor/VC71_ad.vcproj (modified) (2 diffs)
contrib/extractor/VC80_ad.vcproj (modified) (4 diffs)
contrib/extractor/VC90_ad.vcproj (modified) (3 diffs)
src/bindings/scripts/include/sc_creature.cpp (modified) (2 diffs)
src/bindings/scripts/scripts/creature/mob_event_ai.cpp (modified) (1 diff)
src/bindings/scripts/scripts/npc/npc_escortAI.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp (modified) (2 diffs)
src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp (modified) (2 diffs)
src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp (modified) (3 diffs)
src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp (modified) (1 diff)
src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp (modified) (2 diffs)
src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp (modified) (1 diff)
src/game/AggressorAI.cpp (modified) (1 diff)
src/game/AuctionHouse.cpp (modified) (2 diffs)
src/game/BattleGroundMgr.cpp (modified) (1 diff)
src/game/Chat.cpp (modified) (2 diffs)
src/game/Creature.cpp (modified) (9 diffs)
src/game/GMTicketMgr.cpp (modified) (1 diff)
src/game/GameObject.cpp (modified) (6 diffs)
src/game/Group.cpp (modified) (1 diff)
src/game/GuardAI.cpp (modified) (1 diff)
src/game/Guild.cpp (modified) (1 diff)
src/game/Guild.h (modified) (1 diff)
src/game/GuildHandler.cpp (modified) (8 diffs)
src/game/ItemHandler.cpp (modified) (2 diffs)
src/game/ItemPrototype.h (modified) (1 diff)
src/game/LFGHandler.cpp (modified) (2 diffs)
src/game/Level3.cpp (modified) (1 diff)
src/game/LootMgr.cpp (modified) (1 diff)
src/game/Mail.cpp (modified) (2 diffs)
src/game/Map.cpp (modified) (1 diff)
src/game/MiscHandler.cpp (modified) (2 diffs)
src/game/MovementHandler.cpp (modified) (1 diff)
src/game/ObjectGridLoader.cpp (modified) (2 diffs)
src/game/ObjectMgr.cpp (modified) (21 diffs)
src/game/OutdoorPvP.cpp (modified) (2 diffs)
src/game/PetAI.cpp (modified) (1 diff)
src/game/Player.cpp (modified) (8 diffs)
src/game/Player.h (modified) (3 diffs)
src/game/SharedDefines.h (modified) (2 diffs)
src/game/Spell.cpp (modified) (2 diffs)
src/game/SpellAuraDefines.h (modified) (1 diff)
src/game/SpellAuras.cpp (modified) (24 diffs)
src/game/SpellEffects.cpp (modified) (13 diffs)
src/game/SpellMgr.cpp (modified) (1 diff)
src/game/SpellMgr.h (modified) (1 diff)
src/game/StatSystem.cpp (modified) (2 diffs)
src/game/TaxiHandler.cpp (modified) (1 diff)
src/game/ThreatManager.cpp (modified) (3 diffs)
src/game/ThreatManager.h (modified) (1 diff)
src/game/Unit.cpp (modified) (47 diffs)
src/game/Unit.h (modified) (3 diffs)
src/game/WaypointMovementGenerator.cpp (modified) (1 diff)
src/game/World.cpp (modified) (2 diffs)
src/game/World.h (modified) (1 diff)
src/game/WorldSession.cpp (modified) (1 diff)
src/game/WorldSocket.cpp (modified) (3 diffs)
src/game/WorldSocketMgr.cpp (modified) (1 diff)
src/shared/Database/DBCStores.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/contrib/extractor/VC71_ad.vcproj

r2	r229
53	53	RuntimeLibrary="1"
54	54	UsePrecompiledHeader="0"
55		PrecompiledHeaderFile="~~c:\windows\temp/~~ad.pch"
56		AssemblerListingLocation="~~c:\windows\temp/~~"
57		ObjectFile="~~c:\windows\temp/~~"
58		ProgramDataBaseFileName="~~c:\windows\temp/~~"
	55	PrecompiledHeaderFile="$(IntDir)ad.pch"
	56	AssemblerListingLocation="$(IntDir)\"
	57	ObjectFile="$(IntDir)\"
	58	ProgramDataBaseFileName="$(IntDir)\"
59	59	BrowseInformation="1"
60	60	WarningLevel="3"
…	…
150	150	RuntimeLibrary="0"
151	151	UsePrecompiledHeader="0"
152		PrecompiledHeaderFile="~~c:\windows\temp/~~ad.pch"
153		AssemblerListingLocation="~~c:\windows\temp/~~"
154		ObjectFile="~~c:\windows\temp/~~"
155		ProgramDataBaseFileName="~~c:\windows\temp/~~"
	152	PrecompiledHeaderFile="$(IntDir)ad.pch"
	153	AssemblerListingLocation="$(IntDir)\"
	154	ObjectFile="$(IntDir)\"
	155	ProgramDataBaseFileName="$(IntDir)\"
156	156	WarningLevel="3"
157	157	SuppressStartupBanner="true"

trunk/contrib/extractor/VC80_ad.vcproj

r2	r229
55	55	RuntimeLibrary="1"
56	56	UsePrecompiledHeader="0"
57		PrecompiledHeaderFile="c:\windows\temp/ad.pch"
58		AssemblerListingLocation="c:\windows\temp/"
59		ObjectFile="c:\windows\temp/"
60		ProgramDataBaseFileName="c:\windows\temp/"
	57	PrecompiledHeaderFile="$(IntDir)ad.pch"
	58	AssemblerListingLocation="$(IntDir)\"
	59	ObjectFile="$(IntDir)\"
	60	ProgramDataBaseFileName="$(IntDir)\"
	61	XMLDocumentationFileName="$(IntDir)\"
61	62	BrowseInformation="1"
62	63	WarningLevel="3"
…	…
81	82	LinkIncremental="1"
82	83	SuppressStartupBanner="true"
83		AdditionalLibraryDirectories="./debug/"
	84	AdditionalLibraryDirectories="./debug"
84	85	IgnoreDefaultLibraryNames="LIBCD.lib"
85	86	GenerateDebugInformation="true"
…	…
154	155	UsePrecompiledHeader="0"
155	156	PrecompiledHeaderFile="c:\windows\temp/ad.pch"
156		AssemblerListingLocation="c:\windows\temp/"
157		ObjectFile="c:\windows\temp/"
158		ProgramDataBaseFileName="c:\windows\temp/"
	157	AssemblerListingLocation="$(IntDir)\"
	158	ObjectFile="$(IntDir)\"
	159	ProgramDataBaseFileName="$(IntDir)\"
	160	XMLDocumentationFileName="$(IntDir)\"
159	161	WarningLevel="3"
160	162	SuppressStartupBanner="true"
…	…
177	179	LinkIncremental="1"
178	180	SuppressStartupBanner="true"
179		AdditionalLibraryDirectories="./release/"
	181	AdditionalLibraryDirectories="./release"
180	182	IgnoreDefaultLibraryNames="LIBC.lib"
181	183	ProgramDatabaseFile="./ad.pdb"

trunk/contrib/extractor/VC90_ad.vcproj

r2	r229
5	5	Name="ad"
6	6	ProjectGUID="{D7552D4F-408F-4F8E-859B-366659150CF4}"
	7	RootNamespace="ad"
7	8	TargetFrameworkVersion="131072"
8	9	>
…	…
54	55	RuntimeLibrary="1"
55	56	UsePrecompiledHeader="0"
56		PrecompiledHeaderFile="c:\windows\temp/ad.pch"
57		AssemblerListingLocation="c:\windows\temp/"
58		ObjectFile="c:\windows\temp/"
59		ProgramDataBaseFileName="c:\windows\temp/"
	57	PrecompiledHeaderFile="$(IntDir)ad.pch"
	58	AssemblerListingLocation="$(IntDir)\"
	59	ObjectFile="$(IntDir)\"
	60	ProgramDataBaseFileName="$(IntDir)\"
	61	XMLDocumentationFileName="$(IntDir)\"
60	62	BrowseInformation="1"
	63	BrowseInformationFile="$(IntDir)"
61	64	WarningLevel="3"
62	65	SuppressStartupBanner="true"
…	…
150	153	RuntimeLibrary="0"
151	154	UsePrecompiledHeader="0"
152		PrecompiledHeaderFile="c:\windows\temp/ad.pch"
153		AssemblerListingLocation="c:\windows\temp/"
154		ObjectFile="c:\windows\temp/"
155		ProgramDataBaseFileName="c:\windows\temp/"
	155	PrecompiledHeaderFile="$(IntDir)ad.pch"
	156	AssemblerListingLocation="$(IntDir)\"
	157	ObjectFile="$(IntDir)\"
	158	ProgramDataBaseFileName="$(IntDir)\"
	159	XMLDocumentationFileName="$(IntDir)\"
156	160	WarningLevel="3"
157	161	SuppressStartupBanner="true"

trunk/src/bindings/scripts/include/sc_creature.cpp

r203	r229
74	74	void ScriptedAI::MoveInLineOfSight(Unit *who)
75	75	{
76		if(m_creature->getVictim() \|\| !m_creature->IsHostileTo(who) \|\| !who->isInAccessablePlaceFor(m_creature))
	76	if(m_creature->getVictim() \|\| !m_creature->IsHostileTo(who) \|\| !who->isInAccessiblePlaceFor(m_creature))
77	77	return;
78	78
…	…
787	787	void Scripted_NoMovementAI::MoveInLineOfSight(Unit *who)
788	788	{
789		if( !m_creature->getVictim() && m_creature->canAttack(who) && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
	789	if( !m_creature->getVictim() && m_creature->canAttack(who) && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
790	790	{
791	791	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/creature/mob_event_ai.cpp

r206	r229
1196	1196	return;
1197	1197
1198		if (m_creature->canAttack(who) && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	1198	if (m_creature->canAttack(who) && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
1199	1199	{
1200	1200	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/npc/npc_escortAI.cpp

r174	r229
61	61	return;
62	62
63		if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
	63	if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
64	64	{
65	65	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp

r223	r229
173	173	void MoveInLineOfSight(Unit *who)
174	174	{
175		if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature))
	175	if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature))
176	176	{
177	177	if (!HasTaunted && m_creature->IsWithinDistInMap(who, 150.0))

trunk/src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp

r115	r229
79	79	void MoveInLineOfSight(Unit *who)
80	80	{
81		if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
	81	if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
82	82	{
83	83	if( !HasTaunted && m_creature->IsWithinDistInMap(who, 100.0) )

trunk/src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp

r115	r229
89	89	void MoveInLineOfSight(Unit *who)
90	90	{
91		if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
	91	if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
92	92	{
93	93	if(!Intro && m_creature->IsWithinDistInMap(who, 100))

trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp

r115	r229
179	179	return;
180	180
181		if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	181	if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
182	182	{
183	183	float attackRadius = m_creature->GetAttackDistance(who);

trunk/src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp

r178	r229
190	190	void MoveInLineOfSight(Unit *who)
191	191	{
192		if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
	192	if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
193	193	{
194	194	if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp

r90	r229
163	163	return;
164	164
165		if(who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	165	if(who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
166	166	{
167	167	float attackRadius = m_creature->GetAttackDistance(who);
…	…
277	277	if(!who \|\| (!who->isAlive())) return;
278	278
279		if(who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	279	if(who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
280	280	{
281	281	float attackRadius = m_creature->GetAttackDistance(who);

trunk/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp

r109	r229
287	287	}
288	288
289		if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	289	if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
290	290	{
291	291	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp

r109	r229
42	42	if( who->HasAura(16468,0) )
43	43	{
44		if( who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 15) && who->isInAccessablePlaceFor(m_creature) )
	44	if( who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 15) && who->isInAccessiblePlaceFor(m_creature) )
45	45	{
46	46	DoCast(who,16472);
…	…
49	49	}
50	50
51		if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
	51	if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
52	52	{
53	53	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp

r125	r229
89	89	}
90	90
91		if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	91	if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
92	92	{
93	93	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp

r187	r229
279	279	return;
280	280
281		if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	281	if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
282	282	{
283	283	float attackRadius = m_creature->GetAttackDistance(who);

trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp

r182	r229
237	237	return;
238	238
239		if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
	239	if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
240	240	{
241	241	if (m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp

r187	r229
122	122	if (!who \|\| m_creature->getVictim()) return;
123	123
124		if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	124	if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
125	125	{
126	126	AttackStart(who);

trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp

r164	r229
304	304	return;
305	305
306		if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	306	if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
307	307	{
308	308	//no attack radius check - it attacks the first target that moves in his los

trunk/src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp

r109	r229
453	453	void MoveInLineOfSight(Unit *who)
454	454	{
455		if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	455	if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
456	456	{
457	457	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)
…	…
583	583	void MoveInLineOfSight(Unit *who)
584	584	{
585		if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	585	if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
586	586	{
587	587	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)
…	…
697	697	void MoveInLineOfSight(Unit *who)
698	698	{
699		if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	699	if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
700	700	{
701	701	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp

r166	r229
78	78	void MoveInLineOfSight(Unit* who)
79	79	{
80		if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
	80	if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
81	81	{
82	82	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp

r166	r229
187	187	void MoveInLineOfSight(Unit *who)
188	188	{
189		if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
	189	if (!m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
190	190	{
191	191	if (!IntroOnce && m_creature->IsWithinDistInMap(who, 75))

trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_anubrekhan.cpp

r109	r229
100	100	void MoveInLineOfSight(Unit *who)
101	101	{
102		if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	102	if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
103	103	{
104	104	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/zone/naxxramas/boss_faerlina.cpp

r109	r229
90	90	void MoveInLineOfSight(Unit *who)
91	91	{
92		if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	92	if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
93	93	{
94	94	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/zone/stratholme/boss_timmy_the_cruel.cpp

r109	r229
50	50	return;
51	51
52		if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	52	if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
53	53	{
54	54	float attackRadius = m_creature->GetAttackDistance(who);

trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp

r158	r229
422	422	return;
423	423
424		if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	424	if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
425	425	{
426	426

trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/arcatraz.cpp

r109	r229
350	350	return;
351	351
352		if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
	352	if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
353	353	{
354	354	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp

r109	r229
118	118	return;
119	119
120		if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
	120	if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
121	121	{
122	122	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp

r204	r229
203	203	return;
204	204
205		if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessablePlaceFor(m_creature) )
	205	if( !m_creature->getVictim() && who->isTargetableForAttack() && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) )
206	206	{
207	207	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)
…	…
496	496	void MoveInLineOfSight(Unit *who)
497	497	{
498		if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	498	if (!m_creature->getVictim() && who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
499	499	{
500	500	if (!m_creature->canFly() && m_creature->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)

trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp

r90	r229
346	346	return;
347	347
348		if (who->isTargetableForAttack() && who->isInAccessablePlaceFor(m_creature) && m_creature->IsHostileTo(who))
	348	if (who->isTargetableForAttack() && who->isInAccessiblePlaceFor(m_creature) && m_creature->IsHostileTo(who))
349	349	{
350	350	float attackRadius = m_creature->GetAttackDistance(who);

trunk/src/game/AggressorAI.cpp

r186	r229
52	52	if( !i_creature.getVictim() && !i_creature.hasUnitState(UNIT_STAT_STUNNED) && i_creature.canAttack(u) &&
53	53	( i_creature.IsHostileTo( u ) /\|\| u->getVictim() && i_creature.IsFriendlyTo( u->getVictim() )/ ) &&
54		u->isInAccessablePlaceFor(&i_creature) )
	54	u->isInAccessiblePlaceFor(&i_creature) )
55	55	{
56	56	float attackRadius = i_creature.GetAttackDistance(u);

trunk/src/game/AuctionHouse.cpp

r102	r229
179	179	}
180	180
181		//this function sends mail, when auction is cancelled to old bidder
	181	//this function sends mail, when auction is canceled to old bidder
182	182	void WorldSession::SendAuctionCancelledToBidderMail( AuctionEntry* auction )
183	183	{
…	…
246	246	return;
247	247	}
248		// prevent sending bag with items (cheat: can be placed in bag after adding equiped empty bag to auction)
	248	// prevent sending bag with items (cheat: can be placed in bag after adding equipped empty bag to auction)
249	249	if(!it)
250	250	{

trunk/src/game/BattleGroundMgr.cpp

r102	r229
628	628	bool bAllyOK = BuildSelectionPool(bgTypeId, queue_id, MinPlayersPerTeam, MaxPlayersPerTeam, NORMAL_ALLIANCE, arenatype, isRated, arenaMinRating, arenaMaxRating, discardTime);
629	629	if(bAllyOK)
630		sLog.outDebug("Battleground: ally pool succesfully build");
	630	sLog.outDebug("Battleground: ally pool successfully build");
631	631	else
632	632	sLog.outDebug("Battleground: ally pool wasn't created");
633	633	bool bHordeOK = BuildSelectionPool(bgTypeId, queue_id, MinPlayersPerTeam, MaxPlayersPerTeam, NORMAL_HORDE, arenatype, isRated, arenaMinRating, arenaMaxRating, discardTime);
634	634	if(bHordeOK)
635		sLog.outDebug("Battleground: horde pool succesfully built");
	635	sLog.outDebug("Battleground: horde pool successfully built");
636	636	else
637	637	sLog.outDebug("Battleground: horde pool wasn't created");

trunk/src/game/Chat.cpp

r221	r229
1025	1025	return NULL;
1026	1026
1027		// skip speces
	1027	// skip spaces
1028	1028	while(text==' '\|\|text=='\t'\|\|*text=='\b')
1029	1029	++text;
…	…
1073	1073	return NULL;
1074	1074
1075		// skip speces
	1075	// skip spaces
1076	1076	while(text==' '\|\|text=='\t'\|\|*text=='\b')
1077	1077	++text;

trunk/src/game/Creature.cpp

r193	r229
337	337	{
338	338	case JUST_ALIVED:
339		// Dont must be called, see Creature::setDeathState JUST_ALIVED -> ALIVE promoting.
	339	// Don't must be called, see Creature::setDeathState JUST_ALIVED -> ALIVE promoting.
340	340	sLog.outError("Creature (GUIDLow: %u Entry: %u ) in wrong state: JUST_ALIVED (4)",GetGUIDLow(),GetEntry());
341	341	break;
342	342	case JUST_DIED:
343		// Dont must be called, see Creature::setDeathState JUST_DIED -> CORPSE promoting.
	343	// Don't must be called, see Creature::setDeathState JUST_DIED -> CORPSE promoting.
344	344	sLog.outError("Creature (GUIDLow: %u Entry: %u ) in wrong state: JUST_DEAD (1)",GetGUIDLow(),GetEntry());
345	345	break;
…	…
507	507	uint32 addvalue = 0;
508	508
509		// Not only pet, but any controelled creature
	509	// Not only pet, but any controlled creature
510	510	if(GetCharmerOrOwnerGUID())
511	511	{
…	…
864	864
865	865	// in case non empty gossip menu (that not included quests list size) show it
866		// (quest entries from quest menu wiill be included in list)
	866	// (quest entries from quest menu will be included in list)
867	867	player->PlayerTalkClass->SendGossipMenu(GetNpcTextId(), GetGUID());
868	868	}
…	…
1148	1148	{
1149	1149	// this should only be used when the creature has already been loaded
1150		// perferably after adding to map, because mapid may not be valid otherwise
	1150	// preferably after adding to map, because mapid may not be valid otherwise
1151	1151	CreatureData const *data = objmgr.GetCreatureData(m_DBTableGuid);
1152	1152	if(!data)
…	…
1557	1557	float RetDistance = 20;
1558	1558
1559		// "Aggro Radius varries with level difference at a rate of roughly 1 yard/level"
	1559	// "Aggro Radius varies with level difference at a rate of roughly 1 yard/level"
1560	1560	// radius grow if playlevel < creaturelevel
1561	1561	RetDistance -= (float)leveldif;
…	…
1584	1584
1585	1585	// always save boss respawn time at death to prevent crash cheating
1586		if(sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY) \|\| isWorldBoss())
	1586	if(sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY) \|\| isWorldBoss())
1587	1587	SaveRespawnTime();
1588	1588
…	…
1876	1876	return true;
1877	1877
1878		if(!pVictim->isInAccessablePlaceFor(this))
	1878	if(!pVictim->isInAccessiblePlaceFor(this))
1879	1879	return true;
1880	1880
…	…
1886	1886	uint32 ThreatRadius = sWorld.getConfig(CONFIG_THREAT_RADIUS);
1887	1887
1888		//Use AttackDistance in distance check if threat radius is lower. This prevents creature bounce in and ouf of combat every update tick.
	1888	//Use AttackDistance in distance check if threat radius is lower. This prevents creature bounce in and out of combat every update tick.
1889	1889	return ( length > (ThreatRadius > AttackDist ? ThreatRadius : AttackDist));
1890	1890	}
…	…
1955	1955	}
1956	1956
1957		/// Send a message to LocalDefense channel for players oposition team in the zone
	1957	/// Send a message to LocalDefense channel for players opposition team in the zone
1958	1958	void Creature::SendZoneUnderAttackMessage(Player* attacker)
1959	1959	{

trunk/src/game/GMTicketMgr.cpp

r207	r229
46	46
47	47	sLog.outString();
48		sLog.out~~ErrorDb(">> Loaded `character_ticket`, table is empty!~~");
	48	sLog.outString(">> Loaded `character_ticket`, table is empty.");
49	49	return;
50	50	}

trunk/src/game/GameObject.cpp

r203	r229
66	66	if(m_uint32Values) // field array can be not exist if GameOBject not loaded
67	67	{
68		// crash possable at access to deleted GO in Unit::m_gameobj
	68	// crash possible at access to deleted GO in Unit::m_gameobj
69	69	uint64 owner_guid = GetOwnerGUID();
70	70	if(owner_guid)
…	…
74	74	owner->RemoveGameObject(this,false);
75	75	else if(!IS_PLAYER_GUID(owner_guid))
76		sLog.outError("Delete GameObject (GUID: %u Entry: %u ) that have references in not found creature %u GO list. Crash possable later.",GetGUIDLow(),GetGOInfo()->id,GUID_LOPART(owner_guid));
	76	sLog.outError("Delete GameObject (GUID: %u Entry: %u ) that have references in not found creature %u GO list. Crash possible later.",GetGUIDLow(),GetGOInfo()->id,GUID_LOPART(owner_guid));
77	77	}
78	78	}
…	…
210	210	}
211	211
212		m_lootState = GO_READY; // can be succesfully open with some chance
	212	m_lootState = GO_READY; // can be successfully open with some chance
213	213	}
214	214	return;
…	…
287	287	if(!radius)
288	288	{
289		if(goInfo->trap.cooldown != 3) // cast in other case (at some triggring/linked go/etc explicit call)
	289	if(goInfo->trap.cooldown != 3) // cast in other case (at some triggering/linked go/etc explicit call)
290	290	return;
291	291	else
…	…
434	434
435	435	// if option not set then object will be saved at grid unload
436		if(sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY))
	436	if(sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY))
437	437	SaveRespawnTime();
438	438
…	…
487	487	{
488	488	// this should only be used when the gameobject has already been loaded
489		// perferably after adding to map, because mapid may not be valid otherwise
	489	// preferably after adding to map, because mapid may not be valid otherwise
490	490	GameObjectData const *data = objmgr.GetGOData(m_DBTableGuid);
491	491	if(!data)

trunk/src/game/Group.cpp

r132	r229
1463	1463	if(bind.save)
1464	1464	{
1465		// when a boss is killed or when copying the players's binds to the group
	1465	// when a boss is killed or when copying the player's binds to the group
1466	1466	if(permanent != bind.perm \|\| save != bind.save)
1467	1467	if(!load) CharacterDatabase.PExecute("UPDATE group_instance SET instance = '%u', permanent = '%u' WHERE leaderGuid = '%u' AND instance = '%u'", save->GetInstanceId(), permanent, GUID_LOPART(GetLeaderGUID()), bind.save->GetInstanceId());

trunk/src/game/GuardAI.cpp

r186	r229
46	46	if( !i_creature.getVictim() && i_creature.canAttack(u) &&
47	47	( u->IsHostileToPlayers() \|\| i_creature.IsHostileTo(u) /\|\| u->getVictim() && i_creature.IsFriendlyTo(u->getVictim())/ ) &&
48		u->isInAccessablePlaceFor(&i_creature))
	48	u->isInAccessiblePlaceFor(&i_creature))
49	49	{
50	50	float attackRadius = i_creature.GetAttackDistance(u);

trunk/src/game/Guild.cpp

r173	r229
1929	1929	}
1930	1930
1931		// not specific slot or have spece for partly store only in specific slot
	1931	// not specific slot or have space for partly store only in specific slot
1932	1932
1933	1933	// search stack in tab for merge to

trunk/src/game/Guild.h

r177	r229
331	331	{
332	332	return (members.find(LowGuid) != members.end());
	333	}
	334	MemberSlot* GetMemberSlot(std::string const& name, uint64& guid)
	335	{
	336	for(MemberList::iterator itr = members.begin(); itr != members.end(); ++itr)
	337	{
	338	if(itr->second.name == name)
	339	{
	340	guid = itr->first;
	341	return &itr->second;
	342	}
	343	}
	344	return NULL;
333	345	}
334	346

trunk/src/game/GuildHandler.cpp

r177	r229
174	174	}
175	175
176		uint64 plGuid ~~= objmgr.GetPlayerGUIDByName(plName)~~;
177
178		if(!~~plGuid~~)
179		{
180		SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_~~FOUND~~);
181		return;
182		}
183
184		if(~~plGuid == guild->GetLeader()~~)
	176	uint64 plGuid;
	177	MemberSlot* slot = guild->GetMemberSlot(plName, plGuid);
	178	if(!slot)
	179	{
	180	SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
	181	return;
	182	}
	183
	184	if(slot->RankId == GR_GUILDMASTER)
185	185	{
186	186	SendGuildCommandResult(GUILD_QUIT_S, "", GUILD_LEADER_LEAVE);
187		~~return;~~
188		}
189
190		~~if(!guild->IsMember(GUID_LOPART(plGuid)))~~
191		{
192		~~SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);~~
193	187	return;
194	188	}
…	…
302	296	}
303	297
304		uint64 plGuid = objmgr.GetPlayerGUIDByName(plName);
	298	uint64 plGuid;
	299	MemberSlot* slot = guild->GetMemberSlot(plName, plGuid);
	300
	301	if(!slot)
	302	{
	303	SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
	304	return;
	305	}
	306
	307	if(plGuid == GetPlayer()->GetGUID())
	308	{
	309	SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_NAME_INVALID);
	310	return;
	311	}
305	312
306		if(!plGuid)
307		{
308		SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_FOUND);
309		return;
310		}
311		else if(plGuid == GetPlayer()->GetGUID())
312		{
313		SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_NAME_INVALID);
314		return;
315		}
316
317		int32 plRankId = guild->GetRank(GUID_LOPART(plGuid));
318		if(plRankId == -1)
319		{
320		SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
321		return;
322		}
323		if(plRankId < 2 \|\| (plRankId-1) < GetPlayer()->GetRank())
324		return;
325
326		uint32 newRankId = plRankId < guild->GetNrRanks() ? plRankId-1 : guild->GetNrRanks()-1;
	313	if(slot->RankId < 2 \|\| (slot->RankId-1) < GetPlayer()->GetRank())
	314	return;
	315
	316	uint32 newRankId = slot->RankId < guild->GetNrRanks() ? slot->RankId-1 : guild->GetNrRanks()-1;
327	317
328	318	guild->ChangeRank(plGuid, newRankId);
…	…
366	356	}
367	357
368		uint64 plGuid = objmgr.GetPlayerGUIDByName(plName);
369
370		if( !plGuid )
371		{
372		SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_FOUND);
	358	uint64 plGuid;
	359	MemberSlot* slot = guild->GetMemberSlot(plName, plGuid);
	360
	361	if (!slot)
	362	{
	363	SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
373	364	return;
374	365	}
…	…
380	371	}
381	372
382		int32 plRankId = guild->GetRank(GUID_LOPART(plGuid));
383		if(plRankId == -1)
384		{
385		SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
386		return;
387		}
388
389		if((plRankId+1) >= guild->GetNrRanks() \|\| plRankId <= this->GetPlayer()->GetRank())
390		return;
391
392		guild->ChangeRank(plGuid, (plRankId+1));
	373	if((slot->RankId+1) >= guild->GetNrRanks() \|\| slot->RankId <= GetPlayer()->GetRank())
	374	return;
	375
	376	guild->ChangeRank(plGuid, (slot->RankId+1));
393	377	// Put record into guildlog
394		guild->LogGuildEvent(GUILD_EVENT_LOG_DEMOTE_PLAYER, GetPlayer()->GetGUIDLow(), GUID_LOPART(plGuid), (plRankId+1));
	378	guild->LogGuildEvent(GUILD_EVENT_LOG_DEMOTE_PLAYER, GetPlayer()->GetGUIDLow(), GUID_LOPART(plGuid), (slot->RankId+1));
395	379
396	380	WorldPacket data(SMSG_GUILD_EVENT, (2+30)); // guess size
…	…
399	383	data << GetPlayer()->GetName();
400	384	data << plName;
401		data << guild->GetRankName(plRankId+1);
	385	data << guild->GetRankName(slot->RankId+1);
402	386	guild->BroadcastPacket(&data);
403	387	}
…	…
498	482	}
499	483
500		uint64 newLeaderGUID = objmgr.GetPlayerGUIDByName(name);
501		if (!newLeaderGUID)
502		{
503		SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_FOUND);
504		return;
505		}
506		if(!guild->IsMember(GUID_LOPART(newLeaderGUID)))
	484	uint64 newLeaderGUID;
	485	MemberSlot* slot = guild->GetMemberSlot(name, newLeaderGUID);
	486
	487	if (!slot)
507	488	{
508	489	SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_IN_GUILD_S);
…	…
584	565	}
585	566
586		uint64 plGuid = objmgr.GetPlayerGUIDByName(name);
587
588		if (!plGuid)
589		{
590		SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_FOUND);
591		return;
592		}
593
594		if (!guild->IsMember(GUID_LOPART(plGuid)))
	567	uint64 plGuid;
	568	MemberSlot* slot = guild->GetMemberSlot(name, plGuid);
	569
	570	if (!slot)
595	571	{
596	572	SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_IN_GUILD_S);
…	…
629	605	}
630	606
631		uint64 plGuid = objmgr.GetPlayerGUIDByName(plName);
632
633		if (!plGuid)
634		{
635		SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_FOUND);
636		return;
637		}
	607	uint64 plGuid;
	608	MemberSlot* slot = guild->GetMemberSlot(plName, plGuid);
638	609
639		if (!~~guild->IsMember(GUID_LOPART(plGuid))~~)
	610	if (!slot)
640	611	{
641	612	SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);

trunk/src/game/ItemHandler.cpp

r207	r229
556	556	else
557	557	{
558		// prevent sell more items that exist in stack (possable only not from client)
	558	// prevent sell more items that exist in stack (possible only not from client)
559	559	if(count > pItem->GetCount())
560	560	{
…	…
1028	1028	}
1029	1029
1030		if(item==gift) // not possable with pacjket from real client
	1030	if(item==gift) // not possible with pacjket from real client
1031	1031	{
1032	1032	_player->SendEquipError( EQUIP_ERR_WRAPPED_CANT_BE_WRAPPED, item, NULL );

trunk/src/game/ItemPrototype.h

r102	r229
79	79	NO_BIND = 0,
80	80	BIND_WHEN_PICKED_UP = 1,
81		BIND_WHEN_EQUIPED = 2,
	81	BIND_WHEN_EQUIPPED = 2,
82	82	BIND_WHEN_USE = 3,
83	83	BIND_QUEST_ITEM = 4,

trunk/src/game/LFGHandler.cpp

r102	r229
113	113	{
114	114	delete group;
115		return; // cann't create group (??)
	115	return; // can't create group (??)
116	116	}
117	117
…	…
255	255	uint32 number = 0;
256	256
257		// start preper packet;
	257	// start prepare packet;
258	258	WorldPacket data(MSG_LOOKING_FOR_GROUP);
259	259	data << uint32(type); // type

trunk/src/game/Level3.cpp

r209	r229
53	53	#include "InstanceSaveMgr.h"
54	54	#include "InstanceData.h"
55		~~#include "AccountMgr.h"~~
56	55
57	56	//reload commands

trunk/src/game/LootMgr.cpp

r102	r229
535	535	// all players will get notified of it being removed
536	536	// (other questitems can be looted by each group member)
537		// bit inefficient but isnt called often
	537	// bit inefficient but isn't called often
538	538
539	539	std::set<uint64>::iterator i_next;

trunk/src/game/Mail.cpp

r149	r229
376	376	}
377	377
378		// preper mail and send in other case
	378	// prepare mail and send in other case
379	379	bool needItemDelay = false;
380	380
…	…
468	468	sender_accId = objmgr.GetPlayerAccountIdByGUID(sender_guid);
469	469
470		// check player exist~~ans~~e
	470	// check player existence
471	471	if(receive \|\| sender_accId)
472	472	{

trunk/src/game/Map.cpp

r221	r229
678	678	{
679	679	// if option set then object already saved at this moment
680		if(!sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY))
	680	if(!sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY))
681	681	obj->SaveRespawnTime();
682	682	DeleteFromWorld(obj);

trunk/src/game/MiscHandler.cpp

r209	r229
259	259	data << uint32( pzoneid ); // player zone id
260	260
261		// 49 is maximum player count sent to client - can be overriden
	261	// 49 is maximum player count sent to client - can be overridden
262	262	// through config, but is unstable
263	263	if ((++clientcount) == sWorld.getConfig(CONFIG_MAX_WHO))
…	…
1281	1281	}
1282	1282
	1283	normalizePlayerName (charname);
	1284
1283	1285	Player *plr = objmgr.GetPlayer(charname.c_str());
1284	1286

trunk/src/game/MovementHandler.cpp

r189	r229
141	141	_player->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
142	142
143		// battleground state preper
	143	// battleground state prepare
144	144	// only add to bg group and object, if the player was invited (else he entered through command)
145	145	if(_player->InBattleGround() && _player->IsInvitedForBattleGroundInstance(_player->GetBattleGroundId()))

trunk/src/game/ObjectGridLoader.cpp

r102	r229
256	256	T *obj = m.getFirst()->getSource();
257	257	// if option set then object already saved at this moment
258		if(!sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY))
	258	if(!sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY))
259	259	obj->SaveRespawnTime();
260	260	///- object must be out of world before delete
…	…
277	277	Creature *obj = m.getFirst()->getSource();
278	278	// if option set then object already saved at this moment
279		if(!sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY))
	279	if(!sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY))
280	280	obj->SaveRespawnTime();
281	281	///- object will get delinked from the manager when deleted

trunk/src/game/ObjectMgr.cpp

r207	r229
893	893	}
894	894
895		// replace by new strucutres array
	895	// replace by new structures array
896	896	const_cast<CreatureDataAddonAura*&>(addon->auras) = new CreatureDataAddonAura[val.size()/2+1];
897	897
…	…
3133	3133	sLog.outErrorDb("Quest %u has `SrcItemId` = %u but `SrcItemCount` = 0, set to 1 but need fix in DB.",
3134	3134	qinfo->GetQuestId(),qinfo->SrcItemId);
3135		qinfo->SrcItemCount = 1; // update to 1 for allow quest work for backward comptibility with DB
	3135	qinfo->SrcItemCount = 1; // update to 1 for allow quest work for backward compatibility with DB
3136	3136	}
3137	3137	}
…	…
3536	3536	Quest const* quest = GetQuestTemplate(quest_id);
3537	3537
3538		// some quest referenced in spells not exist (outdataed spells)
	3538	// some quest referenced in spells not exist (outdated spells)
3539	3539	if(!quest)
3540	3540	continue;
…	…
3896	3896	const_cast<Quest*>(quest)->SetFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT);
3897	3897
3898		// continue; - quest objective requiremet set and command can be allowed
	3898	// continue; - quest objective requirement set and command can be allowed
3899	3899	}
3900	3900
…	…
4070	4070	std::set<uint32>::const_iterator itr2 = evt_scripts.find(itr->first);
4071	4071	if (itr2 == evt_scripts.end())
4072		sLog.outErrorDb("Table `event_scripts` has script (Id: %u) not refering to any gameobject_template type 10 data2 field or type 3 data6 field or any spell effect %u", itr->first, SPELL_EFFECT_SEND_EVENT);
	4072	sLog.outErrorDb("Table `event_scripts` has script (Id: %u) not referring to any gameobject_template type 10 data2 field or type 3 data6 field or any spell effect %u", itr->first, SPELL_EFFECT_SEND_EVENT);
4073	4073	}
4074	4074	}
…	…
4237	4237	}
4238	4238
4239		// the reset_delay must be atleast one day
	4239	// the reset_delay must be at least one day
4240	4240	temp->reset_delay = std::max((uint32)1, (uint32)(temp->reset_delay * sWorld.getRate(RATE_INSTANCE_RESET_TIME)));
4241	4241	}
…	…
4538	4538	const_cast<Quest*>(quest)->SetFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT);
4539	4539
4540		// continue; - quest modified to required obkective and trigger can be allowed.
	4540	// continue; - quest modified to required objective and trigger can be allowed.
4541	4541	}
4542	4542
…	…
4835	4835
4836	4836	if(!AddGraveYardLink(safeLocId,zoneId,team,false))
4837		sLog.outErrorDb("Table `game_graveyard_zone` has a duplicate record for Garveyard (ID: %u) and Zone (ID: %u), skipped.",safeLocId,zoneId);
	4837	sLog.outErrorDb("Table `game_graveyard_zone` has a duplicate record for Graveyard (ID: %u) and Zone (ID: %u), skipped.",safeLocId,zoneId);
4838	4838	} while( result->NextRow() );
4839	4839
…	…
5236	5236	if(m_auctionid>=0xFFFFFFFF)
5237	5237	{
5238		sLog.outError("Auctions ids overflow!! Can't continue, shuting down server. ");
	5238	sLog.outError("Auctions ids overflow!! Can't continue, shutting down server. ");
5239	5239	sWorld.m_stopEvent = true;
5240	5240	}
…	…
5247	5247	if(m_mailid>=0xFFFFFFFF)
5248	5248	{
5249		sLog.outError("Mail ids overflow!! Can't continue, shuting down server. ");
	5249	sLog.outError("Mail ids overflow!! Can't continue, shutting down server. ");
5250	5250	sWorld.m_stopEvent = true;
5251	5251	}
…	…
5258	5258	if(m_ItemTextId>=0xFFFFFFFF)
5259	5259	{
5260		sLog.outError("Item text ids overflow!! Can't continue, shuting down server. ");
	5260	sLog.outError("Item text ids overflow!! Can't continue, shutting down server. ");
5261	5261	sWorld.m_stopEvent = true;
5262	5262	}
…	…
5286	5286	if(m_hiItemGuid>=0xFFFFFFFF)
5287	5287	{
5288		sLog.outError("Item guid overflow!! Can't continue, shuting down server. ");
	5288	sLog.outError("Item guid overflow!! Can't continue, shutting down server. ");
5289	5289	sWorld.m_stopEvent = true;
5290	5290	}
…	…
5294	5294	if(m_hiCreatureGuid>=0x00FFFFFF)
5295	5295	{
5296		sLog.outError("Creature guid overflow!! Can't continue, shuting down server. ");
	5296	sLog.outError("Creature guid overflow!! Can't continue, shutting down server. ");
5297	5297	sWorld.m_stopEvent = true;
5298	5298	}
…	…
5302	5302	if(m_hiPetGuid>=0x00FFFFFF)
5303	5303	{
5304		sLog.outError("Pet guid overflow!! Can't continue, shuting down server. ");
	5304	sLog.outError("Pet guid overflow!! Can't continue, shutting down server. ");
5305	5305	sWorld.m_stopEvent = true;
5306	5306	}
…	…
5310	5310	if(m_hiCharGuid>=0xFFFFFFFF)
5311	5311	{
5312		sLog.outError("Players guid overflow!! Can't continue, shuting down server. ");
	5312	sLog.outError("Players guid overflow!! Can't continue, shutting down server. ");
5313	5313	sWorld.m_stopEvent = true;
5314	5314	}
…	…
5318	5318	if(m_hiGoGuid>=0x00FFFFFF)
5319	5319	{
5320		sLog.outError("Gameobject guid overflow!! Can't continue, shuting down server. ");
	5320	sLog.outError("Gameobject guid overflow!! Can't continue, shutting down server. ");
5321	5321	sWorld.m_stopEvent = true;
5322	5322	}
…	…
5326	5326	if(m_hiCorpseGuid>=0xFFFFFFFF)
5327	5327	{
5328		sLog.outError("Corpse guid overflow!! Can't continue, shuting down server. ");
	5328	sLog.outError("Corpse guid overflow!! Can't continue, shutting down server. ");
5329	5329	sWorld.m_stopEvent = true;
5330	5330	}
…	…
5334	5334	if(m_hiDoGuid>=0xFFFFFFFF)
5335	5335	{
5336		sLog.outError("DynamicObject guid overflow!! Can't continue, shuting down server. ");
	5336	sLog.outError("DynamicObject guid overflow!! Can't continue, shutting down server. ");
5337	5337	sWorld.m_stopEvent = true;
5338	5338	}
…	…
6178	6178	}
6179	6179
6180		if(strictMask & 0x1) // basic latin
	6180	if(strictMask & 0x1) // basic Latin
6181	6181	{
6182	6182	if(isBasicLatinString(wstr,numericOrSpace))
…	…
6512	6512	void ObjectMgr::LoadFishingBaseSkillLevel()
6513	6513	{
6514		mFishingBaseForArea.clear(); // for relaod case
	6514	mFishingBaseForArea.clear(); // for reload case
6515	6515
6516	6516	uint32 count = 0;
…	…
6828	6828	void ObjectMgr::LoadGameTele()
6829	6829	{
6830		m_GameTeleMap.clear(); // for relaod case
	6830	m_GameTeleMap.clear(); // for reload case
6831	6831
6832	6832	uint32 count = 0;

trunk/src/game/OutdoorPvP.cpp

r102	r229
322	322	sLog.outDebug("deleting opvp creature type %u",type);
323	323	uint32 guid = cr->GetDBTableGUIDLow();
324		// ~~don~~t save respawn time
	324	// Don't save respawn time
325	325	cr->SetRespawnTime(0);
326	326	cr->RemoveCorpse();
…	…
380	380	{
381	381	uint32 guid = cr->GetDBTableGUIDLow();
382		// ~~don~~t save respawn time
	382	// Don't save respawn time
383	383	cr->SetRespawnTime(0);
384	384	cr->RemoveCorpse();

trunk/src/game/PetAI.cpp

r191	r229
50	50	i_pet.GetCharmInfo()->HasReactState(REACT_AGGRESSIVE) &&
51	51	i_pet.IsHostileTo( u ) && i_pet.canAttack(u) &&
52		u->isInAccessablePlaceFor(&i_pet))
	52	u->isInAccessiblePlaceFor(&i_pet))
53	53	{
54	54	float attackRadius = i_pet.GetAttackDistance(u);

trunk/src/game/Player.cpp

r221	r229
798	798	}
799	799
800		void Player::EnvironmentalDamage(uint64 guid, Enviro~~mentalDamag~~e type, uint32 damage)
	800	void Player::EnvironmentalDamage(uint64 guid, EnvironmentalDamageType type, uint32 damage)
801	801	{
802	802	WorldPacket data(SMSG_ENVIRONMENTALDAMAGELOG, (21));
…	…
1545	1545	((Player*)GetCharmer())->RemovePossess();
1546	1546
1547		// The player was ported to another map and looses the duel immediatly.
	1547	// The player was ported to another map and looses the duel immediately.
1548	1548	// We have to perform this check before the teleport, otherwise the
1549	1549	// ObjectAccessor won't find the flag.
…	…
6691	6691	}
6692	6692
6693		if(!IsUseEquipedWeapon(slot==EQUIPMENT_SLOT_MAINHAND))
	6693	if(!IsUseEquippedWeapon(slot==EQUIPMENT_SLOT_MAINHAND))
6694	6694	return;
6695	6695
…	…
8469	8469	return item;
8470	8470
8471		if( item->IsBroken() \|\| !IsUseEquipedWeapon(attackType==BASE_ATTACK) )
	8471	if( item->IsBroken() \|\| !IsUseEquippedWeapon(attackType==BASE_ATTACK) )
8472	8472	return NULL;
8473	8473
…	…
10139	10139	if( pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP \|\|
10140	10140	pItem->GetProto()->Bonding == BIND_QUEST_ITEM \|\|
10141		pItem->GetProto()->Bonding == BIND_WHEN_EQUIPED && IsBagPos(pos) )
	10141	pItem->GetProto()->Bonding == BIND_WHEN_EQUIPPED && IsBagPos(pos) )
10142	10142	pItem->SetBinding( true );
10143	10143
…	…
10185	10185	if( pItem2->GetProto()->Bonding == BIND_WHEN_PICKED_UP \|\|
10186	10186	pItem2->GetProto()->Bonding == BIND_QUEST_ITEM \|\|
10187		pItem2->GetProto()->Bonding == BIND_WHEN_EQUIPED && IsBagPos(pos) )
	10187	pItem2->GetProto()->Bonding == BIND_WHEN_EQUIPPED && IsBagPos(pos) )
10188	10188	pItem2->SetBinding( true );
10189	10189
…	…
10370	10370
10371	10371	// check also BIND_WHEN_PICKED_UP and BIND_QUEST_ITEM for .additem or .additemset case by GM (not binded at adding to inventory)
10372		if( pItem->GetProto()->Bonding == BIND_WHEN_EQUIPED \|\| pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP \|\| pItem->GetProto()->Bonding == BIND_QUEST_ITEM )
	10372	if( pItem->GetProto()->Bonding == BIND_WHEN_EQUIPPED \|\| pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP \|\| pItem->GetProto()->Bonding == BIND_QUEST_ITEM )
10373	10373	pItem->SetBinding( true );
10374	10374
…	…
17332	17332	if(u->GetVisibility() == VISIBILITY_GROUP_STEALTH)
17333	17333	{
17334		// if player is dead then he can't detect anyone in anycases
	17334	// if player is dead then he can't detect anyone in any cases
17335	17335	//do not know what is the use of this detect
17336	17336	// stealth and detected and visible for some seconds

trunk/src/game/Player.h

r221	r229
786	786
787	787	/// Type of environmental damages
788		enum Enviro~~mentalDamag~~e
	788	enum EnvironmentalDamageType
789	789	{
790	790	DAMAGE_EXHAUSTED = 0,
…	…
1124	1124	uint32 GetArmorProficiency() const { return m_ArmorProficiency; }
1125	1125	bool IsInFeralForm() const { return m_form == FORM_CAT \|\| m_form == FORM_BEAR \|\| m_form == FORM_DIREBEAR; }
1126		bool IsUseEquipedWeapon( bool mainhand ) const
	1126	bool IsUseEquippedWeapon( bool mainhand ) const
1127	1127	{
1128	1128	// disarm applied only to mainhand weapon
…	…
1934	1934
1935	1935	/*********************************************************/
1936		/* ENVIROMENTAL SYSTEM */
1937		/*********************************************************/
1938
1939		void EnvironmentalDamage(uint64 guid, Enviro~~mentalDamag~~e type, uint32 damage);
	1936	/* ENVIRONMENTAL SYSTEM */
	1937	/*********************************************************/
	1938
	1939	void EnvironmentalDamage(uint64 guid, EnvironmentalDamageType type, uint32 damage);
1940	1940
1941	1941	/*********************************************************/

trunk/src/game/SharedDefines.h

r226	r229
200	200
201	201	#define SPELL_ATTR_UNK0 0x00000001 // 0
202		#define SPELL_ATTR_RANGED 0x00000002 // 1 All ranged abilites have this flag
	202	#define SPELL_ATTR_RANGED 0x00000002 // 1 All ranged abilities have this flag
203	203	#define SPELL_ATTR_ON_NEXT_SWING_1 0x00000004 // 2 on next swing
204	204	#define SPELL_ATTR_UNK3 0x00000008 // 3 not set in 2.4.2
…	…
737	737	(1<<MECHANIC_DAZE )\|(1<<MECHANIC_SAPPED ) )
738	738
739		// Spell dispell type
	739	// Spell dispel type
740	740	enum DispelType
741	741	{

trunk/src/game/Spell.cpp

r228	r229
366	366	m_powerCost = 0; // setup to correct value in Spell::prepare, don't must be used before.
367	367	m_casttime = 0; // setup to correct value in Spell::prepare, don't must be used before.
368		m_timer = 0; // will set to castime in preper
	368	m_timer = 0; // will set to castime in prepare
369	369
370	370	m_needAliveTargetMask = 0;
…	…
1680	1680	TagUnitMap.push_back(target);
1681	1681	}break;
1682		// TARGET_SINGLE_PARTY means that the spells can only be casted on a party member and not on the caster (some sceals, fire shield from imp, etc..)
	1682	// TARGET_SINGLE_PARTY means that the spells can only be casted on a party member and not on the caster (some seals, fire shield from imp, etc..)
1683	1683	case TARGET_SINGLE_PARTY:
1684	1684	{

trunk/src/game/SpellAuraDefines.h

r102	r229
214	214	SPELL_AURA_MOD_MOUNTED_SPEED_NOT_STACK = 172,
215	215	SPELL_AURA_ALLOW_CHAMPION_SPELLS = 173,
216		SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT = 174, // by def~~eult inte~~lect, dependent from SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT
	216	SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT = 174, // by default intellect, dependent from SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT
217	217	SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT = 175,
218	218	SPELL_AURA_SPIRIT_OF_REDEMPTION = 176,

trunk/src/game/SpellAuras.cpp

r213	r229
216	216	&Aura::HandleShieldBlockValue, //158 SPELL_AURA_MOD_SHIELD_BLOCKVALUE
217	217	&Aura::HandleNoImmediateEffect, //159 SPELL_AURA_NO_PVP_CREDIT only for Honorless Target spell
218		&Aura::HandleNoImmediateEffect, //160 SPELL_AURA_MOD_AOE_AVOIDANCE implemended in Unit::MagicSpellHitResult
	218	&Aura::HandleNoImmediateEffect, //160 SPELL_AURA_MOD_AOE_AVOIDANCE implemented in Unit::MagicSpellHitResult
219	219	&Aura::HandleNoImmediateEffect, //161 SPELL_AURA_MOD_HEALTH_REGEN_IN_COMBAT
220	220	&Aura::HandleAuraPowerBurn, //162 SPELL_AURA_POWER_BURN_MANA
…	…
230	230	&Aura::HandleAuraModIncreaseMountedSpeed, //172 SPELL_AURA_MOD_MOUNTED_SPEED_NOT_STACK
231	231	&Aura::HandleUnused, //173 SPELL_AURA_ALLOW_CHAMPION_SPELLS only for Proclaim Champion spell
232		&Aura::HandleModSpellDamagePercentFromStat, //174 SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT implemented in Unit::SpellBaseDamageBonus (by def~~eult inte~~lect, dependent from SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT)
	232	&Aura::HandleModSpellDamagePercentFromStat, //174 SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT implemented in Unit::SpellBaseDamageBonus (by default intellect, dependent from SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT)
233	233	&Aura::HandleModSpellHealingPercentFromStat, //175 SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT implemented in Unit::SpellBaseHealingBonus
234	234	&Aura::HandleSpiritOfRedemption, //176 SPELL_AURA_SPIRIT_OF_REDEMPTION only for Spirit of Redemption spell, die at aura end
…	…
243	243	&Aura::HandleNoImmediateEffect, //185 SPELL_AURA_MOD_ATTACKER_RANGED_HIT_CHANCE implemented in Unit::RollMeleeOutcomeAgainst
244	244	&Aura::HandleNoImmediateEffect, //186 SPELL_AURA_MOD_ATTACKER_SPELL_HIT_CHANCE implemented in Unit::MagicSpellHitResult
245		&Aura::HandleNoImmediateEffect, //187 SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_CHANCE implemended in Unit::GetUnitCriticalChance
	245	&Aura::HandleNoImmediateEffect, //187 SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_CHANCE implemented in Unit::GetUnitCriticalChance
246	246	&Aura::HandleNoImmediateEffect, //188 SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_CHANCE implemented in Unit::GetUnitCriticalChance
247	247	&Aura::HandleModRating, //189 SPELL_AURA_MOD_RATING
…	…
1055	1055	}
1056	1056	}
1057		else if(sameaura) // decrease count for spell, only for same aura effect, or this spell auras in remove proccess.
	1057	else if(sameaura) // decrease count for spell, only for same aura effect, or this spell auras in remove process.
1058	1058	UpdateSlotCounterAndDuration(false);
1059	1059	}
…	…
1205	1205	uint64 originalCasterGUID = GetCasterGUID();
1206	1206
1207		SpellEntry const *triggredSpellInfo = sSpellStore.LookupEntry(trigger_spell_id);
	1207	SpellEntry const *triggeredSpellInfo = sSpellStore.LookupEntry(trigger_spell_id);
1208	1208	SpellEntry const *auraSpellInfo = GetSpellProto();
1209	1209	uint32 auraId = auraSpellInfo->Id;
1210	1210
1211	1211	// specific code for cases with no trigger spell provided in field
1212		if (triggredSpellInfo == NULL)
	1212	if (triggeredSpellInfo == NULL)
1213	1213	{
1214	1214	switch(auraSpellInfo->SpellFamilyName)
…	…
1218	1218	switch(auraId)
1219	1219	{
1220		// Firestone Passive (1-5 rangs)
	1220	// Firestone Passive (1-5 ranks)
1221	1221	case 758:
1222	1222	case 17945:
…	…
1252	1252	// // Polymorphic Ray
1253	1253	// case 6965: break;
1254		// // Fire Nova (1-7 ~~Rang~~s)
	1254	// // Fire Nova (1-7 ranks)
1255	1255	// case 8350:
1256	1256	// case 8508:
…	…
1824	1824	}
1825	1825	// Reget trigger spell proto
1826		triggredSpellInfo = sSpellStore.LookupEntry(trigger_spell_id);
1827		if(triggredSpellInfo == NULL)
	1826	triggeredSpellInfo = sSpellStore.LookupEntry(trigger_spell_id);
	1827	if(triggeredSpellInfo == NULL)
1828	1828	{
1829	1829	sLog.outError("Aura::TriggerSpell: Spell %u have 0 in EffectTriggered[%d], not handled custom case?",GetId(),GetEffIndex());
…	…
1833	1833	else
1834	1834	{
1835		// Spell exist but require c~~ostu~~m code
	1835	// Spell exist but require custom code
1836	1836	switch(auraId)
1837	1837	{
…	…
1843	1843	// 1) target show casting at each triggered cast: target don't must show casting animation for any triggered spell
1844	1844	// but must show affect apply like item casting
1845		// 2) maybe aura must be replace by new with accumulative stat mods insteed stacking
	1845	// 2) maybe aura must be replace by new with accumulative stat mods instead stacking
1846	1846
1847	1847	// prevent cast by triggered auras
…	…
1850	1850
1851	1851	// stop triggering after each affected stats lost > 90
1852		int32 intelectLoss = 0;
	1852	int32 intellectLoss = 0;
1853	1853	int32 spiritLoss = 0;
1854	1854
…	…
1860	1860	switch((*i)->GetModifier()->m_miscvalue)
1861	1861	{
1862		case STAT_INTELLECT: intelectLoss += (*i)->GetModifier()->m_amount; break;
	1862	case STAT_INTELLECT: intellectLoss += (*i)->GetModifier()->m_amount; break;
1863	1863	case STAT_SPIRIT: spiritLoss += (*i)->GetModifier()->m_amount; break;
1864	1864	default: break;
…	…
1867	1867	}
1868	1868
1869		if(intelectLoss <= -90 && spiritLoss <= -90)
	1869	if(intellectLoss <= -90 && spiritLoss <= -90)
1870	1870	return;
1871	1871
…	…
1882	1882	}
1883	1883	}
1884		m_target->CastSpell(target, triggredSpellInfo, true, 0, this, originalCasterGUID);
	1884	m_target->CastSpell(target, triggeredSpellInfo, true, 0, this, originalCasterGUID);
1885	1885	/*// All ok cast by default case
1886		Spell *spell = new Spell(m_target, triggredSpellInfo, true, originalCasterGUID );
	1886	Spell *spell = new Spell(m_target, triggeredSpellInfo, true, originalCasterGUID );
1887	1887
1888	1888	SpellCastTargets targets;
…	…
2009	2009	if(GetId()==45934)
2010	2010	{
2011		// Kill target if dispeled
	2011	// Kill target if dispelled
2012	2012	if (m_removeMode==AURA_REMOVE_BY_DISPEL)
2013	2013	m_target->DealDamage(m_target, m_target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
…	…
2566	2566	else
2567	2567	{
2568		m_target->SetDisplayId(m_target->GetNativeDisplayId());
	2568	if(modelid > 0)
	2569	m_target->SetDisplayId(m_target->GetNativeDisplayId());
2569	2570	m_target->SetByteValue(UNIT_FIELD_BYTES_2, 3, FORM_NONE);
2570	2571	if(m_target->getClass() == CLASS_DRUID)
…	…
2717	2718	for(Unit::AuraList::const_iterator i = otherTransforms.begin();i != otherTransforms.end(); ++i)
2718	2719	{
2719		// negative auras are prefered
	2720	// negative auras are preferred
2720	2721	if(!IsPositiveSpell((*i)->GetSpellProto()->Id))
2721	2722	{
…	…
3117	3118	return;
3118	3119
3119		// main-hand attack speed already set to special value for feral form already and don't must chnage and reset at remove.
	3120	// main-hand attack speed already set to special value for feral form already and don't must change and reset at remove.
3120	3121	if (((Player *)m_target)->IsInFeralForm())
3121	3122	return;
…	…
3439	3440	{
3440	3441	uint32 state = currentSpell->getState();
3441		// Stop spells on prepere or casting state
	3442	// Stop spells on prepare or casting state
3442	3443	if ( state == SPELL_STATE_PREPARING \|\| state == SPELL_STATE_CASTING )
3443	3444	{
…	…
4012	4013	float mwb_min = caster->GetWeaponDamageRange(BASE_ATTACK,MINDAMAGE);
4013	4014	float mwb_max = caster->GetWeaponDamageRange(BASE_ATTACK,MAXDAMAGE);
4014		// WARNING! in 3.0 multipler 0.00743f change to 0.6
	4015	// WARNING! in 3.0 multiplier 0.00743f change to 0.6
4015	4016	m_modifier.m_amount+=int32(((mwb_min+mwb_max)/2+apmws/14000)0.00743f);
4016	4017	}
…	…
4040	4041	if (m_spellProto->SpellFamilyFlags & 0x000000000000800000LL)
4041	4042	{
4042		// $AP * min(0.06*$cp, 0.24)/6 [Yes, there is no difference, wheather 4 or 5 CPs are being used]
	4043	// $AP * min(0.06*$cp, 0.24)/6 [Yes, there is no difference, whether 4 or 5 CPs are being used]
4043	4044	if (apply && !loading && caster && caster->GetTypeId() == TYPEID_PLAYER)
4044	4045	{
…	…
4093	4094	if (m_spellProto->SpellFamilyFlags & 0x000000000000100000LL)
4094	4095	{
4095		// Dmg/tick = $APmin(0.01$cp, 0.03) [Like Rip: only the first three CP inrease the contribution from AP]
	4096	// Dmg/tick = $APmin(0.01$cp, 0.03) [Like Rip: only the first three CP increase the contribution from AP]
4096	4097	if (apply && !loading && caster && caster->GetTypeId() == TYPEID_PLAYER)
4097	4098	{
…	…
4423	4424	if(m_modifier.m_miscvalue != SPELL_SCHOOL_MASK_NORMAL)
4424	4425	{
4425		// support required adding replace UpdateArmor by loop by UpdateResistence at intelect update
	4426	// support required adding replace UpdateArmor by loop by UpdateResistence at intellect update
4426	4427	// and include in UpdateResistence same code as in UpdateArmor for aura mod apply.
4427		sLog.outError("Aura SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT(182) need adding support for non-armor resistences!");
	4428	sLog.outError("Aura SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT(182) need adding support for non-armor resistances!");
4428	4429	return;
4429	4430	}
…	…
4888	4889	{
4889	4890	// support required adding UpdateAttackPowerAndDamage calls at stat update
4890		sLog.outError("Aura SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT (212) need support non-intelect stats!");
	4891	sLog.outError("Aura SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT (212) need support non-intellect stats!");
4891	4892	return;
4892	4893	}

trunk/src/game/SpellEffects.cpp

r227	r229
810	810	case 13567: // Dummy Trigger
811	811	{
812		// can be used for different aura triggreing, so select by aura
	812	// can be used for different aura triggering, so select by aura
813	813	if(!m_triggeredByAuraSpell \|\| !unitTarget)
814	814	return;
…	…
1353	1353	case 25461: spellid = 25460; break; // Rank 7
1354	1354	default:
1355		sLog.outError("Spell::EffectDummy: Spell 28598 triggered by unhandeled spell %u",m_triggeredByAuraSpell->Id);
	1355	sLog.outError("Spell::EffectDummy: Spell 28598 triggered by unhandled spell %u",m_triggeredByAuraSpell->Id);
1356	1356	return;
1357	1357	}
…	…
2666	2666
2667	2667	// Some level depends spells
2668		int multipler = 0;
	2668	int multiplier = 0;
2669	2669	int level_diff = 0;
2670	2670	switch (m_spellInfo->Id)
…	…
2673	2673	case 9512:
2674	2674	level_diff = m_caster->getLevel() - 40;
2675		multipler = 2;
	2675	multiplier = 2;
2676	2676	break;
2677	2677	// Blood Fury
2678	2678	case 24571:
2679	2679	level_diff = m_caster->getLevel() - 60;
2680		multipler = 10;
	2680	multiplier = 10;
2681	2681	break;
2682	2682	// Burst of Energy
2683	2683	case 24532:
2684	2684	level_diff = m_caster->getLevel() - 60;
2685		multipler = 4;
	2685	multiplier = 4;
2686	2686	break;
2687	2687	default:
…	…
2690	2690
2691	2691	if (level_diff > 0)
2692		damage -= multipler * level_diff;
	2692	damage -= multiplier * level_diff;
2693	2693
2694	2694	if(damage < 0)
…	…
3293	3293	return;
3294	3294
3295		// Fill possible dispell list
	3295	// Fill possible dispel list
3296	3296	std::vector <Aura *> dispel_list;
3297	3297
…	…
3328	3328	std::list < uint32 > fail_list; // spell_id
3329	3329	int32 list_size = dispel_list.size();
3330		// ~~Dispel~~l N = damage buffs (or while exist buffs for dispel)
	3330	// dispel N = damage buffs (or while exist buffs for dispel)
3331	3331	for (int32 count=0; count < damage && list_size > 0; ++count)
3332	3332	{
…	…
3352	3352	for (std::vector<Aura *>::iterator j = dispel_list.begin(); j != dispel_list.end(); )
3353	3353	{
3354		Aura dispeled = j;
3355		if (dispel~~ed->GetId() == aur->GetId() && dispe~~led->GetCasterGUID() == aur->GetCasterGUID())
	3354	Aura dispelled = j;
	3355	if (dispelled->GetId() == aur->GetId() && dispelled->GetCasterGUID() == aur->GetCasterGUID())
3356	3356	{
3357	3357	j = dispel_list.erase(j);
…	…
3369	3369	data.append(unitTarget->GetPackGUID()); // Victim GUID
3370	3370	data.append(m_caster->GetPackGUID()); // Caster GUID
3371		data << uint32(m_spellInfo->Id); // ~~Dispel~~l spell id
	3371	data << uint32(m_spellInfo->Id); // dispel spell id
3372	3372	data << uint8(0); // not used
3373	3373	data << uint32(count); // count
…	…
3376	3376	SpellEntry const* spellInfo = sSpellStore.LookupEntry(j->first);
3377	3377	data << uint32(spellInfo->Id); // Spell Id
3378		data << uint8(0); // 0 - dispeled !=0 cleansed
	3378	data << uint8(0); // 0 - dispelled !=0 cleansed
3379	3379	unitTarget->RemoveAurasDueToSpellByDispel(spellInfo->Id, j->second, m_caster);
3380	3380	}
…	…
3409	3409	data << uint64(m_caster->GetGUID()); // Caster GUID
3410	3410	data << uint64(unitTarget->GetGUID()); // Victim GUID
3411		data << uint32(m_spellInfo->Id); // ~~Dispel~~l spell id
	3411	data << uint32(m_spellInfo->Id); // dispel spell id
3412	3412	for (std::list< uint32 >::iterator j = fail_list.begin(); j != fail_list.end(); ++j)
3413	3413	data << uint32(*j); // Spell Id
…	…
6225	6225	std::list < std::pair<uint32,uint64> > success_list;
6226	6226	int32 list_size = steal_list.size();
6227		// ~~Dispel~~l N = damage buffs (or while exist buffs for dispel)
	6227	// dispel N = damage buffs (or while exist buffs for dispel)
6228	6228	for (int32 count=0; count < damage && list_size > 0; ++count)
6229	6229	{
…	…
6254	6254	data.append(unitTarget->GetPackGUID()); // Victim GUID
6255	6255	data.append(m_caster->GetPackGUID()); // Caster GUID
6256		data << uint32(m_spellInfo->Id); // ~~Dispel~~l spell id
	6256	data << uint32(m_spellInfo->Id); // dispel spell id
6257	6257	data << uint8(0); // not used
6258	6258	data << uint32(count); // count

trunk/src/game/SpellMgr.cpp

r219	r229
486	486	if (!spellproto) return false;
487	487
488		// spells with atleast one negative effect are considered negative
	488	// spells with at least one negative effect are considered negative
489	489	// some self-applied spells have negative effects but in self casting case negative check ignored.
490	490	for (int i = 0; i < 3; i++)

trunk/src/game/SpellMgr.h

r219	r229
429	429	inline uint32 GetDispellMask(DispelType dispel)
430	430	{
431		// If dispell all
	431	// If dispel all
432	432	if (dispel == DISPEL_ALL)
433	433	return DISPEL_ALL_MASK;

trunk/src/game/StatSystem.cpp

r136	r229
69	69	UpdateMaxPower(POWER_MANA);
70	70	UpdateAllSpellCritChances();
71		UpdateAttackPowerAndDamage(true); //SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT, only intelect currently
	71	UpdateAttackPowerAndDamage(true); //SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT, only intellect currently
72	72	UpdateArmor(); //SPELL_AURA_MOD_RESISTANCE_OF_INTELLECT_PERCENT, only armor currently
73	73	break;
…	…
385	385	weapon_maxdamage = lvl1.25att_speed;
386	386	}
387		else if(!IsUseEquipedWeapon(attType==BASE_ATTACK)) //check if player not in form but still can't use weapon (broken/etc)
	387	else if(!IsUseEquippedWeapon(attType==BASE_ATTACK)) //check if player not in form but still can't use weapon (broken/etc)
388	388	{
389	389	weapon_mindamage = BASE_MINDAMAGE;

trunk/src/game/TaxiHandler.cpp

r102	r229
202	202	// 1) end taxi path in far (multi-node) flight
203	203	// 2) switch from one map to other in case multim-map taxi path
204		// we need proccess only (1)
	204	// we need process only (1)
205	205	uint32 curDest = GetPlayer()->m_taxi.GetTaxiDestination();
206	206	if(!curDest)

trunk/src/game/ThreatManager.cpp

r198	r229
133	133	{
134	134	Creature* creature = (Creature* ) getSourceUnit();
135		online = getTarget()->isInAccessablePlaceFor(creature);
	135	online = getTarget()->isInAccessiblePlaceFor(creature);
136	136	if(!online)
137	137	{
138	138	if(creature->AI()->canReachByRangeAttack(getTarget()))
139		online = true; // not accessable but stays online
	139	online = true; // not accessible but stays online
140	140	}
141	141	else
…	…
156	156	iOnline = pIsOnline;
157	157	if(!iOnline)
158		setAccessibleState(false); // if not online that not accessable as well
	158	setAccessibleState(false); // if not online that not accessible as well
159	159	fireStatusChanged(ThreatRefStatusChangeEvent(UEV_THREAT_REF_ONLINE_STATUS, this));
160	160	}
…	…
279	279	assert(target); // if the ref has status online the target must be there !
280	280
281		// some units are prefered in comparison to others
	281	// some units are preferred in comparison to others
282	282	if(iter != lastRef && (target->IsImmunedToDamage(pAttacker->GetMeleeDamageSchoolMask(), false) \|\|
283	283	target->hasUnitState(UNIT_STAT_CONFUSED \| UNIT_STAT_FLEEING)

trunk/src/game/ThreatManager.h

r102	r229
75	75
76	76	// The Unit might be in water and the creature can not enter the water, but has range attack
77		// in this case online = true, but accessable = false
78		bool isAccessable() const { return iAccessible; }
	77	// in this case online = true, but accessible = false
	78	bool isAccessible() const { return iAccessible; }
79	79
80	80	// used for temporary setting a threat and reducting it later again.

trunk/src/game/Unit.cpp

r226	r229
388	388	WorldPacket data( SMSG_MONSTER_MOVE, (GetPackGUID().size()+4+4+4+4+1+4+4+4+pathSize43) );
389	389	data.append(GetPackGUID());
390		data << GetPositionX( )
391		<< GetPositionY( )
392		<< GetPositionZ( );
393		data << GetOrientation( );
	390	data << GetPositionX();
	391	data << GetPositionY();
	392	data << GetPositionZ();
	393
	394	// unknown field - unrelated to orientation
	395	// seems to increment about 1000 for every 1.7 seconds
	396	// for now, we'll just use mstime
	397	data << getMSTime();
	398
394	399	data << uint8( 0 );
395	400	data << uint32( MovementFlags );
…	…
869	874	if(getVictim())
870	875	{
871		// if have target and damage pVictim just call AI recation
	876	// if have target and damage pVictim just call AI reaction
872	877	if(pVictim != getVictim() && pVictim->GetTypeId()==TYPEID_UNIT && ((Creature*)pVictim)->AI())
873	878	((Creature*)pVictim)->AI()->AttackedBy(this);
…	…
983	988	}
984	989
985		void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item castItem, Aura triggredByAura, uint64 originalCaster)
	990	void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item castItem, Aura triggeredByAura, uint64 originalCaster)
986	991	{
987	992	SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
…	…
993	998	}
994	999
995		CastSpell(Victim,spellInfo,triggered,castItem,triggredByAura, originalCaster);
996		}
997
998		void Unit::CastSpell(Unit* Victim,SpellEntry const spellInfo, bool triggered, Item castItem, Aura* triggredByAura, uint64 originalCaster)
	1000	CastSpell(Victim,spellInfo,triggered,castItem,triggeredByAura, originalCaster);
	1001	}
	1002
	1003	void Unit::CastSpell(Unit* Victim,SpellEntry const spellInfo, bool triggered, Item castItem, Aura* triggeredByAura, uint64 originalCaster)
999	1004	{
1000	1005	assert(Victim);
…	…
1008	1013	DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id);
1009	1014
1010		if(!originalCaster && triggredByAura)
1011		originalCaster = triggredByAura->GetCasterGUID();
	1015	if(!originalCaster && triggeredByAura)
	1016	originalCaster = triggeredByAura->GetCasterGUID();
1012	1017
1013	1018	Spell *spell = new Spell(this, spellInfo, triggered, originalCaster );
…	…
1017	1022	targets.setDestination( Victim->GetPositionX(), Victim->GetPositionY(), Victim->GetPositionZ(), false);
1018	1023	spell->m_CastItem = castItem;
1019		spell->prepare(&targets, triggredByAura);
1020		}
1021
1022		void Unit::CastCustomSpell(Unit* Victim,uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item castItem, Aura triggredByAura, uint64 originalCaster)
	1024	spell->prepare(&targets, triggeredByAura);
	1025	}
	1026
	1027	void Unit::CastCustomSpell(Unit* Victim,uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item castItem, Aura triggeredByAura, uint64 originalCaster)
1023	1028	{
1024	1029	SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
…	…
1030	1035	}
1031	1036
1032		CastCustomSpell(Victim,spellInfo,bp0,bp1,bp2,triggered,castItem,triggredByAura, originalCaster);
1033		}
1034
1035		void Unit::CastCustomSpell(Unit* Victim,SpellEntry const spellInfo, int32 const bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item castItem, Aura triggredByAura, uint64 originalCaster)
	1037	CastCustomSpell(Victim,spellInfo,bp0,bp1,bp2,triggered,castItem,triggeredByAura, originalCaster);
	1038	}
	1039
	1040	void Unit::CastCustomSpell(Unit* Victim,SpellEntry const spellInfo, int32 const bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item castItem, Aura triggeredByAura, uint64 originalCaster)
1036	1041	{
1037	1042	if(!spellInfo)
…	…
1044	1049	DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id);
1045	1050
1046		if(!originalCaster && triggredByAura)
1047		originalCaster = triggredByAura->GetCasterGUID();
	1051	if(!originalCaster && triggeredByAura)
	1052	originalCaster = triggeredByAura->GetCasterGUID();
1048	1053
1049	1054	Spell *spell = new Spell(this, spellInfo, triggered, originalCaster);
…	…
1061	1066	targets.setUnitTarget( Victim );
1062	1067	spell->m_CastItem = castItem;
1063		spell->prepare(&targets, triggredByAura);
	1068	spell->prepare(&targets, triggeredByAura);
1064	1069	}
1065	1070
1066	1071	// used for scripting
1067		void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item castItem, Aura triggredByAura, uint64 originalCaster)
	1072	void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item castItem, Aura triggeredByAura, uint64 originalCaster)
1068	1073	{
1069	1074	SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
…	…
1075	1080	}
1076	1081
1077		CastSpell(x, y, z,spellInfo,triggered,castItem,triggredByAura, originalCaster);
	1082	CastSpell(x, y, z,spellInfo,triggered,castItem,triggeredByAura, originalCaster);
1078	1083	}
1079	1084
1080	1085	// used for scripting
1081		void Unit::CastSpell(float x, float y, float z, SpellEntry const spellInfo, bool triggered, Item castItem, Aura* triggredByAura, uint64 originalCaster)
	1086	void Unit::CastSpell(float x, float y, float z, SpellEntry const spellInfo, bool triggered, Item castItem, Aura* triggeredByAura, uint64 originalCaster)
1082	1087	{
1083	1088	if(!spellInfo)
…	…
1090	1095	DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id);
1091	1096
1092		if(!originalCaster && triggredByAura)
1093		originalCaster = triggredByAura->GetCasterGUID();
	1097	if(!originalCaster && triggeredByAura)
	1098	originalCaster = triggeredByAura->GetCasterGUID();
1094	1099
1095	1100	Spell *spell = new Spell(this, spellInfo, triggered, originalCaster );
…	…
1098	1103	targets.setDestination(x, y, z);
1099	1104	spell->m_CastItem = castItem;
1100		spell->prepare(&targets, triggredByAura);
	1105	spell->prepare(&targets, triggeredByAura);
1101	1106	}
1102	1107
…	…
1106	1111	DEBUG_LOG("DealFlatDamage (BEFORE) >> DMG:%u", *damage);
1107	1112
1108		// Per-damage calss calculation
	1113	// Per-damage class calculation
1109	1114	switch (spellInfo->DmgClass)
1110	1115	{
…	…
1712	1717	}
1713	1718
1714		// only split damage if not damaing yourself
	1719	// only split damage if not damaging yourself
1715	1720	if(pVictim != this)
1716	1721	{
…	…
2192	2197	hitInfo = HITINFO_LEFTSWING;
2193	2198	else
2194		return; // ignore ranaged case
	2199	return; // ignore ranged case
2195	2200
2196	2201	uint32 extraAttacks = m_extraAttacks;
…	…
2306	2311	else
2307	2312	{
2308		// parry can be avoided only by some abilites
	2313	// parry can be avoided only by some abilities
2309	2314	parry_chance = pVictim->GetUnitParryChance();
2310	2315	// block might be bypassed by it as well
…	…
2320	2325	crit_chance += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_SPELL_CRIT_CHANCE_SCHOOL, spellInfo->SchoolMask);
2321	2326
2322		if( dodge_chance != 0.0f ) // if dodge chance is already 0, ignore talents fpr speed
	2327	if( dodge_chance != 0.0f ) // if dodge chance is already 0, ignore talents for speed
2323	2328	{
2324	2329	AuraList const& mCanNotBeDodge = GetAurasByType(SPELL_AURA_IGNORE_COMBAT_RESULT);
…	…
2886	2891
2887	2892	// TODO need use this code for spell hit result calculation
2888		// now code commented for compotability
	2893	// now code commented for computability
2889	2894	switch (spell->DmgClass)
2890	2895	{
…	…
3058	3063	return GetFloatValue(PLAYER_BLOCK_PERCENTAGE);
3059	3064	}
3060		// is player but has no block ability or no not broken shield equiped
	3065	// is player but has no block ability or no not broken shield equipped
3061	3066	return 0.0f;
3062	3067	}
…	…
3139	3144	return GetMaxSkillValueForLevel(); // always maximized SKILL_FERAL_COMBAT in fact
3140	3145
3141		// weaon skill or (unarmed for base attack)
	3146	// weapon skill or (unarmed for base attack)
3142	3147	uint32 skill = item ? item->GetSkill() : SKILL_UNARMED;
3143	3148
…	…
3457	3462	}
3458	3463
3459		bool Unit::isInAccessablePlaceFor(Creature const* c) const
	3464	bool Unit::isInAccessiblePlaceFor(Creature const* c) const
3460	3465	{
3461	3466	if(IsInWater())
…	…
3493	3498	float Unit::GetTotalAuraMultiplier(AuraType auratype) const
3494	3499	{
3495		float multipler = 1.0f;
	3500	float multiplier = 1.0f;
3496	3501
3497	3502	AuraList const& mTotalAuraList = GetAurasByType(auratype);
3498	3503	for(AuraList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
3499		multipler = (100.0f + (i)->GetModifier()->m_amount)/100.0f;
3500
3501		return multipler;
	3504	multiplier = (100.0f + (i)->GetModifier()->m_amount)/100.0f;
	3505
	3506	return multiplier;
3502	3507	}
3503	3508
…	…
3542	3547	float Unit::GetTotalAuraMultiplierByMiscMask(AuraType auratype, uint32 misc_mask) const
3543	3548	{
3544		float multipler = 1.0f;
	3549	float multiplier = 1.0f;
3545	3550
3546	3551	AuraList const& mTotalAuraList = GetAurasByType(auratype);
…	…
3549	3554	Modifier* mod = (*i)->GetModifier();
3550	3555	if (mod->m_miscvalue & misc_mask)
3551		multipler *= (100.0f + mod->m_amount)/100.0f;
3552		}
3553		return multipler;
	3556	multiplier *= (100.0f + mod->m_amount)/100.0f;
	3557	}
	3558	return multiplier;
3554	3559	}
3555	3560
…	…
3600	3605	float Unit::GetTotalAuraMultiplierByMiscValue(AuraType auratype, int32 misc_value) const
3601	3606	{
3602		float multipler = 1.0f;
	3607	float multiplier = 1.0f;
3603	3608
3604	3609	AuraList const& mTotalAuraList = GetAurasByType(auratype);
…	…
3607	3612	Modifier* mod = (*i)->GetModifier();
3608	3613	if (mod->m_miscvalue == misc_value)
3609		multipler *= (100.0f + mod->m_amount)/100.0f;
3610		}
3611		return multipler;
	3614	multiplier *= (100.0f + mod->m_amount)/100.0f;
	3615	}
	3616	return multiplier;
3612	3617	}
3613	3618
…	…
3725	3730	{
3726	3731	delete Aur;
3727		return false; // couldnt remove conflicting aura with higher rank
	3732	return false; // couldn't remove conflicting aura with higher rank
3728	3733	}
3729	3734	}
…	…
3867	3872	{
3868	3873	// prevent remove dummy triggered spells at next effect aura add
3869		switch(spellProto->Effect[j]) // main spell auras added added after triggred spell
	3874	switch(spellProto->Effect[j]) // main spell auras added added after triggered spell
3870	3875	{
3871	3876	case SPELL_EFFECT_DUMMY:
…	…
3880	3885	break;
3881	3886
3882		// prevent remove form main spell by triggred passive spells
	3887	// prevent remove form main spell by triggered passive spells
3883	3888	switch(i_spellProto->EffectApplyAuraName[j]) // main aura added before triggered spell
3884	3889	{
…	…
4049	4054	// Create dispel mask by dispel type
4050	4055	uint32 dispelMask = GetDispellMask(type);
4051		// Dispel all existing auras vs current dispell type
	4056	// Dispel all existing auras vs current dispel type
4052	4057	AuraMap& auras = GetAuras();
4053	4058	for(AuraMap::iterator itr = auras.begin(); itr != auras.end(); )
…	…
4482	4487
4483	4488	// Assign melee/ranged proc flags for magic attacks, that are actually melee/ranged abilities
4484		// not assign for spell proc triggered spell to prevent infinity (or unexpacted 2-3 times) melee damage spell proc call with melee damage effect
	4489	// not assign for spell proc triggered spell to prevent infinity (or unexpected 2-3 times) melee damage spell proc call with melee damage effect
4485	4490	// That is the question though if it's fully correct
4486	4491	if(procSpell && !isTriggeredSpell)
…	…
4509	4514	if (procAttacker)
4510	4515	{
4511		// proc~~ces~~ auras that not generate casts at proc event before auras that generate casts to prevent proc aura added at prev. proc aura execute in set
	4516	// processing auras that not generate casts at proc event before auras that generate casts to prevent proc aura added at prev. proc aura execute in set
4512	4517	ProcDamageAndSpellFor(false,pVictim,procAttacker,attackerProcEffectAuraTypes,attType, procSpell, damage, damageSchoolMask);
4513	4518	ProcDamageAndSpellFor(false,pVictim,procAttacker,attackerProcCastAuraTypes,attType, procSpell, damage, damageSchoolMask);
…	…
4518	4523	if(pVictim && pVictim->isAlive() && procVictim)
4519	4524	{
4520		// proc~~ces~~ auras that not generate casts at proc event before auras that generate casts to prevent proc aura added at prev. proc aura execute in set
	4525	// processing auras that not generate casts at proc event before auras that generate casts to prevent proc aura added at prev. proc aura execute in set
4521	4526	pVictim->ProcDamageAndSpellFor(true,this,procVictim,victimProcEffectAuraTypes,attType,procSpell, damage, damageSchoolMask);
4522	4527	pVictim->ProcDamageAndSpellFor(true,this,procVictim,victimProcCastAuraTypes,attType,procSpell, damage, damageSchoolMask);
…	…
4707	4712	case 35429:
4708	4713	{
4709		// prevent chain of trigg~~red spell from same trigg~~red spell
	4714	// prevent chain of triggered spell from same triggered spell
4710	4715	if(procSpell && procSpell->Id==26654)
4711	4716	return false;
…	…
5729	5734
5730	5735	uint32 spellId = 0;
5731		// Every Lightning Bolt and Chain Lightning spell have dublicate vs half damage and zero cost
	5736	// Every Lightning Bolt and Chain Lightning spell have duplicate vs half damage and zero cost
5732	5737	switch (procSpell->Id)
5733	5738	{
…	…
5772	5777	((Player*)this)->RemoveSpellCooldown(spellId);
5773	5778
5774		// Hmmm.. in most case spells alredy set half basepoints but...
	5779	// Hmmm.. in most case spells already set half basepoints but...
5775	5780	// Lightning Bolt (2-10 rank) have full basepoint and half bonus from level
5776	5781	// As on wiki:
…	…
5990	5995	return false;
5991	5996
5992		// custom chnace
	5997	// custom chance
5993	5998	float chance = 0;
5994	5999	switch (triggeredByAura->GetId())
…	…
7054	7059	if(!(*iter)->AttackStop())
7055	7060	{
7056		sLog.outError("WORLD: Unit has an attacker that isnt attacking it!");
	7061	sLog.outError("WORLD: Unit has an attacker that isn't attacking it!");
7057	7062	m_attackers.erase(iter);
7058	7063	}
…	…
8375	8380	{
8376	8381	// normalized proc chance for weapon attack speed
8377		// (odd formulae...)
	8382	// (odd formula...)
8378	8383	if(isAttackReady(BASE_ATTACK))
8379	8384	return (GetAttackTime(BASE_ATTACK) * 1.8f / 1000.0f);
…	…
9064	9069	Unit* target = NULL;
9065	9070
9066		//This function only useful once AI has been initi~~lazi~~ed
	9071	//This function only useful once AI has been initialized
9067	9072	if (!((Creature*)this)->AI())
9068	9073	return false;
…	…
9096	9101	for(AttackerSet::const_iterator itr = m_attackers.begin(); itr != m_attackers.end(); ++itr)
9097	9102	{
9098		if( (itr)->IsInMap(this) && canAttack(itr) && (itr)->isInAccessablePlaceFor((Creature)this) )
	9103	if( (itr)->IsInMap(this) && canAttack(itr) && (itr)->isInAccessiblePlaceFor((Creature)this) )
9099	9104	return false;
9100	9105	}
…	…
9338	9343	if(unitMod >= UNIT_MOD_END \|\| modifierType >= MODIFIER_TYPE_END)
9339	9344	{
9340		sLog.outError("ERROR in HandleStatModifier(): nonexisted UnitMods or wrong UnitModifierType!");
	9345	sLog.outError("ERROR in HandleStatModifier(): non existed UnitMods or wrong UnitModifierType!");
9341	9346	return false;
9342	9347	}
…	…
9408	9413	if( unitMod >= UNIT_MOD_END \|\| modifierType >= MODIFIER_TYPE_END)
9409	9414	{
9410		sLog.outError("ERROR: trial to access nonexisted modifier value from UnitMods!");
	9415	sLog.outError("ERROR: trial to access non existed modifier value from UnitMods!");
9411	9416	return 0.0f;
9412	9417	}
…	…
9438	9443	if(unitMod >= UNIT_MOD_END)
9439	9444	{
9440		sLog.outError("ERROR: trial to access nonexisted UnitMods in GetTotalAuraModValue()!");
	9445	sLog.outError("ERROR: trial to access non existed UnitMods in GetTotalAuraModValue()!");
9441	9446	return 0.0f;
9442	9447	}
…	…
9738	9743	{
9739	9744	InterruptNonMeleeSpells(true);
9740		m_Events.KillAllEvents(false); // non-delatable (currently casted spells) will not deleted ~~ans will delea~~ted at call in Map::RemoveAllObjectsInRemoveList
	9745	m_Events.KillAllEvents(false); // non-delatable (currently casted spells) will not deleted now but it will deleted at call in Map::RemoveAllObjectsInRemoveList
9741	9746	CombatStop();
9742	9747	ClearComboPointHolders();
…	…
10048	10053	{
10049	10054	sLog.outError("Spell aura %u (id:%u effect:%u) has been deleted before call spell proc event handler",*aur,i->triggeredByAura_SpellPair.first,i->triggeredByAura_SpellPair.second);
10050		sLog.outError("It can be deleted one from early proccesed auras:");
	10055	sLog.outError("It can be deleted one from early processed auras:");
10051	10056	for(ProcTriggeredList::iterator i2 = procTriggered.begin(); i != i2; ++i2)
10052	10057	sLog.outError(" Spell aura %u (id:%u effect:%u)",*aur,i2->triggeredByAura_SpellPair.first,i2->triggeredByAura_SpellPair.second);
…	…
10298	10303
10299	10304	// send explicit stop packet
10300		// rely on vmaps here because for exemple stormwind is in air
	10305	// rely on vmaps here because for example stormwind is in air
10301	10306	float z = MapManager::Instance().GetBaseMap(GetMapId())->GetHeight(GetPositionX(), GetPositionY(), GetPositionZ(), true);
10302	10307	//if (fabs(GetPositionZ() - z) < 2.0f)

trunk/src/game/Unit.h

r226	r229
214	214	HITINFO_MISS = 0x00000010,
215	215	HITINFO_ABSORB = 0x00000020, // plays absorb sound
216		HITINFO_RESIST = 0x00000040, // resisted atleast some damage
	216	HITINFO_RESIST = 0x00000040, // resisted at least some damage
217	217	HITINFO_CRITICALHIT = 0x00000080,
218	218	HITINFO_UNK2 = 0x00000100, // wotlk?
…	…
928	928	virtual bool IsInWater() const;
929	929	virtual bool IsUnderWater() const;
930		bool isInAccessablePlaceFor(Creature const* c) const;
	930	bool isInAccessiblePlaceFor(Creature const* c) const;
931	931
932	932	void SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, bool critical = false);
933	933	void SendEnergizeSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage,Powers powertype, bool critical = false);
934	934	uint32 SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage, bool isTriggeredSpell = false, bool useSpellDamage = true);
935		void CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item castItem = NULL, Aura triggredByAura = NULL, uint64 originalCaster = 0);
936		void CastSpell(Unit* Victim,SpellEntry const spellInfo, bool triggered, Item castItem= NULL, Aura* triggredByAura = NULL, uint64 originalCaster = 0);
937		void CastCustomSpell(Unit* Victim, uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item castItem= NULL, Aura triggredByAura = NULL, uint64 originalCaster = 0);
938		void CastCustomSpell(Unit* Victim,SpellEntry const spellInfo, int32 const bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item castItem= NULL, Aura triggredByAura = NULL, uint64 originalCaster = 0);
939		void CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item castItem = NULL, Aura triggredByAura = NULL, uint64 originalCaster = 0);
940		void CastSpell(float x, float y, float z, SpellEntry const spellInfo, bool triggered, Item castItem = NULL, Aura* triggredByAura = NULL, uint64 originalCaster = 0);
	935	void CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item castItem = NULL, Aura triggeredByAura = NULL, uint64 originalCaster = 0);
	936	void CastSpell(Unit* Victim,SpellEntry const spellInfo, bool triggered, Item castItem= NULL, Aura* triggeredByAura = NULL, uint64 originalCaster = 0);
	937	void CastCustomSpell(Unit* Victim, uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item castItem= NULL, Aura triggeredByAura = NULL, uint64 originalCaster = 0);
	938	void CastCustomSpell(Unit* Victim,SpellEntry const spellInfo, int32 const bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item castItem= NULL, Aura triggeredByAura = NULL, uint64 originalCaster = 0);
	939	void CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item castItem = NULL, Aura triggeredByAura = NULL, uint64 originalCaster = 0);
	940	void CastSpell(float x, float y, float z, SpellEntry const spellInfo, bool triggered, Item castItem = NULL, Aura* triggeredByAura = NULL, uint64 originalCaster = 0);
941	941
942	942	bool IsDamageToThreatSpell(SpellEntry const * spellInfo) const;
…	…
1363	1363
1364	1364	void ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag, AuraTypeSet const& procAuraTypes, WeaponAttackType attType, SpellEntry const * procSpell, uint32 damage, SpellSchoolMask damageSchoolMask );
1365		bool HandleDummyAuraProc(Unit pVictim, SpellEntry const spellProto, uint32 effIndex, uint32 damage, Aura* triggredByAura, SpellEntry const * procSpell, uint32 procFlag,uint32 cooldown);
1366		bool HandleProcTriggerSpell(Unit pVictim,uint32 damage, Aura triggredByAura, SpellEntry const *procSpell, uint32 procFlags,WeaponAttackType attType,uint32 cooldown);
1367		bool HandleHasteAuraProc(Unit pVictim, SpellEntry const spellProto, uint32 effIndex, uint32 damage, Aura* triggredByAura, SpellEntry const * procSpell, uint32 procFlag,uint32 cooldown);
1368		bool HandleOverrideClassScriptAuraProc(Unit pVictim, int32 scriptId, uint32 damage, Aura triggredByAura, SpellEntry const *procSpell,uint32 cooldown);
	1365	bool HandleDummyAuraProc(Unit pVictim, SpellEntry const spellProto, uint32 effIndex, uint32 damage, Aura* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag,uint32 cooldown);
	1366	bool HandleProcTriggerSpell(Unit pVictim,uint32 damage, Aura triggeredByAura, SpellEntry const *procSpell, uint32 procFlags,WeaponAttackType attType,uint32 cooldown);
	1367	bool HandleHasteAuraProc(Unit pVictim, SpellEntry const spellProto, uint32 effIndex, uint32 damage, Aura* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag,uint32 cooldown);
	1368	bool HandleOverrideClassScriptAuraProc(Unit pVictim, int32 scriptId, uint32 damage, Aura triggeredByAura, SpellEntry const *procSpell,uint32 cooldown);
1369	1369
1370	1370	uint32 m_state; // Even derived shouldn't modify

trunk/src/game/WaypointMovementGenerator.cpp

r102	r229
154	154	if( !behavior->text[1].empty() )
155	155	{
156		// Select one from max 5 texts (0 and 1 laready checked)
	156	// Select one from max 5 texts (0 and 1 already checked)
157	157	int i = 2;
158	158	for( ; i < 5; ++i )

trunk/src/game/World.cpp

r207	r229
721	721	}
722	722
723		m_configs[CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY] = sConfig.GetBoolDefault("SaveRespawnTimeImmediately",true);
	723	m_configs[CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY] = sConfig.GetBoolDefault("SaveRespawnTimeImmediately",true);
724	724	m_configs[CONFIG_WEATHER] = sConfig.GetBoolDefault("ActivateWeather",true);
725	725
…	…
2456	2456	SendServerMessage(msgid);
2457	2457
2458		DEBUG_LOG("Server %s cancelled.",(m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown"));
	2458	DEBUG_LOG("Server %s canceled.",(m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown"));
2459	2459	}
2460	2460

trunk/src/game/World.h

r206	r229
133	133	CONFIG_SKILL_GAIN_WEAPON,
134	134	CONFIG_MAX_OVERSPEED_PINGS,
135		CONFIG_SAVE_RESPAWN_TIME_IMMEDIATLY,
	135	CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY,
136	136	CONFIG_WEATHER,
137	137	CONFIG_EXPANSION,

trunk/src/game/WorldSession.cpp

r181	r229
486	486	void WorldSession::Handle_EarlyProccess( WorldPacket& recvPacket )
487	487	{
488		sLog.outError( "SESSION: received opcode %s (0x%.4X) that must be proccessed in WorldSocket::OnRead",
	488	sLog.outError( "SESSION: received opcode %s (0x%.4X) that must be processed in WorldSocket::OnRead",
489	489	LookupOpcodeName(recvPacket.GetOpcode()),
490	490	recvPacket.GetOpcode());

trunk/src/game/WorldSocket.cpp

r181	r229
264	264	(errno == EAGAIN))
265	265	{
266		return Update (); // interesting line ,isnt it ?
	266	return Update (); // interesting line ,isn't it ?
267	267	}
268	268
…	…
470	470	if (m_Header.space () > 0)
471	471	{
472		//couldnt recieve the whole header this time
	472	//couldn't recieve the whole header this time
473	473	ACE_ASSERT (message_block.length () == 0);
474	474	errno = EWOULDBLOCK;
…	…
504	504	if (m_RecvPct.space () > 0)
505	505	{
506		//couldnt recieve the whole data this time
	506	//couldn't recieve the whole data this time
507	507	ACE_ASSERT (message_block.length () == 0);
508	508	errno = EWOULDBLOCK;

trunk/src/game/WorldSocketMgr.cpp

r149	r229
166	166	while (!m_Reactor->reactor_event_loop_done ())
167	167	{
168		// ~~don~~t be too smart to move this outside the loop
	168	// Don't be too smart to move this outside the loop
169	169	// the run_reactor_event_loop will modify interval
170	170	ACE_Time_Value interval (0, 10000);

trunk/src/shared/Database/DBCStores.cpp

r102	r229
330	330	LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTalentTabStore, dbcPath,"TalentTab.dbc");
331	331
332		// preper fast data access to bit pos of talent ranks for use at inspecting
	332	// prepare fast data access to bit pos of talent ranks for use at inspecting
333	333	{
334	334	// fill table by amount of talent ranks and fill sTalentTabBitSizeInInspect

Context Navigation

Changeset 229

Legend:

Download in other formats: