Merge commit 'origin/master' into 320

Conflicts:
	src/game/WorldSession.cpp
This commit is contained in:
tomrus88 2009-08-30 15:52:20 +04:00
commit 9c8a0d615e
13 changed files with 162 additions and 22 deletions

View file

@ -31,6 +31,7 @@
#include "SystemConfig.h"
#include "revision.h"
#include "revision_nr.h"
#include "revision_sql.h"
#include "Util.h"
#include <openssl/opensslv.h>
#include <openssl/crypto.h>
@ -325,6 +326,9 @@ bool StartDB(std::string &dbstring)
return false;
}
if(!loginDatabase.CheckRequiredField("realmd_db_version",REVISION_DB_REALMD))
return false;
return true;
}