Skip to content

Commit

Permalink
Merge pull request #425 from TrinityCore/master
Browse files Browse the repository at this point in the history
Update 02.05.25
  • Loading branch information
KamiliaBlow authored Feb 4, 2025
2 parents 3af7ed1 + 24af663 commit 7318d50
Show file tree
Hide file tree
Showing 10 changed files with 1,046 additions and 12 deletions.
7 changes: 4 additions & 3 deletions cmake/compiler/msvc/settings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,15 @@ if(BUILD_SHARED_LIBS)
message(STATUS "MSVC: Enabled shared linking")
endif()

# Move some warnings that are enabled for other compilers from level 4 to level 3
# Move some warnings that are enabled for other compilers from level 4 to level 3 and enable some warnings which are off by default
target_compile_options(trinity-compile-option-interface
INTERFACE
/w34100 # C4100 'identifier' : unreferenced formal parameter
/w15038 # C5038: data member 'member1' will be initialized after data member 'member2'
/w34100 # C4100: 'identifier' : unreferenced formal parameter
/w34101 # C4101: 'identifier' : unreferenced local variable
/w34189 # C4189: 'identifier' : local variable is initialized but not referenced
/w34389 # C4389: 'equality-operator' : signed/unsigned mismatch
/w35054) # C5054: 'operator 'operator-name': deprecated between enumerations of different types'
/w35054) # C5054: 'operator 'operator-name': deprecated between enumerations of different types'

# Enable and treat as errors the following warnings to easily detect virtual function signature failures:
# 'function' : member function does not override any base class virtual member function
Expand Down
19 changes: 14 additions & 5 deletions sql/base/auth_database.sql
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,14 @@ INSERT INTO `build_auth_key` VALUES
(58867,'Mac','x64','WoWC',0xB7C65FC1DA519ED5304019262FEFEFA6),
(58867,'Win','A64','WoW',0xEF8C2258197FDBC6DA5C39699BDEB7A1),
(58867,'Win','x64','WoW',0x7C1627A7325C57FAD21A29D57BBF80A6),
(58867,'Win','x64','WoWC',0x3F8E07E581847B644D6F76489477540D);
(58867,'Win','x64','WoWC',0x3F8E07E581847B644D6F76489477540D),
(58911,'Mac','A64','WoW',0xDEE67D3A0C9D8EDD5A94C7BD8FA1E657),
(58911,'Mac','A64','WoWC',0x6D3C242B3C76686FEEE9B18444C113C7),
(58911,'Mac','x64','WoW',0x78D3576614AED3DE8FB8C90AFF838F3B),
(58911,'Mac','x64','WoWC',0xA4C80CDBC805A19FAB8EF1BAA483DB9A),
(58911,'Win','A64','WoW',0xF02130BA7BFF2C0292F25F3C6240B2E8),
(58911,'Win','x64','WoW',0x5EF341D9F5A27F796D5BD786A5BD5A16),
(58911,'Win','x64','WoWC',0xA9C0BEA1B7351665091E6754A0A90A16);
/*!40000 ALTER TABLE `build_auth_key` ENABLE KEYS */;
UNLOCK TABLES;

Expand Down Expand Up @@ -1299,7 +1306,8 @@ INSERT INTO `build_info` VALUES
(58630,11,0,7,NULL),
(58680,11,0,7,NULL),
(58773,11,0,7,NULL),
(58867,11,0,7,NULL);
(58867,11,0,7,NULL),
(58911,11,0,7,NULL);
/*!40000 ALTER TABLE `build_info` ENABLE KEYS */;
UNLOCK TABLES;

