Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-17 13:03:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug with adding Vip from console or map, who is already on viplist.

Browse Source
This commit is contained in:
Kamil
2012-07-09 08:59:16 +02:00
committed by niczkx
parent c8d9833444
commit 8f492f7e06
14 changed files with 226 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/framework/core/binarytree.cpp
View File

@@ -60,7 +60,7 @@ void BinaryTree::seek(uint pos)
uint8 BinaryTree::getU8()
{
if(m_pos+1 > m_buffer.size())
if (m_pos+1 > m_buffer.size())
stdext::throw_exception("BinaryTree: getU8 failed");
uint8 v = m_buffer[m_pos];
m_pos += 1;
@@ -69,7 +69,7 @@ uint8 BinaryTree::getU8()
uint16 BinaryTree::getU16()
{
if(m_pos+2 > m_buffer.size())
if (m_pos+2 > m_buffer.size())
stdext::throw_exception("BinaryTree: getU16 failed");
uint16 v = stdext::readLE16(&m_buffer[m_pos]);
m_pos += 2;
@@ -78,7 +78,7 @@ uint16 BinaryTree::getU16()
uint32 BinaryTree::getU32()
{
if(m_pos+4 > m_buffer.size())
if (m_pos+4 > m_buffer.size())
stdext::throw_exception("BinaryTree: getU32 failed");
uint32 v = stdext::readLE32(&m_buffer[m_pos]);
m_pos += 4;
@@ -87,8 +87,8 @@ uint32 BinaryTree::getU32()
uint64 BinaryTree::getU64()
{
if(m_pos+8 > m_buffer.size())
stdext::throw_exception("BinaryTree: getu64 failed");
if (m_pos+8 > m_buffer.size())
stdext::throw_exception("BinaryTree: getU64 failed");
uint64 v = stdext::readLE64(&m_buffer[m_pos]);
m_pos += 8;
return v;
@@ -98,7 +98,10 @@ std::string BinaryTree::getString()
{
uint16 len = getU16();
if (len == 0 || len > 8192)
stdext::throw_exception("failed to get string from binary tree - invalid size read.");
stdext::throw_exception("BinaryTree: getString failed: invalid or too large string length");
if (m_pos+len > m_buffer.size())
stdext::throw_exception("BinaryTree: getString failed: string length exceeded buffer size.");
std::string ret((char *)&m_buffer[m_pos], len);
m_pos += len;

4
src/framework/pch.h
View File

@@ -63,4 +63,8 @@
// boost utilities
#include <boost/algorithm/string.hpp>
// tiny XML
#define TIXML_USE_STL
#include <framework/thirdparty/tinyxml.h>
#endif