Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4
Conflicts: README.md sql/base/auth_database.sql sql/updates/world/2014_12_27_01_world_335.sql src/server/game/Conditions/ConditionMgr.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Server/WorldSession.cpp src/server/scripts/Commands/cs_misc.cpp src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp src/server/scripts/Spells/spell_hunter.cpp
This commit is contained in:
commit
79eb80dcba
71 files changed
+1652
-1862
No files matched your search
@@ -81,6 +81,14 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
// Ensures there's "some" free space, make sure to call Normalize() before this
|
||||
void EnsureFreeSpace()
|
||||
{
|
||||
// Double the size of the buffer if it's already full
|
||||
if (GetRemainingSpace() == 0)
|
||||
_storage.resize(_storage.size() * 2);
|
||||
}
|
||||
|
||||
void Write(void const* data, std::size_t size)
|
||||
{
|
||||
if (size)
|
||||
|
||||
Reference in new issue
Block a user