Expand Down Expand Up @@ -2911,7 +2919,7 @@ CREATE TABLE `realmlist` (
`timezone` tinyint unsigned NOT NULL DEFAULT '0',
`allowedSecurityLevel` tinyint unsigned NOT NULL DEFAULT '0',
`population` float NOT NULL DEFAULT '0',
`gamebuild` int unsigned NOT NULL DEFAULT '58867',
`gamebuild` int unsigned NOT NULL DEFAULT '58911',
`Region` tinyint unsigned NOT NULL DEFAULT '1',
`Battlegroup` tinyint unsigned NOT NULL DEFAULT '1',
PRIMARY KEY (`id`),
Expand All @@ -2926,7 +2934,7 @@ CREATE TABLE `realmlist` (
LOCK TABLES `realmlist` WRITE;
/*!40000 ALTER TABLE `realmlist` DISABLE KEYS */;
INSERT INTO `realmlist` VALUES
(1,'Trinity','127.0.0.1','127.0.0.1',NULL,NULL,'255.255.255.0',8085,0,0,1,0,0,58867,1,1);
(1,'Trinity','127.0.0.1','127.0.0.1',NULL,NULL,'255.255.255.0',8085,0,0,1,0,0,58911,1,1);
/*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
UNLOCK TABLES;

Expand Down Expand Up @@ -3407,7 +3415,8 @@ INSERT INTO `updates` VALUES
('2025_01_15_01_auth.sql','885A553B190CCD7A22791AF4EC3BC15C43DDC2D2','RELEASED','2025-01-15 10:27:39',0),
('2025_01_22_00_auth.sql','E08C40B02DB391DC1A478B6C714FDDDDB144F24F','RELEASED','2025-01-22 20:58:45',0),
('2025_01_29_00_auth.sql','7334CFE779D5F79AFAC8EA269950FC07E625810F','RELEASED','2025-01-29 12:57:32',0),
('2025_01_31_00_auth.sql','DF2640D25C15E41358C1ED46B4F86043583FC8FB','RELEASED','2025-01-31 11:51:23',0);
('2025_01_31_00_auth.sql','DF2640D25C15E41358C1ED46B4F86043583FC8FB','RELEASED','2025-01-31 11:51:23',0),
('2025_02_03_00_auth.sql','87033116EF72051499AF23FE14545D828F5A9B59','RELEASED','2025-02-03 22:51:31',0);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;

Expand Down
23 changes: 23 additions & 0 deletions sql/updates/auth/master/2025_02_03_00_auth.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
DELETE FROM `build_info` WHERE `build` IN (58911);
INSERT INTO `build_info` (`build`,`majorVersion`,`minorVersion`,`bugfixVersion`,`hotfixVersion`) VALUES
(58911,11,0,7,NULL);

DELETE FROM `build_auth_key` WHERE `build`=58911 AND `platform`='Mac' AND `arch`='A64' AND `type`='WoW';
DELETE FROM `build_auth_key` WHERE `build`=58911 AND `platform`='Mac' AND `arch`='A64' AND `type`='WoWC';
DELETE FROM `build_auth_key` WHERE `build`=58911 AND `platform`='Mac' AND `arch`='x64' AND `type`='WoW';
DELETE FROM `build_auth_key` WHERE `build`=58911 AND `platform`='Mac' AND `arch`='x64' AND `type`='WoWC';
DELETE FROM `build_auth_key` WHERE `build`=58911 AND `platform`='Win' AND `arch`='A64' AND `type`='WoW';
DELETE FROM `build_auth_key` WHERE `build`=58911 AND `platform`='Win' AND `arch`='x64' AND `type`='WoW';
DELETE FROM `build_auth_key` WHERE `build`=58911 AND `platform`='Win' AND `arch`='x64' AND `type`='WoWC';
INSERT INTO `build_auth_key` (`build`,`platform`,`arch`,`type`,`key`) VALUES
(58911,'Mac','A64','WoW',0xDEE67D3A0C9D8EDD5A94C7BD8FA1E657),
(58911,'Mac','A64','WoWC',0x6D3C242B3C76686FEEE9B18444C113C7),
(58911,'Mac','x64','WoW',0x78D3576614AED3DE8FB8C90AFF838F3B),
(58911,'Mac','x64','WoWC',0xA4C80CDBC805A19FAB8EF1BAA483DB9A),
(58911,'Win','A64','WoW',0xF02130BA7BFF2C0292F25F3C6240B2E8),
(58911,'Win','x64','WoW',0x5EF341D9F5A27F796D5BD786A5BD5A16),
(58911,'Win','x64','WoWC',0xA9C0BEA1B7351665091E6754A0A90A16);

UPDATE `realmlist` SET `gamebuild`=58911 WHERE `gamebuild`=58867;

ALTER TABLE `realmlist` CHANGE `gamebuild` `gamebuild` int unsigned NOT NULL DEFAULT '58911';
Loading

0 comments on commit 7318d50

Please sign in to comment.