Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity

Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4

Browse Source 
Conflicts:
	dep/cppformat/CMakeLists.txt
	dep/cppformat/ChangeLog.rst
	dep/cppformat/format.cc
	dep/cppformat/format.h
	dep/cppformat/posix.cc
	dep/cppformat/posix.h
	sql/updates/world/2015_03_16_02_world.sql
	sql/updates/world/2015_03_16_03_world.sql
	sql/updates/world/2015_03_16_04_world.sql
	sql/updates/world/2015_03_16_05_world.sql
	sql/updates/world/2015_03_16_06_world.sql
	sql/updates/world/2015_03_17_00_world.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/worldserver/CMakeLists.txt
This commit is contained in:
Carbenium committed 2015-07-21 23:46:56 +02:00
2 parents e44401c292 bba8555a29
commit b82a072b25
41 files changed
+813 -1193
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Scripting/ScriptMgr.cpp
+1 -2
View File
@@ -182,9 +182,8 @@ struct TSpellSummary
uint8 Effects; // set of enum SelectEffect
} *SpellSummary;
ScriptMgr::ScriptMgr() : _scriptCount(0)
ScriptMgr::ScriptMgr() : _scriptCount(0), _scheduledScripts(0)
{
_scheduledScripts = 0;
}
ScriptMgr::~ScriptMgr() { }