diff --git a/src/game/AchievementMgr.h b/src/game/AchievementMgr.h index 1703ef595..148a1b11d 100644 --- a/src/game/AchievementMgr.h +++ b/src/game/AchievementMgr.h @@ -51,8 +51,8 @@ enum AchievementCriteriaDataType ACHIEVEMENT_CRITERIA_DATA_TYPE_S_AREA = 6, // area id 0 ACHIEVEMENT_CRITERIA_DATA_TYPE_T_AURA = 7, // spell_id effect_idx ACHIEVEMENT_CRITERIA_DATA_TYPE_VALUE = 8, // minvalue value provided with achievement update must be not less that limit - ACHIEVEMENT_CRITERIA_DATA_TYPE_T_LEVEL = 9, // minlevel minlevel of target - ACHIEVEMENT_CRITERIA_DATA_TYPE_T_GENDER = 10,// gender 0=male; 1=female + ACHIEVEMENT_CRITERIA_DATA_TYPE_T_LEVEL = 9, // minlevel minlevel of target + ACHIEVEMENT_CRITERIA_DATA_TYPE_T_GENDER = 10,// gender 0=male; 1=female ACHIEVEMENT_CRITERIA_DATA_TYPE_DISABLED = 11,// used to prevent achievement creteria complete if not all requirement implemented and listed in table ACHIEVEMENT_CRITERIA_DATA_TYPE_MAP_DIFFICULTY = 12,// difficulty normal/heroic difficulty for current event map ACHIEVEMENT_CRITERIA_DATA_TYPE_MAP_PLAYER_COUNT = 13,// count "with less than %u people in the zone" diff --git a/src/mangosd/Master.cpp b/src/mangosd/Master.cpp index b6c2c2eca..14b13d87b 100644 --- a/src/mangosd/Master.cpp +++ b/src/mangosd/Master.cpp @@ -180,7 +180,7 @@ public: { while (!World::IsStopped()) { - ACE_Based::Thread::Sleep(static_cast (socketSelecttime / 1000)); + ACE_Based::Thread::Sleep(static_cast (socketSelecttime / 1000)); checkping (); } } diff --git a/src/realmd/AuthSocket.cpp b/src/realmd/AuthSocket.cpp index fac6dd9ad..989c645da 100644 --- a/src/realmd/AuthSocket.cpp +++ b/src/realmd/AuthSocket.cpp @@ -944,7 +944,7 @@ bool AuthSocket::_HandleXferAccept() ibuf.Remove(1); // clear input buffer fseek(pPatch,0,0); - ACE_Based::Thread u(*new PatcherRunnable(this)); + ACE_Based::Thread u(*new PatcherRunnable(this)); return true; } diff --git a/src/shared/LockedQueue.h b/src/shared/LockedQueue.h index b085dd09b..5109b1716 100644 --- a/src/shared/LockedQueue.h +++ b/src/shared/LockedQueue.h @@ -58,7 +58,7 @@ namespace ACE_Based ACE_Guard g(_lock); ASSERT(!_canceled); - // throw Cancellation_Exception(); + // throw Cancellation_Exception(); _queue.push_back(item); @@ -73,7 +73,7 @@ namespace ACE_Based ACE_Guard g(_lock); ASSERT (!_queue.empty() || !_canceled); - // throw Cancellation_Exception(); + // throw Cancellation_Exception(); T item = _queue.front(); _queue.pop_front(); @@ -87,7 +87,7 @@ namespace ACE_Based ACE_Guard g(_lock); ASSERT (!_queue.empty()); - // throw NoSuchElement_Exception(); + // throw NoSuchElement_Exception(); return _queue.front(); } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ac98696f0..6cafd0927 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8066" + #define REVISION_NR "8067" #endif // __REVISION_NR_H__