From 9d753c27c2c58499af86293065aabc09e138cdd2 Mon Sep 17 00:00:00 2001 From: Warkdev Date: Fri, 15 Jan 2021 14:21:27 +0000 Subject: [PATCH] [Extractors] Convert Extractors to use stormlib This is purely swapping over the libraries behind the extractors. - You should not need to extract the files again. --- CMakeLists.txt | 2 +- dep | 2 +- src/mangosd/CMakeLists.txt | 42 ++++++++++++++++++++---------------- src/shared/Auth/md5.c | 6 ++---- src/shared/Auth/md5.h | 2 +- src/tools/Extractor_projects | 2 +- win | 2 +- 7 files changed, 30 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6f90356..f70deb91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ set_property(GLOBAL option(BUILD_MANGOSD "Build the main server" ON) option(BUILD_REALMD "Build the login server" ON) option(BUILD_TOOLS "Build the map/vmap/mmap extractors" ON) -option(USE_STORMLIB "Use StormLib for reading MPQs" OFF) +option(USE_STORMLIB "Use StormLib for reading MPQs" ON) option(SCRIPT_LIB_ELUNA "Compile with support for Eluna scripts" ON) option(SCRIPT_LIB_SD3 "Compile with support for ScriptDev3 scripts" ON) option(PLAYERBOTS "Enable Player Bots" OFF) diff --git a/dep b/dep index c37808a1..fd0b1c0f 160000 --- a/dep +++ b/dep @@ -1 +1 @@ -Subproject commit c37808a175c578d0997a8e955f9c174a49172bb5 +Subproject commit fd0b1c0f176ea06d1215a8adf233cf7e605a01c9 diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt index ab3c6bc6..a2be88de 100644 --- a/src/mangosd/CMakeLists.txt +++ b/src/mangosd/CMakeLists.txt @@ -1,22 +1,26 @@ -# MaNGOS is a full featured server for World of Warcraft, supporting -# the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8 -# -# Copyright (C) 2005-2021 MaNGOS -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - +#/** +# * MaNGOS is a full featured server for World of Warcraft, supporting +# * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8 +# * +# * Copyright (C) 2005-2021 MaNGOS +# * +# * This program is free software; you can redistribute it and/or modify +# * it under the terms of the GNU General Public License as published by +# * the Free Software Foundation; either version 2 of the License, or +# * (at your option) any later version. +# * +# * This program is distributed in the hope that it will be useful, +# * but WITHOUT ANY WARRANTY; without even the implied warranty of +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# * GNU General Public License for more details. +# * +# * You should have received a copy of the GNU General Public License +# * along with this program; if not, write to the Free Software +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# * +# * World of Warcraft, and all World of Warcraft or Warcraft art, images, +# * and lore are copyrighted by Blizzard Entertainment, Inc. +# */ #Main Files set(SRC_GRP_MAIN diff --git a/src/shared/Auth/md5.c b/src/shared/Auth/md5.c index 3e9735e2..be38b8a3 100644 --- a/src/shared/Auth/md5.c +++ b/src/shared/Auth/md5.c @@ -311,8 +311,7 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/) pms->abcd[3] += d; } -void -md5_init(md5_state_t *pms) +void mangos_md5_init(md5_state_t *pms) { pms->count[0] = pms->count[1] = 0; pms->abcd[0] = 0x67452301; @@ -321,8 +320,7 @@ md5_init(md5_state_t *pms) pms->abcd[3] = 0x10325476; } -void -md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes) +void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes) { const md5_byte_t *p = data; int left = nbytes; diff --git a/src/shared/Auth/md5.h b/src/shared/Auth/md5.h index 90f2ebb0..68fe3837 100644 --- a/src/shared/Auth/md5.h +++ b/src/shared/Auth/md5.h @@ -77,7 +77,7 @@ extern "C" #endif /* Initialize the algorithm. */ - void md5_init(md5_state_t* pms); + void mangos_md5_init(md5_state_t* pms); /* Append a string to the message. */ void md5_append(md5_state_t* pms, const md5_byte_t* data, int nbytes); diff --git a/src/tools/Extractor_projects b/src/tools/Extractor_projects index da2208ce..93739191 160000 --- a/src/tools/Extractor_projects +++ b/src/tools/Extractor_projects @@ -1 +1 @@ -Subproject commit da2208cea8eb7d9eb52dd39d4e7c27b737e8db3b +Subproject commit 93739191bbec2cc3ee3722cd8c087c49c9d5e12c diff --git a/win b/win index 8b1eff37..a3b1b8a2 160000 --- a/win +++ b/win @@ -1 +1 @@ -Subproject commit 8b1eff37dab67e194a62f081be01ac5620867597 +Subproject commit a3b1b8a282680fe5e853f36b6bc659272009ac6d