mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 310

Browse source 
Conflicts:
	src/game/Unit.cpp
This commit is contained in:
tomrus88 2009-04-03 11:28:51 +04:00
commit 17d86309fa
22 changed files with 373 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/game/World.cpp
View file

@ -1267,6 +1267,7 @@ void World::SetInitialWorldSettings()
sLog.outString( "Loading Achievements..." );
sLog.outString();
achievementmgr.LoadAchievementReferenceList();
achievementmgr.LoadAchievementCriteriaList();
achievementmgr.LoadRewards();
achievementmgr.LoadRewardLocales();