aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/mangos.sql6
-rw-r--r--sql/updates/7643_01_mangos_db_version.sql7
-rw-r--r--sql/updates/7643_02_mangos_mangos_string.sql5
-rw-r--r--src/game/Language.h3
-rw-r--r--src/game/Level0.cpp1
-rw-r--r--src/game/World.cpp12
-rw-r--r--src/game/World.h2
-rw-r--r--src/trinitycore/Master.cpp3
8 files changed, 32 insertions, 7 deletions
diff --git a/sql/mangos.sql b/sql/mangos.sql
index bf6fbcfcef7..4aa7b69c067 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -22,7 +22,8 @@
DROP TABLE IF EXISTS `db_version`;
CREATE TABLE `db_version` (
`version` varchar(120) default NULL,
- `required_7633_01_mangos_achievement_criteria_data` bit(1) default NULL
+ `creature_ai_version` varchar(120) default NULL,
+ `required_7643_02_mangos_mangos_string` bit(1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
--
@@ -32,7 +33,7 @@ CREATE TABLE `db_version` (
LOCK TABLES `db_version` WRITE;
/*!40000 ALTER TABLE `db_version` DISABLE KEYS */;
INSERT INTO `db_version` VALUES
-('Mangos default database.',NULL);
+('Mangos default database.','Creature EventAI not provided.',NULL);
/*!40000 ALTER TABLE `db_version` ENABLE KEYS */;
UNLOCK TABLES;
@@ -2462,6 +2463,7 @@ INSERT INTO `mangos_string` VALUES
(56,'Current Message of the day: \r\n%s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(57,'Using World DB: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(58,'Using script library: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(59,'Using creature EventAI: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(100,'Global notify: ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(101,'Map: %u (%s) Zone: %u (%s) Area: %u (%s) Phase: %u\nX: %f Y: %f Z: %f Orientation: %f\ngrid[%u,%u]cell[%u,%u] InstanceID: %u\n ZoneX: %f ZoneY: %f\nGroundZ: %f FloorZ: %f Have height data (Map: %u VMap: %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(102,'%s is already being teleported.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
diff --git a/sql/updates/7643_01_mangos_db_version.sql b/sql/updates/7643_01_mangos_db_version.sql
new file mode 100644
index 00000000000..efdd0e22e0d
--- /dev/null
+++ b/sql/updates/7643_01_mangos_db_version.sql
@@ -0,0 +1,7 @@
+ALTER TABLE db_version CHANGE COLUMN required_7633_01_mangos_achievement_criteria_data required_7643_01_mangos_db_version bit;
+
+ALTER TABLE db_version
+ ADD COLUMN creature_ai_version varchar(120) default NULL AFTER version;
+
+UPDATE db_version
+ SET creature_ai_version = 'Mangos default creature EventAI data.';
diff --git a/sql/updates/7643_02_mangos_mangos_string.sql b/sql/updates/7643_02_mangos_mangos_string.sql
new file mode 100644
index 00000000000..2ce9573b3f7
--- /dev/null
+++ b/sql/updates/7643_02_mangos_mangos_string.sql
@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_7643_01_mangos_db_version required_7643_02_mangos_mangos_string bit;
+
+DELETE FROM mangos_string WHERE entry IN(59);
+INSERT INTO mangos_string VALUES
+(59,'Using creature EventAI: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/src/game/Language.h b/src/game/Language.h
index 51df64227f8..8217193ea50 100644
--- a/src/game/Language.h
+++ b/src/game/Language.h
@@ -84,7 +84,8 @@ enum TrinityStrings
LANG_MOTD_CURRENT = 56,
LANG_USING_WORLD_DB = 57,
LANG_USING_SCRIPT_LIB = 58,
- // Room for more level 0 59-99 not used
+ LANG_USING_EVENT_AI = 59,
+ // Room for more level 0 60-99 not used
// level 1 chat
LANG_GLOBAL_NOTIFY = 100,
diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp
index 50aa1e46538..5f8a6cf86ef 100644
--- a/src/game/Level0.cpp
+++ b/src/game/Level0.cpp
@@ -102,6 +102,7 @@ bool ChatHandler::HandleServerInfoCommand(const char* /*args*/)
//SendSysMessage(full);
//PSendSysMessage(LANG_USING_SCRIPT_LIB,sWorld.GetScriptsVersion());
//PSendSysMessage(LANG_USING_WORLD_DB,sWorld.GetDBVersion());
+ //PSendSysMessage(LANG_USING_EVENT_AI,sWorld.GetCreatureEventAIVersion());
PSendSysMessage(LANG_CONNECTED_USERS, activeClientsNum, maxActiveClientsNum, queuedClientsNum, maxQueuedClientsNum);
PSendSysMessage(LANG_UPTIME, str.c_str());
PSendSysMessage("Update time diff: %u.", updateTime);
diff --git a/src/game/World.cpp b/src/game/World.cpp
index a8dbff76114..f496dd6ae36 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -3200,14 +3200,20 @@ void World::UpdateMaxSessionCounters()
void World::LoadDBVersion()
{
QueryResult* result = WorldDatabase.Query("SELECT db_version FROM version LIMIT 1");
+ //QueryResult* result = WorldDatabase.Query("SELECT version, creature_ai_version FROM db_version LIMIT 1");
if(result)
{
Field* fields = result->Fetch();
- m_DBVersion = fields[0].GetString();
+ m_DBVersion = fields[0].GetCppString();
+ //m_CreatureEventAIVersion = fields[1].GetCppString();
delete result;
}
- else
- m_DBVersion = "unknown world database";
+
+ if(m_DBVersion.empty())
+ m_DBVersion = "Unknown world database.";
+
+ if(m_CreatureEventAIVersion.empty())
+ m_CreatureEventAIVersion = "Unknown creature EventAI.";
}
diff --git a/src/game/World.h b/src/game/World.h
index 2f261467a6c..27075885368 100644
--- a/src/game/World.h
+++ b/src/game/World.h
@@ -560,6 +560,7 @@ class World
//used World DB version
void LoadDBVersion();
char const* GetDBVersion() { return m_DBVersion.c_str(); }
+ char const* GetCreatureEventAIVersion() { return m_CreatureEventAIVersion.c_str(); }
//used Script version
void SetScriptsVersion(char const* version) { m_ScriptsVersion = version ? version : "unknown scripting library"; }
@@ -640,6 +641,7 @@ class World
//used versions
std::string m_DBVersion;
+ std::string m_CreatureEventAIVersion;
std::string m_ScriptsVersion;
};
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp
index a92ac0584f5..62446c4106c 100644
--- a/src/trinitycore/Master.cpp
+++ b/src/trinitycore/Master.cpp
@@ -475,7 +475,8 @@ bool Master::_StartDB()
sWorld.LoadDBVersion();
- sLog.outString("Using %s", sWorld.GetDBVersion());
+ sLog.outString("Using World DB: %s", sWorld.GetDBVersion());
+ sLog.outString("Using creature EventAI: %s", sWorld.GetCreatureEventAIVersion());
return true;
}