mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-20 12:19:10 +00:00
Progress towards making plClient compile
This commit is contained in:
@ -0,0 +1,4 @@
|
||||
add_definitions(-D_LIB) # We shouldn't actually need this here, but
|
||||
# Cyan uses it, so meh
|
||||
|
||||
add_subdirectory(plClient)
|
||||
@ -0,0 +1,160 @@
|
||||
include_directories("../../Apps")
|
||||
include_directories("../../CoreLib")
|
||||
include_directories("../../FeatureLib/inc")
|
||||
include_directories("../../FeatureLib")
|
||||
include_directories("../../NucleusLib/inc")
|
||||
include_directories("../../NucleusLib")
|
||||
include_directories("../../PubUtilLib/inc")
|
||||
include_directories("../../PubUtilLib")
|
||||
|
||||
include_directories(${OPENAL_INCLUDE_DIR})
|
||||
include_directories(${OPENSSL_INCLUDE_DIR})
|
||||
include_directories(${PYTHON_INCLUDE_DIR})
|
||||
|
||||
set(plClient_HEADERS
|
||||
plClient.h
|
||||
plClientCreatable.h
|
||||
#plClientKey.h
|
||||
plClientUpdateFormat.h
|
||||
#plPluginClient.h
|
||||
)
|
||||
|
||||
set(plClient_SOURCES
|
||||
pfAllCreatables.cpp
|
||||
plAllCreatables.cpp
|
||||
plClient.cpp
|
||||
#plClientKey.cpp
|
||||
#plPluginClient.cpp
|
||||
pnAllCreatables.cpp
|
||||
winmain.cpp
|
||||
)
|
||||
|
||||
set(plClient_TEXT
|
||||
../../../../Docs/ReleaseNotes/ReleaseNotes.txt
|
||||
)
|
||||
|
||||
set(plClient_RESOURCES
|
||||
res/plClient.rc
|
||||
res/resource.h
|
||||
)
|
||||
|
||||
add_executable(plClient WIN32 ${plClient_SOURCES} ${plClient_HEADERS}
|
||||
${plClient_TEXT} ${plClient_RESOURCES})
|
||||
target_link_libraries(plClient CoreLib)
|
||||
target_link_libraries(plClient CoreLibExe)
|
||||
target_link_libraries(plClient pfAnimation)
|
||||
target_link_libraries(plClient pfAudio)
|
||||
target_link_libraries(plClient pfCamera)
|
||||
target_link_libraries(plClient pfCCR)
|
||||
target_link_libraries(plClient pfCharacter)
|
||||
target_link_libraries(plClient pfConditional)
|
||||
target_link_libraries(plClient pfConsole)
|
||||
target_link_libraries(plClient pfCsrSrv)
|
||||
target_link_libraries(plClient pfGameGUIMgr)
|
||||
target_link_libraries(plClient pfGameMgr)
|
||||
target_link_libraries(plClient pfGameScoreMgr)
|
||||
target_link_libraries(plClient pfJournalBook)
|
||||
target_link_libraries(plClient pfLocalizationMgr)
|
||||
target_link_libraries(plClient pfMessage)
|
||||
target_link_libraries(plClient pfPython)
|
||||
target_link_libraries(plClient pfSecurePreloader)
|
||||
target_link_libraries(plClient pfStackTrace)
|
||||
target_link_libraries(plClient pfSurface)
|
||||
target_link_libraries(plClient plAgeDescription)
|
||||
target_link_libraries(plClient plAgeLoader)
|
||||
target_link_libraries(plClient plAudible)
|
||||
target_link_libraries(plClient plAudio)
|
||||
target_link_libraries(plClient plAudioCore)
|
||||
target_link_libraries(plClient plAvatar)
|
||||
#target_link_libraries(plClient plClientKey)
|
||||
target_link_libraries(plClient plCompression)
|
||||
target_link_libraries(plClient plContainer)
|
||||
target_link_libraries(plClient plDrawable)
|
||||
target_link_libraries(plClient plEncryption)
|
||||
target_link_libraries(plClient plFile)
|
||||
target_link_libraries(plClient plGImage)
|
||||
target_link_libraries(plClient plGLight)
|
||||
target_link_libraries(plClient plInputCore)
|
||||
target_link_libraries(plClient plInterp)
|
||||
target_link_libraries(plClient plIntersect)
|
||||
target_link_libraries(plClient plJPEG)
|
||||
target_link_libraries(plClient plMath)
|
||||
target_link_libraries(plClient plMessage)
|
||||
target_link_libraries(plClient plModifier)
|
||||
target_link_libraries(plClient plNetClient)
|
||||
target_link_libraries(plClient plNetClientComm)
|
||||
target_link_libraries(plClient plNetClientRecorder)
|
||||
target_link_libraries(plClient plNetCommon)
|
||||
target_link_libraries(plClient plNetGameLib)
|
||||
target_link_libraries(plClient plNetMessage)
|
||||
target_link_libraries(plClient plNetTransport)
|
||||
target_link_libraries(plClient plParticleSystem)
|
||||
target_link_libraries(plClient plPhysical)
|
||||
target_link_libraries(plClient plPhysX)
|
||||
target_link_libraries(plClient plPipeline)
|
||||
target_link_libraries(plClient plProgressMgr)
|
||||
target_link_libraries(plClient plResMgr)
|
||||
target_link_libraries(plClient plScene)
|
||||
target_link_libraries(plClient plSDL)
|
||||
target_link_libraries(plClient plSockets)
|
||||
target_link_libraries(plClient plStatGather)
|
||||
target_link_libraries(plClient plStatusLog)
|
||||
target_link_libraries(plClient plStreamLogger)
|
||||
target_link_libraries(plClient plSurface)
|
||||
target_link_libraries(plClient plTransform)
|
||||
target_link_libraries(plClient plUnifiedTime)
|
||||
target_link_libraries(plClient plUUID)
|
||||
target_link_libraries(plClient plVault)
|
||||
target_link_libraries(plClient pnAddrInfo)
|
||||
target_link_libraries(plClient pnAsyncCore)
|
||||
target_link_libraries(plClient pnAsyncCoreExe)
|
||||
target_link_libraries(plClient pnCsrNet)
|
||||
target_link_libraries(plClient pnDispatch)
|
||||
target_link_libraries(plClient pnFactory)
|
||||
target_link_libraries(plClient pnGameMgr)
|
||||
target_link_libraries(plClient pnIni)
|
||||
target_link_libraries(plClient pnIniExe)
|
||||
target_link_libraries(plClient pnInputCore)
|
||||
target_link_libraries(plClient pnKeyedObject)
|
||||
target_link_libraries(plClient pnMessage)
|
||||
target_link_libraries(plClient pnModifier)
|
||||
target_link_libraries(plClient pnNetBase)
|
||||
target_link_libraries(plClient pnNetCli)
|
||||
target_link_libraries(plClient pnNetCommon)
|
||||
target_link_libraries(plClient pnNetProtocol)
|
||||
target_link_libraries(plClient pnNucleusInc)
|
||||
target_link_libraries(plClient pnProduct)
|
||||
target_link_libraries(plClient pnSceneObject)
|
||||
target_link_libraries(plClient pnSimpleNet)
|
||||
target_link_libraries(plClient pnTimer)
|
||||
target_link_libraries(plClient pnUtils)
|
||||
target_link_libraries(plClient pnUtilsExe)
|
||||
|
||||
target_link_libraries(plClient ${PYTHON_LIBRARY})
|
||||
target_link_libraries(plClient ${PYTHON_DEBUG_LIBRARY})
|
||||
target_link_libraries(plClient ${OPENAL_LIBRARY})
|
||||
target_link_libraries(plClient ${OPENSSL_LIBRARIES})
|
||||
target_link_libraries(plClient ${EXPAT_LIBRARY})
|
||||
target_link_libraries(plClient ${JPEG_LIBRARY})
|
||||
target_link_libraries(plClient ${Speex_LIBRARY})
|
||||
target_link_libraries(plClient ${PHYSX_LIBRARIES})
|
||||
target_link_libraries(plClient ${Ogg_LIBRARIES})
|
||||
target_link_libraries(plClient ${Vorbis_LIBRARIES})
|
||||
target_link_libraries(plClient ws2_32)
|
||||
target_link_libraries(plClient winhttp)
|
||||
target_link_libraries(plClient version)
|
||||
target_link_libraries(plClient rpcrt4)
|
||||
target_link_libraries(plClient vfw32)
|
||||
target_link_libraries(plClient d3d9)
|
||||
target_link_libraries(plClient d3dx9)
|
||||
target_link_libraries(plClient ddraw)
|
||||
target_link_libraries(plClient dinput8)
|
||||
target_link_libraries(plClient dsound)
|
||||
target_link_libraries(plClient dxerr9)
|
||||
target_link_libraries(plClient dxguid)
|
||||
target_link_libraries(plClient strmiids)
|
||||
|
||||
source_group("Source Files" FILES ${plClient_SOURCES})
|
||||
source_group("Header Files" FILES ${plClient_HEADERS})
|
||||
source_group("Text" FILES ${plClient_TEXT})
|
||||
source_group("Resource Files" FILES ${plClient_RESOURCES})
|
||||
@ -29,119 +29,119 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#include "hsWindowHndl.h"
|
||||
#include "plClient.h"
|
||||
#include "hsStream.h"
|
||||
#include "../plResMgr/plResManager.h"
|
||||
#include "../plResMgr/plKeyFinder.h"
|
||||
#include "../pnKeyedObject/plKey.h"
|
||||
#include "../pnKeyedObject/plFixedKey.h"
|
||||
#include "../pnMessage/plRefMsg.h"
|
||||
#include "../pnSceneObject/plSceneObject.h"
|
||||
#include "../pnSceneObject/plCoordinateInterface.h"
|
||||
#include "../plScene/plSceneNode.h"
|
||||
#include "../pnMessage/plTimeMsg.h"
|
||||
#include "../pnMessage/plClientMsg.h"
|
||||
#include "../pfCamera/plVirtualCamNeu.h"
|
||||
#include "plResMgr/plResManager.h"
|
||||
#include "plResMgr/plKeyFinder.h"
|
||||
#include "pnKeyedObject/plKey.h"
|
||||
#include "pnKeyedObject/plFixedKey.h"
|
||||
#include "pnMessage/plRefMsg.h"
|
||||
#include "pnSceneObject/plSceneObject.h"
|
||||
#include "pnSceneObject/plCoordinateInterface.h"
|
||||
#include "plScene/plSceneNode.h"
|
||||
#include "pnMessage/plTimeMsg.h"
|
||||
#include "pnMessage/plClientMsg.h"
|
||||
#include "pfCamera/plVirtualCamNeu.h"
|
||||
#include "hsTimer.h"
|
||||
#include "../plPipeline/hsG3DDeviceSelector.h"
|
||||
#include "../plFile/plEncryptedStream.h"
|
||||
#include "../plFile/plFileUtils.h"
|
||||
#include "../plInputCore/plInputManager.h"
|
||||
#include "../plInputCore/plInputInterfaceMgr.h"
|
||||
#include "../plInputCore/plInputDevice.h"
|
||||
#include "../plPhysX/plSimulationMgr.h"
|
||||
#include "../plNetClient/plNetClientMgr.h"
|
||||
#include "../plAvatar/plAvatarMgr.h"
|
||||
#include "../plScene/plRelevanceMgr.h"
|
||||
#include "../pnTimer/plTimerCallbackManager.h"
|
||||
#include "../pfAudio/plListener.h"
|
||||
#include "../pnMessage/plCmdIfaceModMsg.h"
|
||||
#include "../plMessage/plRoomLoadNotifyMsg.h"
|
||||
#include "../pnMessage/plPlayerPageMsg.h"
|
||||
#include "../pnMessage/plCameraMsg.h"
|
||||
#include "../plMessage/plTransitionMsg.h"
|
||||
#include "../plMessage/plLinkToAgeMsg.h"
|
||||
#include "../plMessage/plPreloaderMsg.h"
|
||||
#include "../plMessage/plNetCommMsgs.h"
|
||||
#include "../plMessage/plAgeLoadedMsg.h"
|
||||
#include "plPipeline/hsG3DDeviceSelector.h"
|
||||
#include "plFile/plEncryptedStream.h"
|
||||
#include "plFile/plFileUtils.h"
|
||||
#include "plInputCore/plInputManager.h"
|
||||
#include "plInputCore/plInputInterfaceMgr.h"
|
||||
#include "plInputCore/plInputDevice.h"
|
||||
#include "plPhysX/plSimulationMgr.h"
|
||||
#include "plNetClient/plNetClientMgr.h"
|
||||
#include "plAvatar/plAvatarMgr.h"
|
||||
#include "plScene/plRelevanceMgr.h"
|
||||
#include "pnTimer/plTimerCallbackManager.h"
|
||||
#include "pfAudio/plListener.h"
|
||||
#include "pnMessage/plCmdIfaceModMsg.h"
|
||||
#include "plMessage/plRoomLoadNotifyMsg.h"
|
||||
#include "pnMessage/plPlayerPageMsg.h"
|
||||
#include "pnMessage/plCameraMsg.h"
|
||||
#include "plMessage/plTransitionMsg.h"
|
||||
#include "plMessage/plLinkToAgeMsg.h"
|
||||
#include "plMessage/plPreloaderMsg.h"
|
||||
#include "plMessage/plNetCommMsgs.h"
|
||||
#include "plMessage/plAgeLoadedMsg.h"
|
||||
|
||||
#include "../pfConsole/pfConsoleEngine.h"
|
||||
#include "../pfConsole/pfConsole.h"
|
||||
#include "../pfConsole/pfConsoleDirSrc.h"
|
||||
#include "../plScene/plPageTreeMgr.h"
|
||||
#include "../plScene/plVisMgr.h"
|
||||
#include "../plFile/hsFiles.h"
|
||||
#include "pfConsole/pfConsoleEngine.h"
|
||||
#include "pfConsole/pfConsole.h"
|
||||
#include "pfConsole/pfConsoleDirSrc.h"
|
||||
#include "plScene/plPageTreeMgr.h"
|
||||
#include "plScene/plVisMgr.h"
|
||||
#include "plFile/hsFiles.h"
|
||||
|
||||
#include "../pfKI/pfKI.h"
|
||||
#include "pfKI/pfKI.h"
|
||||
|
||||
#include "../plAudio/plAudioSystem.h"
|
||||
#include "../plAudio/plAudioCaps.h"
|
||||
#include "plAudio/plAudioSystem.h"
|
||||
#include "plAudio/plAudioCaps.h"
|
||||
|
||||
#include "../plStatGather/plProfileManagerFull.h"
|
||||
#include "plStatGather/plProfileManagerFull.h"
|
||||
|
||||
#include "plPipeline.h"
|
||||
#include "../plPipeline/plPipelineCreate.h"
|
||||
#include "../plPipeline/plPipeDebugFlags.h"
|
||||
#include "../plPipeline/plTransitionMgr.h"
|
||||
#include "../plPipeline/plCaptureRender.h"
|
||||
#include "../plPipeline/plDynamicEnvMap.h"
|
||||
#include "../plNetClient/plLinkEffectsMgr.h"
|
||||
#include "../plAvatar/plAvatarClothing.h"
|
||||
#include "../plAvatar/plArmatureMod.h"
|
||||
#include "../pnMessage/plProxyDrawMsg.h"
|
||||
#include "plPipeline/plPipelineCreate.h"
|
||||
#include "plPipeline/plPipeDebugFlags.h"
|
||||
#include "plPipeline/plTransitionMgr.h"
|
||||
#include "plPipeline/plCaptureRender.h"
|
||||
#include "plPipeline/plDynamicEnvMap.h"
|
||||
#include "plNetClient/plLinkEffectsMgr.h"
|
||||
#include "plAvatar/plAvatarClothing.h"
|
||||
#include "plAvatar/plArmatureMod.h"
|
||||
#include "pnMessage/plProxyDrawMsg.h"
|
||||
|
||||
#include "../plScene/plRenderRequest.h"
|
||||
#include "../plDrawable/plAccessGeometry.h"
|
||||
#include "plScene/plRenderRequest.h"
|
||||
#include "plDrawable/plAccessGeometry.h"
|
||||
#include "plPipeResReq.h"
|
||||
#include "../plDrawable/plVisLOSMgr.h"
|
||||
#include "plDrawable/plVisLOSMgr.h"
|
||||
|
||||
#include "../plGImage/plBitmap.h"
|
||||
#include "plGImage/plBitmap.h"
|
||||
|
||||
#include "../plStatusLog/plStatusLog.h"
|
||||
#include "../plProgressMgr/plProgressMgr.h"
|
||||
#include "../plPipeline/plDTProgressMgr.h"
|
||||
#include "../plPipeline/plBinkPlayer.h"
|
||||
#include "../plMessage/plMovieMsg.h"
|
||||
#include "plStatusLog/plStatusLog.h"
|
||||
#include "plProgressMgr/plProgressMgr.h"
|
||||
#include "plPipeline/plDTProgressMgr.h"
|
||||
#include "plPipeline/plBinkPlayer.h"
|
||||
#include "plMessage/plMovieMsg.h"
|
||||
|
||||
#include "../plSDL/plSDL.h"
|
||||
#include "plSDL/plSDL.h"
|
||||
|
||||
#include "../pnDispatch/plDispatch.h"
|
||||
#include "../pnDispatch/plDispatchLogBase.h"
|
||||
#include "../pfGameGUIMgr/pfGameGUIMgr.h"
|
||||
#include "../pfPython/cyMisc.h"
|
||||
#include "../plMessage/plInputEventMsg.h"
|
||||
#include "../plMessage/plRenderRequestMsg.h"
|
||||
#include "../pnMessage/plEventCallbackMsg.h"
|
||||
#include "../plModifier/plSimpleModifier.h"
|
||||
#include "pnDispatch/plDispatch.h"
|
||||
#include "pnDispatch/plDispatchLogBase.h"
|
||||
#include "pfGameGUIMgr/pfGameGUIMgr.h"
|
||||
#include "pfPython/cyMisc.h"
|
||||
#include "plMessage/plInputEventMsg.h"
|
||||
#include "plMessage/plRenderRequestMsg.h"
|
||||
#include "pnMessage/plEventCallbackMsg.h"
|
||||
#include "plModifier/plSimpleModifier.h"
|
||||
#include "plAudible.h"
|
||||
#include "../plMessage/plAnimCmdMsg.h"
|
||||
#include "../pnMessage/plSoundMsg.h"
|
||||
#include "../pnMessage/plAudioSysMsg.h"
|
||||
#include "../plMessage/plRenderMsg.h"
|
||||
#include "../plAgeLoader/plResPatcher.h"
|
||||
#include "../pfPython/cyPythonInterface.h"
|
||||
#include "../plUnifiedTime/plClientUnifiedTime.h"
|
||||
#include "../pfAnimation/plAnimDebugList.h"
|
||||
#include "../pfGameGUIMgr/pfGUICtrlGenerator.h"
|
||||
#include "plMessage/plAnimCmdMsg.h"
|
||||
#include "pnMessage/plSoundMsg.h"
|
||||
#include "pnMessage/plAudioSysMsg.h"
|
||||
#include "plMessage/plRenderMsg.h"
|
||||
#include "plAgeLoader/plResPatcher.h"
|
||||
#include "pfPython/cyPythonInterface.h"
|
||||
#include "plUnifiedTime/plClientUnifiedTime.h"
|
||||
#include "pfAnimation/plAnimDebugList.h"
|
||||
#include "pfGameGUIMgr/pfGUICtrlGenerator.h"
|
||||
|
||||
#include "../plGImage/plWinFontCache.h"
|
||||
#include "../plGImage/plFontCache.h"
|
||||
#include "plGImage/plWinFontCache.h"
|
||||
#include "plGImage/plFontCache.h"
|
||||
|
||||
#include "../pfJournalBook/pfJournalBook.h"
|
||||
#include "pfJournalBook/pfJournalBook.h"
|
||||
|
||||
#include "../plAvatar/plAGAnimInstance.h"
|
||||
#include "../plAgeLoader/plAgeLoader.h"
|
||||
#include "../plClientKey/plClientKey.h"
|
||||
#include "plAvatar/plAGAnimInstance.h"
|
||||
#include "plAgeLoader/plAgeLoader.h"
|
||||
#include "plClientKey/plClientKey.h"
|
||||
|
||||
#include "../CoreLib/plQuality.h"
|
||||
#include "../plGLight/plShadowCaster.h"
|
||||
#include "plQuality.h"
|
||||
#include "plGLight/plShadowCaster.h"
|
||||
|
||||
#include "../plNetClient/plNetLinkingMgr.h"
|
||||
#include "../plNetCommon/plNetCommonConstants.h"
|
||||
#include "../plNetGameLib/plNetGameLib.h"
|
||||
#include "plNetClient/plNetLinkingMgr.h"
|
||||
#include "plNetCommon/plNetCommonConstants.h"
|
||||
#include "plNetGameLib/plNetGameLib.h"
|
||||
|
||||
#include "../pfSecurePreloader/pfSecurePreloader.h"
|
||||
#include "../pfLocalizationMgr/pfLocalizationMgr.h"
|
||||
#include "pfSecurePreloader/pfSecurePreloader.h"
|
||||
#include "pfLocalizationMgr/pfLocalizationMgr.h"
|
||||
|
||||
#include "../pfCsrSrv/pfCsrSrv.h"
|
||||
#include "pfCsrSrv/pfCsrSrv.h"
|
||||
|
||||
#include "plTweak.h"
|
||||
|
||||
@ -1619,7 +1619,7 @@ void plClient::ShutdownDLLs()
|
||||
|
||||
hsBool plClient::MainLoop()
|
||||
{
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
|
||||
if (PythonInterface::UsePythonDebugger())
|
||||
{
|
||||
PythonInterface::PythonDebugger()->Update();
|
||||
|
||||
@ -27,7 +27,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#ifndef plClientCreatable_inc
|
||||
#define plClientCreatable_inc
|
||||
|
||||
#include "../pnFactory/plCreator.h"
|
||||
#include "pnFactory/plCreator.h"
|
||||
|
||||
#include "plClient.h"
|
||||
|
||||
|
||||
@ -374,7 +374,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
#endif //_WIN32
|
||||
#endif
|
||||
|
||||
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "plClient.exe.manifest"
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#endif // not APSTUDIO_INVOKED
|
||||
|
||||
|
||||
@ -30,34 +30,36 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
|
||||
//#define DETACH_EXE // Microsoft trick to force loading of exe to memory
|
||||
#ifdef DETACH_EXE
|
||||
#include "dmdfm.h" // Windows Load EXE into memory suff
|
||||
#include <dmdfm.h> // Windows Load EXE into memory suff
|
||||
#endif
|
||||
|
||||
#include <winsock2.h>
|
||||
#include <windows.h>
|
||||
#include <WinHttp.h>
|
||||
|
||||
#include "HeadSpin.h"
|
||||
#include "hsStream.h"
|
||||
#include "hsUtils.h"
|
||||
#include "plClient.h"
|
||||
#include "../plNetClient/plNetClientMgr.h"
|
||||
#include "../plNetClient/plNetLinkingMgr.h"
|
||||
#include "../plInputCore/plInputManager.h"
|
||||
#include "../plUnifiedTime/plUnifiedTime.h"
|
||||
#include "plNetClient/plNetClientMgr.h"
|
||||
#include "plNetClient/plNetLinkingMgr.h"
|
||||
#include "plInputCore/plInputManager.h"
|
||||
#include "plUnifiedTime/plUnifiedTime.h"
|
||||
#include "plPipeline.h"
|
||||
#include "../plResMgr/plResManager.h"
|
||||
#include "../plResMgr/plLocalization.h"
|
||||
#include "../plFile/plEncryptedStream.h"
|
||||
#include "plResMgr/plResManager.h"
|
||||
#include "plResMgr/plLocalization.h"
|
||||
#include "plFile/plEncryptedStream.h"
|
||||
|
||||
#include "../plStatusLog/plStatusLog.h"
|
||||
#include "../pnProduct/pnProduct.h"
|
||||
#include "../plNetGameLib/plNetGameLib.h"
|
||||
#include "../plFile/plFileUtils.h"
|
||||
#include "plStatusLog/plStatusLog.h"
|
||||
#include "pnProduct/pnProduct.h"
|
||||
#include "plNetGameLib/plNetGameLib.h"
|
||||
#include "plFile/plFileUtils.h"
|
||||
|
||||
#include "../plPhysX/plSimulationMgr.h"
|
||||
#include "plPhysX/plSimulationMgr.h"
|
||||
|
||||
#include "res\resource.h"
|
||||
#include "res/resource.h"
|
||||
|
||||
#include <shellapi.h>
|
||||
#include "WinHttp.h"
|
||||
//#include <shellapi.h>
|
||||
//
|
||||
// Defines
|
||||
//
|
||||
@ -1274,7 +1276,7 @@ BOOL CALLBACK UruLoginDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
|
||||
{
|
||||
static ShaDigest namePassHash;
|
||||
static LoginDialogParam* loginParam;
|
||||
static showAuthFailed = false;
|
||||
static bool showAuthFailed = false;
|
||||
|
||||
switch( uMsg )
|
||||
{
|
||||
@ -1948,11 +1950,11 @@ bool IsExpired()
|
||||
void* desc = nil;
|
||||
if (VerQueryValue(data, "\\StringFileInfo\\040904B0\\FileDescription", &desc, &descLen))
|
||||
{
|
||||
char* buildDateStart = strstr((const char*)desc, " - Built ");
|
||||
const char* buildDateStart = strstr((const char*)desc, " - Built ");
|
||||
if (buildDateStart)
|
||||
{
|
||||
buildDateStart += strlen(" - Built ");
|
||||
char* buildDateEnd = strstr(buildDateStart, " at");
|
||||
const char* buildDateEnd = strstr(buildDateStart, " at");
|
||||
if (buildDateEnd)
|
||||
{
|
||||
int len = buildDateEnd-buildDateStart;
|
||||
|
||||
@ -478,7 +478,7 @@ static void ProcessManifestEntry (void * param, ENetError error) {
|
||||
s_workingDir,
|
||||
p->mr->manifest[p->index].clientName
|
||||
);
|
||||
dword start = TimeGetTime() / kTimeIntervalsPerMs;
|
||||
dword start = (dword)(TimeGetTime() / kTimeIntervalsPerMs);
|
||||
if(!MD5Check(path, p->mr->manifest[p->index].md5)) {
|
||||
p->mr->critsect.Enter();
|
||||
p->mr->indices.Add(p->index);
|
||||
|
||||
Reference in New Issue
Block a user