Merge commit 'origin/master' into 310

This commit is contained in:
tomrus88 2009-04-25 17:24:05 +04:00
commit 55d6fbe3cb
46 changed files with 325 additions and 1369 deletions

View file

@ -187,7 +187,7 @@ class MANGOS_DLL_SPEC Object
return *(((uint8*)&m_uint32Values[ index ])+offset);
}
uint8 GetUInt16Value( uint16 index, uint8 offset) const
uint16 GetUInt16Value( uint16 index, uint8 offset) const
{
ASSERT( index < m_valuesCount || PrintIndexError( index , false) );
ASSERT( offset < 2 );