Merge remote branch 'origin/master' into 330

This commit is contained in:
tomrus88 2009-11-30 01:29:59 +03:00
commit 90ee507cf7
83 changed files with 1629 additions and 737 deletions

View file

@ -1769,7 +1769,7 @@ struct MapDifficulty
MapDifficulty(uint32 _resetTime, uint32 _maxPlayers) : resetTime(_resetTime), maxPlayers(_maxPlayers) {}
uint32 resetTime;
uint32 maxPlayers;
uint32 maxPlayers; // some heroic dungeons have 0 when expect same value as in normal dificulty case
};
struct TalentSpellPos