Shauren
fca4a5448a
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-10-07 14:30:37 +02:00
joschiwald
a0c637f52a
Core/Scripts: added some OVERRIDEs
2013-09-25 16:37:43 +02:00
Vincent-Michael
f2dff3da38
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
2013-09-22 15:31:21 +02:00
jackpoz
9579d0a3e7
Scripts/ScarletEnclave: Fix uninitialized values in Highlord Darion Mograine
...
Reset() has if checks on values that are initialized after them so it's required to initialize these fields in the constructor.
Valgrind log:
Conditional jump or move depends on uninitialised value(s)
by 0x11CF472: HashMapHolder<Creature>::Find(unsigned long) (ObjectAccessor.h:67)
by 0x11CE36F: Creature* ObjectAccessor::GetObjectInWorld<Creature>(unsigned long, Creature*) (ObjectAccessor.h:114)
by 0x1257C13: Creature* ObjectAccessor::GetObjectInMap<Creature>(unsigned long, Map*, Creature*) (ObjectAccessor.h:135)
by 0x12E64F1: Map::GetCreature(unsigned long) (Map.cpp:2767)
by 0x10AF4DE: Unit::GetCreature(WorldObject&, unsigned long) (Unit.cpp:13021)
by 0x16F8F81: npc_highlord_darion_mograine::npc_highlord_darion_mograineAI::Reset() (chapter5.cpp:386)
by 0x16F8D36: npc_highlord_darion_mograine::npc_highlord_darion_mograineAI::npc_highlord_darion_mograineAI(Creature*) (chapter5.cpp:314)
by 0x16F8CD6: npc_highlord_darion_mograine::GetAI(Creature*) const (chapter5.cpp:307)
by 0x132AF6C: ScriptMgr::GetCreatureAI(Creature*) (ScriptMgr.cpp:796)
by 0x1441D45: FactorySelector::selectAI(Creature*) (CreatureAISelector.cpp:41)
2013-09-21 22:36:23 +02:00
Vincent-Michael
d25c2e7f5b
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Guilds/Guild.h
src/server/game/Spells/SpellMgr.cpp
src/tools/map_extractor/loadlib.cpp
2013-09-05 16:46:14 +02:00
Sebastian Valle
24f8b2b994
Core/Misc: Fixed some more issues found by code analysis tools.
2013-09-03 15:09:37 -05:00
Vincent-Michael
6c8d0e5405
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-08-31 21:52:15 +02:00
joschiwald
ae36ddefec
Core/Scripts: add creature_text to pet mojo
...
Scripts/Karazhan/Moroes: cleanup a bit (should fixes mem leak)
2013-08-31 16:48:37 +02:00
Nay
14d80d269d
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Globals/ObjectMgr.cpp
2013-08-27 16:10:11 +01:00
Shauren
4f44cdf2b5
Core/Scripts: Fixed uninitialized variable and memory leaks
2013-08-26 17:38:02 +02:00
Nay
2050a36b58
SAI & Scripts: Fix unitialized values found by Valgrind
...
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x19B3031: boss_skarvald_the_constructor::boss_skarvald_the_constructorAI::UpdateAI(unsigned int) (boss_skarvald_dalronn.cpp:217)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x19B3948: boss_dalronn_the_controller::boss_dalronn_the_controllerAI::UpdateAI(unsigned int) (boss_skarvald_dalronn.cpp:388)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x15E2FCC: SmartScript::ProcessAction(SmartScriptHolder&, Unit*, unsigned int, unsigned int, bool, SpellInfo const*, GameObject*) (SmartScript.cpp:144)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x191CB98: dummy_dragonAI::UpdateAI(unsigned int) (boss_sartharion.cpp:961)
==3064== by 0x191D242: npc_shadron::npc_shadronAI::UpdateAI(unsigned int) (boss_sartharion.cpp:1122)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x19AE913: boss_ymiron::boss_ymironAI::UpdateAI(unsigned int) (boss_ymiron.cpp:215)
==3064== Use of uninitialised value of size 8
...
==3064== by 0x18A9F4A: boss_illidan_stormrage::boss_illidan_stormrageAI::Reset() (boss_illidan.cpp:1805)
==3064== Conditional jump or move depends on uninitialised value(s)
...
==3064== by 0x18A9F4A: boss_illidan_stormrage::boss_illidan_stormrageAI::Reset() (boss_illidan.cpp:1805)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x191CB98: dummy_dragonAI::UpdateAI(unsigned int) (boss_sartharion.cpp:961)
==3064== by 0x191CE88: npc_tenebron::npc_tenebronAI::UpdateAI(unsigned int) (boss_sartharion.cpp:1027)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x191CB98: dummy_dragonAI::UpdateAI(unsigned int) (boss_sartharion.cpp:961)
==3064== by 0x191D5B8: npc_vesperon::npc_vesperonAI::UpdateAI(unsigned int) (boss_sartharion.cpp:1220)
==3064== Conditional jump or move depends on uninitialised value(s)
...
==3064== by 0x1868F59: boss_lady_vashj::boss_lady_vashjAI::Reset() (boss_lady_vashj.cpp:206)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x191C14C: dummy_dragonAI::MovementInform(unsigned int, unsigned int) (boss_sartharion.cpp:802)
==3064== Conditional jump or move depends on uninitialised value(s)
==3064== at 0x1046986: Position::NormalizeOrientation(float) (Object.h:388)
...
==3064== by 0x17D9463: boss_malchezaar::boss_malchezaarAI::SummonInfernal(unsigned int) (boss_prince_malchezaar.cpp:373)
2013-08-26 16:13:26 +01:00
Nay
a7527b3b48
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/tools/map_extractor/mpq_libmpq04.h
2013-08-25 14:12:32 +01:00
Nay
12973de799
Core&Tools: Fix multiple issues found by a static code coverage tool
2013-08-24 22:57:22 +01:00
Nay
0d44191a83
Scripts/BH: Fix non pch build - trial 2
2013-08-23 19:39:11 +01:00
Nay
9490fa5f4c
Scripts/BH: Fix non pch build
2013-08-23 19:32:25 +01:00
Vincent-Michael
9461868710
Core: Fix non pch build
2013-08-23 20:09:39 +02:00
Vincent-Michael
34cd8e808e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
2013-08-20 17:48:18 +02:00
joschiwald
e0f010b310
Scripts: Random script fixes and code optimizations
2013-08-19 20:03:06 +02:00
Vincent-Michael
f16f427c48
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Spell.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/CMakeLists.txt
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
src/server/scripts/Spells/spell_hunter.cpp
2013-08-18 18:13:14 +02:00
joschiwald
2b19ba1879
Misc: replace Unit::GetPlayer with ObjectAccessor::GetPlayer and some cosmetic changes
2013-08-18 01:41:10 +02:00
w1sht0l1v3
0333d22fe9
Core/Scripts: Placeholder for instance Ragefire Chasm.
...
It is needed for Random Dungeon Finder credit.
2013-08-17 15:25:09 +03:00
w1sht0l1v3
7b9f34afc5
Core/Scripts: Placeholder for instance The Stockade.
...
It is needed for Random Dungeon Finder credit.
Correct entry for last encounter in the instance.
2013-08-17 14:59:49 +03:00
Vincent-Michael
fd10e25813
Misc: Random changes here and there
2013-08-15 07:47:31 +02:00
Vincent-Michael
d823057ab8
Scriped/BaradinHold: Small cleanup in 595fcdee70
2013-08-14 19:50:47 +02:00
Vincent-Michael
595fcdee70
Scripted/BaradinHold: Add missing door for Alizabal
2013-08-14 19:48:53 +02:00
Vincent-Michael
11ecb9c633
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/PetHandler.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/Spell.h
2013-08-14 16:52:13 +02:00
Vincent-Michael
c8b722e4a4
Scripted/BaradinHold: Implemented Occu'thar
2013-08-14 13:36:07 +02:00
Vincent-Michael
bb9614d00d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
2013-08-10 17:58:53 +02:00
Vincent-Michael
8acefbff8c
Scripted: Use now override for instance scripts
2013-08-10 17:42:12 +02:00
Vincent-Michael
16b8bce334
Scripted: Fix more fail in ba6e62fd6e -.-
2013-08-10 16:55:59 +02:00
Vincent-Michael
dfd0575111
Scripted: Fix typo in ba6e62fd6e (thx to Shauren)
2013-08-10 16:49:38 +02:00
Vincent-Michael
ba6e62fd6e
Scripted/BaradinHold: Implemented Pit Lord Argaloth
...
Note: Need some update with sniff
2013-08-10 16:35:06 +02:00
Vincent-Michael
2daa8ed56f
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/CMakeLists.txt
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Spells/spell_generic.cpp
2013-08-07 20:07:05 +02:00
Malcrom
f5e4fd67c3
Scripting: Moved Lord Valthalak from EAI to CPP. Moved all Blackrock Instances to Blackrock Mountain Dir.
2013-08-07 10:50:06 -02:30
Ukulutl
df9f34cde7
Scripts/Kezan: Fix quest "Good Help is Hard to Find"
...
Added Maelstorm to scriptloader
Close #10337
Signed-off-by: Nay <dnpd.dd@gmail.com >
2013-08-06 13:18:58 +01:00
Vincent-Michael
39cce3344c
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
2013-08-02 14:41:33 +02:00
Shauren
ac10589eda
Core/Misc: Fixed some issues found by Coverity Scan
2013-08-01 21:31:11 +02:00
Vincent-Michael
d5d3e785b7
DB/Player: Fix clear glyph for some class
2013-07-26 18:09:10 +02:00
Vincent-Michael
4d251bf707
Core/Misc: Fix db startup errors
2013-07-26 14:38:34 +02:00
Vincent-Michael
b684cd6079
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-07-21 23:49:38 +02:00
Shauren
3d6b88f5aa
Fixed compile warnings
2013-07-21 14:17:24 +02:00
Vincent-Michael
63675c3b0b
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
src/server/scripts/Spells/spell_generic.cpp
2013-07-17 20:24:29 +02:00
Malcrom
8462a09264
DB/Gossip: Added missing gossip for Royal Historian Archesonus. Removed cpp script.
2013-07-16 21:42:40 -02:30
Vincent-Michael
56bd42dcf1
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/World/World.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
2013-07-15 18:04:04 +02:00
Vincent-Michael
7104e3c70f
Core: Fix build
2013-07-15 17:44:32 +02:00
Vincent-Michael
de193fc80d
Scripted: Add some missing override
2013-07-15 15:14:01 +02:00
Vincent-Michael
08c1a81096
Scripted/Misc: Fix random stuff
2013-07-15 01:01:37 +02:00
Nay
b56b282eee
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/QuestHandler.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/boss_kruul.cpp
src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_desolace.cpp
src/server/scripts/Kalimdor/zone_durotar.cpp
src/server/scripts/Kalimdor/zone_felwood.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/scripts/Kalimdor/zone_tanaris.cpp
src/server/scripts/Kalimdor/zone_thousand_needles.cpp
src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
src/server/scripts/Northrend/zone_dalaran.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/Spells/spell_druid.cpp
src/server/scripts/Spells/spell_generic.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_paladin.cpp
src/server/scripts/Spells/spell_priest.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warlock.cpp
src/server/scripts/Spells/spell_warrior.cpp
src/server/scripts/World/item_scripts.cpp
2013-07-14 16:10:20 +01:00
Vincent-Michael
e464d2bd2c
Scripted: Some cleanups + ninja changes
2013-07-08 21:15:23 +02:00
Nay
3561ab98ba
Misc: Use override and final C++11 keywords in a few places (mostly scripts)
...
OVERRIDE and FINAL are TC macros (expand to nothing if compiler does not support C++11)
2013-07-06 20:21:45 +01:00