diff options
| -rw-r--r-- | sql/updates/2227_mangos_7544_01_world_uptime.sql | 3 | ||||
| -rw-r--r-- | sql/updates/2227_mangos_7546_02_realmd_uptime.sql (renamed from sql/updates/7546_02_realmd_uptime.sql) | 5 | ||||
| -rw-r--r-- | sql/updates/2254_world.sql | 13 | ||||
| -rw-r--r-- | sql/updates/7544_01_mangos_uptime.sql | 3 | ||||
| -rw-r--r-- | src/game/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/shared/Database/CMakeLists.txt | 8 |
6 files changed, 25 insertions, 12 deletions
diff --git a/sql/updates/2227_mangos_7544_01_world_uptime.sql b/sql/updates/2227_mangos_7544_01_world_uptime.sql new file mode 100644 index 00000000000..0889d78c1a0 --- /dev/null +++ b/sql/updates/2227_mangos_7544_01_world_uptime.sql @@ -0,0 +1,3 @@ +/*ALTER TABLE db_version CHANGE COLUMN required_7536_01_mangos_spell_chain required_7544_01_mangos_uptime bit;*/ + +DROP TABLE IF EXISTS `uptime`;
\ No newline at end of file diff --git a/sql/updates/7546_02_realmd_uptime.sql b/sql/updates/2227_mangos_7546_02_realmd_uptime.sql index a53b0f95ff5..6ba9b17deaf 100644 --- a/sql/updates/7546_02_realmd_uptime.sql +++ b/sql/updates/2227_mangos_7546_02_realmd_uptime.sql @@ -1,5 +1,4 @@ -ALTER TABLE realmd_db_version CHANGE COLUMN required_6976_01_realmd_realmd_db_version required_7546_02_realmd_uptime bit; - +/*ALTER TABLE realmd_db_version CHANGE COLUMN required_6976_01_realmd_realmd_db_version required_7546_02_realmd_uptime bit;*/ -- -- Table structure for table `uptime` @@ -13,4 +12,4 @@ CREATE TABLE `uptime` ( `uptime` bigint(20) unsigned NOT NULL default '0', `maxplayers` smallint(5) unsigned NOT NULL default '0', PRIMARY KEY (`realmid`,`starttime`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Uptime system'; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Uptime system';
\ No newline at end of file diff --git a/sql/updates/2254_world.sql b/sql/updates/2254_world.sql new file mode 100644 index 00000000000..0741985ebfe --- /dev/null +++ b/sql/updates/2254_world.sql @@ -0,0 +1,13 @@ +DELETE FROM `command` WHERE `name` IN ('server difftime', 'addmove', 'Mod32Value', 'allowmove', 'reload tickets', 'npc tempadd', 'gobject tempadd', 'gobject addtemp', 'npc addtemp');
+INSERT INTO `command` VALUES
+('gobject tempadd','2','Adds a temporary gameobject that is not saved to DB.'),
+('npc tempadd','2','Adds temporary NPC, not saved to database.');
+UPDATE `command` SET `name`="ahbotoption" WHERE `name`="ahbotoptions";
+DELETE FROM `command` WHERE `name` LIKE "path%";
+DELETE FROM `command` WHERE `name` LIKE "wp%";
+INSERT INTO `command` VALUES
+('wp load',2,'Syntax: .wp load $pathid\nLoad pathid number for selected creature. Creature must have no waypoint data.'),
+('wp event',2,'Syntax: .wp event $subcommand\nType .path event to see the list of possible subcommands or .help path event $subcommand to see info on subcommands.'),
+('wp unload',2,'Syntax: .wp unload\nUnload path for selected creature.'),
+('wp show',2,'Syntax: .wp show $option\nOptions:\non $pathid (or selected creature with loaded path) - Show path\noff - Hide path\ninfo $slected_waypoint - Show info for selected waypoint.'),
+('wp mod',2,'Syntax: .wp mod\nType .path mod to see the list of possible subcommands or .help path mod $subcommand to see info on subcommands.'),
\ No newline at end of file diff --git a/sql/updates/7544_01_mangos_uptime.sql b/sql/updates/7544_01_mangos_uptime.sql deleted file mode 100644 index 223f3f63069..00000000000 --- a/sql/updates/7544_01_mangos_uptime.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE db_version CHANGE COLUMN required_7536_01_mangos_spell_chain required_7544_01_mangos_uptime bit; - -DROP TABLE IF EXISTS `uptime`;
\ No newline at end of file diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index 57ffa238e6c..5e84c28ebb8 100644 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -77,6 +77,11 @@ SET(game_STAT_SRCS Creature.h CreatureGroups.cpp CreatureGroups.h + DBCEnums.h + DBCStores.cpp + DBCStores.h + DBCStructure.h + DBCfmt.h Debugcmds.cpp DestinationHolder.cpp DestinationHolder.h diff --git a/src/shared/Database/CMakeLists.txt b/src/shared/Database/CMakeLists.txt index 78cc48436e7..b2f97760a9d 100644 --- a/src/shared/Database/CMakeLists.txt +++ b/src/shared/Database/CMakeLists.txt @@ -1,8 +1,6 @@ SET(trinitydatabase_STAT_SRCS - DBCStores.cpp - DBCStores.h - DBCStructure.h - DBCfmt.cpp + DBCFileLoader.h + DBCStore.h Database.cpp Database.h DatabaseEnv.h @@ -30,8 +28,6 @@ SET(trinitydatabase_STAT_SRCS SqlDelayThread.h SqlOperations.cpp SqlOperations.h - dbcfile.cpp - dbcfile.h ) add_library(trinitydatabase STATIC ${trinitydatabase_STAT_SRCS}) |