mirror of
https://github.com/mangosfour/server.git
synced 2025-12-21 10:37:06 +00:00
[11049] Fix mangos and SD2 compilation after commits [11045] and [11047].
Signed-off-by: Ambal <pogrebniak@gala.net>
This commit is contained in:
parent
0941a3f851
commit
4ddedf0804
7 changed files with 15 additions and 5 deletions
|
|
@ -385,7 +385,7 @@ void Pet::SavePetToDB(PetSaveMode mode)
|
||||||
_SaveSpells();
|
_SaveSpells();
|
||||||
_SaveSpellCooldowns();
|
_SaveSpellCooldowns();
|
||||||
_SaveAuras();
|
_SaveAuras();
|
||||||
CharacterDatabase.CommitTransaction;
|
CharacterDatabase.CommitTransaction();
|
||||||
|
|
||||||
uint32 ownerLow = GetOwnerGuid().GetCounter();
|
uint32 ownerLow = GetOwnerGuid().GetCounter();
|
||||||
std::string name = m_name;
|
std::string name = m_name;
|
||||||
|
|
|
||||||
|
|
@ -186,7 +186,7 @@ class MANGOS_DLL_SPEC Database
|
||||||
//factory method to create SqlDelayThread objects
|
//factory method to create SqlDelayThread objects
|
||||||
virtual SqlDelayThread * CreateDelayThread();
|
virtual SqlDelayThread * CreateDelayThread();
|
||||||
|
|
||||||
class TransHelper
|
class MANGOS_DLL_SPEC TransHelper
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
TransHelper() : m_pTrans(NULL) {}
|
TransHelper() : m_pTrans(NULL) {}
|
||||||
|
|
|
||||||
|
|
@ -84,6 +84,11 @@ SqlConnection * DatabaseMysql::CreateConnection()
|
||||||
return new MySQLConnection();
|
return new MySQLConnection();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MySQLConnection::~MySQLConnection()
|
||||||
|
{
|
||||||
|
mysql_close(mMysql);
|
||||||
|
}
|
||||||
|
|
||||||
bool MySQLConnection::Initialize(const char *infoString)
|
bool MySQLConnection::Initialize(const char *infoString)
|
||||||
{
|
{
|
||||||
MYSQL * mysqlInit = mysql_init(NULL);
|
MYSQL * mysqlInit = mysql_init(NULL);
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ class MANGOS_DLL_SPEC MySQLConnection : public SqlConnection
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
MySQLConnection() : mMysql(NULL) {}
|
MySQLConnection() : mMysql(NULL) {}
|
||||||
~MySQLConnection() { mysql_close(mMysql); }
|
~MySQLConnection();
|
||||||
|
|
||||||
bool Initialize(const char *infoString);
|
bool Initialize(const char *infoString);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -67,6 +67,11 @@ SqlConnection * DatabasePostgre::CreateConnection()
|
||||||
return new PostgreSQLConnection();
|
return new PostgreSQLConnection();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PostgreSQLConnection::~PostgreSQLConnection()
|
||||||
|
{
|
||||||
|
PQfinish(mPGconn);
|
||||||
|
}
|
||||||
|
|
||||||
bool PostgreSQLConnection::Initialize(const char *infoString)
|
bool PostgreSQLConnection::Initialize(const char *infoString)
|
||||||
{
|
{
|
||||||
Tokens tokens = StrSplit(infoString, ";");
|
Tokens tokens = StrSplit(infoString, ";");
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ class MANGOS_DLL_SPEC PostgreSQLConnection : public SqlConnection
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
PostgreSQLConnection() : mPGconn(NULL) {}
|
PostgreSQLConnection() : mPGconn(NULL) {}
|
||||||
~PostgreSQLConnection() { PQfinish(mPGconn); }
|
~PostgreSQLConnection();
|
||||||
|
|
||||||
bool Initialize(const char *infoString);
|
bool Initialize(const char *infoString);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "11048"
|
#define REVISION_NR "11049"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue