From ce3d1a0ac4e8393ee703ed7ed1fdaaf21e9cf675 Mon Sep 17 00:00:00 2001 From: AconiteX <63141077+AconiteX@users.noreply.github.com> Date: Mon, 10 May 2021 09:28:55 -0400 Subject: [PATCH] Update ClientMain.cpp Fix for Debug Client Build --- .../SwgClient/src/win32/ClientMain.cpp | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/game/client/application/SwgClient/src/win32/ClientMain.cpp b/src/game/client/application/SwgClient/src/win32/ClientMain.cpp index aae825187..998321c25 100644 --- a/src/game/client/application/SwgClient/src/win32/ClientMain.cpp +++ b/src/game/client/application/SwgClient/src/win32/ClientMain.cpp @@ -48,6 +48,7 @@ #include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation//Os.h" #include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/Production.h" #include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/SetupSharedFoundation.h" +#include "../../../../../../engine/shared/library/sharedFoundation/include/public/sharedFoundation/ConfigSharedFoundation.h" #include "sharedGame/CommoditiesAdvancedSearchAttribute.h" #include "sharedGame/SetupSharedGame.h" #include "sharedImage/SetupSharedImage.h" @@ -79,10 +80,6 @@ #include "swgClientUserInterface/SwgCuiG15Lcd.h" #include "swgClientUserInterface/SwgCuiManager.h" #include "swgSharedNetworkMessages/SetupSwgSharedNetworkMessages.h" -#include "sharedFoundation/ConfigSharedFoundation.h" - - -#include "libMozilla/libMozilla.h" #include "Resource.h" @@ -308,19 +305,6 @@ int ClientMain( setupGraphicsData.alphaBufferBitDepth = 0; SetupClientGraphics::setupDefaultGameData(setupGraphicsData); - - - // Mozilla - // We want to use the Mozilla that's shipped with the game, not whatever's on the system - char szCWD[_MAX_PATH + 1]; - GetCurrentDirectory(_MAX_PATH, szCWD); - std::string sPath(szCWD); - sPath += "\\mozilla"; - if (!libMozilla::init(Os::getWindow(), sPath.c_str())) - { - DEBUG_FATAL(true, ("Mozilla init failed.\n")); - } - if (SetupClientGraphics::install(setupGraphicsData)) { VideoList::install(Audio::getMilesDigitalDriver()); @@ -396,8 +380,6 @@ int ClientMain( SetupSharedFoundation::remove(); SetupSharedThread::remove(); - libMozilla::release(); - if (semaphore) CloseHandle(semaphore); return 0;