Merging changes with the latest repository branch

data/sql/db-world/2024_04_07_01_guildhouse_spawns.sql

@@ -8,7 +8,11 @@ CREATE TABLE IF NOT EXISTS `guild_house_spawns` (
   `comment` varchar(500) DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `entry` (`entry`)
-) ENGINE=InnoDB AUTO_INCREMENT=51 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- !!! NOTE: set these before running the queries in order to avoid conflicts !!!
+SET @C_TEMPLATE = 500030;
+SET @GO_TEMPLATE = 500000;
 
 REPLACE INTO `guild_house_spawns` (`id`, `entry`, `posX`, `posY`, `posZ`, `orientation`, `comment`) VALUES
   (1, 26327, 16216.5, 16279.4, 20.9306, 0.552869, 'Paladin Trainer'),
@@ -20,7 +24,7 @@ REPLACE INTO `guild_house_spawns` (`id`, `entry`, `posX`, `posY`, `posZ`, `orien
   (7, 26330, 16235.5, 16280.8, 20.9257, 2.18652, 'Shaman Trainer'),
   (8, 26331, 16240.8, 16283.3, 20.9299, 1.86843, 'Warlock Trainer'),
   (9, 26332, 16246.6, 16284.5, 20.9301, 1.68975, 'Warrior Trainer'),
-  (10, 500032, 16218.9, 16284.5, 13.1761, 6.18533, 'Innkeeper'),
+  (10, @C_TEMPLATE + 2, 16218.9, 16284.5, 13.1761, 6.18533, 'Innkeeper'),
   (11, 30605, 16228.0, 16280.5, 13.1761, 2.98877, 'Banker'),
   (12, 29195, 16252.3, 16284.9, 20.9324, 1.79537, 'Death Knight Trainer'),
   (13, 2836, 16220.5, 16302.3, 13.176, 6.14647, 'Blacksmithing Trainer'),
@@ -45,16 +49,16 @@ REPLACE INTO `guild_house_spawns` (`id`, `entry`, `posX`, `posY`, `posZ`, `orien
   (32, 184137, 16220.3, 16272, 12.9736, 4.45592, 'Mailbox (Object)'),
   (33, 1685, 16253.8, 16294.3, 13.1758, 6.11938, 'Forge (Object)'),
   (34, 4087, 16254.4, 16298.7, 13.1758, 3.36027, 'Anvil (Object)'),
-  (35, 500000, 16232.9, 16264.1, 13.55570, 3.028813, 'Portal: Stormwind (Object)'),
-  (36, 500001, 16232.8, 16257.1, 13.93456, 3.028813, 'Portal: Darnassus (Object)'),
-  (37, 500002, 16231.3, 16254.2, 13.65647, 3.028813, 'Portal: Exodar (Object)'),
-  (38, 500003, 16233.4, 16260.6, 13.84770, 3.028813, 'Portal: Ironforge (Object)'),
-  (39, 500004, 16232.9, 16264.1, 13.55570, 3.028813, 'Portal: Orgrimmar (Object)'),
-  (40, 500005, 16231.3, 16254.2, 13.65647, 3.028813, 'Portal: Silvermoon (Object)'),
-  (41, 500006, 16233.4, 16260.6, 13.84770, 3.028813, 'Portal: Thunder Bluff (Object)'),
-  (42, 500007, 16232.8, 16257.1, 13.93456, 3.028813, 'Portal: Undercity (Object)'),
-  (43, 500008, 16211.1, 16266.9, 13.7458, 5.6724, 'Portal: Shattrath (Object)'),
-  (44, 500009, 16213.9, 16270.5, 13.1378, 5.4996, 'Portal: Dalaran (Object)'),
+  (35, @GO_TEMPLATE + 0, 16232.9, 16264.1, 13.55570, 3.028813, 'Portal: Stormwind (Object)'),
+  (36, @GO_TEMPLATE + 1, 16232.8, 16257.1, 13.93456, 3.028813, 'Portal: Darnassus (Object)'),
+  (37, @GO_TEMPLATE + 2, 16231.3, 16254.2, 13.65647, 3.028813, 'Portal: Exodar (Object)'),
+  (38, @GO_TEMPLATE + 3, 16233.4, 16260.6, 13.84770, 3.028813, 'Portal: Ironforge (Object)'),
+  (39, @GO_TEMPLATE + 4, 16232.9, 16264.1, 13.55570, 3.028813, 'Portal: Orgrimmar (Object)'),
+  (40, @GO_TEMPLATE + 5, 16231.3, 16254.2, 13.65647, 3.028813, 'Portal: Silvermoon (Object)'),
+  (41, @GO_TEMPLATE + 6, 16233.4, 16260.6, 13.84770, 3.028813, 'Portal: Thunder Bluff (Object)'),
+  (42, @GO_TEMPLATE + 7, 16232.8, 16257.1, 13.93456, 3.028813, 'Portal: Undercity (Object)'),
+  (43, @GO_TEMPLATE + 8, 16211.1, 16266.9, 13.7458, 5.6724, 'Portal: Shattrath (Object)'),
+  (44, @GO_TEMPLATE + 9, 16213.9, 16270.5, 13.1378, 5.4996, 'Portal: Dalaran (Object)'),
   (45, 187293, 16230.5, 16283.5, 13.9061, 3, 'Guild Vault (Object)'),
   (46, 28692, 16236.2, 16315.7, 20.8454, 4.64365, 'Trade Supplies'),
   (47, 28776, 16223.7, 16297.9, 20.8454, 6.17044, 'Tabard Vendor'),

src/guildhouse.h

@@ -1,9 +1,11 @@
 
 // Offsets from creatures_objects.sql
-constexpr uint32 GetCreatureEntry(uint32 offset) {
+constexpr uint32 GetCreatureEntry(uint32 offset)
+{
     return 500030 + offset;
 }
 
-constexpr uint32 GetGameObjectEntry(uint32 offset) {
+constexpr uint32 GetGameObjectEntry(uint32 offset)
+{
     return 500000 + offset;
 }