From 24200cd6923495710293d4d0077b833caa41d196 Mon Sep 17 00:00:00 2001 From: Micrah <44911744+milestorme@users.noreply.github.com> Date: Fri, 3 Jan 2020 21:35:11 +1100 Subject: [PATCH] fix: docker install --- README.md | 18 +++++++++++------- lfg-solo.patch | 1 + src/Lfg_Solo.cpp | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 49a7bfe..47ef8e6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# mod-solo-lfg +# Solo Dungeon Finder ## Description @@ -7,19 +7,23 @@ Allows for players to use dungeon finder solo or in groups less than and up to 5 ## Standard Installation ``` 1. Apply lfg-solo.patch to your core. -2. Simply place the module under the `modules` directory of your AzerothCore source. -3. Re-run cmake and launch a clean build of AzerothCore. +2. Simply place the module under the `modules` directory of your AzerothCore source. +3. Apply lfg-solo.patch to your core. + a. In order to do this, please go to the root /azerothcore-wotlk of your installation. + b. Then do git apply modules/mod-solo-lfg/lfg-solo.patch +4. Re-run cmake and launch a clean build of AzerothCore. ``` ## Docker Installation ``` -0. Go inside your /modules/ folder -1. git clone https://github.com/milestorme/mod-solo-lfg.git -2. Apply lfg-solo.patch to your core. +1. Go inside your /modules/ folder +2. git clone https://github.com/milestorme/mod-solo-lfg.git +3. Apply lfg-solo.patch to your core. a. In order to do this, please go to the root /azerothcore-wotlk of your installation. b. Then do git apply modules/mod-solo-lfg/lfg-solo.patch (make sure the path is indeed pointing to your lfg-solo.patch file) -3. Re-run cmake and launch a clean build of AzerothCore. +4. Go to src/Lfg_solo.cpp and replace line 24 with ``` void OnLogin(Player* __attribute__ ((unused))player)``` save file. +5. Re-run cmake and launch a clean build of AzerothCore. a. Go to your root folder and ./bin/acore-docker-build b. Then do a docker-compose up ``` diff --git a/lfg-solo.patch b/lfg-solo.patch index 8bbd107..e37fe64 100644 --- a/lfg-solo.patch +++ b/lfg-solo.patch @@ -82,3 +82,4 @@ index 30ae2a4ec4..288ccbe5af 100644 { strGuids.addRoles(proposalRoles); for (uint8 i=0; i<5 && check.guid[i]; ++i) + diff --git a/src/Lfg_Solo.cpp b/src/Lfg_Solo.cpp index 4cb08b3..7f93144 100644 --- a/src/Lfg_Solo.cpp +++ b/src/Lfg_Solo.cpp @@ -21,7 +21,7 @@ public: // Docker Installation prevents warnings. In order to avoid the issue, we need to add __attribute__ ((unused)) // to the player variable to tell the compiler it is fine not to use it. - void OnLogin(Player* __attribute__ ((unused))player) + void OnLogin(Player* player) { if (sConfigMgr->GetIntDefault("LFG.SoloMode", true)) {