From 3e48262ed61bcfee101893c48a91777283805ed8 Mon Sep 17 00:00:00 2001 From: sbx320 Date: Sun, 9 Jun 2019 02:38:18 +0200 Subject: [PATCH 1/2] Remove usages of ZERO_ON_NEW macro Fixes #944 --- Client/core/CAdditionalVertexStreamManager.h | 5 +- Client/core/CClientVariables.h | 6 +- Client/core/CCompressorJobQueue.cpp | 7 +- Client/core/CCompressorJobQueue.h | 19 +- Client/core/CCore.h | 105 ++++---- Client/core/CGraphStats.cpp | 5 +- Client/core/CJoystickManager.cpp | 63 +++-- Client/core/CLanguageSelector.h | 19 +- Client/core/CMemStats.cpp | 5 +- Client/core/CMemStats.h | 20 +- Client/core/CModelCacheManager.cpp | 12 +- Client/core/CModuleLoader.h | 4 +- Client/core/CNewsBrowser.h | 7 +- Client/core/CScreenGrabber.cpp | 9 +- Client/core/CVersionUpdater.Util.hpp | 26 +- Client/core/CVersionUpdater.cpp | 38 ++- Client/core/CVertexStreamBoundingBoxManager.h | 3 +- Client/core/DXHook/CProxyDirect3DDevice9.h | 18 +- Client/core/Graphics/CAspectRatioConverter.h | 20 +- Client/core/Graphics/CGraphics.h | 63 +++-- Client/core/Graphics/CLine3DBatcher.h | 5 +- Client/core/Graphics/CMaterialLine3DBatcher.h | 7 +- Client/core/Graphics/CPixelsManager.h | 5 +- Client/core/Graphics/CPrimitiveBatcher.h | 13 +- .../core/Graphics/CPrimitiveMaterialBatcher.h | 15 +- Client/core/Graphics/CRenderItemManager.h | 51 ++-- Client/core/Graphics/CTileBatcher.h | 27 +- Client/core/Graphics/CVideoModeManager.cpp | 43 ++- .../CServerBrowser.MasterServerManager.cpp | 3 +- .../CServerBrowser.RemoteMasterServer.cpp | 3 +- Client/core/ServerBrowser/CServerCache.cpp | 3 +- Client/game_sa/CGameSA.h | 134 +++++----- Client/game_sa/CRenderWareSA.h | 19 +- Client/mods/deathmatch/logic/CBassAudio.h | 64 +++-- Client/mods/deathmatch/logic/CClientGame.h | 252 +++++++++--------- Client/mods/deathmatch/logic/CClientManager.h | 79 +++--- .../logic/CClientModelCacheManager.cpp | 10 +- .../deathmatch/logic/CClientObjectManager.h | 21 +- .../logic/CClientPerfStat.PacketUsage.cpp | 12 +- .../deathmatch/logic/CClientPlayerVoice.h | 37 ++- .../deathmatch/logic/CClientSoundManager.h | 9 +- .../deathmatch/logic/CClientVehicleManager.h | 5 +- .../mods/deathmatch/logic/CElementDeleter.h | 2 +- Client/mods/deathmatch/logic/CEvents.h | 4 +- Client/mods/deathmatch/logic/CNetAPI.h | 29 +- .../deathmatch/logic/CRegisteredCommands.h | 2 +- .../logic/CResourceFileDownloadManager.h | 3 +- Client/mods/deathmatch/logic/CServer.h | 8 +- .../deathmatch/logic/CServerIdManager.cpp | 6 +- Client/mods/deathmatch/logic/lua/CLuaMain.h | 17 +- Client/multiplayer_sa/CMultiplayerSA.h | 41 ++- Client/sdk/core/CRenderItemManagerInterface.h | 54 ++-- Client/sdk/core/CScreenGrabberInterface.h | 2 - Client/sdk/game/CGame.h | 10 +- Client/sdk/multiplayer/CMultiplayer.h | 16 +- Server/dbconmy/CDatabaseConnectionMySql.cpp | 19 +- Server/mods/deathmatch/logic/ASE.h | 11 +- .../logic/CAccessControlListManager.h | 17 +- Server/mods/deathmatch/logic/CAccount.h | 13 +- .../mods/deathmatch/logic/CConnectHistory.h | 10 +- .../logic/CDatabaseConnectionSqlite.cpp | 17 +- .../deathmatch/logic/CDatabaseJobQueue.cpp | 15 +- .../logic/CDatabaseJobQueueManager.h | 3 +- .../deathmatch/logic/CDatabaseManager.cpp | 5 +- .../mods/deathmatch/logic/CDatabaseManager.h | 30 +-- .../deathmatch/logic/CDatabaseTypeMySql.cpp | 3 +- .../deathmatch/logic/CDatabaseTypeSqlite.cpp | 1 - .../mods/deathmatch/logic/CDynamicLibrary.h | 4 +- Server/mods/deathmatch/logic/CEvents.h | 4 +- Server/mods/deathmatch/logic/CGame.h | 205 +++++++------- Server/mods/deathmatch/logic/CMainConfig.h | 95 ++++--- .../logic/CPerfStat.BandwidthReduction.cpp | 4 +- .../logic/CPerfStat.BandwidthUsage.cpp | 10 +- .../deathmatch/logic/CPerfStat.DebugInfo.cpp | 4 +- .../deathmatch/logic/CPerfStat.DebugTable.cpp | 2 - .../logic/CPerfStat.EventPacketUsage.cpp | 6 +- .../logic/CPerfStat.FunctionTiming.cpp | 3 +- .../deathmatch/logic/CPerfStat.LibMemory.cpp | 1 - .../deathmatch/logic/CPerfStat.LuaMemory.cpp | 1 - .../deathmatch/logic/CPerfStat.LuaTiming.cpp | 5 +- .../logic/CPerfStat.PacketUsage.cpp | 12 +- .../logic/CPerfStat.PlayerPacketUsage.cpp | 5 +- .../logic/CPerfStat.RPCPacketUsage.cpp | 22 +- .../deathmatch/logic/CPerfStat.ServerInfo.cpp | 6 +- .../logic/CPerfStat.ServerTiming.cpp | 5 +- .../logic/CPerfStat.SqliteTiming.cpp | 7 +- .../mods/deathmatch/logic/CPerfStatModule.h | 24 +- Server/mods/deathmatch/logic/CPlayer.h | 150 +++++------ Server/mods/deathmatch/logic/CResource.h | 1 - .../mods/deathmatch/logic/CResourceManager.h | 13 +- Server/mods/deathmatch/logic/CVehicle.h | 129 +++++---- Server/mods/deathmatch/logic/lua/CLuaMain.h | 37 ++- Server/mods/deathmatch/logic/lua/LuaCommon.h | 6 +- Server/mods/deathmatch/logic/net/CNetBuffer.h | 25 +- .../deathmatch/logic/net/CNetBufferWatchDog.h | 21 +- .../logic/net/CSimBulletsyncPacket.h | 10 +- .../deathmatch/logic/net/CSimKeysyncPacket.h | 30 +-- .../deathmatch/logic/net/CSimPedTaskPacket.h | 6 +- Server/mods/deathmatch/logic/net/CSimPlayer.h | 41 ++- .../deathmatch/logic/net/CSimPlayerManager.h | 4 +- .../logic/net/CSimPlayerPuresyncPacket.h | 34 ++- .../logic/net/CSimVehiclePuresyncPacket.h | 55 ++-- .../deathmatch/utils/CFunctionUseLogger.h | 2 - Server/mods/deathmatch/utils/CHqComms.h | 8 +- .../deathmatch/utils/CMasterServerAnnouncer.h | 28 +- .../mods/deathmatch/utils/COpenPortsTester.h | 4 +- Server/sdk/net/ns_common.h | 44 +-- Server/sdk/net/ns_playerid.h | 5 +- .../mods/deathmatch/logic/CDebugHookManager.h | 3 +- .../deathmatch/logic/CLatentTransferManager.h | 23 +- Shared/sdk/Common.h | 2 +- Shared/sdk/SharedUtil.IntervalCounter.h | 13 +- Shared/sdk/SharedUtil.Misc.h | 22 +- Shared/sdk/SharedUtil.Profiling.h | 2 +- Shared/sdk/SharedUtil.Time.h | 12 +- Shared/sdk/net/SyncStructures.h | 4 +- 116 files changed, 1314 insertions(+), 1454 deletions(-) diff --git a/Client/core/CAdditionalVertexStreamManager.h b/Client/core/CAdditionalVertexStreamManager.h index dd0e3aae80d..4b53d037c74 100644 --- a/Client/core/CAdditionalVertexStreamManager.h +++ b/Client/core/CAdditionalVertexStreamManager.h @@ -72,7 +72,6 @@ struct SCurrentStateInfo class CAdditionalVertexStreamManager { public: - ZERO_ON_NEW CAdditionalVertexStreamManager(); virtual ~CAdditionalVertexStreamManager(); @@ -94,8 +93,8 @@ class CAdditionalVertexStreamManager SAdditionalStreamInfo* GetAdditionalStreamInfo(IDirect3DVertexBuffer9* pStreamData1); SAdditionalStreamInfo* CreateAdditionalStreamInfo(const SCurrentStateInfo& state); - IDirect3DDevice9* m_pDevice; - IDirect3DVertexDeclaration9* m_pOldVertexDeclaration; + IDirect3DDevice9* m_pDevice = nullptr; + IDirect3DVertexDeclaration9* m_pOldVertexDeclaration = nullptr; std::map m_AdditionalStreamInfoMap; static CAdditionalVertexStreamManager* ms_Singleton; }; diff --git a/Client/core/CClientVariables.h b/Client/core/CClientVariables.h index fe064ae8b64..fae1f0832db 100644 --- a/Client/core/CClientVariables.h +++ b/Client/core/CClientVariables.h @@ -121,7 +121,7 @@ class CClientVariables : public CCVarsInterface, public CSingleton m_IgnoreResultList; std::set m_FinishedList; // Result has been used, will be deleted next pulse @@ -56,8 +55,8 @@ class CCompressorJobQueueImpl : public CCompressorJobQueue // Shared variables struct { - bool m_bTerminateThread; - bool m_bThreadTerminated; + bool m_bTerminateThread = false; + bool m_bThreadTerminated = false; std::list m_CommandQueue; std::list m_ResultQueue; CComboMutex m_Mutex; diff --git a/Client/core/CCompressorJobQueue.h b/Client/core/CCompressorJobQueue.h index 503e368d47e..d4a4afeaf17 100644 --- a/Client/core/CCompressorJobQueue.h +++ b/Client/core/CCompressorJobQueue.h @@ -40,7 +40,6 @@ using EJobStage::EJobStageType; class CCompressJobData { public: - ZERO_ON_NEW bool SetCallback(PFN_SCREENSHOT_CALLBACK pfnScreenShotCallback, uint uiTimeSpentInQueue); bool HasCallback(); void ProcessCallback(); @@ -48,28 +47,28 @@ class CCompressJobData CCompressJobData() { DEBUG_CREATE_COUNT("CCompressJobData"); } ~CCompressJobData() { DEBUG_DESTROY_COUNT("CCompressJobData"); } - EJobStageType stage; + EJobStageType stage = EJobStageType::NONE; struct { - uint uiSizeX; - uint uiSizeY; - uint uiQuality; + uint uiSizeX = 0; + uint uiSizeY = 0; + uint uiQuality = 0; CBuffer buffer; } command; struct { - EJobResultType status; + EJobResultType status = EJobResultType::NONE; CBuffer buffer; } result; struct { - PFN_SCREENSHOT_CALLBACK pfnScreenShotCallback; - uint uiTimeSpentInQueue; - bool bSet; - bool bDone; + PFN_SCREENSHOT_CALLBACK pfnScreenShotCallback = nullptr; + uint uiTimeSpentInQueue = 0; + bool bSet = false; + bool bDone = false; } callback; }; diff --git a/Client/core/CCore.h b/Client/core/CCore.h index eafa1f331ad..f34794445d5 100644 --- a/Client/core/CCore.h +++ b/Client/core/CCore.h @@ -78,7 +78,6 @@ extern SString g_strJingleBells; class CCore : public CCoreInterface, public CSingleton { public: - ZERO_ON_NEW CCore(); ~CCore(); @@ -277,31 +276,31 @@ class CCore : public CCoreInterface, public CSingleton HANDLE SetThreadHardwareBreakPoint(HANDLE hThread, HWBRK_TYPE Type, HWBRK_SIZE Size, DWORD dwAddress); private: // Core devices. - CXML* m_pXML; - CLocalGUI* m_pLocalGUI; - CGraphics* m_pGraphics; - CCommands* m_pCommands; - CDirect3DData* m_pDirect3DData; - CConnectManager* m_pConnectManager; - CModelCacheManager* m_pModelCacheManager; + CXML* m_pXML = nullptr; + CLocalGUI* m_pLocalGUI = nullptr; + CGraphics* m_pGraphics = nullptr; + CCommands* m_pCommands = nullptr; + CDirect3DData* m_pDirect3DData = nullptr; + CConnectManager* m_pConnectManager = nullptr; + CModelCacheManager* m_pModelCacheManager = nullptr; // Instances (put new classes here!) - CXMLFile* m_pConfigFile; + CXMLFile* m_pConfigFile = nullptr; CClientVariables m_ClientVariables; CWebCoreInterface* m_pWebCore = nullptr; - CTrayIcon* m_pTrayIcon; + CTrayIcon* m_pTrayIcon = nullptr; // Hook interfaces. - CMessageLoopHook* m_pMessageLoopHook; - CDirectInputHookManager* m_pDirectInputHookManager; - CDirect3DHookManager* m_pDirect3DHookManager; + CMessageLoopHook* m_pMessageLoopHook = nullptr; + CDirectInputHookManager* m_pDirectInputHookManager = nullptr; + CDirect3DHookManager* m_pDirect3DHookManager = nullptr; // CFileSystemHook * m_pFileSystemHook; - CSetCursorPosHook* m_pSetCursorPosHook; + CSetCursorPosHook* m_pSetCursorPosHook = nullptr; - bool m_bLastFocused; - int m_iUnminimizeFrameCounter; - bool m_bDidRecreateRenderTargets; - bool m_bIsWindowMinimized; + bool m_bLastFocused = false; + int m_iUnminimizeFrameCounter = 0; + bool m_bDidRecreateRenderTargets = false; + bool m_bIsWindowMinimized = false; // Module loader objects. CModuleLoader m_GameModule; @@ -312,58 +311,58 @@ class CCore : public CCoreInterface, public CSingleton CModuleLoader m_WebCoreModule; // Mod manager - CModManager* m_pModManager; + CModManager* m_pModManager = nullptr; // Module interfaces. - CGame* m_pGame; - CNet* m_pNet; - CMultiplayer* m_pMultiplayer; - CGUI* m_pGUI; + CGame* m_pGame = nullptr; + CNet* m_pNet = nullptr; + CMultiplayer* m_pMultiplayer = nullptr; + CGUI* m_pGUI = nullptr; // Logger utility interface. - CConsoleLogger* m_pConsoleLogger; + CConsoleLogger* m_pConsoleLogger = nullptr; - CLocalization* m_pLocalization; + CLocalization* m_pLocalization = nullptr; - CKeyBinds* m_pKeyBinds; - CMouseControl* m_pMouseControl; + CKeyBinds* m_pKeyBinds = nullptr; + CMouseControl* m_pMouseControl = nullptr; - bool m_bFirstFrame; - bool m_bIsOfflineMod; - bool m_bCursorToggleControls; - pfnProcessMessage m_pfnMessageProcessor; + bool m_bFirstFrame = false; + bool m_bIsOfflineMod = false; + bool m_bCursorToggleControls = false; + pfnProcessMessage m_pfnMessageProcessor = nullptr; - CGUIMessageBox* m_pMessageBox; + CGUIMessageBox* m_pMessageBox = nullptr; // screen res DEVMODE m_Current; SString m_strModInstallRoot; - bool m_bQuitOnPulse; - bool m_bDestroyMessageBox; + bool m_bQuitOnPulse = false; + bool m_bDestroyMessageBox = false; - bool m_bDoneFrameRateLimit; - uint m_uiServerFrameRateLimit; - uint m_uiClientScriptFrameRateLimit; - uint m_uiFrameRateLimit; + bool m_bDoneFrameRateLimit = false; + uint m_uiServerFrameRateLimit = 0; + uint m_uiClientScriptFrameRateLimit = 0; + uint m_uiFrameRateLimit = 0; CElapsedTimeHD m_FrameRateTimer; - uint m_uiQueuedFrameRate; - bool m_bQueuedFrameRateValid; - bool m_bWaitToSetNick; - uint m_uiNewNickWaitFrames; - EDiagnosticDebugType m_DiagnosticDebug; - float m_fMinStreamingMemory; - float m_fMaxStreamingMemory; - bool m_bGettingIdleCallsFromMultiplayer; - bool m_bWindowsTimerEnabled; - bool m_bModulesLoaded; - int m_iDummyProgressValue; - HANDLE m_DummyProgressTimerHandle; + uint m_uiQueuedFrameRate = 0; + bool m_bQueuedFrameRateValid = false; + bool m_bWaitToSetNick = false; + uint m_uiNewNickWaitFrames = 0; + EDiagnosticDebugType m_DiagnosticDebug = EDiagnosticDebugType::NONE; + float m_fMinStreamingMemory = 0.0f; + float m_fMaxStreamingMemory = 0.0f; + bool m_bGettingIdleCallsFromMultiplayer = false; + bool m_bWindowsTimerEnabled = false; + bool m_bModulesLoaded = false; + int m_iDummyProgressValue = 0; + HANDLE m_DummyProgressTimerHandle = nullptr; SString m_strDummyProgressType; - bool m_bDummyProgressUpdateAlways; - bool m_bIsRenderingGrass; - bool m_bFakeLagCommandEnabled; + bool m_bDummyProgressUpdateAlways = false; + bool m_bIsRenderingGrass = false; + bool m_bFakeLagCommandEnabled = false; // Command line static void ParseCommandLine(std::map& options, const char*& szArgs, const char** pszNoValOptions = NULL); diff --git a/Client/core/CGraphStats.cpp b/Client/core/CGraphStats.cpp index 7a00c6b1e3d..492d21e8910 100644 --- a/Client/core/CGraphStats.cpp +++ b/Client/core/CGraphStats.cpp @@ -32,7 +32,6 @@ namespace class CGraphStats : public CGraphStatsInterface { public: - ZERO_ON_NEW CGraphStats(); ~CGraphStats(); @@ -43,9 +42,9 @@ class CGraphStats : public CGraphStatsInterface virtual void AddTimingPoint(const char* szName); protected: - bool m_bEnabled; + bool m_bEnabled = false; std::map m_LineList; - TIMEUS m_StartTime; + TIMEUS m_StartTime = 0; }; /////////////////////////////////////////////////////////////// diff --git a/Client/core/CJoystickManager.cpp b/Client/core/CJoystickManager.cpp index 0f95c2cbfc5..38928c9bb55 100644 --- a/Client/core/CJoystickManager.cpp +++ b/Client/core/CJoystickManager.cpp @@ -89,34 +89,34 @@ struct SMappingLine // struct SInputDeviceInfo { - IDirectInputDevice8A* pDevice; - bool bDoneEnumAxes; - int iAxisCount; - int iDeadZone; - int iSaturation; - GUID guidProduct; - string strGuid; - string strProductName; + IDirectInputDevice8A* pDevice = nullptr; + bool bDoneEnumAxes = false; + int iAxisCount = 0; + int iDeadZone = 0; + int iSaturation = 0; + GUID guidProduct = {}; + std::string strGuid; + std::string strProductName; struct { - bool bEnabled; - long lMax; - long lMin; - DWORD dwType; - float fAutoDeadZoneSample; + bool bEnabled = false; + long lMax = 0; + long lMin = 0; + DWORD dwType = 0; + float fAutoDeadZoneSample = 0.0f; } axis[7]; }; // Internal state struct SJoystickState { - float rgfAxis[7]; /* axis positions -1.f to 1.f */ - DWORD rgdwPOV[4]; /* POV directions */ - BYTE rgbButtons[32]; /* 32 buttons */ - BYTE rgbButtonsWas[32]; - BYTE povButtonsWas[4]; - BYTE axisButtonsWas[14]; // Axis as buttons + float rgfAxis[7] = {}; /* axis positions -1.f to 1.f */ + DWORD rgdwPOV[4] = {}; /* POV directions */ + BYTE rgbButtons[32] = {}; /* 32 buttons */ + BYTE rgbButtonsWas[32] = {}; + BYTE povButtonsWas[4] = {}; + BYTE axisButtonsWas[14] = {}; // Axis as buttons }; /////////////////////////////////////////////////////////////// @@ -127,7 +127,6 @@ struct SJoystickState class CJoystickManager : public CJoystickManagerInterface { public: - ZERO_ON_NEW CJoystickManager(); ~CJoystickManager(); @@ -174,25 +173,25 @@ class CJoystickManager : public CJoystickManagerInterface CXMLNode* GetConfigNode(bool bCreateIfRequired); bool LoadFromXML(); - bool m_bDoneInit; - int m_SettingsRevision; + bool m_bDoneInit = false; + int m_SettingsRevision = 0; SInputDeviceInfo m_DevInfo; SJoystickState m_JoystickState; - SMappingLine m_currentMapping[10]; - bool m_bUseXInput; - bool m_bXInputDeviceAttached; - uint m_uiXInputReattachDelay; + SMappingLine m_currentMapping[10] = {}; + bool m_bUseXInput = false; + bool m_bXInputDeviceAttached = false; + uint m_uiXInputReattachDelay = 0; CElapsedTime m_XInputReattachTimer; - bool m_bAutoDeadZoneEnabled; - int m_iAutoDeadZoneCounter; + bool m_bAutoDeadZoneEnabled = false; + int m_iAutoDeadZoneCounter = 0; // Used during axis binding - bool m_bCaptureAxis; - int m_iCaptureOutputIndex; + bool m_bCaptureAxis = false; + int m_iCaptureOutputIndex = 0; SJoystickState m_PreBindJoystickState; - DIJOYCONFIG* m_pPreferredJoyCfg; - bool m_bPreferredJoyCfgValid; + DIJOYCONFIG* m_pPreferredJoyCfg = nullptr; + bool m_bPreferredJoyCfgValid = false; }; /////////////////////////////////////////////////////////////// diff --git a/Client/core/CLanguageSelector.h b/Client/core/CLanguageSelector.h index 585c79d3ca6..9718f09d2cd 100644 --- a/Client/core/CLanguageSelector.h +++ b/Client/core/CLanguageSelector.h @@ -11,14 +11,14 @@ struct CLangListItem { CLangListItem() : fFocusEffectPos(0), fFocusEffectTarget(0), pContainerPane(nullptr), pFlag(nullptr), pLabel(nullptr) {} - float fFocusEffectPos; - float fFocusEffectTarget; + float fFocusEffectPos = 0.0f; + float fFocusEffectTarget = 0.0f; SString strLocale; - CGUIElement* pContainerPane; - CGUIStaticImage* pFlag; + CGUIElement* pContainerPane = nullptr; + CGUIStaticImage* pFlag = nullptr; CVector2D vecFlagInitialPos; CVector2D vecFlagInitialSize; - CGUILabel* pLabel; + CGUILabel* pLabel = nullptr; CVector2D vecLabelInitialPos; CVector2D vecLabelInitialSize; }; @@ -26,7 +26,6 @@ struct CLangListItem class CLanguageSelector { public: - ZERO_ON_NEW CLanguageSelector(CGUIElement* pMainMenuCanvas); ~CLanguageSelector(); void DoPulse(); @@ -45,11 +44,11 @@ class CLanguageSelector bool OnListItemClick(CGUIElement* pElement); bool OnListDeactivate(CGUIElement* pElement); - CGUIScrollPane* m_pButtonWindow; - CGUIWindow* m_pListWindow; + CGUIScrollPane* m_pButtonWindow = nullptr; + CGUIWindow* m_pListWindow = nullptr; CLangListItem m_ButtonItem; std::vector m_ListItems; CTickCount m_LastTickCount; - bool m_bMouseOverButton; - bool m_bListWasVisible; + bool m_bMouseOverButton = false; + bool m_bListWasVisible = false; }; diff --git a/Client/core/CMemStats.cpp b/Client/core/CMemStats.cpp index dc598010241..890b778cdd0 100644 --- a/Client/core/CMemStats.cpp +++ b/Client/core/CMemStats.cpp @@ -253,7 +253,6 @@ namespace class CMemStats : public CMemStatsInterface { public: - ZERO_ON_NEW CMemStats(); ~CMemStats(); @@ -269,13 +268,13 @@ class CMemStats : public CMemStatsInterface void CreateTables(); CElapsedTime m_UpdateTimer; - bool m_bEnabled; + bool m_bEnabled = false; SMemStatsInfo m_MemStatsNow; SMemStatsInfo m_MemStatsPrev; SMemStatsInfo m_MemStatsDelta; SMemStatsInfo m_MemStatsMax; std::list m_TableList; - float m_fPosY; + float m_fPosY = 0.0f; }; /////////////////////////////////////////////////////////////// diff --git a/Client/core/CMemStats.h b/Client/core/CMemStats.h index 78154c35b52..91a301ccf51 100644 --- a/Client/core/CMemStats.h +++ b/Client/core/CMemStats.h @@ -10,10 +10,10 @@ struct SModelCacheStats { - uint uiMaxNumPedModels; - uint uiMaxNumVehicleModels; - uint uiNumPedModels; - uint uiNumVehicleModels; + uint uiMaxNumPedModels = 0; + uint uiMaxNumVehicleModels = 0; + uint uiNumPedModels = 0; + uint uiNumVehicleModels = 0; }; // @@ -21,22 +21,20 @@ struct SModelCacheStats // struct SMemStatsInfo { - ZERO_ON_NEW - CProxyDirect3DDevice9::SMemoryState d3dMemory; CProxyDirect3DDevice9::SFrameStats frameStats; SDxStatus dxStatus; - int iProcessMemSizeKB; - int iProcessTotalVirtualKB; - int iStreamingMemoryUsed; - int iStreamingMemoryAvailable; + int iProcessMemSizeKB = 0; + int iProcessTotalVirtualKB = 0; + int iStreamingMemoryUsed = 0; + int iStreamingMemoryAvailable = 0; SRwResourceStats rwResourceStats; SClothesCacheStats clothesCacheStats; SShaderReplacementStats shaderReplacementStats; SModelCacheStats modelCacheStats; union { - uint uiArray[14]; + uint uiArray[14] = {}; struct { uint uiPlayerModels_0_312; diff --git a/Client/core/CModelCacheManager.cpp b/Client/core/CModelCacheManager.cpp index 494842555fb..91f99d8eba4 100644 --- a/Client/core/CModelCacheManager.cpp +++ b/Client/core/CModelCacheManager.cpp @@ -33,8 +33,6 @@ namespace class CModelCacheManagerImpl : public CModelCacheManager { public: - ZERO_ON_NEW - // CModelCacheManager interface virtual void DoPulse(); virtual void GetStats(SModelCacheStats& outStats); @@ -57,12 +55,12 @@ class CModelCacheManagerImpl : public CModelCacheManager void SubModelRefCount(ushort usModelId); protected: - CGame* m_pGame; - int m_iFrameCounter; + CGame* m_pGame = nullptr; + int m_iFrameCounter = 0; CTickCount m_TickCountNow; - bool m_bDonePreLoad; - uint m_uiMaxCachedPedModels; - uint m_uiMaxCachedVehicleModels; + bool m_bDonePreLoad = false; + uint m_uiMaxCachedPedModels = 0; + uint m_uiMaxCachedVehicleModels = 0; std::map m_PedModelCacheInfoMap; std::map m_VehicleModelCacheInfoMap; std::set m_PermoLoadedModels; diff --git a/Client/core/CModuleLoader.h b/Client/core/CModuleLoader.h index 800ceb2386c..d582ee1ef2d 100644 --- a/Client/core/CModuleLoader.h +++ b/Client/core/CModuleLoader.h @@ -30,7 +30,7 @@ class CModuleLoader PVOID GetFunctionPointer(const std::string& FunctionName); private: - HMODULE m_hLoadedModule; - bool m_bStatus; + HMODULE m_hLoadedModule = nullptr; + bool m_bStatus = false; SString m_strLastError; }; diff --git a/Client/core/CNewsBrowser.h b/Client/core/CNewsBrowser.h index f71cb9cd77f..2d726bb811d 100644 --- a/Client/core/CNewsBrowser.h +++ b/Client/core/CNewsBrowser.h @@ -23,7 +23,6 @@ struct SNewsItem class CNewsBrowser { public: - ZERO_ON_NEW CNewsBrowser(); ~CNewsBrowser(); @@ -41,9 +40,9 @@ class CNewsBrowser bool OnOKButtonClick(CGUIElement* pElement); std::vector m_NewsitemList; - CGUIWindow* m_pWindow; - CGUITabPanel* m_pTabPanel; - CGUIButton* m_pButtonOK; + CGUIWindow* m_pWindow = nullptr; + CGUITabPanel* m_pTabPanel = nullptr; + CGUIButton* m_pButtonOK = nullptr; std::vector m_TabList; std::vector m_TabContentList; }; diff --git a/Client/core/CScreenGrabber.cpp b/Client/core/CScreenGrabber.cpp index 7262836e262..9184fe7b889 100644 --- a/Client/core/CScreenGrabber.cpp +++ b/Client/core/CScreenGrabber.cpp @@ -28,7 +28,6 @@ struct SScreenShotQueueItem class CScreenGrabber : public CScreenGrabberInterface { public: - ZERO_ON_NEW CScreenGrabber(); ~CScreenGrabber(); @@ -46,10 +45,10 @@ class CScreenGrabber : public CScreenGrabberInterface void ProcessScreenShotQueue(); protected: - IDirect3DDevice9* m_pDevice; - CCompressorJobQueue* m_pCompressorJobQueue; - CCompressJobData* m_pCompressJobData; - CRenderTargetItem* m_pScreenShotTemp; + IDirect3DDevice9* m_pDevice = nullptr; + CCompressorJobQueue* m_pCompressorJobQueue = nullptr; + CCompressJobData* m_pCompressJobData = nullptr; + CRenderTargetItem* m_pScreenShotTemp = nullptr; std::list m_ScreenShotQueue; }; diff --git a/Client/core/CVersionUpdater.Util.hpp b/Client/core/CVersionUpdater.Util.hpp index 0ff0ca55292..34e6a81da64 100644 --- a/Client/core/CVersionUpdater.Util.hpp +++ b/Client/core/CVersionUpdater.Util.hpp @@ -162,7 +162,7 @@ namespace /////////////////////////////////////////////////////////////// class CValueInt : public CValue { - int m_iValue; + int m_iValue = 0; public: CValueInt(int iValue = 0) : m_iValue(iValue) {} @@ -789,23 +789,23 @@ namespace slim.iFilesize = 0; } // Input - int iMaxServersToTry; - int iTimeoutConnect; - int iTimeoutTransfer; - bool bShowDownloadPercent; + int iMaxServersToTry = 0; + int iTimeoutConnect = 0; + int iTimeoutTransfer = 0; + bool bShowDownloadPercent = false; std::vector serverList; std::vector postContent; - bool bPostContentBinary; + bool bPostContentBinary = false; SString strPostFilename; // Using - int iCurrent; - int iRetryCount; - int iIdleTime; - int iIdleTimeLeft; - unsigned int uiBytesDownloaded; - EDownloadStatus downloadStatus; - int iDownloadResultCode; + int iCurrent = 0; + int iRetryCount = 0; + int iIdleTime = 0; + int iIdleTimeLeft = 0; + unsigned int uiBytesDownloaded = 0; + EDownloadStatus downloadStatus = EDownloadStatus::None; + int iDownloadResultCode = 0; SString strResumableSaveLocation; // Result diff --git a/Client/core/CVersionUpdater.cpp b/Client/core/CVersionUpdater.cpp index 4fb799ca3a6..36f80a80d42 100644 --- a/Client/core/CVersionUpdater.cpp +++ b/Client/core/CVersionUpdater.cpp @@ -24,8 +24,6 @@ class CVersionUpdater : public CVersionUpdaterInterface { public: - ZERO_ON_NEW - // CVersionUpdaterInterface interface CVersionUpdater(); virtual ~CVersionUpdater(); @@ -139,7 +137,7 @@ class CVersionUpdater : public CVersionUpdaterInterface void UpdaterYield(); SJobInfo m_JobInfo; - long long m_llTimeStart; + long long m_llTimeStart = 0; CConditionMap m_ConditionMap; SString m_strServerSaysType; SString m_strServerSaysData; @@ -151,37 +149,37 @@ class CVersionUpdater : public CVersionUpdaterInterface SString m_strSidegradePassword; SString m_strSidegradePath; - bool m_bCheckedTimeForVersionCheck; - bool m_bCheckedTimeForNewsUpdate; - bool m_bCheckedTimeForMasterFetch; - bool m_bLoadedConfig; - bool m_bSentCrashDump; - bool m_bSentReportLog; + bool m_bCheckedTimeForVersionCheck = false; + bool m_bCheckedTimeForNewsUpdate = false; + bool m_bCheckedTimeForMasterFetch = false; + bool m_bLoadedConfig = false; + bool m_bSentCrashDump = false; + bool m_bSentReportLog = false; std::map m_DoneOptionalMap; - long long m_llTimeLastManualCheck; + long long m_llTimeLastManualCheck = 0; SString m_strLastManualCheckBuildType; - CReportWrap* m_pReportWrap; + CReportWrap* m_pReportWrap = nullptr; SString m_strLastQueryURL; - bool m_bEnabled; - uint m_uiFrameCounter; - int m_iForceMasterConfigRefreshCount; + bool m_bEnabled = false; + uint m_uiFrameCounter = 0; + int m_iForceMasterConfigRefreshCount = 0; SUpdaterMasterConfig m_MasterConfig; SUpdaterVarConfig m_VarConfig; - CThreadHandle* m_pProgramThreadHandle; + CThreadHandle* m_pProgramThreadHandle = nullptr; // Shared variables struct { - bool m_bTerminateThread; - bool m_bThreadTerminated; - EUpdaterProgramType m_CurrentProgram; + bool m_bTerminateThread = false; + bool m_bThreadTerminated = false; + EUpdaterProgramType m_CurrentProgram = EUpdaterProgramType::None; CComboMutex m_Mutex; - bool m_bQuitCurrentProgram; - bool m_bExitGame; + bool m_bQuitCurrentProgram = false; + bool m_bExitGame = false; } shared; }; diff --git a/Client/core/CVertexStreamBoundingBoxManager.h b/Client/core/CVertexStreamBoundingBoxManager.h index 145436d9521..9a5da16faab 100644 --- a/Client/core/CVertexStreamBoundingBoxManager.h +++ b/Client/core/CVertexStreamBoundingBoxManager.h @@ -122,7 +122,6 @@ struct SCurrentStateInfo2 class CVertexStreamBoundingBoxManager { public: - ZERO_ON_NEW CVertexStreamBoundingBoxManager(); virtual ~CVertexStreamBoundingBoxManager(); @@ -142,7 +141,7 @@ class CVertexStreamBoundingBoxManager SStreamBoundsInfo* GetStreamBoundsInfo(IDirect3DVertexBuffer9* pStreamData); SStreamBoundsInfo* CreateStreamBoundsInfo(const SCurrentStateInfo2& state); - IDirect3DDevice9* m_pDevice; + IDirect3DDevice9* m_pDevice = nullptr; std::map m_StreamBoundsInfoMap; static CVertexStreamBoundingBoxManager* ms_Singleton; }; diff --git a/Client/core/DXHook/CProxyDirect3DDevice9.h b/Client/core/DXHook/CProxyDirect3DDevice9.h index f337d409952..521e6a1b6f2 100644 --- a/Client/core/DXHook/CProxyDirect3DDevice9.h +++ b/Client/core/DXHook/CProxyDirect3DDevice9.h @@ -469,13 +469,13 @@ interface CProxyDirect3DDevice9 : public IDirect3DDevice9 struct SResourceMemory { - int iCurrentCount; - int iCurrentBytes; - int iCreatedCount; - int iCreatedBytes; - int iDestroyedCount; - int iDestroyedBytes; - int iLockedCount; + int iCurrentCount = 0; + int iCurrentBytes = 0; + int iCreatedCount = 0; + int iCreatedBytes = 0; + int iDestroyedCount = 0; + int iDestroyedBytes = 0; + int iLockedCount = 0; }; struct SMemoryState @@ -511,8 +511,8 @@ interface CProxyDirect3DDevice9 : public IDirect3DDevice9 struct SFrameStats { - int iNumShadersFullSetup; - int iNumShadersReuseSetup; + int iNumShadersFullSetup = 0; + int iNumShadersReuseSetup = 0; }; struct SD3DDeviceState diff --git a/Client/core/Graphics/CAspectRatioConverter.h b/Client/core/Graphics/CAspectRatioConverter.h index 97abf06f7f4..84a96e90138 100644 --- a/Client/core/Graphics/CAspectRatioConverter.h +++ b/Client/core/Graphics/CAspectRatioConverter.h @@ -14,8 +14,6 @@ class CAspectRatioConverter { public: - ZERO_ON_NEW - // Call once void Init(float ViewportHeight) { @@ -81,13 +79,13 @@ class CAspectRatioConverter } protected: - bool m_bValidRatios; - bool m_bSuspended; - float m_fSourceRatioValue; - float m_fTargetRatioValue; - float m_fToRelMul; - float m_fFromRelMul; - float m_fTargetBase; - float m_fSourceBase; - float m_fConvertScale; + bool m_bValidRatios = false; + bool m_bSuspended = false; + float m_fSourceRatioValue = 0.0f; + float m_fTargetRatioValue = 0.0f; + float m_fToRelMul = 0.0f; + float m_fFromRelMul = 0.0f; + float m_fTargetBase = 0.0f; + float m_fSourceBase = 0.0f; + float m_fConvertScale = 0.0f; }; diff --git a/Client/core/Graphics/CGraphics.h b/Client/core/Graphics/CGraphics.h index 8acb0387143..f1084850ed2 100644 --- a/Client/core/Graphics/CGraphics.h +++ b/Client/core/Graphics/CGraphics.h @@ -67,7 +67,6 @@ class CGraphics : public CGraphicsInterface, public CSingleton friend CPrimitiveMaterialBatcher; public: - ZERO_ON_NEW CGraphics(CLocalGUI* pGUI); ~CGraphics(); @@ -195,33 +194,33 @@ class CGraphics : public CGraphicsInterface, public CSingleton unsigned long ulFormat, ID3DXFont* pDXFont, bool bPostGUI, bool bSubPixelPositioning, float fRotation, float fRotationCenterX, float fRotationCenterY); - CLocalGUI* m_pGUI; + CLocalGUI* m_pGUI = nullptr; - int m_iDebugQueueRefs; - int m_iDrawBatchRefCount; - EBlendModeType m_ActiveBlendMode; - EDrawModeType m_CurDrawMode; - EBlendModeType m_CurBlendMode; + int m_iDebugQueueRefs = 0; + int m_iDrawBatchRefCount = 0; + EBlendModeType m_ActiveBlendMode = EBlendModeType::NONE; + EDrawModeType m_CurDrawMode = EDrawModeType::NONE; + EBlendModeType m_CurBlendMode = EBlendModeType::NONE; - LPD3DXSPRITE m_pDXSprite; + LPD3DXSPRITE m_pDXSprite = nullptr; - IDirect3DDevice9* m_pDevice; + IDirect3DDevice9* m_pDevice = nullptr; - CRenderItemManager* m_pRenderItemManager; - CScreenGrabberInterface* m_pScreenGrabber; - CPixelsManagerInterface* m_pPixelsManager; - CTileBatcher* m_pTileBatcher; - CLine3DBatcher* m_pLine3DBatcherPreGUI; - CLine3DBatcher* m_pLine3DBatcherPostGUI; - CMaterialLine3DBatcher* m_pMaterialLine3DBatcherPreGUI; - CMaterialLine3DBatcher* m_pMaterialLine3DBatcherPostGUI; - CPrimitiveBatcher* m_pPrimitiveBatcher; - CPrimitiveMaterialBatcher* m_pPrimitiveMaterialBatcher; - CAspectRatioConverter* m_pAspectRatioConverter; + CRenderItemManager* m_pRenderItemManager = nullptr; + CScreenGrabberInterface* m_pScreenGrabber = nullptr; + CPixelsManagerInterface* m_pPixelsManager = nullptr; + CTileBatcher* m_pTileBatcher = nullptr; + CLine3DBatcher* m_pLine3DBatcherPreGUI = nullptr; + CLine3DBatcher* m_pLine3DBatcherPostGUI = nullptr; + CMaterialLine3DBatcher* m_pMaterialLine3DBatcherPreGUI = nullptr; + CMaterialLine3DBatcher* m_pMaterialLine3DBatcherPostGUI = nullptr; + CPrimitiveBatcher* m_pPrimitiveBatcher = nullptr; + CPrimitiveMaterialBatcher* m_pPrimitiveMaterialBatcher = nullptr; + CAspectRatioConverter* m_pAspectRatioConverter = nullptr; // Fonts - ID3DXFont* m_pDXFonts[NUM_FONTS]; - ID3DXFont* m_pBigDXFonts[NUM_FONTS]; + ID3DXFont* m_pDXFonts[NUM_FONTS] = {}; + ID3DXFont* m_pBigDXFonts[NUM_FONTS] = {}; std::vector m_FontResourceNames; @@ -338,7 +337,7 @@ class CGraphics : public CGraphicsInterface, public CSingleton void RemoveQueueRef(IUnknown* pUnknown); // Drawing types - struct ID3DXLine* m_pLineInterface; + struct ID3DXLine* m_pLineInterface = nullptr; enum EMTARenderZone { @@ -347,20 +346,20 @@ class CGraphics : public CGraphicsInterface, public CSingleton MTA_RZONE_OUTSIDE, // MTA rendering outside known areas. i.e. During a keypress or GTA callback }; - EMTARenderZone m_MTARenderZone; - int m_iOutsideZoneCount; - IDirect3DStateBlock9* m_pSavedStateBlock; + EMTARenderZone m_MTARenderZone = EMTARenderZone::MTA_RZONE_NONE; + int m_iOutsideZoneCount = 0; + IDirect3DStateBlock9* m_pSavedStateBlock = nullptr; CElapsedTime m_LastRenderedSceneTimer; - IDirect3DSurface9* m_pSavedFrontBufferData; - CRenderTargetItem* m_pTempBackBufferData; - CTextureItem* m_ProgressSpinnerTexture; - CTextureItem* m_RectangleEdgeTexture; + IDirect3DSurface9* m_pSavedFrontBufferData = nullptr; + CRenderTargetItem* m_pTempBackBufferData = nullptr; + CTextureItem* m_ProgressSpinnerTexture = nullptr; + CTextureItem* m_RectangleEdgeTexture = nullptr; SString m_strProgressMessage; CElapsedTime m_FirstDrawnProgressTimer; CElapsedTime m_LastDrawnProgressTimer; CElapsedTime m_LastLostDeviceTimer; - bool m_bProgressVisible; + bool m_bProgressVisible = false; CElapsedTime m_ProgressAnimTimer; - uint m_uiProgressAnimFrame; + uint m_uiProgressAnimFrame = 0; std::map m_CustomScaleFontMap; }; diff --git a/Client/core/Graphics/CLine3DBatcher.h b/Client/core/Graphics/CLine3DBatcher.h index e951613881d..3339ae7bf5e 100644 --- a/Client/core/Graphics/CLine3DBatcher.h +++ b/Client/core/Graphics/CLine3DBatcher.h @@ -37,7 +37,6 @@ struct SLine3DItem class CLine3DBatcher { public: - ZERO_ON_NEW CLine3DBatcher(bool bZTest); ~CLine3DBatcher(); @@ -47,7 +46,7 @@ class CLine3DBatcher void AddLine3D(const CVector& vecFrom, const CVector& vecTo, float fWidth, ulong ulColor); protected: - bool m_bZTest; - IDirect3DDevice9* m_pDevice; + bool m_bZTest = false; + IDirect3DDevice9* m_pDevice = nullptr; std::vector m_LineList; }; diff --git a/Client/core/Graphics/CMaterialLine3DBatcher.h b/Client/core/Graphics/CMaterialLine3DBatcher.h index 41c3f3e463d..11a40e9a4ae 100644 --- a/Client/core/Graphics/CMaterialLine3DBatcher.h +++ b/Client/core/Graphics/CMaterialLine3DBatcher.h @@ -31,7 +31,6 @@ struct SMaterialLine3DItem class CMaterialLine3DBatcher { public: - ZERO_ON_NEW CMaterialLine3DBatcher(bool bPreGUI); ~CMaterialLine3DBatcher(); @@ -44,9 +43,9 @@ class CMaterialLine3DBatcher protected: void DrawBatch(const CVector& vecCameraPos, uint* pBatchIndices, uint uiNumBatchLines, CMaterialItem* pMaterial); - bool m_bPreGUI; - IDirect3DDevice9* m_pDevice; + bool m_bPreGUI = false; + IDirect3DDevice9* m_pDevice = nullptr; std::vector m_LineList; static SMaterialLine3DItem* ms_pLines; // Used in sort callback - ETextureAddress m_CurrentTextureAddress; + ETextureAddress m_CurrentTextureAddress = (ETextureAddress)0; }; diff --git a/Client/core/Graphics/CPixelsManager.h b/Client/core/Graphics/CPixelsManager.h index 393388ee4a9..16c1c900ba5 100644 --- a/Client/core/Graphics/CPixelsManager.h +++ b/Client/core/Graphics/CPixelsManager.h @@ -33,7 +33,6 @@ class CAutoReleaseMe class CPixelsManager : public CPixelsManagerInterface { public: - ZERO_ON_NEW CPixelsManager(); ~CPixelsManager(); @@ -70,6 +69,6 @@ class CPixelsManager : public CPixelsManagerInterface static HRESULT LockVolumeRect(IDirect3DVolume9* pD3DVolume, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags, uint uiSlice); protected: - IDirect3DDevice9* m_pDevice; - IDirect3DSurface9* m_pTempOffscreenSurface; + IDirect3DDevice9* m_pDevice = nullptr; + IDirect3DSurface9* m_pTempOffscreenSurface = nullptr; }; diff --git a/Client/core/Graphics/CPrimitiveBatcher.h b/Client/core/Graphics/CPrimitiveBatcher.h index 2f687d8916f..a9f36554af4 100644 --- a/Client/core/Graphics/CPrimitiveBatcher.h +++ b/Client/core/Graphics/CPrimitiveBatcher.h @@ -20,7 +20,6 @@ struct sPrimitive class CPrimitiveBatcher { public: - ZERO_ON_NEW CPrimitiveBatcher(); ~CPrimitiveBatcher(); void OnDeviceCreate(IDirect3DDevice9* pDevice, float fViewportSizeX, float fViewportSizeY); @@ -33,11 +32,11 @@ class CPrimitiveBatcher void AddPrimitive(D3DPRIMITIVETYPE eType, std::vector* pVecVertices); protected: - IDirect3DDevice9* m_pDevice; + IDirect3DDevice9* m_pDevice = nullptr; std::vector m_primitiveList; - float m_fViewportSizeX; - float m_fViewportSizeY; - D3DXMATRIX m_MatWorld; - D3DXMATRIX m_MatView; - D3DXMATRIX m_MatProjection; + float m_fViewportSizeX = 0.0f; + float m_fViewportSizeY = 0.0f; + D3DXMATRIX m_MatWorld = {}; + D3DXMATRIX m_MatView = {}; + D3DXMATRIX m_MatProjection = {}; }; diff --git a/Client/core/Graphics/CPrimitiveMaterialBatcher.h b/Client/core/Graphics/CPrimitiveMaterialBatcher.h index e9f56d8bcec..a6f5bc5d87a 100644 --- a/Client/core/Graphics/CPrimitiveMaterialBatcher.h +++ b/Client/core/Graphics/CPrimitiveMaterialBatcher.h @@ -22,7 +22,6 @@ class CPrimitiveMaterialBatcher friend CGraphics; public: - ZERO_ON_NEW CPrimitiveMaterialBatcher(CGraphics* graphics); ~CPrimitiveMaterialBatcher(); void OnDeviceCreate(IDirect3DDevice9* pDevice, float fViewportSizeX, float fViewportSizeY); @@ -35,12 +34,12 @@ class CPrimitiveMaterialBatcher void AddPrimitive(D3DPRIMITIVETYPE eType, CMaterialItem* pMaterial, std::vector* pVecVertices); protected: - IDirect3DDevice9* m_pDevice; - CGraphics* m_pGraphics; + IDirect3DDevice9* m_pDevice = nullptr; + CGraphics* m_pGraphics = nullptr; std::vector m_primitiveList; - float m_fViewportSizeX; - float m_fViewportSizeY; - D3DXMATRIX m_MatWorld; - D3DXMATRIX m_MatView; - D3DXMATRIX m_MatProjection; + float m_fViewportSizeX = 0.0f; + float m_fViewportSizeY = 0.0f; + D3DXMATRIX m_MatWorld = {}; + D3DXMATRIX m_MatView = {}; + D3DXMATRIX m_MatProjection = {}; }; diff --git a/Client/core/Graphics/CRenderItemManager.h b/Client/core/Graphics/CRenderItemManager.h index 6b37f737a90..d2c984fbae6 100644 --- a/Client/core/Graphics/CRenderItemManager.h +++ b/Client/core/Graphics/CRenderItemManager.h @@ -17,7 +17,6 @@ class CRenderItemManager : public CRenderItemManagerInterface { public: - ZERO_ON_NEW CRenderItemManager(); ~CRenderItemManager(); @@ -85,35 +84,35 @@ class CRenderItemManager : public CRenderItemManagerInterface protected: std::set m_CreatedItemList; - IDirect3DSurface9* m_pDefaultD3DRenderTarget; - IDirect3DSurface9* m_pDefaultD3DZStencilSurface; - uint m_uiDefaultViewportSizeX; - uint m_uiDefaultViewportSizeY; - CRenderTargetItem* m_pBackBufferCopy; - bool m_bBackBufferCopyMaybeNeedsResize; - uint m_uiBackBufferCopyRevision; + IDirect3DSurface9* m_pDefaultD3DRenderTarget = nullptr; + IDirect3DSurface9* m_pDefaultD3DZStencilSurface = nullptr; + uint m_uiDefaultViewportSizeX = 0; + uint m_uiDefaultViewportSizeY = 0; + CRenderTargetItem* m_pBackBufferCopy = nullptr; + bool m_bBackBufferCopyMaybeNeedsResize = false; + uint m_uiBackBufferCopyRevision = 0; CFastHashSet m_FrameTextureUsage; CFastHashSet m_PrevFrameTextureUsage; - class CRenderWare* m_pRenderWare; - CEffectCloner* m_pEffectCloner; - eDxTestMode m_TestMode; + class CRenderWare* m_pRenderWare = nullptr; + CEffectCloner* m_pEffectCloner = nullptr; + eDxTestMode m_TestMode = eDxTestMode::DX_TEST_MODE_NONE; SString m_strVideoCardName; - int m_iVideoCardMemoryKBTotal; - int m_iVideoCardMemoryKBForMTATotal; + int m_iVideoCardMemoryKBTotal = 0; + int m_iVideoCardMemoryKBForMTATotal = 0; SString m_strVideoCardPSVersion; - int m_iTextureMemoryKBUsed; - int m_iRenderTargetMemoryKBUsed; - int m_iFontMemoryKBUsed; - int m_iMemoryKBFreeForMTA; - bool m_bSetRenderTargetEnabledOldVer; - bool m_bUsingReadableDepthBuffer; - ERenderFormat m_depthBufferFormat; + int m_iTextureMemoryKBUsed = 0; + int m_iRenderTargetMemoryKBUsed = 0; + int m_iFontMemoryKBUsed = 0; + int m_iMemoryKBFreeForMTA = 0; + bool m_bSetRenderTargetEnabledOldVer = false; + bool m_bUsingReadableDepthBuffer = false; + ERenderFormat m_depthBufferFormat = ERenderFormat::RFORMAT_UNKNOWN; std::set m_ShadersUsingDepthBuffer; std::set m_ShadersUsingMultipleRenderTargets; - IDirect3DSurface9* m_pSavedSceneDepthSurface; - IDirect3DSurface9* m_pSavedSceneRenderTargetAA; - IDirect3DSurface9* m_pNonAADepthSurface2; - IDirect3DSurface9* m_pNonAARenderTarget; - IDirect3DTexture9* m_pNonAARenderTargetTexture; - bool m_bIsSwiftShader; + IDirect3DSurface9* m_pSavedSceneDepthSurface = nullptr; + IDirect3DSurface9* m_pSavedSceneRenderTargetAA = nullptr; + IDirect3DSurface9* m_pNonAADepthSurface2 = nullptr; + IDirect3DSurface9* m_pNonAARenderTarget = nullptr; + IDirect3DTexture9* m_pNonAARenderTargetTexture = nullptr; + bool m_bIsSwiftShader = false; }; diff --git a/Client/core/Graphics/CTileBatcher.h b/Client/core/Graphics/CTileBatcher.h index cc03c3a104b..62d49e33f9d 100644 --- a/Client/core/Graphics/CTileBatcher.h +++ b/Client/core/Graphics/CTileBatcher.h @@ -40,7 +40,6 @@ struct SPDTVertex class CTileBatcher { public: - ZERO_ON_NEW CTileBatcher(); ~CTileBatcher(); @@ -56,19 +55,19 @@ class CTileBatcher void MakeCustomMatrices(const SShaderTransform& t, float fX1, float fY1, float fX2, float fY2, D3DXMATRIX& matOutWorld, D3DXMATRIX& matOutProjection); protected: - IDirect3DDevice9* m_pDevice; - CMaterialItem* m_pCurrentMaterial; - float m_fCurrentRotation; - float m_fCurrentRotCenX; - float m_fCurrentRotCenY; + IDirect3DDevice9* m_pDevice = nullptr; + CMaterialItem* m_pCurrentMaterial = nullptr; + float m_fCurrentRotation = 0.0f; + float m_fCurrentRotCenX = 0.0f; + float m_fCurrentRotCenY = 0.0f; std::vector m_Indices; std::vector m_Vertices; - D3DXMATRIX m_MatView; - D3DXMATRIX m_MatProjection; - float m_fViewportSizeX; - float m_fViewportSizeY; - bool m_bUseCustomMatrices; - D3DXMATRIX m_MatCustomWorld; - D3DXMATRIX m_MatCustomProjection; - bool m_bZBufferDirty; + D3DXMATRIX m_MatView = {}; + D3DXMATRIX m_MatProjection = {}; + float m_fViewportSizeX = 0.0f; + float m_fViewportSizeY = 0.0f; + bool m_bUseCustomMatrices = false; + D3DXMATRIX m_MatCustomWorld = {}; + D3DXMATRIX m_MatCustomProjection = {}; + bool m_bZBufferDirty = false; }; diff --git a/Client/core/Graphics/CVideoModeManager.cpp b/Client/core/Graphics/CVideoModeManager.cpp index d63aa4059af..0eac3701cc0 100644 --- a/Client/core/Graphics/CVideoModeManager.cpp +++ b/Client/core/Graphics/CVideoModeManager.cpp @@ -20,7 +20,6 @@ class CVideoModeManager : public CVideoModeManagerInterface { public: - ZERO_ON_NEW CVideoModeManager(); ~CVideoModeManager(); @@ -54,27 +53,27 @@ class CVideoModeManager : public CVideoModeManagerInterface void UpdateMonitor(); - unsigned long m_ulForceBackBufferWidth; - unsigned long m_ulForceBackBufferHeight; - unsigned long m_ulForceBackBufferColorDepth; - unsigned long m_ulFullScreenRefreshRate; - HWND m_hDeviceWindow; - CGameSettings* m_pGameSettings; - unsigned long m_ulMonitorCount; - - int m_iCurrentVideoMode; // VideoMode this run - int m_iCurrentAdapter; - bool m_bCurrentWindowed; - bool m_bCurrentFullScreenMinimize; - int m_iCurrentFullscreenStyle; - int m_iNextVideoMode; // VideoMode next run - int m_iNextAdapter; - bool m_bNextWindowed; - int m_iNextFullscreenStyle; - HMONITOR m_hCurrentMonitor; - - bool m_bPendingGainFocus; - bool m_bOriginalDesktopResMatches; + unsigned long m_ulForceBackBufferWidth = 0; + unsigned long m_ulForceBackBufferHeight = 0; + unsigned long m_ulForceBackBufferColorDepth = 0; + unsigned long m_ulFullScreenRefreshRate = 0; + HWND m_hDeviceWindow = nullptr; + CGameSettings* m_pGameSettings = nullptr; + unsigned long m_ulMonitorCount = 0; + + int m_iCurrentVideoMode = 0; // VideoMode this run + int m_iCurrentAdapter = 0; + bool m_bCurrentWindowed = false; + bool m_bCurrentFullScreenMinimize = false; + int m_iCurrentFullscreenStyle = 0; + int m_iNextVideoMode = 0; // VideoMode next run + int m_iNextAdapter = 0; + bool m_bNextWindowed = false; + int m_iNextFullscreenStyle = 0; + HMONITOR m_hCurrentMonitor = nullptr; + + bool m_bPendingGainFocus = false; + bool m_bOriginalDesktopResMatches = false; }; /////////////////////////////////////////////////////////////// diff --git a/Client/core/ServerBrowser/CServerBrowser.MasterServerManager.cpp b/Client/core/ServerBrowser/CServerBrowser.MasterServerManager.cpp index a52723dd992..022758f2d09 100644 --- a/Client/core/ServerBrowser/CServerBrowser.MasterServerManager.cpp +++ b/Client/core/ServerBrowser/CServerBrowser.MasterServerManager.cpp @@ -16,7 +16,6 @@ class CMasterServerManager : public CMasterServerManagerInterface { public: - ZERO_ON_NEW CMasterServerManager(); ~CMasterServerManager(); @@ -29,7 +28,7 @@ class CMasterServerManager : public CMasterServerManagerInterface protected: CElapsedTime m_ElapsedTime; std::vector m_MasterServerList; - uint m_iActiveAmount; + uint m_iActiveAmount = 0; }; /////////////////////////////////////////////////////////////// diff --git a/Client/core/ServerBrowser/CServerBrowser.RemoteMasterServer.cpp b/Client/core/ServerBrowser/CServerBrowser.RemoteMasterServer.cpp index a09cccce354..e295f09b5bf 100644 --- a/Client/core/ServerBrowser/CServerBrowser.RemoteMasterServer.cpp +++ b/Client/core/ServerBrowser/CServerBrowser.RemoteMasterServer.cpp @@ -15,7 +15,6 @@ class CRemoteMasterServer : public CRemoteMasterServerInterface { public: - ZERO_ON_NEW CRemoteMasterServer(); ~CRemoteMasterServer(); @@ -38,7 +37,7 @@ class CRemoteMasterServer : public CRemoteMasterServerInterface static void StaticDownloadFinished(const SHttpDownloadResult& result); void DownloadFinished(const SHttpDownloadResult& result); - long long m_llLastRefreshTime; + long long m_llLastRefreshTime = 0; SString m_strStage; SString m_strURL; CBuffer m_Data; diff --git a/Client/core/ServerBrowser/CServerCache.cpp b/Client/core/ServerBrowser/CServerCache.cpp index d98bdcb0817..72eab3f05c1 100644 --- a/Client/core/ServerBrowser/CServerCache.cpp +++ b/Client/core/ServerBrowser/CServerCache.cpp @@ -54,7 +54,6 @@ namespace class CServerCache : public CServerCacheInterface { public: - ZERO_ON_NEW virtual void SaveServerCache(bool bWaitUntilFinished); virtual void GetServerCachedInfo(CServerListItem* pItem); virtual void SetServerCachedInfo(const CServerListItem* pItem); @@ -69,7 +68,7 @@ class CServerCache : public CServerCacheInterface static DWORD StaticThreadProc(LPVOID lpdwThreadParam); static void StaticSaveServerCache(); - bool m_bListChanged; + bool m_bListChanged = false; std::map m_ServerCachedMap; }; diff --git a/Client/game_sa/CGameSA.h b/Client/game_sa/CGameSA.h index 06e1ce65d86..a8a8a5f8ba0 100644 --- a/Client/game_sa/CGameSA.h +++ b/Client/game_sa/CGameSA.h @@ -101,12 +101,10 @@ class CGameSA : public CGame typedef std::unique_ptr AssocGroup_type; private: - CWeaponInfo* WeaponInfos[NUM_WeaponInfosTotal]; - CModelInfoSA ModelInfo[MODELINFO_MAX]; + CWeaponInfo* WeaponInfos[NUM_WeaponInfosTotal] = {nullptr}; + CModelInfoSA ModelInfo[MODELINFO_MAX] = {}; public: - ZERO_ON_NEW - CGameSA(); // constructor ~CGameSA(); @@ -424,77 +422,77 @@ class CGameSA : public CGame void SetPostWeaponFireHandler(PostWeaponFireHandler* pPostWeaponFireHandler) { m_pPostWeaponFireHandler = pPostWeaponFireHandler; } void SetTaskSimpleBeHitHandler(TaskSimpleBeHitHandler* pTaskSimpleBeHitHandler) { m_pTaskSimpleBeHitHandler = pTaskSimpleBeHitHandler; } - PreWeaponFireHandler* m_pPreWeaponFireHandler; - PostWeaponFireHandler* m_pPostWeaponFireHandler; - TaskSimpleBeHitHandler* m_pTaskSimpleBeHitHandler; + PreWeaponFireHandler* m_pPreWeaponFireHandler = nullptr; + PostWeaponFireHandler* m_pPostWeaponFireHandler = nullptr; + TaskSimpleBeHitHandler* m_pTaskSimpleBeHitHandler = nullptr; private: - CPools* m_pPools; - CPlayerInfo* m_pPlayerInfo; - CProjectileInfo* m_pProjectileInfo; - CRadar* m_pRadar; - CRestart* m_pRestart; - CClock* m_pClock; - CCoronas* m_pCoronas; - CCheckpoints* m_pCheckpoints; - CEventList* m_pEventList; - CFireManager* m_pFireManager; - CGarages* m_pGarages; - CHud* m_pHud; - CWanted* m_pWanted; - CWeather* m_pWeather; - CWorld* m_pWorld; - CCamera* m_pCamera; - CModelInfo* m_pModelInfo; - CPickups* m_pPickups; - CWeaponInfo* m_pWeaponInfo; - CExplosionManager* m_pExplosionManager; - C3DMarkers* m_p3DMarkers; - CRenderWareSA* m_pRenderWare; - CHandlingManager* m_pHandlingManager; - CAnimManager* m_pAnimManager; - CStreaming* m_pStreaming; - CVisibilityPlugins* m_pVisibilityPlugins; - CKeyGen* m_pKeyGen; - CRopes* m_pRopes; - CFx* m_pFx; - CFxManagerSA* m_pFxManager; - CWaterManager* m_pWaterManager; - CWeaponStatManager* m_pWeaponStatsManager; - CPointLights* m_pPointLights; - - CPad* m_pPad; - CTheCarGenerators* m_pTheCarGenerators; - CAERadioTrackManager* m_pCAERadioTrackManager; - CAudioEngine* m_pAudioEngine; - CAEAudioHardware* m_pAEAudioHardware; - CAESoundManager* m_pAESoundManager; - CAudioContainer* m_pAudioContainer; - CMenuManager* m_pMenuManager; - CText* m_pText; - CStats* m_pStats; - CFont* m_pFont; - CPathFind* m_pPathFind; - CPopulation* m_pPopulation; - CTaskManagementSystem* m_pTaskManagementSystem; // not used outside the game_sa - CTasks* m_pTasks; - CGameSettings* m_pSettings; - CCarEnterExit* m_pCarEnterExit; - CControllerConfigManager* m_pControllerConfigManager; - - eGameVersion m_eGameVersion; - bool m_bAsyncScriptEnabled; - bool m_bAsyncScriptForced; - bool m_bASyncLoadingSuspended; - int m_iCheckStatus; - bool m_bUnderworldWarp; + CPools* m_pPools = nullptr; + CPlayerInfo* m_pPlayerInfo = nullptr; + CProjectileInfo* m_pProjectileInfo = nullptr; + CRadar* m_pRadar = nullptr; + CRestart* m_pRestart = nullptr; + CClock* m_pClock = nullptr; + CCoronas* m_pCoronas = nullptr; + CCheckpoints* m_pCheckpoints = nullptr; + CEventList* m_pEventList = nullptr; + CFireManager* m_pFireManager = nullptr; + CGarages* m_pGarages = nullptr; + CHud* m_pHud = nullptr; + CWanted* m_pWanted = nullptr; + CWeather* m_pWeather = nullptr; + CWorld* m_pWorld = nullptr; + CCamera* m_pCamera = nullptr; + CModelInfo* m_pModelInfo = nullptr; + CPickups* m_pPickups = nullptr; + CWeaponInfo* m_pWeaponInfo = nullptr; + CExplosionManager* m_pExplosionManager = nullptr; + C3DMarkers* m_p3DMarkers = nullptr; + CRenderWareSA* m_pRenderWare = nullptr; + CHandlingManager* m_pHandlingManager = nullptr; + CAnimManager* m_pAnimManager = nullptr; + CStreaming* m_pStreaming = nullptr; + CVisibilityPlugins* m_pVisibilityPlugins = nullptr; + CKeyGen* m_pKeyGen = nullptr; + CRopes* m_pRopes = nullptr; + CFx* m_pFx = nullptr; + CFxManagerSA* m_pFxManager = nullptr; + CWaterManager* m_pWaterManager = nullptr; + CWeaponStatManager* m_pWeaponStatsManager = nullptr; + CPointLights* m_pPointLights = nullptr; + + CPad* m_pPad = nullptr; + CTheCarGenerators* m_pTheCarGenerators = nullptr; + CAERadioTrackManager* m_pCAERadioTrackManager = nullptr; + CAudioEngine* m_pAudioEngine = nullptr; + CAEAudioHardware* m_pAEAudioHardware = nullptr; + CAESoundManager* m_pAESoundManager = nullptr; + CAudioContainer* m_pAudioContainer = nullptr; + CMenuManager* m_pMenuManager = nullptr; + CText* m_pText = nullptr; + CStats* m_pStats = nullptr; + CFont* m_pFont = nullptr; + CPathFind* m_pPathFind = nullptr; + CPopulation* m_pPopulation = nullptr; + CTaskManagementSystem* m_pTaskManagementSystem = nullptr; // not used outside the game_sa + CTasks* m_pTasks = nullptr; + CGameSettings* m_pSettings = nullptr; + CCarEnterExit* m_pCarEnterExit = nullptr; + CControllerConfigManager* m_pControllerConfigManager = nullptr; + + eGameVersion m_eGameVersion = eGameVersion::VERSION_ALL; + bool m_bAsyncScriptEnabled = false; + bool m_bAsyncScriptForced = false; + bool m_bASyncLoadingSuspended = false; + int m_iCheckStatus = 0; + bool m_bUnderworldWarp = false; static unsigned long* VAR_SystemTime; static unsigned long* VAR_IsAtMenu; static unsigned long* VAR_IsGameLoaded; static bool* VAR_GamePaused; static bool* VAR_IsForegroundWindow; - ; + static unsigned long* VAR_SystemState; static void* VAR_StartGame; static bool* VAR_IsNastyGame; @@ -508,6 +506,6 @@ class CGameSA : public CGame SFixedArray m_JetpackWeapons; - CPed* m_pPedContext; + CPed* m_pPedContext = nullptr; CTickCount m_llASyncLoadingAutoUnsuspendTime; }; diff --git a/Client/game_sa/CRenderWareSA.h b/Client/game_sa/CRenderWareSA.h index 3d92080d945..4becf4a6512 100644 --- a/Client/game_sa/CRenderWareSA.h +++ b/Client/game_sa/CRenderWareSA.h @@ -27,7 +27,6 @@ class CModelTexturesInfo; class CRenderWareSA : public CRenderWare { public: - ZERO_ON_NEW CRenderWareSA(enum eGameVersion version); ~CRenderWareSA(); void Initialize(); @@ -144,16 +143,16 @@ class CRenderWareSA : public CRenderWare // Watched world textures std::multimap m_TexInfoMap; CFastHashMap m_D3DDataTexInfoMap; - CClientEntityBase* m_pRenderingClientEntity; - ushort m_usRenderingEntityModelId; - int m_iRenderingEntityType; - CMatchChannelManager* m_pMatchChannelManager; - int m_uiReplacementRequestCounter; - int m_uiReplacementMatchCounter; - int m_uiNumReplacementRequests; - int m_uiNumReplacementMatches; + CClientEntityBase* m_pRenderingClientEntity = nullptr; + ushort m_usRenderingEntityModelId = 0; + int m_iRenderingEntityType = 0; + CMatchChannelManager* m_pMatchChannelManager = nullptr; + int m_uiReplacementRequestCounter = 0; + int m_uiReplacementMatchCounter = 0; + int m_uiNumReplacementRequests = 0; + int m_uiNumReplacementMatches = 0; CElapsedTime m_GTAVertexShadersDisabledTimer; - bool m_bGTAVertexShadersEnabled; + bool m_bGTAVertexShadersEnabled = false; std::set m_SpecialTextures; static int ms_iRenderingType; }; diff --git a/Client/mods/deathmatch/logic/CBassAudio.h b/Client/mods/deathmatch/logic/CBassAudio.h index 41d8b3ee69a..15cf727c77a 100644 --- a/Client/mods/deathmatch/logic/CBassAudio.h +++ b/Client/mods/deathmatch/logic/CBassAudio.h @@ -30,11 +30,10 @@ struct SSoundEventInfo struct SSoundThreadVariables { - ZERO_ON_NEW SString strURL; - long lFlags; - DWORD pSound; - bool bStreamCreateResult; + long lFlags = 0; + DWORD pSound = 0; + bool bStreamCreateResult = false; std::list onClientSoundFinishedDownloadQueue; std::list onClientBPMQueue; std::list onClientBeatQueue; @@ -45,7 +44,6 @@ struct SSoundThreadVariables class CBassAudio { public: - ZERO_ON_NEW CBassAudio(bool bStream, const SString& strPath, bool bLoop, bool bThrottle, bool b3D); CBassAudio(void* pBuffer, unsigned int uiBufferLength, bool bLoop, bool b3D); ~CBassAudio(); @@ -103,34 +101,34 @@ class CBassAudio void Process3D(const CVector& vecPlayerPosition, const CVector& vecCameraPosition, const CVector& vecLookAt); public: - SSoundThreadVariables* m_pVars; - uint uiEndSyncCount; - bool bFreeSync; + SSoundThreadVariables* m_pVars = nullptr; + uint uiEndSyncCount = 0; + bool bFreeSync = false; private: - const bool m_bStream; + const bool m_bStream = false; const SString m_strPath; - const bool m_b3D; - const bool m_bLoop; - const bool m_bThrottle; - void* m_pBuffer; - unsigned int m_uiBufferLength; + const bool m_b3D = false; + const bool m_bLoop = false; + const bool m_bThrottle = false; + void* m_pBuffer = nullptr; + unsigned int m_uiBufferLength = 0; - bool m_bPendingPlay; - DWORD m_pSound; + bool m_bPendingPlay = false; + DWORD m_pSound = 0; // Playback state - bool m_bPaused; - bool m_bReversed; - bool m_bPan; - float m_fDefaultFrequency; - float m_fVolume; - float m_fMinDistance; - float m_fMaxDistance; - float m_fPlaybackSpeed; - float m_fPitch; - float m_fTempo; - float m_fSampleRate; + bool m_bPaused = false; + bool m_bReversed = false; + bool m_bPan = false; + float m_fDefaultFrequency = 0.0f; + float m_fVolume = 0.0f; + float m_fMinDistance = 0.0f; + float m_fMaxDistance = 0.0f; + float m_fPlaybackSpeed = 0.0f; + float m_fPitch = 0.0f; + float m_fTempo = 0.0f; + float m_fSampleRate = 0.0f; CVector m_vecPosition; CVector m_vecVelocity; @@ -143,11 +141,11 @@ class CBassAudio std::map m_ConvertedTagMap; std::list m_EventQueue; - float m_fBPM; + float m_fBPM = 0.0f; - void* m_uiCallbackId; - HSYNC m_hSyncDownload; - HSYNC m_hSyncEnd; - HSYNC m_hSyncFree; - HSYNC m_hSyncMeta; + void* m_uiCallbackId = nullptr; + HSYNC m_hSyncDownload = 0; + HSYNC m_hSyncEnd = 0; + HSYNC m_hSyncFree = 0; + HSYNC m_hSyncMeta = 0; }; diff --git a/Client/mods/deathmatch/logic/CClientGame.h b/Client/mods/deathmatch/logic/CClientGame.h index 7c7d8681127..89ebee801dc 100644 --- a/Client/mods/deathmatch/logic/CClientGame.h +++ b/Client/mods/deathmatch/logic/CClientGame.h @@ -55,18 +55,18 @@ class CResourceFileDownloadManager; struct SVehExtrapolateSettings { - int iBaseMs; - int iScalePercent; - int iMaxMs; - bool bEnabled; + int iBaseMs = 0; + int iScalePercent = 0; + int iMaxMs = 0; + bool bEnabled = false; }; struct SMiscGameSettings { - bool bUseAltPulseOrder; - bool bAllowFastSprintFix; - bool bAllowBadDrivebyHitboxFix; - bool bAllowShotgunDamageFix; + bool bUseAltPulseOrder = false; + bool bAllowFastSprintFix = false; + bool bAllowBadDrivebyHitboxFix = false; + bool bAllowShotgunDamageFix = false; }; class CClientGame @@ -222,7 +222,6 @@ class CClientGame }; public: - ZERO_ON_NEW CClientGame(bool bLocalPlay = false); ~CClientGame(); @@ -626,158 +625,157 @@ class CClientGame void VehicleWeaponHitHandler(SVehicleWeaponHitEvent& event); private: - eStatus m_Status; - eServerType m_ServerType; - unsigned long m_ulTimeStart; - unsigned long m_ulVerifyTimeStart; - unsigned long m_ulLastClickTick; + eStatus m_Status = eStatus::STATUS_CONNECTING; + eServerType m_ServerType = eServerType::SERVER_TYPE_NORMAL; + unsigned long m_ulTimeStart = 0; + unsigned long m_ulVerifyTimeStart = 0; + unsigned long m_ulLastClickTick = 0; CVector2D m_vecLastCursorPosition; - bool m_bWaitingForLocalConnect; - bool m_bErrorStartingLocal; - int m_iLocalConnectAttempts; - - bool m_bIsPlayingBack; - bool m_bFirstPlaybackFrame; - - CClientManager* m_pManager; - CClientCamera* m_pCamera; - CClientGUIManager* m_pGUIManager; - CClientMarkerManager* m_pMarkerManager; - CClientObjectManager* m_pObjectManager; - CClientPickupManager* m_pPickupManager; - CClientPlayerManager* m_pPlayerManager; - CClientDisplayManager* m_pDisplayManager; - CClientVehicleManager* m_pVehicleManager; - CClientRadarAreaManager* m_pRadarAreaManager; - CClientRadarMarkerManager* m_pRadarMarkerManager; - CClientPathManager* m_pPathManager; - CClientTeamManager* m_pTeamManager; - CClientPedManager* m_pPedManager; - CClientPointLightsManager* m_pPointLightsManager; - CClientProjectileManager* m_pProjectileManager; - CRPCFunctions* m_pRPCFunctions; - CUnoccupiedVehicleSync* m_pUnoccupiedVehicleSync; - CPedSync* m_pPedSync; + bool m_bWaitingForLocalConnect = false; + bool m_bErrorStartingLocal = false; + int m_iLocalConnectAttempts = 0; + + bool m_bIsPlayingBack = false; + bool m_bFirstPlaybackFrame = false; + + CClientManager* m_pManager = nullptr; + CClientCamera* m_pCamera = nullptr; + CClientGUIManager* m_pGUIManager = nullptr; + CClientMarkerManager* m_pMarkerManager = nullptr; + CClientObjectManager* m_pObjectManager = nullptr; + CClientPickupManager* m_pPickupManager = nullptr; + CClientPlayerManager* m_pPlayerManager = nullptr; + CClientDisplayManager* m_pDisplayManager = nullptr; + CClientVehicleManager* m_pVehicleManager = nullptr; + CClientRadarAreaManager* m_pRadarAreaManager = nullptr; + CClientRadarMarkerManager* m_pRadarMarkerManager = nullptr; + CClientPathManager* m_pPathManager = nullptr; + CClientTeamManager* m_pTeamManager = nullptr; + CClientPedManager* m_pPedManager = nullptr; + CClientPointLightsManager* m_pPointLightsManager = nullptr; + CClientProjectileManager* m_pProjectileManager = nullptr; + CRPCFunctions* m_pRPCFunctions = nullptr; + CUnoccupiedVehicleSync* m_pUnoccupiedVehicleSync = nullptr; + CPedSync* m_pPedSync = nullptr; #ifdef WITH_OBJECT_SYNC CObjectSync* m_pObjectSync; #endif - CMovingObjectsManager* m_pMovingObjectsManager; - CNametags* m_pNametags; - CNetAPI* m_pNetAPI; - CNetworkStats* m_pNetworkStats; - CSyncDebug* m_pSyncDebug; - // CScreenshot* m_pScreenshot; - CRadarMap* m_pRadarMap; - CTransferBox* m_pTransferBox; - CResourceManager* m_pResourceManager; - CScriptKeyBinds* m_pScriptKeyBinds; + CMovingObjectsManager* m_pMovingObjectsManager = nullptr; + CNametags* m_pNametags = nullptr; + CNetAPI* m_pNetAPI = nullptr; + CNetworkStats* m_pNetworkStats = nullptr; + CSyncDebug* m_pSyncDebug = nullptr; + CRadarMap* m_pRadarMap = nullptr; + CTransferBox* m_pTransferBox = nullptr; + CResourceManager* m_pResourceManager = nullptr; + CScriptKeyBinds* m_pScriptKeyBinds = nullptr; CElementDeleter m_ElementDeleter; CObjectRespawner m_ObjectRespawner; - CZoneNames* m_pZoneNames; - CPacketHandler* m_pPacketHandler; - CLocalServer* m_pLocalServer; - CLatentTransferManager* m_pLatentTransferManager; - bool m_bInitiallyFadedOut; - bool m_bHudAreaNameDisabled; - CSingularFileDownloadManager* m_pSingularFileDownloadManager; - CClientModelCacheManager* m_pModelCacheManager; - CDebugHookManager* m_pDebugHookManager; - CRemoteCalls* m_pRemoteCalls; - CResourceFileDownloadManager* m_pResourceFileDownloadManager; + CZoneNames* m_pZoneNames = nullptr; + CPacketHandler* m_pPacketHandler = nullptr; + CLocalServer* m_pLocalServer = nullptr; + CLatentTransferManager* m_pLatentTransferManager = nullptr; + bool m_bInitiallyFadedOut = false; + bool m_bHudAreaNameDisabled = false; + CSingularFileDownloadManager* m_pSingularFileDownloadManager = nullptr; + CClientModelCacheManager* m_pModelCacheManager = nullptr; + CDebugHookManager* m_pDebugHookManager = nullptr; + CRemoteCalls* m_pRemoteCalls = nullptr; + CResourceFileDownloadManager* m_pResourceFileDownloadManager = nullptr; // Revised facilities CServer m_Server; - CVoiceRecorder* m_pVoiceRecorder; + CVoiceRecorder* m_pVoiceRecorder = nullptr; - CClientPlayer* m_pLocalPlayer; + CClientPlayer* m_pLocalPlayer = nullptr; ElementID m_LocalID; SString m_strLocalNick; - CClientEntity* m_pRootEntity; - CLuaManager* m_pLuaManager; - CScriptDebugging* m_pScriptDebugging; + CClientEntity* m_pRootEntity = nullptr; + CLuaManager* m_pLuaManager = nullptr; + CScriptDebugging* m_pScriptDebugging = nullptr; CRegisteredCommands m_RegisteredCommands; // Map statuses SString m_strCurrentMapName; SString m_strModRoot; - CBlendedWeather* m_pBlendedWeather; - bool m_bShowNametags; - bool m_bShowRadar; + CBlendedWeather* m_pBlendedWeather = nullptr; + bool m_bShowNametags = false; + bool m_bShowRadar = false; // Status booleans - bool m_bGameLoaded; - bool m_bTriggeredIngameAndConnected; - bool m_bGracefulDisconnect; + bool m_bGameLoaded = false; + bool m_bTriggeredIngameAndConnected = false; + bool m_bGracefulDisconnect = false; // Network update vars - unsigned long m_ulLastVehicleInOutTime; - bool m_bIsGettingOutOfVehicle; - bool m_bIsGettingIntoVehicle; - bool m_bIsJackingVehicle; - bool m_bIsGettingJacked; + unsigned long m_ulLastVehicleInOutTime = 0; + bool m_bIsGettingOutOfVehicle = false; + bool m_bIsGettingIntoVehicle = false; + bool m_bIsJackingVehicle = false; + bool m_bIsGettingJacked = false; ElementID m_VehicleInOutID; - unsigned char m_ucVehicleInOutSeat; - bool m_bNoNewVehicleTask; + unsigned char m_ucVehicleInOutSeat = 0; + bool m_bNoNewVehicleTask = false; ElementID m_NoNewVehicleTaskReasonID; - CClientPlayer* m_pGettingJackedBy; + CClientPlayer* m_pGettingJackedBy = nullptr; - CEntity* m_pTargetedGameEntity; - CClientEntity* m_pTargetedEntity; - bool m_bTargetSent; + CEntity* m_pTargetedGameEntity = nullptr; + CClientEntity* m_pTargetedEntity = nullptr; + bool m_bTargetSent = false; ElementID m_TargetedPlayerID; - CClientEntity* m_pDamageEntity; + CClientEntity* m_pDamageEntity = nullptr; ElementID m_DamagerID; - unsigned char m_ucDamageWeapon; - unsigned char m_ucDamageBodyPiece; - unsigned long m_ulDamageTime; - bool m_bDamageSent; + unsigned char m_ucDamageWeapon = 0; + unsigned char m_ucDamageBodyPiece = 0; + unsigned long m_ulDamageTime = 0; + bool m_bDamageSent = false; - eWeaponSlot m_lastWeaponSlot; - SFixedArray m_wasWeaponAmmoInClip; + eWeaponSlot m_lastWeaponSlot = eWeaponSlot::WEAPONSLOT_TYPE_UNARMED; + SFixedArray m_wasWeaponAmmoInClip = {}; - bool m_bCursorEventsEnabled; - bool m_bLocalPlay; + bool m_bCursorEventsEnabled = false; + bool m_bLocalPlay = false; - bool m_bShowNetstat; - bool m_bShowFPS; + bool m_bShowNetstat = false; + bool m_bShowFPS = false; - bool m_bTransferringSingularFiles; + bool m_bTransferringSingularFiles = false; - float m_fGameSpeed; - long m_lMoney; - DWORD m_dwWanted; + float m_fGameSpeed = 0.0f; + long m_lMoney = 0; + DWORD m_dwWanted = 0; - SFixedArray m_Glitches; + SFixedArray m_Glitches = {}; // Clouds Enabled - bool m_bCloudsEnabled; + bool m_bCloudsEnabled = false; // Birds Enabled - bool m_bBirdsEnabled; + bool m_bBirdsEnabled = false; - unsigned long m_ulMinuteDuration; + unsigned long m_ulMinuteDuration = 0; - CClientGUIElement* m_pClickedGUIElement; + CClientGUIElement* m_pClickedGUIElement = nullptr; SString m_strHTTPDownloadURL; - bool m_bReceivingBigPacket; - unsigned long m_ulBigPacketSize; - unsigned long m_ulBigPacketBytesReceivedBase; - CTransferBox* m_pBigPacketTransferBox; + bool m_bReceivingBigPacket = false; + unsigned long m_ulBigPacketSize = 0; + unsigned long m_ulBigPacketBytesReceivedBase = 0; + CTransferBox* m_pBigPacketTransferBox = nullptr; CElapsedTimeHD m_TimeSliceTimer; - uint m_uiFrameCount; + uint m_uiFrameCount = 0; - long long m_llLastTransgressionTime; + long long m_llLastTransgressionTime = 0; SString m_strLastDiagnosticStatus; - bool m_bBeingDeleted; // To enable speedy disconnect + bool m_bBeingDeleted = false; // To enable speedy disconnect - bool m_bWasMinimized; + bool m_bWasMinimized = false; // Cache for speeding up collision processing public: @@ -785,28 +783,28 @@ class CClientGame private: std::map m_CachedCollisionMap; - bool m_BuiltCollisionMapThisFrame; + bool m_BuiltCollisionMapThisFrame = false; #if defined (MTA_DEBUG) || defined (MTA_BETA) - bool m_bShowSyncingInfo; + bool m_bShowSyncingInfo = false; #endif #ifdef MTA_DEBUG - CClientPlayer* m_pShowPlayerTasks; - CClientPlayer* m_pShowPlayer; + CClientPlayer* m_pShowPlayerTasks = nullptr; + CClientPlayer* m_pShowPlayer = nullptr; std::list m_Mimics; - bool m_bMimicLag; - unsigned long m_ulLastMimicLag; + bool m_bMimicLag = false; + unsigned long m_ulLastMimicLag = 0; CVector m_vecLastMimicPos; CVector m_vecLastMimicMove; CVector m_vecLastMimicTurn; CVector m_vecLastMimicRot; - bool m_bDoPaintballs; - bool m_bShowInterpolation; + bool m_bDoPaintballs = 0; + bool m_bShowInterpolation = 0; #endif - bool m_bDevelopmentMode; - bool m_bShowCollision; - bool m_bShowSound; + bool m_bDevelopmentMode = 0; + bool m_bShowCollision = 0; + bool m_bShowSound = 0; // Debug class. Empty in release. public: @@ -815,7 +813,7 @@ class CClientGame private: CEvents m_Events; std::list m_ScreenShotArgList; - ushort m_usNextScreenShotId; + ushort m_usNextScreenShotId = 0; std::list m_DelayedSendList; std::multimap m_HeliCollisionsMap; CElapsedTime m_LastClearTime; @@ -825,16 +823,16 @@ class CClientGame SVehExtrapolateSettings m_VehExtrapolateSettings; SMiscGameSettings m_MiscGameSettings; - uint m_uiAltPulseOrderCounter; + uint m_uiAltPulseOrderCounter = 0; SString m_strACInfo; std::map m_SentMessageIds; - bool m_bLastKeyWasEscapeCancelled; + bool m_bLastKeyWasEscapeCancelled = false; std::set m_AllowKeyUpMap; - uint m_uiPrecisionCallDepth; + uint m_uiPrecisionCallDepth = 0; SString m_strFileCacheRoot; - SharedUtil::CAsyncTaskScheduler* m_pAsyncTaskScheduler; + SharedUtil::CAsyncTaskScheduler* m_pAsyncTaskScheduler = nullptr; ksignals::Delegate m_Delegate; diff --git a/Client/mods/deathmatch/logic/CClientManager.h b/Client/mods/deathmatch/logic/CClientManager.h index ce7135ebea4..c6d9618fbd1 100644 --- a/Client/mods/deathmatch/logic/CClientManager.h +++ b/Client/mods/deathmatch/logic/CClientManager.h @@ -49,7 +49,6 @@ class CClientExplosionManager; class CClientManager { public: - ZERO_ON_NEW CClientManager(); ~CClientManager(); @@ -109,43 +108,43 @@ class CClientManager private: CAntiCheat m_AntiCheat; - CClientCamera* m_pCamera; - CClientCivilianManager* m_pCivilianManager; - CClientColModelManager* m_pColModelManager; - CClientDFFManager* m_pDFFManager; - CClientGUIManager* m_pGUIManager; - CClientMarkerManager* m_pMarkerManager; - CClientStreamer* m_pMarkerStreamer; - CClientModelRequestManager* m_pModelRequestManager; - CClientObjectManager* m_pObjectManager; - CClientPathManager* m_pPathManager; - CClientPickupManager* m_pPickupManager; - CClientStreamer* m_pPickupStreamer; - CClientPlayerManager* m_pPlayerManager; - CClientStreamer* m_pPlayerStreamer; - CClientRadarAreaManager* m_pRadarAreaManager; - CClientRadarMarkerManager* m_pRadarMarkerManager; - CClientSoundManager* m_pSoundManager; - CClientRenderElementManager* m_pRenderElementManager; - CClientStreamer* m_pObjectStreamer; - CClientStreamer* m_pObjectLodStreamer; - CClientTeamManager* m_pTeamManager; - CClientDisplayManager* m_pDisplayManager; - CClientVehicleManager* m_pVehicleManager; - CClientStreamer* m_pVehicleStreamer; - CClientStreamer* m_pLightStreamer; - CClientPedManager* m_pPedManager; - CClientWaterManager* m_pWaterManager; - CResourceManager* m_pResourceManager; - CClientColManager* m_pColManager; - CClientGroups* m_pGroups; - CClientProjectileManager* m_pProjectileManager; - CClientExplosionManager* m_pExplosionManager; - CClientWeaponManager* m_pWeaponManager; - CClientEffectManager* m_pEffectManager; - CClientPointLightsManager* m_pPointLightsManager; - CClientPacketRecorder* m_pPacketRecorder; - bool m_bBeingDeleted; - bool m_bGameUnloadedFlag; - int m_iNumLowLODElements; + CClientCamera* m_pCamera = nullptr; + CClientCivilianManager* m_pCivilianManager = nullptr; + CClientColModelManager* m_pColModelManager = nullptr; + CClientDFFManager* m_pDFFManager = nullptr; + CClientGUIManager* m_pGUIManager = nullptr; + CClientMarkerManager* m_pMarkerManager = nullptr; + CClientStreamer* m_pMarkerStreamer = nullptr; + CClientModelRequestManager* m_pModelRequestManager = nullptr; + CClientObjectManager* m_pObjectManager = nullptr; + CClientPathManager* m_pPathManager = nullptr; + CClientPickupManager* m_pPickupManager = nullptr; + CClientStreamer* m_pPickupStreamer = nullptr; + CClientPlayerManager* m_pPlayerManager = nullptr; + CClientStreamer* m_pPlayerStreamer = nullptr; + CClientRadarAreaManager* m_pRadarAreaManager = nullptr; + CClientRadarMarkerManager* m_pRadarMarkerManager = nullptr; + CClientSoundManager* m_pSoundManager = nullptr; + CClientRenderElementManager* m_pRenderElementManager = nullptr; + CClientStreamer* m_pObjectStreamer = nullptr; + CClientStreamer* m_pObjectLodStreamer = nullptr; + CClientTeamManager* m_pTeamManager = nullptr; + CClientDisplayManager* m_pDisplayManager = nullptr; + CClientVehicleManager* m_pVehicleManager = nullptr; + CClientStreamer* m_pVehicleStreamer = nullptr; + CClientStreamer* m_pLightStreamer = nullptr; + CClientPedManager* m_pPedManager = nullptr; + CClientWaterManager* m_pWaterManager = nullptr; + CResourceManager* m_pResourceManager = nullptr; + CClientColManager* m_pColManager = nullptr; + CClientGroups* m_pGroups = nullptr; + CClientProjectileManager* m_pProjectileManager = nullptr; + CClientExplosionManager* m_pExplosionManager = nullptr; + CClientWeaponManager* m_pWeaponManager = nullptr; + CClientEffectManager* m_pEffectManager = nullptr; + CClientPointLightsManager* m_pPointLightsManager = nullptr; + CClientPacketRecorder* m_pPacketRecorder = nullptr; + bool m_bBeingDeleted = false; + bool m_bGameUnloadedFlag = false; + int m_iNumLowLODElements = 0; }; diff --git a/Client/mods/deathmatch/logic/CClientModelCacheManager.cpp b/Client/mods/deathmatch/logic/CClientModelCacheManager.cpp index 30e33fe00c9..c19895fb5f4 100644 --- a/Client/mods/deathmatch/logic/CClientModelCacheManager.cpp +++ b/Client/mods/deathmatch/logic/CClientModelCacheManager.cpp @@ -33,8 +33,6 @@ class CClientModelCacheManagerImpl : public CClientModelCacheManager { public: - ZERO_ON_NEW - // CClientModelCacheManager interface virtual void DoPulse(); virtual void OnRestreamModel(ushort usModelId); @@ -53,13 +51,13 @@ class CClientModelCacheManagerImpl : public CClientModelCacheManager void AddProcessStat(const char* szTag, bool bCache, ePuresyncType syncType, ushort usModelId, const CVector& vecStartPos, const CVector& vecEndPos); protected: - int m_iFrameCounter; + int m_iFrameCounter = 0; CTickCount m_TickCountNow; CVector m_vecCameraPos; CTickCount m_LastTimeMs; - float m_fSmoothCameraSpeed; - CClientPlayer* m_pLocalPlayer; - float m_fGameFps; + float m_fSmoothCameraSpeed = 0.0f; + CClientPlayer* m_pLocalPlayer = nullptr; + float m_fGameFps = 0.0f; CModelCacheManager* m_pCoreModelCacheManager; }; diff --git a/Client/mods/deathmatch/logic/CClientObjectManager.h b/Client/mods/deathmatch/logic/CClientObjectManager.h index da748395e22..cbbb146e5fc 100644 --- a/Client/mods/deathmatch/logic/CClientObjectManager.h +++ b/Client/mods/deathmatch/logic/CClientObjectManager.h @@ -17,7 +17,6 @@ class CObject; class CClientObjectManager { public: - ZERO_ON_NEW CClientObjectManager(class CClientManager* pManager); ~CClientObjectManager(); @@ -51,17 +50,17 @@ class CClientObjectManager protected: void UpdateLimitInfo(); - int m_iEntryInfoNodeEntries; - int m_iPointerNodeSingleLinkEntries; - int m_iPointerNodeDoubleLinkEntries; - uint m_uiMaxStreamedInCount; - uint m_uiMaxLowLodStreamedInCount; - uint m_uiStreamedInCount; - uint m_uiLowLodStreamedInCount; - bool m_bDoneLimitWarning; + int m_iEntryInfoNodeEntries = 0; + int m_iPointerNodeSingleLinkEntries = 0; + int m_iPointerNodeDoubleLinkEntries = 0; + uint m_uiMaxStreamedInCount = 0; + uint m_uiMaxLowLodStreamedInCount = 0; + uint m_uiStreamedInCount = 0; + uint m_uiLowLodStreamedInCount = 0; + bool m_bDoneLimitWarning = false; - CClientManager* m_pManager; - bool m_bCanRemoveFromList; + CClientManager* m_pManager = nullptr; + bool m_bCanRemoveFromList = false; CMappedArray m_Objects; CMappedArray m_StreamedIn; }; diff --git a/Client/mods/deathmatch/logic/CClientPerfStat.PacketUsage.cpp b/Client/mods/deathmatch/logic/CClientPerfStat.PacketUsage.cpp index 174d242d145..e3bdb31f320 100644 --- a/Client/mods/deathmatch/logic/CClientPerfStat.PacketUsage.cpp +++ b/Client/mods/deathmatch/logic/CClientPerfStat.PacketUsage.cpp @@ -21,8 +21,6 @@ class CClientPerfStatPacketUsageImpl : public CClientPerfStatPacketUsage { public: - ZERO_ON_NEW - CClientPerfStatPacketUsageImpl(); virtual ~CClientPerfStatPacketUsageImpl(); @@ -34,13 +32,13 @@ class CClientPerfStatPacketUsageImpl : public CClientPerfStatPacketUsage // CClientPerfStatModuleImpl void MaybeRecordStats(); - int m_iStatsCleared; + int m_iStatsCleared = 0; CElapsedTime m_TimeSinceGetStats; - long long m_llNextRecordTime; + long long m_llNextRecordTime = 0; SString m_strCategoryName; - SPacketStat m_PrevPacketStats[2][256]; - SPacketStat m_PacketStats[2][256]; - SFixedArray m_ShownPacketStats; + SPacketStat m_PrevPacketStats[2][256] = {}; + SPacketStat m_PacketStats[2][256] = {}; + SFixedArray m_ShownPacketStats = {}; }; /////////////////////////////////////////////////////////////// diff --git a/Client/mods/deathmatch/logic/CClientPlayerVoice.h b/Client/mods/deathmatch/logic/CClientPlayerVoice.h index 39ce38121d7..3342e5edd50 100644 --- a/Client/mods/deathmatch/logic/CClientPlayerVoice.h +++ b/Client/mods/deathmatch/logic/CClientPlayerVoice.h @@ -25,7 +25,6 @@ class CClientPlayerVoice { public: - ZERO_ON_NEW CClientPlayerVoice(CClientPlayer* pPlayer, CVoiceRecorder* pVoiceRecorder); ~CClientPlayerVoice(); void DecodeAndBuffer(char* pBuffer, unsigned int bytesWritten); @@ -80,27 +79,27 @@ class CClientPlayerVoice void ServiceEventQueue(); void ApplyFxEffects(); - CClientPlayer* m_pPlayer; - CVoiceRecorder* m_pVoiceRecorder; - unsigned int m_SampleRate; - HSTREAM m_pBassPlaybackStream; - void* m_pSpeexDecoderState; - int m_iSpeexIncomingFrameSampleCount; - float m_fVolume; - float m_fVolumeScale; + CClientPlayer* m_pPlayer = nullptr; + CVoiceRecorder* m_pVoiceRecorder = nullptr; + unsigned int m_SampleRate = 0; + HSTREAM m_pBassPlaybackStream = 0; + void* m_pSpeexDecoderState = nullptr; + int m_iSpeexIncomingFrameSampleCount = 0; + float m_fVolume = 0.0f; + float m_fVolumeScale = 0.0f; // Playback altering stuff - float m_fPitch; - float m_fTempo; - float m_fSampleRate; - bool m_bPan; - float m_fPan; + float m_fPitch = 0.0f; + float m_fTempo = 0.0f; + float m_fSampleRate = 0.0f; + bool m_bPan = false; + float m_fPan = 0.0f; // Playback state - bool m_bPaused; - float m_fPlaybackSpeed; - float m_fDefaultFrequency; + bool m_bPaused = false; + float m_fPlaybackSpeed = 0.0f; + float m_fDefaultFrequency = 0.0f; - SFixedArray m_EnabledEffects; - SFixedArray m_FxEffects; + SFixedArray m_EnabledEffects = {}; + SFixedArray m_FxEffects = {}; }; diff --git a/Client/mods/deathmatch/logic/CClientSoundManager.h b/Client/mods/deathmatch/logic/CClientSoundManager.h index b5434ac7cd6..bfaee4b2f43 100644 --- a/Client/mods/deathmatch/logic/CClientSoundManager.h +++ b/Client/mods/deathmatch/logic/CClientSoundManager.h @@ -19,7 +19,6 @@ class CClientSoundManager; class CClientSoundManager { public: - ZERO_ON_NEW CClientSoundManager(CClientManager* pClientManager); ~CClientSoundManager(); @@ -59,9 +58,9 @@ class CClientSoundManager void ProcessStopQueues(bool bFlush = false); private: - CClientManager* m_pClientManager; + CClientManager* m_pClientManager = nullptr; - unsigned short m_usDimension; + unsigned short m_usDimension = 0; std::list m_Sounds; std::set m_DistanceStreamedInMap; @@ -69,9 +68,9 @@ class CClientSoundManager std::map m_FxEffectNames; SString m_strUserAgent; - bool m_bMinimizeMuted; + bool m_bMinimizeMuted = false; - bool m_aValidatedSFX[9]; + bool m_aValidatedSFX[9] = {false}; std::vector m_ChannelStopQueue; std::map m_AudioStopQueue; diff --git a/Client/mods/deathmatch/logic/CClientVehicleManager.h b/Client/mods/deathmatch/logic/CClientVehicleManager.h index d5a9e0750dd..e015790f4c2 100644 --- a/Client/mods/deathmatch/logic/CClientVehicleManager.h +++ b/Client/mods/deathmatch/logic/CClientVehicleManager.h @@ -20,7 +20,6 @@ extern const SFixedArray g_ucMaxPassengers; class CClientVehicleManager { public: - ZERO_ON_NEW CClientVehicleManager(CClientManager* pManager); ~CClientVehicleManager(); @@ -69,8 +68,8 @@ class CClientVehicleManager void OnDestruction(CClientVehicle* pVehicle); protected: - CClientManager* m_pManager; - bool m_bCanRemoveFromList; + CClientManager* m_pManager = nullptr; + bool m_bCanRemoveFromList = false; CMappedArray m_List; CMappedArray m_StreamedIn; }; diff --git a/Client/mods/deathmatch/logic/CElementDeleter.h b/Client/mods/deathmatch/logic/CElementDeleter.h index b766aa147d9..2f4b37e6478 100644 --- a/Client/mods/deathmatch/logic/CElementDeleter.h +++ b/Client/mods/deathmatch/logic/CElementDeleter.h @@ -31,6 +31,6 @@ class CElementDeleter void DoDeleteAllSmartPointers(); CMappedList m_List; - bool m_bAllowUnreference; + bool m_bAllowUnreference = false; CMappedList m_ListRawSmartPointer; }; diff --git a/Client/mods/deathmatch/logic/CEvents.h b/Client/mods/deathmatch/logic/CEvents.h index e5a5ede8ec8..20c4a79fa42 100644 --- a/Client/mods/deathmatch/logic/CEvents.h +++ b/Client/mods/deathmatch/logic/CEvents.h @@ -50,6 +50,6 @@ class CEvents CFastHashMap m_EventHashMap; std::vector m_CancelledList; - bool m_bEventCancelled; - bool m_bWasEventCancelled; + bool m_bEventCancelled = false; + bool m_bWasEventCancelled = false; }; diff --git a/Client/mods/deathmatch/logic/CNetAPI.h b/Client/mods/deathmatch/logic/CNetAPI.h index ed0dc291d91..c5af9c3fc48 100644 --- a/Client/mods/deathmatch/logic/CNetAPI.h +++ b/Client/mods/deathmatch/logic/CNetAPI.h @@ -39,7 +39,6 @@ enum eServerRPCFunctions class CNetAPI { public: - ZERO_ON_NEW CNetAPI(CClientManager* pManager); void DoPulse(); @@ -100,14 +99,14 @@ class CNetAPI void RPC(eServerRPCFunctions ID, NetBitStreamInterface* pBitStream = NULL); private: - CClientManager* m_pManager; - CClientPlayerManager* m_pPlayerManager; - CClientVehicleManager* m_pVehicleManager; - unsigned long m_ulLastPuresyncTime; - unsigned long m_ulLastSyncReturnTime; - - bool m_bStoredReturnSync; - bool m_bVehicleLastReturn; + CClientManager* m_pManager = nullptr; + CClientPlayerManager* m_pPlayerManager = nullptr; + CClientVehicleManager* m_pVehicleManager = nullptr; + unsigned long m_ulLastPuresyncTime = 0; + unsigned long m_ulLastSyncReturnTime = 0; + + bool m_bStoredReturnSync = false; + bool m_bVehicleLastReturn = false; CVector m_vecLastReturnPosition; CVector m_vecLastReturnRotation; @@ -115,14 +114,14 @@ class CNetAPI CInterpolator m_Interpolator; - bool m_bIsNetworkTrouble; - bool m_bIncreaseTimeoutTime; + bool m_bIsNetworkTrouble = false; + bool m_bIncreaseTimeoutTime = false; CElapsedTime m_IncreaseTimeoutTimeTimer; CElapsedTime m_TimeSinceMouseOrAnalogStateSent; CControllerState m_LastSentControllerState; - float m_fLastSentCameraRotation; - float m_fLastSentAimY; - uchar m_ucBulletSyncOrderCounter; - uchar m_ucCustomWeaponBulletSyncOrderCounter; + float m_fLastSentCameraRotation = 0.0f; + float m_fLastSentAimY = 0.0f; + uchar m_ucBulletSyncOrderCounter = 0; + uchar m_ucCustomWeaponBulletSyncOrderCounter = 0; }; diff --git a/Client/mods/deathmatch/logic/CRegisteredCommands.h b/Client/mods/deathmatch/logic/CRegisteredCommands.h index 2ca6c315807..9781f94f78b 100644 --- a/Client/mods/deathmatch/logic/CRegisteredCommands.h +++ b/Client/mods/deathmatch/logic/CRegisteredCommands.h @@ -49,5 +49,5 @@ class CRegisteredCommands std::list m_Commands; std::list m_TrashCan; - bool m_bIteratingList; + bool m_bIteratingList = false; }; diff --git a/Client/mods/deathmatch/logic/CResourceFileDownloadManager.h b/Client/mods/deathmatch/logic/CResourceFileDownloadManager.h index 9332791d04b..7811c61c038 100644 --- a/Client/mods/deathmatch/logic/CResourceFileDownloadManager.h +++ b/Client/mods/deathmatch/logic/CResourceFileDownloadManager.h @@ -21,7 +21,6 @@ struct SHttpServerInfo class CResourceFileDownloadManager { public: - ZERO_ON_NEW void AddServer(const SString& strUrl, int iMaxConnectionsPerClient, EDownloadModeType downloadChannel, uint uiConnectionAttempts, uint uiConnectTimeoutMs); void AddPendingFileDownload(CDownloadableResource* pDownloadableResource); void UpdatePendingDownloads(); @@ -42,6 +41,6 @@ class CResourceFileDownloadManager std::vector m_PendingFileDownloadList; std::vector m_ActiveFileDownloadList; std::vector m_HttpServerList; - bool m_bIsTransferingFiles; + bool m_bIsTransferingFiles = false; SString m_strLastHTTPError; }; diff --git a/Client/mods/deathmatch/logic/CServer.h b/Client/mods/deathmatch/logic/CServer.h index 38f487febd1..518e5dc2061 100644 --- a/Client/mods/deathmatch/logic/CServer.h +++ b/Client/mods/deathmatch/logic/CServer.h @@ -40,15 +40,15 @@ class CServer static DWORD WINAPI Thread_EntryPoint(LPVOID pThis); unsigned long Thread_Run(); - bool m_bIsReady; - HANDLE m_hThread; - CDynamicLibrary* volatile m_pLibrary; + bool m_bIsReady = false; + HANDLE m_hThread = nullptr; + CDynamicLibrary* volatile m_pLibrary = nullptr; CCriticalSection m_CriticalSection; SString m_strServerRoot; SString m_strDLLFile; SString m_strConfig; - int m_iLastError; + int m_iLastError = 0; std::string m_strPassword; diff --git a/Client/mods/deathmatch/logic/CServerIdManager.cpp b/Client/mods/deathmatch/logic/CServerIdManager.cpp index 183e79f569d..da8e324fd7a 100644 --- a/Client/mods/deathmatch/logic/CServerIdManager.cpp +++ b/Client/mods/deathmatch/logic/CServerIdManager.cpp @@ -52,8 +52,6 @@ namespace class CServerIdManagerImpl : public CServerIdManager { public: - ZERO_ON_NEW - virtual SString GetConnectionPrivateDirectory(bool bPreviousVer); CServerIdManagerImpl(); @@ -66,8 +64,8 @@ class CServerIdManagerImpl : public CServerIdManager static DWORD StaticThreadProc(LPVOID lpdwThreadParam); static void StaticSaveServerIdMap(); - bool m_bListChanged; - bool m_bClearedDefaultDirectory; + bool m_bListChanged = false; + bool m_bClearedDefaultDirectory = false; std::map m_ServerIdMap; SString m_strServerIdLookupBaseDir; SString m_strTempErrorDir; diff --git a/Client/mods/deathmatch/logic/lua/CLuaMain.h b/Client/mods/deathmatch/logic/lua/CLuaMain.h index 10ad08ae97d..d08d8023c58 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaMain.h +++ b/Client/mods/deathmatch/logic/lua/CLuaMain.h @@ -29,14 +29,13 @@ class CLuaMain; struct CRefInfo { - unsigned long int ulUseCount; - int iFunction; + unsigned long int ulUseCount = 0; + int iFunction = 0; }; -class CLuaMain //: public CClient +class CLuaMain { public: - ZERO_ON_NEW CLuaMain(class CLuaManager* pLuaManager, CResource* pResourceOwner, bool bEnableOOP); ~CLuaMain(); @@ -85,19 +84,19 @@ class CLuaMain //: public CClient SString m_strScriptName; - lua_State* m_luaVM; - CLuaTimerManager* m_pLuaTimerManager; + lua_State* m_luaVM = nullptr; + CLuaTimerManager* m_pLuaTimerManager = nullptr; - bool m_bBeingDeleted; // prevent it being deleted twice + bool m_bBeingDeleted = false; // prevent it being deleted twice CElapsedTime m_FunctionEnterTimer; - class CResource* m_pResource; + class CResource* m_pResource = nullptr; std::list m_XMLFiles; static SString ms_strExpectedUndumpHash; - bool m_bEnableOOP; + bool m_bEnableOOP = false; public: CFastHashMap m_CallbackTable; diff --git a/Client/multiplayer_sa/CMultiplayerSA.h b/Client/multiplayer_sa/CMultiplayerSA.h index c1771354e24..ca62b536b69 100644 --- a/Client/multiplayer_sa/CMultiplayerSA.h +++ b/Client/multiplayer_sa/CMultiplayerSA.h @@ -46,12 +46,9 @@ class CMultiplayerSA : public CMultiplayer friend class COffsetsMP; private: - CRemoteDataSA* RemoteData; - CPopulationSA* Population; - + CRemoteDataSA* RemoteData = nullptr; + CPopulationSA* Population = nullptr; public: - ZERO_ON_NEW - CMultiplayerSA(); void InitHooks(); void InitHooks_CrashFixHacks(); @@ -289,28 +286,28 @@ class CMultiplayerSA : public CMultiplayer DWORD GetLastAnimArrayAddress() { return m_dwLastAnimArrayAddress; } CVector m_vecAkimboTarget; - bool m_bAkimboTargetUp; + bool m_bAkimboTargetUp = false; static char* ms_PlayerImgCachePtr; - bool m_bBadDrivebyHitboxesDisabled; + bool m_bBadDrivebyHitboxesDisabled = false; private: - bool m_bSuspensionEnabled; + bool m_bSuspensionEnabled = false; std::vector m_PlayerImgCache; - EFastClothesLoading m_FastClothesLoading; + EFastClothesLoading m_FastClothesLoading = EFastClothesLoading::FAST_CLOTHES_OFF; CLimitsSA m_limits; - bool m_bEnabledLODSystem; - bool m_bEnabledAltWaterOrder; - bool m_bEnabledClothesMemFix; - float m_fAircraftMaxHeight; - float m_fAircraftMaxVelocity; - float m_fAircraftMaxVelocity_Sq; - bool m_bHeatHazeEnabled; - bool m_bHeatHazeCustomized; - float m_fNearClipDistance; - float m_fMaddDoggPoolLevel; - DWORD m_dwLastStaticAnimGroupID; - DWORD m_dwLastStaticAnimID; - DWORD m_dwLastAnimArrayAddress; + bool m_bEnabledLODSystem = false; + bool m_bEnabledAltWaterOrder = false; + bool m_bEnabledClothesMemFix = false; + float m_fAircraftMaxHeight = 0.0f; + float m_fAircraftMaxVelocity = 0.0f; + float m_fAircraftMaxVelocity_Sq = 0.0f; + bool m_bHeatHazeEnabled = false; + bool m_bHeatHazeCustomized = false; + float m_fNearClipDistance = 0.0f; + float m_fMaddDoggPoolLevel = 0.0f; + DWORD m_dwLastStaticAnimGroupID = 0; + DWORD m_dwLastStaticAnimID = 0; + DWORD m_dwLastAnimArrayAddress = 0; /* VOID SetPlayerShotVectors(CPlayerPed* player, Vector3D * vecTarget, Vector3D * vecStart); VOID SetPlayerCameraVectors(CPlayerPed* player, Vector3D * vecSource, Vector3D * vecFront); diff --git a/Client/sdk/core/CRenderItemManagerInterface.h b/Client/sdk/core/CRenderItemManagerInterface.h index 1ae78e883b6..9ee66740334 100644 --- a/Client/sdk/core/CRenderItemManagerInterface.h +++ b/Client/sdk/core/CRenderItemManagerInterface.h @@ -83,50 +83,50 @@ enum eDxTestMode struct SDxStatus { - eDxTestMode testMode; + eDxTestMode testMode = eDxTestMode::DX_TEST_MODE_NONE; struct { SString strName; - int iInstalledMemoryKB; + int iInstalledMemoryKB = 0; SString strPSVersion; - int iMaxAnisotropy; - ERenderFormat depthBufferFormat; - int iNumSimultaneousRTs; + int iMaxAnisotropy = 0; + ERenderFormat depthBufferFormat = ERenderFormat::RFORMAT_UNKNOWN; + int iNumSimultaneousRTs = 0; } videoCard; struct { - int iNumShadersUsingReadableDepthBuffer; + int iNumShadersUsingReadableDepthBuffer = 0; } state; struct { - int iFreeForMTA; - int iUsedByFonts; - int iUsedByTextures; - int iUsedByRenderTargets; + int iFreeForMTA = 0; + int iUsedByFonts = 0; + int iUsedByTextures = 0; + int iUsedByRenderTargets = 0; } videoMemoryKB; struct { - bool bWindowed; - int iFullScreenStyle; - int iFXQuality; - int iDrawDistance; - bool bVolumetricShadows; - bool bAllowScreenUpload; - int iStreamingMemory; - bool b32BitColor; - bool bGrassEffect; - bool bHeatHaze; - int iAnisotropicFiltering; - int iAntiAliasing; - eAspectRatio aspectRatio; - bool bHUDMatchAspectRatio; - float fFieldOfView; - bool bHighDetailVehicles; - bool bHighDetailPeds; + bool bWindowed = false; + int iFullScreenStyle = 0; + int iFXQuality = 0; + int iDrawDistance = 0; + bool bVolumetricShadows = false; + bool bAllowScreenUpload = false; + int iStreamingMemory = 0; + bool b32BitColor = false; + bool bGrassEffect = false; + bool bHeatHaze = false; + int iAnisotropicFiltering = 0; + int iAntiAliasing = 0; + eAspectRatio aspectRatio = eAspectRatio::ASPECT_RATIO_AUTO; + bool bHUDMatchAspectRatio = false; + float fFieldOfView = 0.0f; + bool bHighDetailVehicles = false; + bool bHighDetailPeds = false; } settings; }; diff --git a/Client/sdk/core/CScreenGrabberInterface.h b/Client/sdk/core/CScreenGrabberInterface.h index 21ed6fcb2c7..3e4bf0a6dd8 100644 --- a/Client/sdk/core/CScreenGrabberInterface.h +++ b/Client/sdk/core/CScreenGrabberInterface.h @@ -17,8 +17,6 @@ typedef void (*PFN_SCREENSHOT_CALLBACK)(const CBuffer* pBuffer, uint uiTimeSpent class CScreenGrabberInterface { public: - ZERO_ON_NEW - virtual ~CScreenGrabberInterface() {} // CScreenGrabberInterface diff --git a/Client/sdk/game/CGame.h b/Client/sdk/game/CGame.h index 554f183d48a..743f5928b61 100644 --- a/Client/sdk/game/CGame.h +++ b/Client/sdk/game/CGame.h @@ -107,11 +107,11 @@ struct SMatchChannelStats struct SShaderReplacementStats { - uint uiNumReplacementRequests; - uint uiNumReplacementMatches; - uint uiTotalTextures; - uint uiTotalShaders; - uint uiTotalEntitesRefed; + uint uiNumReplacementRequests = 0; + uint uiNumReplacementMatches = 0; + uint uiTotalTextures = 0; + uint uiTotalShaders = 0; + uint uiTotalEntitesRefed = 0; std::map channelStatsList; }; diff --git a/Client/sdk/multiplayer/CMultiplayer.h b/Client/sdk/multiplayer/CMultiplayer.h index 85b7e2a08e8..c1b0dca233f 100644 --- a/Client/sdk/multiplayer/CMultiplayer.h +++ b/Client/sdk/multiplayer/CMultiplayer.h @@ -23,18 +23,18 @@ struct SRwResourceStats { - uint uiTextures; - uint uiRasters; - uint uiGeometries; + uint uiTextures = 0; + uint uiRasters = 0; + uint uiGeometries = 0; }; struct SClothesCacheStats { - uint uiCacheHit; - uint uiCacheMiss; - uint uiNumTotal; - uint uiNumUnused; - uint uiNumRemoved; + uint uiCacheHit = 0; + uint uiCacheMiss = 0; + uint uiNumTotal = 0; + uint uiNumUnused = 0; + uint uiNumRemoved = 0; }; enum EVehicleWeaponType : int diff --git a/Server/dbconmy/CDatabaseConnectionMySql.cpp b/Server/dbconmy/CDatabaseConnectionMySql.cpp index 0fce9898847..1598b00cfc0 100644 --- a/Server/dbconmy/CDatabaseConnectionMySql.cpp +++ b/Server/dbconmy/CDatabaseConnectionMySql.cpp @@ -24,7 +24,6 @@ using namespace std; class CDatabaseConnectionMySql : public CDatabaseConnection { public: - ZERO_ON_NEW CDatabaseConnectionMySql(CDatabaseType* pManager, const SString& strHost, const SString& strUsername, const SString& strPassword, const SString& strOptions); virtual ~CDatabaseConnectionMySql(); @@ -46,17 +45,17 @@ class CDatabaseConnectionMySql : public CDatabaseConnection void EndAutomaticTransaction(); int ConvertToSqliteType(enum_field_types type); - int m_iRefCount; - CDatabaseType* m_pManager; - MYSQL* m_handle; - bool m_bOpened; + int m_iRefCount = 0; + CDatabaseType* m_pManager = nullptr; + MYSQL* m_handle = nullptr; + bool m_bOpened = false; SString m_strLastErrorMessage; - uint m_uiLastErrorCode; - int m_bAutomaticReconnect; - int m_bAutomaticTransactionsEnabled; - bool m_bInAutomaticTransaction; + uint m_uiLastErrorCode = 0; + int m_bAutomaticReconnect = 0; + int m_bAutomaticTransactionsEnabled = 0; + bool m_bInAutomaticTransaction = false; CTickCount m_AutomaticTransactionStartTime; - int m_bMultipleStatements; + int m_bMultipleStatements = 0; }; /////////////////////////////////////////////////////////////// diff --git a/Server/mods/deathmatch/logic/ASE.h b/Server/mods/deathmatch/logic/ASE.h index 941bd114edb..75620f5f0da 100644 --- a/Server/mods/deathmatch/logic/ASE.h +++ b/Server/mods/deathmatch/logic/ASE.h @@ -45,7 +45,6 @@ class CASERule; class ASE { public: - ZERO_ON_NEW ASE(CMainConfig* pMainConfig, CPlayerManager* pPlayerManager, unsigned short usPort, const SString& strServerIPList); ~ASE(); @@ -85,11 +84,11 @@ class ASE const std::string* QueryXfireLightCached(); std::string QueryXfireLight(); - long long m_llCurrentTime; - uint m_uiCurrentPlayerCount; + long long m_llCurrentTime = 0; + uint m_uiCurrentPlayerCount = 0; - CMainConfig* m_pMainConfig; - CPlayerManager* m_pPlayerManager; + CMainConfig* m_pMainConfig = nullptr; + CPlayerManager* m_pPlayerManager = nullptr; std::string m_strGameType; SString m_strMapName; @@ -97,7 +96,7 @@ class ASE std::string m_strPort; static ASE* _instance; - time_t m_tStartTime; + time_t m_tStartTime = 0; list m_Rules; diff --git a/Server/mods/deathmatch/logic/CAccessControlListManager.h b/Server/mods/deathmatch/logic/CAccessControlListManager.h index d3a2ae63bd4..e304b73cdde 100644 --- a/Server/mods/deathmatch/logic/CAccessControlListManager.h +++ b/Server/mods/deathmatch/logic/CAccessControlListManager.h @@ -23,7 +23,6 @@ class CAccessControlListManager; class CAccessControlListManager : public CXMLConfig { public: - ZERO_ON_NEW CAccessControlListManager(); virtual ~CAccessControlListManager(); @@ -75,17 +74,17 @@ class CAccessControlListManager : public CXMLConfig list m_Groups; list m_ACLs; - CAccountManager* m_pAccountManager; + CAccountManager* m_pAccountManager = nullptr; - CXMLFile* m_pXML; - CXMLNode* m_pRootNode; + CXMLFile* m_pXML = nullptr; + CXMLNode* m_pRootNode = nullptr; - bool m_bReadCacheDirty; - long long m_llLastTimeReadCacheCleared; + bool m_bReadCacheDirty = 0; + long long m_llLastTimeReadCacheCleared = 0; CFastHashMap m_ReadCacheMap; - bool m_bNeedsSave; - bool m_bAllowSave; + bool m_bNeedsSave = false; + bool m_bAllowSave = false; CElapsedTime m_AutoSaveTimer; - uint m_uiGlobalRevision; + uint m_uiGlobalRevision = 0; }; diff --git a/Server/mods/deathmatch/logic/CAccount.h b/Server/mods/deathmatch/logic/CAccount.h index 93f00f2c8b4..1354579691e 100644 --- a/Server/mods/deathmatch/logic/CAccount.h +++ b/Server/mods/deathmatch/logic/CAccount.h @@ -64,7 +64,6 @@ class CAccount bool IsAuthorized() const { return tAuthDate != 0; } }; - ZERO_ON_NEW CAccount(class CAccountManager* pManager, EAccountType accountType, const std::string& strName, const std::string& strPassword = "", int iUserID = 0, const std::string& strIP = "", const std::string& strSerial = "", const SString& strHttpPassAppend = ""); ~CAccount(); @@ -117,20 +116,20 @@ class CAccount CAccountManager* m_pManager; - EAccountType m_AccountType; + EAccountType m_AccountType = EAcountType::Guest; SString m_strName; CAccountPassword m_Password; SString m_strHttpPassAppend; std::string m_strIP; std::string m_strSerial; - int m_iUserID; - bool m_bLoadedSerialUsage; + int m_iUserID = 0; + bool m_bLoadedSerialUsage = false; std::vector m_SerialUsageList; - bool m_bChanged; + bool m_bChanged = false; - class CClient* m_pClient; - uint m_uiScriptID; + class CClient* m_pClient = nullptr; + uint m_uiScriptID = 0; std::map m_Data; }; diff --git a/Server/mods/deathmatch/logic/CConnectHistory.h b/Server/mods/deathmatch/logic/CConnectHistory.h index 0456494bd52..c1ca85d5d35 100644 --- a/Server/mods/deathmatch/logic/CConnectHistory.h +++ b/Server/mods/deathmatch/logic/CConnectHistory.h @@ -37,10 +37,10 @@ class CConnectHistory void RemoveExpired(); long long GetModuleTickCount64(); - unsigned long m_ulSamplePeriod; - unsigned long m_ulMaxConnections; - unsigned long m_ulBanLength; + unsigned long m_ulSamplePeriod = 0; + unsigned long m_ulMaxConnections = 0; + unsigned long m_ulBanLength = 0; HistoryItemMap m_HistoryItemMap; - long long m_llTimeLastRemoveExpired; - long long m_llDebugTickCountOffset; + long long m_llTimeLastRemoveExpired = 0; + long long m_llDebugTickCountOffset = 0; }; diff --git a/Server/mods/deathmatch/logic/CDatabaseConnectionSqlite.cpp b/Server/mods/deathmatch/logic/CDatabaseConnectionSqlite.cpp index 347ff039801..a8b3348a7ad 100644 --- a/Server/mods/deathmatch/logic/CDatabaseConnectionSqlite.cpp +++ b/Server/mods/deathmatch/logic/CDatabaseConnectionSqlite.cpp @@ -21,7 +21,6 @@ class CDatabaseConnectionSqlite : public CDatabaseConnection { public: - ZERO_ON_NEW CDatabaseConnectionSqlite(CDatabaseType* pManager, const SString& strPath, const SString& strOptions); virtual ~CDatabaseConnectionSqlite(); @@ -41,16 +40,16 @@ class CDatabaseConnectionSqlite : public CDatabaseConnection void BeginAutomaticTransaction(); void EndAutomaticTransaction(); - int m_iRefCount; - CDatabaseType* m_pManager; - sqlite3* m_handle; - bool m_bOpened; + int m_iRefCount = 0; + CDatabaseType* m_pManager = nullptr; + sqlite3* m_handle = nullptr; + bool m_bOpened = false; SString m_strLastErrorMessage; - uint m_uiLastErrorCode; - bool m_bAutomaticTransactionsEnabled; - bool m_bInAutomaticTransaction; + uint m_uiLastErrorCode = 0; + bool m_bAutomaticTransactionsEnabled = false; + bool m_bInAutomaticTransaction = false; CTickCount m_AutomaticTransactionStartTime; - bool m_bMultipleStatements; + bool m_bMultipleStatements = false; }; /////////////////////////////////////////////////////////////// diff --git a/Server/mods/deathmatch/logic/CDatabaseJobQueue.cpp b/Server/mods/deathmatch/logic/CDatabaseJobQueue.cpp index a66bbbb7974..292220fa5b3 100644 --- a/Server/mods/deathmatch/logic/CDatabaseJobQueue.cpp +++ b/Server/mods/deathmatch/logic/CDatabaseJobQueue.cpp @@ -25,7 +25,6 @@ typedef CFastList CJobQueueType; class CDatabaseJobQueueImpl : public CDatabaseJobQueue { public: - ZERO_ON_NEW CDatabaseJobQueueImpl(); virtual ~CDatabaseJobQueueImpl(); @@ -59,25 +58,25 @@ class CDatabaseJobQueueImpl : public CDatabaseJobQueue void LogString(const SString& strText); // Main thread variables - CThreadHandle* m_pServiceThreadHandle; + CThreadHandle* m_pServiceThreadHandle = nullptr; std::map m_ActiveJobHandles; std::set m_FinishedList; // Result has been used, will be deleted next pulse - uint m_uiJobCountWarnThresh; - uint m_uiJobCount10sMin; + uint m_uiJobCountWarnThresh = 0; + uint m_uiJobCount10sMin = 0; CElapsedTime m_JobCountElpasedTime; std::set m_PendingFlushMap; // Other thread variables std::map m_DatabaseTypeMap; - uint m_uiConnectionCountWarnThresh; - EJobLogLevelType m_LogLevel; + uint m_uiConnectionCountWarnThresh = 0; + EJobLogLevelType m_LogLevel = EJobLogLevelType::NONE; SString m_strLogFilename; // Shared variables struct { - bool m_bTerminateThread; - bool m_bThreadTerminated; + bool m_bTerminateThread = false; + bool m_bThreadTerminated = false; CJobQueueType m_CommandQueue; CJobQueueType m_ResultQueue; CComboMutex m_Mutex; diff --git a/Server/mods/deathmatch/logic/CDatabaseJobQueueManager.h b/Server/mods/deathmatch/logic/CDatabaseJobQueueManager.h index 0d7f6f0f6cb..b5e80eb573c 100644 --- a/Server/mods/deathmatch/logic/CDatabaseJobQueueManager.h +++ b/Server/mods/deathmatch/logic/CDatabaseJobQueueManager.h @@ -18,7 +18,6 @@ class CDatabaseJobQueueManager { public: - ZERO_ON_NEW ~CDatabaseJobQueueManager(); void DoPulse(); CDbJobData* AddCommand(EJobCommandType jobType, SConnectionHandle connectionHandle, const SString& strData); @@ -34,5 +33,5 @@ class CDatabaseJobQueueManager SConnectionHandle GetNextConnectionHandle(); std::map m_QueueNameMap; - SConnectionHandle m_ConnectionHandleCounter; + SConnectionHandle m_ConnectionHandleCounter = 0; }; diff --git a/Server/mods/deathmatch/logic/CDatabaseManager.cpp b/Server/mods/deathmatch/logic/CDatabaseManager.cpp index 3599bf9233e..afdcf740c7d 100644 --- a/Server/mods/deathmatch/logic/CDatabaseManager.cpp +++ b/Server/mods/deathmatch/logic/CDatabaseManager.cpp @@ -25,7 +25,6 @@ SString InsertQueryArgumentsMySql(const char* szQuery, va_list vl); class CDatabaseManagerImpl : public CDatabaseManager { public: - ZERO_ON_NEW CDatabaseManagerImpl(); virtual ~CDatabaseManagerImpl(); @@ -67,10 +66,10 @@ class CDatabaseManagerImpl : public CDatabaseManager m_bLastErrorSuppressed = bSuppressed; } - CDatabaseJobQueueManager* m_JobQueue; + CDatabaseJobQueueManager* m_JobQueue = nullptr; std::map m_ConnectionTypeMap; SString m_strLastErrorMessage; - bool m_bLastErrorSuppressed; + bool m_bLastErrorSuppressed = false; }; /////////////////////////////////////////////////////////////// diff --git a/Server/mods/deathmatch/logic/CDatabaseManager.h b/Server/mods/deathmatch/logic/CDatabaseManager.h index 4162c8dd69a..2f5c05c74f7 100644 --- a/Server/mods/deathmatch/logic/CDatabaseManager.h +++ b/Server/mods/deathmatch/logic/CDatabaseManager.h @@ -84,8 +84,6 @@ class CDbOptionsMap : public CArgMap class CDbJobData { public: - ZERO_ON_NEW - CDbJobData(); ~CDbJobData(); SDbJobId GetId() { return id; } @@ -96,36 +94,36 @@ class CDbJobData CDatabaseJobQueue* GetQueue() { return command.pJobQueue; } SString GetCommandStringForLog(); - EJobStageType stage; - SDbJobId id; + EJobStageType stage = EJobStageType::NONE; + SDbJobId id = 0; SLuaDebugInfo m_LuaDebugInfo; struct { - EJobCommandType type; - SConnectionHandle connectionHandle; + EJobCommandType type = EJobCommandType::NONE; + SConnectionHandle connectionHandle = 0; SString strData; - CDatabaseJobQueue* pJobQueue; + CDatabaseJobQueue* pJobQueue = nullptr; } command; struct { - EJobResultType status; - uint uiErrorCode; + EJobResultType status = EJobResultType::NONE; + uint uiErrorCode = 0; SString strReason; - bool bErrorSuppressed; + bool bErrorSuppressed = false; CRegistryResult registryResult; CTickCount timeReady; - bool bLoggedWarning; - bool bIgnoreResult; + bool bLoggedWarning = false; + bool bIgnoreResult = false; } result; struct { - PFN_DBRESULT pfnDbResult; - void* pContext; - bool bSet; - bool bDone; + PFN_DBRESULT pfnDbResult = nullptr; + void* pContext = nullptr; + bool bSet = false; + bool bDone = false; } callback; }; diff --git a/Server/mods/deathmatch/logic/CDatabaseTypeMySql.cpp b/Server/mods/deathmatch/logic/CDatabaseTypeMySql.cpp index 1104f930106..518438ff774 100644 --- a/Server/mods/deathmatch/logic/CDatabaseTypeMySql.cpp +++ b/Server/mods/deathmatch/logic/CDatabaseTypeMySql.cpp @@ -24,7 +24,6 @@ class CDatabaseTypeMySql : public CDatabaseType { public: - ZERO_ON_NEW CDatabaseTypeMySql(); virtual ~CDatabaseTypeMySql(); @@ -40,7 +39,7 @@ class CDatabaseTypeMySql : public CDatabaseType void UpdateStats(); CDynamicLibrary m_DbconmyLib; - NewDatabaseConnectionMySql_t* m_pfnNewDatabaseConnection; + NewDatabaseConnectionMySql_t* m_pfnNewDatabaseConnection = nullptr; std::map m_SharedConnectionMap; std::set m_AllConnectionMap; SString m_strStatsKeyHead; diff --git a/Server/mods/deathmatch/logic/CDatabaseTypeSqlite.cpp b/Server/mods/deathmatch/logic/CDatabaseTypeSqlite.cpp index 0ec329cb394..0b0eb31fb16 100644 --- a/Server/mods/deathmatch/logic/CDatabaseTypeSqlite.cpp +++ b/Server/mods/deathmatch/logic/CDatabaseTypeSqlite.cpp @@ -21,7 +21,6 @@ class CDatabaseTypeSqlite : public CDatabaseType { public: - ZERO_ON_NEW CDatabaseTypeSqlite(); virtual ~CDatabaseTypeSqlite(); diff --git a/Server/mods/deathmatch/logic/CDynamicLibrary.h b/Server/mods/deathmatch/logic/CDynamicLibrary.h index a58294f9a8b..f1bdd8aa023 100644 --- a/Server/mods/deathmatch/logic/CDynamicLibrary.h +++ b/Server/mods/deathmatch/logic/CDynamicLibrary.h @@ -31,8 +31,8 @@ class CDynamicLibrary private: #ifdef WIN32 - HMODULE m_hModule; + HMODULE m_hModule = nullptr; #else - void* m_hModule; + void* m_hModule = nullptr; #endif }; diff --git a/Server/mods/deathmatch/logic/CEvents.h b/Server/mods/deathmatch/logic/CEvents.h index e64304661d7..cc8dd7badf0 100644 --- a/Server/mods/deathmatch/logic/CEvents.h +++ b/Server/mods/deathmatch/logic/CEvents.h @@ -54,8 +54,8 @@ class CEvents CFastHashMap m_EventHashMap; std::vector m_CancelledList; - bool m_bEventCancelled; - bool m_bWasEventCancelled; + bool m_bEventCancelled = false; + bool m_bWasEventCancelled = false; SString m_strLastError; }; diff --git a/Server/mods/deathmatch/logic/CGame.h b/Server/mods/deathmatch/logic/CGame.h index ac51f491d43..6704a67807d 100644 --- a/Server/mods/deathmatch/logic/CGame.h +++ b/Server/mods/deathmatch/logic/CGame.h @@ -145,7 +145,6 @@ class CSendList : public std::multimap class CGame { public: - ZERO_ON_NEW // To be sure everything is cleared enum { VEHICLE_REQUEST_IN, VEHICLE_NOTIFY_IN, @@ -502,146 +501,146 @@ class CGame // which the voice server library will call to send out data. CEvents m_Events; - CRemoteCalls* m_pRemoteCalls; - CHTTPD* m_pHTTPD; - CMainConfig* m_pMainConfig; - CBlipManager* m_pBlipManager; - CGroups* m_pGroups; - CColManager* m_pColManager; - CObjectManager* m_pObjectManager; - CPickupManager* m_pPickupManager; - CPlayerManager* m_pPlayerManager; - CRadarAreaManager* m_pRadarAreaManager; - CVehicleManager* m_pVehicleManager; - CPacketTranslator* m_pPacketTranslator; - CMapManager* m_pMapManager; + CRemoteCalls* m_pRemoteCalls = nullptr; + CHTTPD* m_pHTTPD = nullptr; + CMainConfig* m_pMainConfig = nullptr; + CBlipManager* m_pBlipManager = nullptr; + CGroups* m_pGroups = nullptr; + CColManager* m_pColManager = nullptr; + CObjectManager* m_pObjectManager = nullptr; + CPickupManager* m_pPickupManager = nullptr; + CPlayerManager* m_pPlayerManager = nullptr; + CRadarAreaManager* m_pRadarAreaManager = nullptr; + CVehicleManager* m_pVehicleManager = nullptr; + CPacketTranslator* m_pPacketTranslator = nullptr; + CMapManager* m_pMapManager = nullptr; CElementDeleter m_ElementDeleter; CConnectHistory m_FloodProtect; - CLuaManager* m_pLuaManager; - CScriptDebugging* m_pScriptDebugging; - CConsole* m_pConsole; - CUnoccupiedVehicleSync* m_pUnoccupiedVehicleSync; - CPedSync* m_pPedSync; + CLuaManager* m_pLuaManager = nullptr; + CScriptDebugging* m_pScriptDebugging = nullptr; + CConsole* m_pConsole = nullptr; + CUnoccupiedVehicleSync* m_pUnoccupiedVehicleSync = nullptr; + CPedSync* m_pPedSync = nullptr; #ifdef WITH_OBJECT_SYNC CObjectSync* m_pObjectSync; #endif - CMarkerManager* m_pMarkerManager; - CClock* m_pClock; - CBanManager* m_pBanManager; - CTeamManager* m_pTeamManager; - CCommandLineParser m_CommandLineParser; - CRegisteredCommands* m_pRegisteredCommands; - CDatabaseManager* m_pDatabaseManager; - CLuaCallbackManager* m_pLuaCallbackManager; - CRegistryManager* m_pRegistryManager; - CRegistry* m_pRegistry; - CAccountManager* m_pAccountManager; - CLatentTransferManager* m_pLatentTransferManager; - CDebugHookManager* m_pDebugHookManager; - CPedManager* m_pPedManager; - CResourceManager* m_pResourceManager; - CAccessControlListManager* m_pACLManager; - CSettings* m_pSettings; - CZoneNames* m_pZoneNames; - ASE* m_pASE; - CHandlingManager* m_pHandlingManager; - CRPCFunctions* m_pRPCFunctions; - CLanBroadcast* m_pLanBroadcast; - CWaterManager* m_pWaterManager; - - CWeaponStatManager* m_pWeaponStatsManager; - CBuildingRemovalManager* m_pBuildingRemovalManager; - - CCustomWeaponManager* m_pCustomWeaponManager; - CFunctionUseLogger* m_pFunctionUseLogger; - - char* m_szCurrentFileName; + CMarkerManager* m_pMarkerManager = nullptr; + CClock* m_pClock = nullptr; + CBanManager* m_pBanManager = nullptr; + CTeamManager* m_pTeamManager = nullptr; + CCommandLineParser m_CommandLineParser = nullptr; + CRegisteredCommands* m_pRegisteredCommands = nullptr; + CDatabaseManager* m_pDatabaseManager = nullptr; + CLuaCallbackManager* m_pLuaCallbackManager = nullptr; + CRegistryManager* m_pRegistryManager = nullptr; + CRegistry* m_pRegistry = nullptr; + CAccountManager* m_pAccountManager = nullptr; + CLatentTransferManager* m_pLatentTransferManager = nullptr; + CDebugHookManager* m_pDebugHookManager = nullptr; + CPedManager* m_pPedManager = nullptr; + CResourceManager* m_pResourceManager = nullptr; + CAccessControlListManager* m_pACLManager = nullptr; + CSettings* m_pSettings = nullptr; + CZoneNames* m_pZoneNames = nullptr; + ASE* m_pASE = nullptr; + CHandlingManager* m_pHandlingManager = nullptr; + CRPCFunctions* m_pRPCFunctions = nullptr; + CLanBroadcast* m_pLanBroadcast = nullptr; + CWaterManager* m_pWaterManager = nullptr; + + CWeaponStatManager* m_pWeaponStatsManager = nullptr; + CBuildingRemovalManager* m_pBuildingRemovalManager = nullptr; + + CCustomWeaponManager* m_pCustomWeaponManager = nullptr; + CFunctionUseLogger* m_pFunctionUseLogger = nullptr; + + char* m_szCurrentFileName = nullptr; // This client represents the console input - CConsoleClient* m_pConsoleClient; + CConsoleClient* m_pConsoleClient = nullptr; - float m_fGravity; - float m_fGameSpeed; - float m_fJetpackMaxHeight; - float m_fAircraftMaxHeight; - float m_fAircraftMaxVelocity; - float m_fAircraftMaxVelocity_Sq; - bool m_bOcclusionsEnabled; - bool m_bUsingMtaServerConf; + float m_fGravity = 0.0f; + float m_fGameSpeed = 0.0f; + float m_fJetpackMaxHeight = 0.0f; + float m_fAircraftMaxHeight = 0.0f; + float m_fAircraftMaxVelocity = 0.0f; + float m_fAircraftMaxVelocity_Sq = 0.0f; + bool m_bOcclusionsEnabled = false; + bool m_bUsingMtaServerConf = false; - unsigned char m_ucTrafficLightState; - bool m_bTrafficLightsLocked; - long long m_llLastTrafficUpdate; + unsigned char m_ucTrafficLightState = 0; + bool m_bTrafficLightsLocked = false; + long long m_llLastTrafficUpdate = 0; - unsigned char m_ucSkyGradientTR, m_ucSkyGradientTG, m_ucSkyGradientTB; - unsigned char m_ucSkyGradientBR, m_ucSkyGradientBG, m_ucSkyGradientBB; - bool m_bHasSkyGradient; + unsigned char m_ucSkyGradientTR = 0, m_ucSkyGradientTG = 0, m_ucSkyGradientTB = 0; + unsigned char m_ucSkyGradientBR = 0, m_ucSkyGradientBG = 0, m_ucSkyGradientBB = 0; + bool m_bHasSkyGradient = false; SHeatHazeSettings m_HeatHazeSettings; - bool m_bHasHeatHaze; + bool m_bHasHeatHaze = false; - bool m_bOverrideWaterColor; - unsigned char m_ucWaterRed, m_ucWaterGreen, m_ucWaterBlue, m_ucWaterAlpha; + bool m_bOverrideWaterColor = false; + unsigned char m_ucWaterRed = 0, m_ucWaterGreen = 0, m_ucWaterBlue = 0, m_ucWaterAlpha = 0; - bool m_bInteriorSoundsEnabled; + bool m_bInteriorSoundsEnabled = false; - bool m_bOverrideRainLevel; - float m_fRainLevel; + bool m_bOverrideRainLevel = false; + float m_fRainLevel = 0.0f; - bool m_bOverrideSunSize; - float m_fSunSize; + bool m_bOverrideSunSize = false; + float m_fSunSize = 0.0f; - bool m_bOverrideMoonSize; - int m_iMoonSize; + bool m_bOverrideMoonSize = false; + int m_iMoonSize = 0; - bool m_bOverrideSunColor; - unsigned char m_ucSunCoreR, m_ucSunCoreG, m_ucSunCoreB, m_ucSunCoronaR, m_ucSunCoronaG, m_ucSunCoronaB; + bool m_bOverrideSunColor = false; + unsigned char m_ucSunCoreR = 0, m_ucSunCoreG = 0, m_ucSunCoreB = 0, m_ucSunCoronaR = 0, m_ucSunCoronaG = 0, m_ucSunCoronaB = 0; - bool m_bOverrideWindVelocity; - float m_fWindVelX, m_fWindVelY, m_fWindVelZ; + bool m_bOverrideWindVelocity = false; + float m_fWindVelX = 0.0f, m_fWindVelY = 0.0f, m_fWindVelZ = 0.0f; - bool m_bOverrideFarClip; - float m_fFarClipDistance; + bool m_bOverrideFarClip = false; + float m_fFarClipDistance = 0.0f; - bool m_bOverrideFogDistance; - float m_fFogDistance; + bool m_bOverrideFogDistance = false; + float m_fFogDistance = 0.0f; - SGarageStates m_bGarageStates; + SGarageStates m_bGarageStates = {}; // FPS statistics - long long m_llLastFPSTime; - unsigned short m_usFrames; - unsigned short m_usFPS; - int m_iSyncFPS; + long long m_llLastFPSTime = 0; + unsigned short m_usFrames = 0; + unsigned short m_usFPS = 0; + int m_iSyncFPS = 0; std::map m_GlitchNames; - SFixedArray m_Glitches; - SFixedArray m_JetpackWeapons; + SFixedArray m_Glitches = {}; + SFixedArray m_JetpackWeapons = {}; // This is ticked to true when the app should end - bool m_bIsFinished; - bool m_bBeingDeleted; + bool m_bIsFinished = false; + bool m_bBeingDeleted = false; // Clouds Enabled - bool m_bCloudsEnabled; + bool m_bCloudsEnabled = false; - COpenPortsTester* m_pOpenPortsTester; - CMasterServerAnnouncer* m_pMasterServerAnnouncer; - CHqComms* m_pHqComms; + COpenPortsTester* m_pOpenPortsTester = nullptr; + CMasterServerAnnouncer* m_pMasterServerAnnouncer = nullptr; + CHqComms* m_pHqComms = nullptr; CLightsyncManager m_lightsyncManager; - bool m_bServerFullyUp; // No http operations should be allowed unless this is true + bool m_bServerFullyUp = false; // No http operations should be allowed unless this is true - bool m_bLatentSendsEnabled; - int m_iLatentSendsBandwidth; - CLuaMain* m_pLatentSendsLuaMain; - ushort m_usLatentSendsResourceNetId; + bool m_bLatentSendsEnabled = false; + int m_iLatentSendsBandwidth = 0; + CLuaMain* m_pLatentSendsLuaMain = nullptr; + ushort m_usLatentSendsResourceNetId = 0; SString m_strPrevMinClientKickRequirement; SString m_strPrevMinClientConnectRequirement; SString m_strPrevLowestConnectedPlayerVersion; - SharedUtil::CAsyncTaskScheduler* m_pAsyncTaskScheduler; + SharedUtil::CAsyncTaskScheduler* m_pAsyncTaskScheduler = nullptr; - bool m_DevelopmentModeEnabled; + bool m_DevelopmentModeEnabled = false; }; diff --git a/Server/mods/deathmatch/logic/CMainConfig.h b/Server/mods/deathmatch/logic/CMainConfig.h index b128632b2dd..0748a83e5de 100644 --- a/Server/mods/deathmatch/logic/CMainConfig.h +++ b/Server/mods/deathmatch/logic/CMainConfig.h @@ -39,7 +39,6 @@ struct SIntSetting class CMainConfig : public CXMLConfig { public: - ZERO_ON_NEW CMainConfig(CConsole* pConsole, class CLuaManager* pLuaMain); bool Load(); @@ -145,48 +144,48 @@ class CMainConfig : public CXMLConfig bool GetSettingTable(const SString& strName, const char** szAttribNames, uint uiNumAttribNames, CLuaArguments* outTable); bool AddMissingSettings(); - CConsole* m_pConsole; - CLuaManager* m_pLuaManager; - CXMLNode* m_pRootNode; - CCommandLineParser* m_pCommandLineParser; + CConsole* m_pConsole = nullptr; + CLuaManager* m_pLuaManager = nullptr; + CXMLNode* m_pRootNode = nullptr; + CCommandLineParser* m_pCommandLineParser = nullptr; - unsigned int m_uiVoiceSampleRate; - unsigned char m_ucVoiceQuality; - unsigned int m_uiVoiceBitrate; + unsigned int m_uiVoiceSampleRate = 0; + unsigned char m_ucVoiceQuality = 0; + unsigned int m_uiVoiceBitrate = 0; - bool m_bVoiceEnabled; + bool m_bVoiceEnabled = false; std::string m_strServerIP; std::string m_strServerName; - unsigned short m_usServerPort; - unsigned int m_uiHardMaxPlayers; - unsigned int m_uiSoftMaxPlayers; - bool m_bHTTPEnabled; + unsigned short m_usServerPort = 0; + unsigned int m_uiHardMaxPlayers = 0; + unsigned int m_uiSoftMaxPlayers = 0; + bool m_bHTTPEnabled = false; std::string m_strPassword; - int m_iAseMode; - int m_iUpdateCycleDatagramsLimit; - int m_iUpdateCycleMessagesLimit; - unsigned short m_usHTTPPort; - eHTTPDownloadType m_ucHTTPDownloadType; + int m_iAseMode = 0; + int m_iUpdateCycleDatagramsLimit = 0; + int m_iUpdateCycleMessagesLimit = 0; + unsigned short m_usHTTPPort = 0; + eHTTPDownloadType m_ucHTTPDownloadType = eHTTPDownloadType::HTTP_DOWNLOAD_DISABLED; std::string m_strHTTPDownloadURL; - int m_iHTTPMaxConnectionsPerClient; - int m_iHTTPThreadCount; - int m_iHTTPDosThreshold; + int m_iHTTPMaxConnectionsPerClient = 0; + int m_iHTTPThreadCount = 0; + int m_iHTTPDosThreshold = 0; SString m_strHTTPDosExclude; - int m_iEnableClientChecks; + int m_iEnableClientChecks = 0; std::string m_strLogFile; std::string m_strAuthFile; - bool m_bJoinFloodProtectionEnabled; - bool m_bScriptDebugLogEnabled; + bool m_bJoinFloodProtectionEnabled = false; + bool m_bScriptDebugLogEnabled = false; std::string m_strScriptDebugLogFile; - unsigned int m_uiScriptDebugLogLevel; + unsigned int m_uiScriptDebugLogLevel = 0; std::string m_strAccessControlListFile; - bool m_bVerifySerials; - unsigned short m_usFPSLimit; - int m_bDontBroadcastLan; + bool m_bVerifySerials = false; + unsigned short m_usFPSLimit = 0; + int m_bDontBroadcastLan = 0; std::set m_DisableComboACMap; std::set m_EnableDiagnosticMap; std::vector m_AuthSerialGroupList; - bool m_bAuthSerialHttpEnabled; + bool m_bAuthSerialHttpEnabled = false; std::vector m_AuthSerialHttpIpExceptionList; std::vector m_OwnerEmailAddressList; SString m_strMinClientVersion; @@ -196,27 +195,27 @@ class CMainConfig : public CXMLConfig SString m_strSystemDatabasesPath; SString m_strBackupPath; SString m_strDbLogFilename; - int m_iBackupInterval; - int m_iBackupAmount; - int m_iCompactInternalDatabases; - bool m_bDidBackup; + int m_iBackupInterval = 0; + int m_iBackupAmount = 0; + int m_iCompactInternalDatabases = 0; + bool m_bDidBackup = false; SString m_strBandwidthReductionMode; - int m_iPendingWorkToDoSleepTime; - int m_iNoWorkToDoSleepTime; - bool m_bThreadNetEnabled; - bool m_bSyncMapElementData; - int m_bBulletSyncEnabled; + int m_iPendingWorkToDoSleepTime = 0; + int m_iNoWorkToDoSleepTime = 0; + bool m_bThreadNetEnabled = false; + bool m_bSyncMapElementData = false; + int m_bBulletSyncEnabled = 0; std::map m_TransientSettings; SNetOptions m_NetOptions; - int m_iVehExtrapolatePercent; - int m_iVehExtrapolatePingLimit; - int m_bUseAltPulseOrder; - int m_bNetAutoFilter; + int m_iVehExtrapolatePercent = 0; + int m_iVehExtrapolatePingLimit = 0; + int m_bUseAltPulseOrder = 0; + int m_bNetAutoFilter = 0; SString m_strLoadstringLogFilename; - int m_iMinClientVersionAutoUpdate; - int m_iServerLogicFpsLimit; - int m_bCrashDumpUploadEnabled; - int m_bFilterDuplicateLogLinesEnabled; - int m_bDatabaseCredentialsProtectionEnabled; - int m_bFakeLagCommandEnabled; + int m_iMinClientVersionAutoUpdate = 0; + int m_iServerLogicFpsLimit = 0; + int m_bCrashDumpUploadEnabled = 0; + int m_bFilterDuplicateLogLinesEnabled = 0; + int m_bDatabaseCredentialsProtectionEnabled = 0; + int m_bFakeLagCommandEnabled = 0; }; diff --git a/Server/mods/deathmatch/logic/CPerfStat.BandwidthReduction.cpp b/Server/mods/deathmatch/logic/CPerfStat.BandwidthReduction.cpp index 3a7deb6b9ba..1371b2ce8ae 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.BandwidthReduction.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.BandwidthReduction.cpp @@ -21,8 +21,6 @@ class CPerfStatBandwidthReductionImpl : public CPerfStatBandwidthReduction { public: - ZERO_ON_NEW - CPerfStatBandwidthReductionImpl(); virtual ~CPerfStatBandwidthReductionImpl(); @@ -34,7 +32,7 @@ class CPerfStatBandwidthReductionImpl : public CPerfStatBandwidthReduction // CPerfStatBandwidthReductionImpl void RecordStats(); - long long m_llNextRecordTime; + long long m_llNextRecordTime = 0; SString m_strCategoryName; CTickCount m_PrevTickCount; CTickCount m_DeltaTickCount; diff --git a/Server/mods/deathmatch/logic/CPerfStat.BandwidthUsage.cpp b/Server/mods/deathmatch/logic/CPerfStat.BandwidthUsage.cpp index be913cfea3d..9cc7dc732a7 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.BandwidthUsage.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.BandwidthUsage.cpp @@ -93,8 +93,6 @@ namespace class CPerfStatBandwidthUsageImpl : public CPerfStatBandwidthUsage { public: - ZERO_ON_NEW - CPerfStatBandwidthUsageImpl(); virtual ~CPerfStatBandwidthUsageImpl(); @@ -110,13 +108,13 @@ class CPerfStatBandwidthUsageImpl : public CPerfStatBandwidthUsage void LoadStats(); void SaveStats(); - long long m_llNextRecordTime; - long long m_llNextSaveTime; + long long m_llNextRecordTime = 0; + long long m_llNextSaveTime = 0; SString m_strCategoryName; SBandwidthStatistics m_PrevLiveStats; - long long m_llPrevHttpTotalBytesSent; + long long m_llPrevHttpTotalBytesSent = 0; std::vector m_History; - SDbConnectionId m_DatabaseConnection; + SDbConnectionId m_DatabaseConnection = 0; }; /////////////////////////////////////////////////////////////// diff --git a/Server/mods/deathmatch/logic/CPerfStat.DebugInfo.cpp b/Server/mods/deathmatch/logic/CPerfStat.DebugInfo.cpp index 3a560395c66..7a39a9cc88b 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.DebugInfo.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.DebugInfo.cpp @@ -31,8 +31,6 @@ namespace class CPerfStatDebugInfoImpl : public CPerfStatDebugInfo { public: - ZERO_ON_NEW - CPerfStatDebugInfoImpl(); virtual ~CPerfStatDebugInfoImpl(); @@ -49,7 +47,7 @@ class CPerfStatDebugInfoImpl : public CPerfStatDebugInfo void RecordStats(); SString m_strCategoryName; - bool m_bActive; + bool m_bActive = false; CTickCount m_LastGetStatsTime; SString m_LastFilter; diff --git a/Server/mods/deathmatch/logic/CPerfStat.DebugTable.cpp b/Server/mods/deathmatch/logic/CPerfStat.DebugTable.cpp index 0b733ade7cb..f948bb4597a 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.DebugTable.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.DebugTable.cpp @@ -31,8 +31,6 @@ namespace class CPerfStatDebugTableImpl : public CPerfStatDebugTable { public: - ZERO_ON_NEW - CPerfStatDebugTableImpl(); virtual ~CPerfStatDebugTableImpl(); diff --git a/Server/mods/deathmatch/logic/CPerfStat.EventPacketUsage.cpp b/Server/mods/deathmatch/logic/CPerfStat.EventPacketUsage.cpp index a110f5a9302..d60e580fcf4 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.EventPacketUsage.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.EventPacketUsage.cpp @@ -31,8 +31,6 @@ struct SEventUsage class CPerfStatEventPacketUsageImpl : public CPerfStatEventPacketUsage { public: - ZERO_ON_NEW - CPerfStatEventPacketUsageImpl(); virtual ~CPerfStatEventPacketUsageImpl(); @@ -49,9 +47,9 @@ class CPerfStatEventPacketUsageImpl : public CPerfStatEventPacketUsage // CPerfStatEventPacketUsageImpl void MaybeRecordStats(); - bool m_bEnabled; + bool m_bEnabled = false; CElapsedTime m_TimeSinceGetStats; - long long m_llNextRecordTime; + long long m_llNextRecordTime = 0; SString m_strCategoryName; std::map m_EventUsageLiveMap; std::vector m_EventUsageSortedList; diff --git a/Server/mods/deathmatch/logic/CPerfStat.FunctionTiming.cpp b/Server/mods/deathmatch/logic/CPerfStat.FunctionTiming.cpp index 0d2cd1bcc26..620358843df 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.FunctionTiming.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.FunctionTiming.cpp @@ -85,7 +85,6 @@ namespace class CPerfStatFunctionTimingImpl : public CPerfStatFunctionTiming { public: - ZERO_ON_NEW CPerfStatFunctionTimingImpl(); virtual ~CPerfStatFunctionTimingImpl(); @@ -102,7 +101,7 @@ class CPerfStatFunctionTimingImpl : public CPerfStatFunctionTiming SString m_strCategoryName; CElapsedTime m_TimeSinceLastViewed; - bool m_bIsActive; + bool m_bIsActive = false; CValueHistory m_PeakUsRequiredHistory; CElapsedTime m_TimeSinceUpdate; diff --git a/Server/mods/deathmatch/logic/CPerfStat.LibMemory.cpp b/Server/mods/deathmatch/logic/CPerfStat.LibMemory.cpp index e5972172462..6a3e4490449 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.LibMemory.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.LibMemory.cpp @@ -54,7 +54,6 @@ namespace class CPerfStatLibMemoryImpl : public CPerfStatLibMemory { public: - ZERO_ON_NEW CPerfStatLibMemoryImpl(); virtual ~CPerfStatLibMemoryImpl(); diff --git a/Server/mods/deathmatch/logic/CPerfStat.LuaMemory.cpp b/Server/mods/deathmatch/logic/CPerfStat.LuaMemory.cpp index 53d59e9dac2..c0d6a7aa2e0 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.LuaMemory.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.LuaMemory.cpp @@ -51,7 +51,6 @@ namespace class CPerfStatLuaMemoryImpl : public CPerfStatLuaMemory { public: - ZERO_ON_NEW CPerfStatLuaMemoryImpl(); virtual ~CPerfStatLuaMemoryImpl(); diff --git a/Server/mods/deathmatch/logic/CPerfStat.LuaTiming.cpp b/Server/mods/deathmatch/logic/CPerfStat.LuaTiming.cpp index 2f344f20481..617b6dcca5e 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.LuaTiming.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.LuaTiming.cpp @@ -112,7 +112,6 @@ namespace class CPerfStatLuaTimingImpl : public CPerfStatLuaTiming { public: - ZERO_ON_NEW CPerfStatLuaTimingImpl(); virtual ~CPerfStatLuaTimingImpl(); @@ -132,8 +131,8 @@ class CPerfStatLuaTimingImpl : public CPerfStatLuaTiming SString m_strCategoryName; CAllLuaTiming AllLuaTiming; - long long m_LastTickCount; - unsigned long m_SecondCounter; + long long m_LastTickCount = 0; + unsigned long m_SecondCounter = 0; CFastHashMap m_LuaMainMap; }; diff --git a/Server/mods/deathmatch/logic/CPerfStat.PacketUsage.cpp b/Server/mods/deathmatch/logic/CPerfStat.PacketUsage.cpp index 425604efe00..7e10232d479 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.PacketUsage.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.PacketUsage.cpp @@ -21,8 +21,6 @@ class CPerfStatPacketUsageImpl : public CPerfStatPacketUsage { public: - ZERO_ON_NEW - CPerfStatPacketUsageImpl(); virtual ~CPerfStatPacketUsageImpl(); @@ -34,13 +32,13 @@ class CPerfStatPacketUsageImpl : public CPerfStatPacketUsage // CPerfStatPacketUsageImpl void MaybeRecordStats(); - int m_iStatsCleared; + int m_iStatsCleared = 0; CElapsedTime m_TimeSinceGetStats; - long long m_llNextRecordTime; + long long m_llNextRecordTime = 0; SString m_strCategoryName; - SPacketStat m_PrevPacketStats[2][256]; - SPacketStat m_PacketStats[2][256]; - SFixedArray m_ShownPacketStats; + SPacketStat m_PrevPacketStats[2][256] = {0}; + SPacketStat m_PacketStats[2][256] = {0}; + SFixedArray m_ShownPacketStats = {0}; }; /////////////////////////////////////////////////////////////// diff --git a/Server/mods/deathmatch/logic/CPerfStat.PlayerPacketUsage.cpp b/Server/mods/deathmatch/logic/CPerfStat.PlayerPacketUsage.cpp index 134c4285d37..80b134edb17 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.PlayerPacketUsage.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.PlayerPacketUsage.cpp @@ -102,7 +102,6 @@ namespace class CPerfStatPlayerPacketUsageImpl : public CPerfStatPlayerPacketUsage { public: - ZERO_ON_NEW CPerfStatPlayerPacketUsageImpl(); virtual ~CPerfStatPlayerPacketUsageImpl(); @@ -118,8 +117,8 @@ class CPerfStatPlayerPacketUsageImpl : public CPerfStatPlayerPacketUsage SString m_strCategoryName; CAllPlayerPacketUsage m_AllPlayerPacketUsage; - long long m_LastTickCount; - unsigned long m_SecondCounter; + long long m_LastTickCount = 0; + unsigned long m_SecondCounter = 0; std::map m_LuaMainMap; }; diff --git a/Server/mods/deathmatch/logic/CPerfStat.RPCPacketUsage.cpp b/Server/mods/deathmatch/logic/CPerfStat.RPCPacketUsage.cpp index 6d9d081a26d..67fd4a20801 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.RPCPacketUsage.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.RPCPacketUsage.cpp @@ -242,8 +242,6 @@ struct SRPCPacketStat class CPerfStatRPCPacketUsageImpl : public CPerfStatRPCPacketUsage { public: - ZERO_ON_NEW - CPerfStatRPCPacketUsageImpl(); virtual ~CPerfStatRPCPacketUsageImpl(); @@ -259,18 +257,18 @@ class CPerfStatRPCPacketUsageImpl : public CPerfStatRPCPacketUsage // CPerfStatRPCPacketUsageImpl void MaybeRecordStats(); - int m_iStatsCleared; + int m_iStatsCleared = 0; CElapsedTime m_TimeSinceGetStats; - long long m_llNextRecordTime; + long long m_llNextRecordTime = 0; SString m_strCategoryName; - SRPCPacketStat m_PrevPacketStatsIn[256]; - SRPCPacketStat m_PacketStatsIn[256]; - SRPCPacketStat m_PacketStatsLiveIn[256]; - SFixedArray m_ShownPacketStatsIn; - SRPCPacketStat m_PrevPacketStatsOut[256]; - SRPCPacketStat m_PacketStatsOut[256]; - SRPCPacketStat m_PacketStatsLiveOut[256]; - SFixedArray m_ShownPacketStatsOut; + SRPCPacketStat m_PrevPacketStatsIn[256] = {}; + SRPCPacketStat m_PacketStatsIn[256] = {}; + SRPCPacketStat m_PacketStatsLiveIn[256] = {}; + SFixedArray m_ShownPacketStatsIn = {}; + SRPCPacketStat m_PrevPacketStatsOut[256] = {}; + SRPCPacketStat m_PacketStatsOut[256] = {}; + SRPCPacketStat m_PacketStatsLiveOut[256] = {}; + SFixedArray m_ShownPacketStatsOut = {}; }; /////////////////////////////////////////////////////////////// diff --git a/Server/mods/deathmatch/logic/CPerfStat.ServerInfo.cpp b/Server/mods/deathmatch/logic/CPerfStat.ServerInfo.cpp index 814e48c75ed..0d5792d7ff1 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.ServerInfo.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.ServerInfo.cpp @@ -56,8 +56,6 @@ namespace class CPerfStatServerInfoImpl : public CPerfStatServerInfo { public: - ZERO_ON_NEW - CPerfStatServerInfoImpl(); virtual ~CPerfStatServerInfoImpl(); @@ -71,8 +69,8 @@ class CPerfStatServerInfoImpl : public CPerfStatServerInfo SString GetProcessMemoryUsage(); SString m_strCategoryName; - time_t m_tStartTime; - long long m_llNextRecordTime; + time_t m_tStartTime = 0; + long long m_llNextRecordTime = 0; SBandwidthStatistics m_PrevLiveStats; SNetPerformanceStatistics m_NetPerformanceStats; SSyncThreadStatistics m_SyncThreadStats; diff --git a/Server/mods/deathmatch/logic/CPerfStat.ServerTiming.cpp b/Server/mods/deathmatch/logic/CPerfStat.ServerTiming.cpp index 99a25fd1759..037fcd2eba7 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.ServerTiming.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.ServerTiming.cpp @@ -21,7 +21,6 @@ class CPerfStatServerTimingImpl : public CPerfStatServerTiming { public: - ZERO_ON_NEW CPerfStatServerTimingImpl(); virtual ~CPerfStatServerTimingImpl(); @@ -36,10 +35,10 @@ class CPerfStatServerTimingImpl : public CPerfStatServerTiming void SetActive(bool bActive); SString m_strCategoryName; - long long m_LastTickCount; + long long m_LastTickCount = 0; CStatResults m_StatResults; CElapsedTime m_TimeSinceLastViewed; - bool m_bIsActive; + bool m_bIsActive = false; }; /////////////////////////////////////////////////////////////// diff --git a/Server/mods/deathmatch/logic/CPerfStat.SqliteTiming.cpp b/Server/mods/deathmatch/logic/CPerfStat.SqliteTiming.cpp index 87891f26f77..77e8bbbd7d0 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.SqliteTiming.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.SqliteTiming.cpp @@ -33,7 +33,6 @@ namespace class CPerfStatSqliteTimingImpl : public CPerfStatSqliteTiming { public: - ZERO_ON_NEW CPerfStatSqliteTimingImpl(); virtual ~CPerfStatSqliteTimingImpl(); @@ -52,11 +51,11 @@ class CPerfStatSqliteTimingImpl : public CPerfStatSqliteTiming void GetSqliteTimingStats(CPerfStatResult* pResult, const std::map& strOptionMap, const SString& strFilter); SString m_strCategoryName; - long long m_llRecordStatsEndTime; - bool m_bDisableBatching; + long long m_llRecordStatsEndTime = 0; + bool m_bDisableBatching = false; std::map m_RegistryMap; std::list m_TimingList; - lua_State* m_currentluaVM; + lua_State* m_currentluaVM = nulptr; }; /////////////////////////////////////////////////////////////// diff --git a/Server/mods/deathmatch/logic/CPerfStatModule.h b/Server/mods/deathmatch/logic/CPerfStatModule.h index 3fffecbbcc7..147fae42466 100644 --- a/Server/mods/deathmatch/logic/CPerfStatModule.h +++ b/Server/mods/deathmatch/logic/CPerfStatModule.h @@ -14,27 +14,25 @@ // struct SStatData { - ZERO_ON_NEW - struct { - SFixedArray llSentPacketsByZone; - SFixedArray llSentBytesByZone; - SFixedArray llSkippedPacketsByZone; - SFixedArray llSkippedBytesByZone; + SFixedArray llSentPacketsByZone = {}; + SFixedArray llSentBytesByZone = {}; + SFixedArray llSkippedPacketsByZone = {}; + SFixedArray llSkippedBytesByZone = {}; } puresync; struct { - long long llSyncPacketsSkipped; - long long llSyncBytesSkipped; - long long llLightSyncPacketsSent; - long long llLightSyncBytesSent; + long long llSyncPacketsSkipped = 0; + long long llSyncBytesSkipped = 0; + long long llLightSyncPacketsSent = 0; + long long llLightSyncBytesSent = 0; } lightsync; - bool bFunctionTimingActive; - int iDbJobDataCount; - int iDbConnectionCount; + bool bFunctionTimingActive = false; + int iDbJobDataCount = 0; + int iDbConnectionCount = 0; }; extern std::unique_ptr g_pStats; diff --git a/Server/mods/deathmatch/logic/CPlayer.h b/Server/mods/deathmatch/logic/CPlayer.h index 370094ab432..ed39b855f54 100644 --- a/Server/mods/deathmatch/logic/CPlayer.h +++ b/Server/mods/deathmatch/logic/CPlayer.h @@ -53,13 +53,13 @@ typedef CFastHashMap SViewerMapType; struct SScreenShotInfo { - bool bInProgress; - ushort usNextPartNumber; - ushort usScreenShotId; - long long llTimeStamp; - uint uiTotalBytes; - ushort usTotalParts; - ushort usResourceNetId; + bool bInProgress = false; + ushort usNextPartNumber = 0; + ushort usScreenShotId = 0; + long long llTimeStamp = 0; + uint uiTotalBytes = 0; + ushort usTotalParts = 0; + ushort usResourceNetId = 0; SString strTag; CBuffer buffer; }; @@ -70,7 +70,6 @@ class CPlayer : public CPed, public CClient friend class CScriptDebugging; public: - ZERO_ON_NEW CPlayer(class CPlayerManager* pPlayerManager, class CScriptDebugging* pScriptDebugging, const NetServerPlayerID& PlayerSocket); ~CPlayer(); @@ -266,32 +265,23 @@ class CPlayer : public CPed, public CClient // struct SLightweightSyncData { - SLightweightSyncData() - { - health.uiContext = 0; - health.bSync = false; - vehicleHealth.uiContext = 0; - vehicleHealth.bSync = false; - m_bSyncPosition = false; - } - struct { - float fLastHealth; - float fLastArmor; - bool bSync; - unsigned int uiContext; + float fLastHealth = 0.0f; + float fLastArmor = 0.0f; + bool bSync = false; + unsigned int uiContext = 0; } health; struct { - CVehicle* lastVehicle; - float fLastHealth; - bool bSync; - unsigned int uiContext; + CVehicle* lastVehicle = nullptr; + float fLastHealth = 0.0f; + bool bSync = false; + unsigned int uiContext = 0; } vehicleHealth; - bool m_bSyncPosition; + bool m_bSyncPosition = false; }; SLightweightSyncData& GetLightweightSyncData() { return m_lightweightSyncData; } @@ -328,10 +318,10 @@ class CPlayer : public CPed, public CClient void SetQuitReasonForLog(const SString& strReason) { m_strQuitReasonForLog = strReason; } CFastHashSet m_PureSyncSimSendList; - bool m_bPureSyncSimSendListDirty; - class CSimPlayer* m_pSimPlayer; + bool m_bPureSyncSimSendListDirty = false; + class CSimPlayer* m_pSimPlayer = nullptr; SString m_strDetectedAC; - uint m_uiD3d9Size; + uint m_uiD3d9Size = 0; SString m_strD3d9Md5; SString m_strD3d9Sha256; @@ -341,94 +331,94 @@ class CPlayer : public CPed, public CClient void WriteCameraModePacket(); void WriteCameraPositionPacket(); - class CPlayerManager* m_pPlayerManager; - class CScriptDebugging* m_pScriptDebugging; + class CPlayerManager* m_pPlayerManager = nullptr; + class CScriptDebugging* m_pScriptDebugging = nullptr; - CPlayerTextManager* m_pPlayerTextManager; + CPlayerTextManager* m_pPlayerTextManager = nullptr; SString m_strNick; - bool m_bDoNotSendEntities; - int m_iGameVersion; - unsigned short m_usMTAVersion; - unsigned short m_usBitStreamVersion; + bool m_bDoNotSendEntities = false; + int m_iGameVersion = 0; + unsigned short m_usMTAVersion = 0; + unsigned short m_usBitStreamVersion = 0; SString m_strPlayerVersion; - bool m_bIsMuted; - bool m_bIsLeavingServer; - bool m_bIsJoined; + bool m_bIsMuted = false; + bool m_bIsLeavingServer = false; + bool m_bIsJoined = false; - bool m_bNametagColorOverridden; + bool m_bNametagColorOverridden = false; - float m_fCameraRotation; - long m_lMoney; + float m_fCameraRotation = 0.0f; + long m_lMoney = 0; CVector m_vecSniperSource; CVector m_vecTargetting; - float m_fAimDirection; - unsigned char m_ucDriveByDirection; + float m_fAimDirection = 0.0f; + unsigned char m_ucDriveByDirection = 0; - bool m_bAkimboArmUp; + bool m_bAkimboArmUp = false; CElapsedTime m_ConnectedTimer; NetServerPlayerID m_PlayerSocket; - uint m_uiPing; + uint m_uiPing = 0; - time_t m_tNickChange; + time_t m_tNickChange = 0; std::list m_SyncingVehicles; std::list m_SyncingPeds; std::list m_SyncingObjects; - unsigned int m_uiScriptDebugLevel; + unsigned int m_uiScriptDebugLevel = 0; ElementID m_PlayerAttackerID; - unsigned char m_ucAttackWeapon; - unsigned char m_ucAttackBodyPart; - long long m_llSetDamageInfoTime; + unsigned char m_ucAttackWeapon = 0; + unsigned char m_ucAttackBodyPart = 0; + long long m_llSetDamageInfoTime = 0; - CTeam* m_pTeam; - CPad* m_pPad; + CTeam* m_pTeam = nullptr; + CPad* m_pPad = nullptr; - bool m_bDebuggerVisible; + bool m_bDebuggerVisible = false; - unsigned int m_uiWantedLevel; + unsigned int m_uiWantedLevel = 0; - bool m_bForcedScoreboard; - bool m_bForcedMap; + bool m_bForcedScoreboard = false; + bool m_bForcedMap = false; - CPlayerCamera* m_pCamera; + CPlayerCamera* m_pCamera = nullptr; - CKeyBinds* m_pKeyBinds; + CKeyBinds* m_pKeyBinds = nullptr; - bool m_bCursorShowing; + bool m_bCursorShowing = false; - char* m_szNametagText; - unsigned char m_ucNametagR; - unsigned char m_ucNametagG; - unsigned char m_ucNametagB; - bool m_bNametagShowing; + char* m_szNametagText = nullptr; + unsigned char m_ucNametagR = 0; + unsigned char m_ucNametagG = 0; + unsigned char m_ucNametagB = 0; + bool m_bNametagShowing = false; std::string m_strSerials[2]; std::string m_strSerialUser; std::string m_strCommunityID; - unsigned char m_ucBlurLevel; + unsigned char m_ucBlurLevel = 0; - long long m_llNextFarPuresyncTime; + long long m_llNextFarPuresyncTime = 0; // Voice - eVoiceState m_VoiceState; + eVoiceState m_VoiceState = eVoiceState::VOICESTATE_IDLE; std::list m_lstBroadcastList; std::list m_lstIgnoredList; // Sync stuff - bool m_bSyncingVelocity; - unsigned int m_uiPuresyncPackets; + bool m_bSyncingVelocity = false; + unsigned int m_uiPuresyncPackets = 0; CElapsedTime m_LastReceivedSyncTimer; std::map m_AnnounceValues; - uint m_uiWeaponIncorrectCount; + uint m_uiWeaponIncorrectCount = 0; SViewerMapType m_NearPlayerList; SViewerMapType m_FarPlayerList; @@ -437,22 +427,22 @@ class CPlayer : public CPed, public CClient CVector m_vecCamPosition; CVector m_vecCamFwd; - int m_iLastPuresyncZoneDebug; + int m_iLastPuresyncZoneDebug = 0; - long long m_llLastPositionHasChanged; + long long m_llLastPositionHasChanged = 0; SString m_strIP; SScreenShotInfo m_ScreenShotInfo; - CPlayerStatsPacket* m_pPlayerStatsPacket; - CVehicle* m_pJackingVehicle; + CPlayerStatsPacket* m_pPlayerStatsPacket = nullptr; + CVehicle* m_pJackingVehicle = nullptr; // Used to reduce calls when calculating weapon range - float m_fWeaponRangeLast; - float m_fWeaponRangeLastSkill; - eWeaponType m_eWeaponRangeLastWeapon; - uint m_uiWeaponRangeLastStatsRevision; + float m_fWeaponRangeLast = 0.0f; + float m_fWeaponRangeLastSkill = 0.0f; + eWeaponType m_eWeaponRangeLastWeapon = eWeaponType::WEAPONTYPE_UNARMED; + uint m_uiWeaponRangeLastStatsRevision = 0; - ushort m_usPrevDimension; + ushort m_usPrevDimension = 0; SString m_strQuitReasonForLog; }; diff --git a/Server/mods/deathmatch/logic/CResource.h b/Server/mods/deathmatch/logic/CResource.h index 2d87ed97c68..53e9b89c61f 100644 --- a/Server/mods/deathmatch/logic/CResource.h +++ b/Server/mods/deathmatch/logic/CResource.h @@ -148,7 +148,6 @@ class CResource : public EHS using KeyValueMap = CFastHashMap; public: - ZERO_ON_NEW CResource(CResourceManager* pResourceManager, bool bIsZipped, const char* szAbsPath, const char* szResourceName); ~CResource(); diff --git a/Server/mods/deathmatch/logic/CResourceManager.h b/Server/mods/deathmatch/logic/CResourceManager.h index 1735b4e9eff..9286d9bf88c 100644 --- a/Server/mods/deathmatch/logic/CResourceManager.h +++ b/Server/mods/deathmatch/logic/CResourceManager.h @@ -45,7 +45,6 @@ class CResourceManager }; public: - ZERO_ON_NEW CResourceManager(); ~CResourceManager(); @@ -121,10 +120,10 @@ class CResourceManager private: SString m_strResourceDirectory; CMappedList m_resources; - unsigned int m_uiResourceLoadedCount; - unsigned int m_uiResourceFailedCount; - bool m_bResourceListChanged; - list m_resourcesToStartAfterRefresh; + unsigned int m_uiResourceLoadedCount = 0; + unsigned int m_uiResourceFailedCount = 0; + bool m_bResourceListChanged = false; + std::list m_resourcesToStartAfterRefresh; // Maps to speed things up CFastHashMap m_ResourceLuaStateMap; @@ -132,12 +131,12 @@ class CResourceManager CFastHashMap m_NameResourceMap; std::map m_NetIdResourceMap; - list m_resourceQueue; + std::list m_resourceQueue; SString m_strMinClientRequirement; CFastHashMap m_MinClientRequirementMap; CFastHashMap m_SyncMapElementDataOptionMap; - ushort m_usNextNetId; + ushort m_usNextNetId = 0; std::map m_BlockedFileReasonMap; }; diff --git a/Server/mods/deathmatch/logic/CVehicle.h b/Server/mods/deathmatch/logic/CVehicle.h index 6b6ef3f27ef..32c5703d3b3 100644 --- a/Server/mods/deathmatch/logic/CVehicle.h +++ b/Server/mods/deathmatch/logic/CVehicle.h @@ -125,15 +125,15 @@ struct SSirenBeaconInfo struct SSirenInfo { // Flags - bool m_b360Flag; - bool m_bDoLOSCheck; - bool m_bUseRandomiser; - bool m_bSirenSilent; + bool m_b360Flag = false; + bool m_bDoLOSCheck = false; + bool m_bUseRandomiser = false; + bool m_bSirenSilent = false; // End of flags - bool m_bOverrideSirens; - unsigned char m_ucSirenType; - unsigned char m_ucSirenCount; - SFixedArray m_tSirenInfo; + bool m_bOverrideSirens = false; + unsigned char m_ucSirenType = 0; + unsigned char m_ucSirenCount = 0; + SFixedArray m_tSirenInfo = {}; }; class CVehicle : public CElement @@ -141,7 +141,6 @@ class CVehicle : public CElement friend class CPlayer; public: - ZERO_ON_NEW CVehicle(class CVehicleManager* pVehicleManager, CElement* pParent, unsigned short usModel, unsigned char ucVariant, unsigned char ucVariant2); ~CVehicle(); CElement* Clone(bool* bAddEntity, CResource* pResource) override; @@ -350,97 +349,97 @@ class CVehicle : public CElement bool ReadSpecialData(const int iLine) override; private: - class CVehicleManager* m_pVehicleManager; + class CVehicleManager* m_pVehicleManager = nullptr; - CPlayer* m_pSyncer; - SFixedArray m_pOccupants; + CPlayer* m_pSyncer = nullptr; + SFixedArray m_pOccupants = {}; - unsigned short m_usModel; - eVehicleType m_eVehicleType; + unsigned short m_usModel = 0; + eVehicleType m_eVehicleType = eVehicleType::VEHICLE_NONE; CVector m_vecPosition; CVector m_vecRotationDegrees; CVector m_vecVelocity; CVector m_vecVelocityMeters; CVector m_vecTurnSpeed; - float m_fHealth; - float m_fLastSyncedHealthHealth; + float m_fHealth = 0.0f; + float m_fLastSyncedHealthHealth = 0.0f; CTickCount m_llBlowTime; CTickCount m_llIdleTime; - unsigned char m_ucMaxPassengersOverride; + unsigned char m_ucMaxPassengersOverride = 0; CVehicleColor m_Color; - bool m_bIsFrozen; - bool m_bUnoccupiedSyncable; + bool m_bIsFrozen = false; + bool m_bUnoccupiedSyncable = false; - CVehicleUpgrades* m_pUpgrades; + CVehicleUpgrades* m_pUpgrades = nullptr; - unsigned char m_ucOverrideLights; + unsigned char m_ucOverrideLights = 0; - CVehicle* m_pTowedVehicle; - CVehicle* m_pTowedByVehicle; + CVehicle* m_pTowedVehicle = nullptr; + CVehicle* m_pTowedByVehicle = nullptr; - char m_szRegPlate[9]; - unsigned char m_ucPaintjob; + char m_szRegPlate[9] = {0}; + unsigned char m_ucPaintjob = 0; - SFixedArray m_fDoorOpenRatio; - bool m_bLocked; - bool m_bDoorsUndamageable; - bool m_bEngineOn; - bool m_bGunsEnabled; - bool m_bFuelTankExplodable; - bool m_bOnGround; - bool m_bSmokeTrail; - unsigned char m_ucAlpha; - bool m_bInWater; - CPlayer* m_pJackingPlayer; + SFixedArray m_fDoorOpenRatio = {}; + bool m_bLocked = false; + bool m_bDoorsUndamageable = false; + bool m_bEngineOn = false; + bool m_bGunsEnabled = false; + bool m_bFuelTankExplodable = false; + bool m_bOnGround = false; + bool m_bSmokeTrail = false; + unsigned char m_ucAlpha = 0; + bool m_bInWater = false; + CPlayer* m_pJackingPlayer = nullptr; SColor m_HeadLightColor; - bool m_bHeliSearchLightVisible; + bool m_bHeliSearchLightVisible = false; // Train specific data - bool m_bDerailed; - bool m_bIsDerailable; - bool m_bTrainDirection; - float m_fTrainSpeed; - float m_fTrainPosition; - uchar m_ucTrackID; + bool m_bDerailed = false; + bool m_bIsDerailable = false; + bool m_bTrainDirection = false; + float m_fTrainSpeed = 0.0f; + float m_fTrainPosition = 0.0f; + uchar m_ucTrackID = 0; // Used to remember where this vehicle spawns CVector m_vecRespawnPosition; CVector m_vecRespawnRotationDegrees; - float m_fRespawnHealth; - bool m_bRespawnEnabled; - unsigned long m_ulBlowRespawnInterval; - unsigned long m_ulIdleRespawnInterval; + float m_fRespawnHealth = 0.0f; + bool m_bRespawnEnabled = false; + unsigned long m_ulBlowRespawnInterval = 0; + unsigned long m_ulIdleRespawnInterval = 0; // Vehicle specific data float m_fTurretPositionX; float m_fTurretPositionY; - bool m_bSirenActive; - bool m_bTaxiLightState; - bool m_bLandingGearDown; - unsigned short m_usAdjustableProperty; - bool m_bCollisionsEnabled; + bool m_bSirenActive = false; + bool m_bTaxiLightState = false; + bool m_bLandingGearDown = false; + unsigned short m_usAdjustableProperty = 0; + bool m_bCollisionsEnabled = false; - CHandlingEntry* m_pHandlingEntry; - bool m_bHandlingChanged; + CHandlingEntry* m_pHandlingEntry = nullptr; + bool m_bHandlingChanged = false; - unsigned char m_ucVariant; - unsigned char m_ucVariant2; + unsigned char m_ucVariant = 0; + unsigned char m_ucVariant2 = 0; CTickCount m_LastPushedTime; CVector m_vecStationaryCheckPosition; - bool m_bNeedsDimensionResync; - ushort m_usLastUnoccupiedSyncDimension; + bool m_bNeedsDimensionResync = false; + ushort m_usLastUnoccupiedSyncDimension = 0; public: // 'Safe' variables (that have no need for accessors) - bool m_bDamageProof; - uint m_uiDamageInfoSendPhase; - SFixedArray m_ucDoorStates; - SFixedArray m_ucWheelStates; - SFixedArray m_ucPanelStates; - SFixedArray m_ucLightStates; + bool m_bDamageProof = false; + uint m_uiDamageInfoSendPhase = 0; + SFixedArray m_ucDoorStates = {}; + SFixedArray m_ucWheelStates = {}; + SFixedArray m_ucPanelStates = {}; + SFixedArray m_ucLightStates = {}; SSirenInfo m_tSirenBeaconInfo; - bool m_bOccupantChanged; + bool m_bOccupantChanged = false; }; diff --git a/Server/mods/deathmatch/logic/lua/CLuaMain.h b/Server/mods/deathmatch/logic/lua/CLuaMain.h index a1450377d2e..108547ccb55 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaMain.h +++ b/Server/mods/deathmatch/logic/lua/CLuaMain.h @@ -40,7 +40,6 @@ struct CRefInfo class CLuaMain //: public CClient { public: - ZERO_ON_NEW CLuaMain(class CLuaManager* pLuaManager, CObjectManager* pObjectManager, CPlayerManager* pPlayerManager, CVehicleManager* pVehicleManager, CBlipManager* pBlipManager, CRadarAreaManager* pRadarAreaManager, CMapManager* pMapManager, CResource* pResourceOwner, bool bEnableOOP); @@ -120,32 +119,32 @@ class CLuaMain //: public CClient SString m_strScriptName; - lua_State* m_luaVM; - CLuaTimerManager* m_pLuaTimerManager; + lua_State* m_luaVM = nullptr; + CLuaTimerManager* m_pLuaTimerManager = nullptr; - class CResource* m_pResource; - class CResourceFile* m_pResourceFile; - CBlipManager* m_pBlipManager; - CObjectManager* m_pObjectManager; - CPlayerManager* m_pPlayerManager; - CRadarAreaManager* m_pRadarAreaManager; - CVehicleManager* m_pVehicleManager; - CMapManager* m_pMapManager; + class CResource* m_pResource = nullptr; + class CResourceFile* m_pResourceFile = nullptr; + CBlipManager* m_pBlipManager = nullptr; + CObjectManager* m_pObjectManager = nullptr; + CPlayerManager* m_pPlayerManager = nullptr; + CRadarAreaManager* m_pRadarAreaManager = nullptr; + CVehicleManager* m_pVehicleManager = nullptr; + CMapManager* m_pMapManager = nullptr; - list m_XMLFiles; - list m_Displays; - list m_TextItems; + std::list m_XMLFiles; + std::list m_Displays; + std::list m_TextItems; - bool m_bEnableOOP; + bool m_bEnableOOP = false; - bool m_bBeingDeleted; // prevent it being deleted twice + bool m_bBeingDeleted = false; // prevent it being deleted twice CElapsedTime m_FunctionEnterTimer; CElapsedTimeApprox m_WarningTimer; - uint m_uiPCallDepth; + uint m_uiPCallDepth = 0; std::vector m_OpenFilenameList; - uint m_uiOpenFileCountWarnThresh; - uint m_uiOpenXMLFileCountWarnThresh; + uint m_uiOpenFileCountWarnThresh = 0; + uint m_uiOpenXMLFileCountWarnThresh = 0; static SString ms_strExpectedUndumpHash; public: diff --git a/Server/mods/deathmatch/logic/lua/LuaCommon.h b/Server/mods/deathmatch/logic/lua/LuaCommon.h index a671e23c66d..8722d621bec 100644 --- a/Server/mods/deathmatch/logic/lua/LuaCommon.h +++ b/Server/mods/deathmatch/logic/lua/LuaCommon.h @@ -91,6 +91,6 @@ struct SLuaDebugInfo } SString strFile; SString strShortSrc; - int iLine; - int infoType; -}; \ No newline at end of file + int iLine = 0; + int infoType = 0; +}; diff --git a/Server/mods/deathmatch/logic/net/CNetBuffer.h b/Server/mods/deathmatch/logic/net/CNetBuffer.h index edfbb55b3bf..bcea39feedc 100644 --- a/Server/mods/deathmatch/logic/net/CNetBuffer.h +++ b/Server/mods/deathmatch/logic/net/CNetBuffer.h @@ -53,7 +53,6 @@ class CNetJobData class CNetServerBuffer : public CNetServer { public: - ZERO_ON_NEW CNetServerBuffer(CSimPlayerManager* pSimPlayerManager); virtual ~CNetServerBuffer(); @@ -185,30 +184,30 @@ class CNetServerBuffer : public CNetServer void GetQueueSizes(uint& uiFinishedList, uint& uiOutCommandQueue, uint& uiOutResultQueue, uint& uiInResultQueue, uint& uiGamePlayerCount); // Main thread variables - PPACKETHANDLER m_pfnDMPacketHandler; - CThreadHandle* m_pServiceThreadHandle; + PPACKETHANDLER m_pfnDMPacketHandler = nullptr; + CThreadHandle* m_pServiceThreadHandle = nullptr; CElapsedTime m_TimeThreadFPSLastCalced; - float m_fSmoothThreadFPS; + float m_fSmoothThreadFPS = 0.0f; CElapsedTime m_TimeSinceGetPacketStats; - SPacketStat m_PacketStatList[2][256]; + SPacketStat m_PacketStatList[2][256] = {}; // Sync thread variables - CNetServer* m_pRealNetServer; - CSimPlayerManager* m_pSimPlayerManager; + CNetServer* m_pRealNetServer = nullptr; + CSimPlayerManager* m_pSimPlayerManager = nullptr; // Shared variables struct { - bool m_bTerminateThread; - bool m_bThreadTerminated; - bool m_bAutoPulse; + bool m_bTerminateThread = false; + bool m_bThreadTerminated = false; + bool m_bAutoPulse = false; std::list m_OutCommandQueue; std::list m_OutResultQueue; std::list m_InResultQueue; std::set m_FinishedList; // Result has been used, will be deleted next pulse (shared access with watchdog thread) CComboMutex m_Mutex; - CNetBufferWatchDog* m_pWatchDog; - int m_iThreadFrameCount; - uint m_iuGamePlayerCount; + CNetBufferWatchDog* m_pWatchDog = nullptr; + int m_iThreadFrameCount = 0; + uint m_iuGamePlayerCount = 0; } shared; }; diff --git a/Server/mods/deathmatch/logic/net/CNetBufferWatchDog.h b/Server/mods/deathmatch/logic/net/CNetBufferWatchDog.h index d22007f3b83..8561fada94b 100644 --- a/Server/mods/deathmatch/logic/net/CNetBufferWatchDog.h +++ b/Server/mods/deathmatch/logic/net/CNetBufferWatchDog.h @@ -53,7 +53,7 @@ class CSizeHistory class CQueueInfo { public: - EQueueStatusType status; + EQueueStatusType status = EQueueStatusType::STATUS_OK; CSizeHistory m_SizeHistory; }; @@ -63,7 +63,6 @@ class CQueueInfo class CNetBufferWatchDog { public: - ZERO_ON_NEW CNetBufferWatchDog(CNetServerBuffer* pNetBuffer, bool bVerboseDebug); ~CNetBufferWatchDog(); @@ -81,25 +80,25 @@ class CNetBufferWatchDog void AllowIncomingSyncPackets(); // Main thread variables - CThreadHandle* m_pServiceThreadHandle; + CThreadHandle* m_pServiceThreadHandle = nullptr; // Check thread variables - CNetServerBuffer* m_pNetBuffer; - uint m_uiFinishedListHigh; - uint m_uiOutCommandQueueHigh; - uint m_uiOutResultQueueHigh; - uint m_uiInResultQueueHigh; + CNetServerBuffer* m_pNetBuffer = nullptr; + uint m_uiFinishedListHigh = 0; + uint m_uiOutCommandQueueHigh = 0; + uint m_uiOutResultQueueHigh = 0; + uint m_uiInResultQueueHigh = 0; CQueueInfo m_FinishedListQueueInfo; CQueueInfo m_OutCommandQueueInfo; CQueueInfo m_OutResultQueueInfo; CQueueInfo m_InResultQueueInfo; - uint m_uiGamePlayerCount; + uint m_uiGamePlayerCount = 0; // Shared variables struct { - bool m_bTerminateThread; - bool m_bThreadTerminated; + bool m_bTerminateThread = false; + bool m_bThreadTerminated = false; CComboMutex m_Mutex; } shared; diff --git a/Server/mods/deathmatch/logic/net/CSimBulletsyncPacket.h b/Server/mods/deathmatch/logic/net/CSimBulletsyncPacket.h index b45babcb5da..6701aa5b21d 100644 --- a/Server/mods/deathmatch/logic/net/CSimBulletsyncPacket.h +++ b/Server/mods/deathmatch/logic/net/CSimBulletsyncPacket.h @@ -13,8 +13,6 @@ class CSimBulletsyncPacket : public CSimPacket { public: - ZERO_ON_NEW - CSimBulletsyncPacket(ElementID PlayerID); ePacketID GetPacketID() const { return PACKET_ID_PLAYER_BULLETSYNC; }; @@ -29,12 +27,12 @@ class CSimBulletsyncPacket : public CSimPacket // Set in Read () struct { - eWeaponType weaponType; + eWeaponType weaponType = eWeaponType::WEAPONTYPE_UNARMED; CVector vecStart; CVector vecEnd; - uchar ucOrderCounter; - float fDamage; - uchar ucHitZone; + uchar ucOrderCounter = 0; + float fDamage = 0.0f; + uchar ucHitZone = 0; ElementID DamagedPlayerID; } m_Cache; }; diff --git a/Server/mods/deathmatch/logic/net/CSimKeysyncPacket.h b/Server/mods/deathmatch/logic/net/CSimKeysyncPacket.h index dd0e0a92181..41b676fde87 100644 --- a/Server/mods/deathmatch/logic/net/CSimKeysyncPacket.h +++ b/Server/mods/deathmatch/logic/net/CSimKeysyncPacket.h @@ -13,8 +13,6 @@ class CSimKeysyncPacket : public CSimPacket { public: - ZERO_ON_NEW - CSimKeysyncPacket(ElementID PlayerID, bool bPlayerHasOccupiedVehicle, ushort usVehicleGotModel, uchar ucPlayerGotWeaponType, float fPlayerGotWeaponRange, bool bVehicleHasHydraulics, bool bVehicleIsPlaneOrHeli, CControllerState& sharedControllerState); @@ -26,31 +24,31 @@ class CSimKeysyncPacket : public CSimPacket // Set in constructor const ElementID m_PlayerID; - const bool m_bPlayerHasOccupiedVehicle; - const ushort m_usVehicleGotModel; - const uchar m_ucPlayerGotWeaponType; - const float m_fPlayerGotWeaponRange; - const bool m_bVehicleHasHydraulics; - const bool m_bVehicleIsPlaneOrHeli; + const bool m_bPlayerHasOccupiedVehicle = false; + const ushort m_usVehicleGotModel = 0; + const uchar m_ucPlayerGotWeaponType = 0; + const float m_fPlayerGotWeaponRange = 0.0f; + const bool m_bVehicleHasHydraulics = false; + const bool m_bVehicleIsPlaneOrHeli = false; CControllerState& m_sharedControllerState; // Set in Read () struct { - float fPlayerRotation; - float fCameraRotation; + float fPlayerRotation = 0.0f; + float fCameraRotation = 0.0f; - SKeysyncFlags flags; + SKeysyncFlags flags = {}; - bool bWeaponCorrect; - uchar ucWeaponSlot; // Only valid if bWeaponCorrect - ushort usAmmoInClip; // Only valid if bWeaponCorrect + bool bWeaponCorrect = false; + uchar ucWeaponSlot = 0; // Only valid if bWeaponCorrect + ushort usAmmoInClip = 0; // Only valid if bWeaponCorrect - float fAimDirection; // Only valid if bWeaponCorrect + float fAimDirection = 0.0f; // Only valid if bWeaponCorrect CVector vecSniperSource; CVector vecTargetting; - uchar ucDriveByDirection; + uchar ucDriveByDirection = 0; SVehicleTurretSync turretSync; } m_Cache; diff --git a/Server/mods/deathmatch/logic/net/CSimPedTaskPacket.h b/Server/mods/deathmatch/logic/net/CSimPedTaskPacket.h index 3d80f862f99..e9e617d8479 100644 --- a/Server/mods/deathmatch/logic/net/CSimPedTaskPacket.h +++ b/Server/mods/deathmatch/logic/net/CSimPedTaskPacket.h @@ -13,8 +13,6 @@ class CSimPedTaskPacket : public CSimPacket { public: - ZERO_ON_NEW - CSimPedTaskPacket(ElementID PlayerID); ePacketID GetPacketID() const { return PACKET_ID_PED_TASK; }; @@ -29,7 +27,7 @@ class CSimPedTaskPacket : public CSimPacket // Set in Read () struct { - uint uiNumBitsInPacketBody; - char DataBuffer[56]; + uint uiNumBitsInPacketBody = 0; + char DataBuffer[56] = {0}; } m_Cache; }; diff --git a/Server/mods/deathmatch/logic/net/CSimPlayer.h b/Server/mods/deathmatch/logic/net/CSimPlayer.h index 5cc86d5ad02..cb208d616c8 100644 --- a/Server/mods/deathmatch/logic/net/CSimPlayer.h +++ b/Server/mods/deathmatch/logic/net/CSimPlayer.h @@ -9,10 +9,10 @@ struct SSimVehicleDamageInfo { - SFixedArray m_ucDoorStates; - SFixedArray m_ucWheelStates; - SFixedArray m_ucPanelStates; - SFixedArray m_ucLightStates; + SFixedArray m_ucDoorStates = {}; + SFixedArray m_ucWheelStates = {}; + SFixedArray m_ucPanelStates = {}; + SFixedArray m_ucLightStates = {}; }; // @@ -21,7 +21,6 @@ struct SSimVehicleDamageInfo class CSimPlayer { public: - ZERO_ON_NEW CSimPlayer() { DEBUG_CREATE_COUNT("CSimPlayer"); } ~CSimPlayer() { DEBUG_DESTROY_COUNT("CSimPlayer"); } @@ -31,35 +30,35 @@ class CSimPlayer NetServerPlayerID& GetSocket() { return m_PlayerSocket; }; // General synced vars - bool m_bIsJoined; - unsigned short m_usBitStreamVersion; - NetServerPlayerID m_PlayerSocket; + bool m_bIsJoined = false; + unsigned short m_usBitStreamVersion = 0; + NetServerPlayerID m_PlayerSocket ; std::vector m_PuresyncSendListFlat; std::multimap m_PuresyncSendListGrouped; // Send list grouped by bitstream version - bool m_bSendListChanged; - bool m_bHasOccupiedVehicle; + bool m_bSendListChanged = false; + bool m_bHasOccupiedVehicle = false; CControllerState m_sharedControllerState; // Updated by CSim*Packet code // Used in CSimPlayerPuresyncPacket and CSimVehiclePuresyncPacket ElementID m_PlayerID; - ushort m_usLatency; - uchar m_ucSyncTimeContext; - uchar m_ucWeaponType; + ushort m_usLatency = 0; + uchar m_ucSyncTimeContext = 0; + uchar m_ucWeaponType = 0; // Used in CSimVehiclePuresyncPacket - ushort m_usVehicleModel; - uchar m_ucOccupiedVehicleSeat; - float m_fWeaponRange; - uint m_uiVehicleDamageInfoSendPhase; + ushort m_usVehicleModel = 0; + uchar m_ucOccupiedVehicleSeat = 0; + float m_fWeaponRange = 0.0f; + uint m_uiVehicleDamageInfoSendPhase = 0; SSimVehicleDamageInfo m_VehicleDamageInfo; // Used in CSimKeysyncPacket - bool m_bVehicleHasHydraulics; - bool m_bVehicleIsPlaneOrHeli; + bool m_bVehicleHasHydraulics = false; + bool m_bVehicleIsPlaneOrHeli = false; // Flag - bool m_bDoneFirstUpdate; + bool m_bDoneFirstUpdate = false; // Interlink to CPlayer object - CPlayer* m_pRealPlayer; + CPlayer* m_pRealPlayer = nullptr; }; diff --git a/Server/mods/deathmatch/logic/net/CSimPlayerManager.h b/Server/mods/deathmatch/logic/net/CSimPlayerManager.h index 9fcca806951..a3acc344438 100644 --- a/Server/mods/deathmatch/logic/net/CSimPlayerManager.h +++ b/Server/mods/deathmatch/logic/net/CSimPlayerManager.h @@ -10,8 +10,6 @@ class CSimPlayerManager { public: - ZERO_ON_NEW - // Main thread methods void AddSimPlayer(CPlayer* pPlayer); void RemoveSimPlayer(CPlayer* pPlayer); @@ -32,7 +30,7 @@ class CSimPlayerManager protected: // Shared variables - bool m_bIsLocked; + bool m_bIsLocked = false; CCriticalSection m_CS; std::set m_AllSimPlayerMap; std::map m_SocketSimMap; diff --git a/Server/mods/deathmatch/logic/net/CSimPlayerPuresyncPacket.h b/Server/mods/deathmatch/logic/net/CSimPlayerPuresyncPacket.h index 5afc3a7b4c9..002ed4ae5b2 100644 --- a/Server/mods/deathmatch/logic/net/CSimPlayerPuresyncPacket.h +++ b/Server/mods/deathmatch/logic/net/CSimPlayerPuresyncPacket.h @@ -27,8 +27,6 @@ class CSimPacket class CSimPlayerPuresyncPacket : public CSimPacket { public: - ZERO_ON_NEW - CSimPlayerPuresyncPacket(ElementID PlayerID, ushort PlayerLatency, uchar PlayerSyncTimeContext, uchar PlayerGotWeaponType, float WeaponRange, CControllerState& sharedControllerState); @@ -47,34 +45,34 @@ class CSimPlayerPuresyncPacket : public CSimPacket // Set in constructor const ElementID m_PlayerID; - const ushort m_PlayerLatency; - const uchar m_PlayerSyncTimeContext; - const uchar m_PlayerGotWeaponType; - const float m_WeaponRange; + const ushort m_PlayerLatency = 0; + const uchar m_PlayerSyncTimeContext = 0; + const uchar m_PlayerGotWeaponType = 0; + const float m_WeaponRange = 0.0f; CControllerState& m_sharedControllerState; // Set in Read () struct { - uchar ucTimeContext; - SPlayerPuresyncFlags flags; + uchar ucTimeContext = 0; + SPlayerPuresyncFlags flags = {}; ElementID ContactElementID; CVector Position; - float fRotation; + float fRotation = 0.0f; CVector Velocity; - float fHealth; - float fArmor; - float fCameraRotation; + float fHealth = 0.0f; + float fArmor = 0.0f; + float fCameraRotation = 0.0f; CVector vecCamPosition; CVector vecCamFwd; - bool bWeaponCorrect; - uchar ucWeaponSlot; // Only valid if bWeaponCorrect - ushort usAmmoInClip; // Only valid if bWeaponCorrect - ushort usTotalAmmo; // Only valid if bWeaponCorrect + bool bWeaponCorrect = false; + uchar ucWeaponSlot = 0; // Only valid if bWeaponCorrect + ushort usAmmoInClip = 0; // Only valid if bWeaponCorrect + ushort usTotalAmmo = 0; // Only valid if bWeaponCorrect - bool bIsAimFull; - float fAimDirection; // Only valid if bWeaponCorrect + bool bIsAimFull = false; + float fAimDirection = 0.0f; // Only valid if bWeaponCorrect CVector vecSniperSource; // Only valid if bWeaponCorrect and bIsAimFull CVector vecTargetting; // Only valid if bWeaponCorrect and bIsAimFull } m_Cache; diff --git a/Server/mods/deathmatch/logic/net/CSimVehiclePuresyncPacket.h b/Server/mods/deathmatch/logic/net/CSimVehiclePuresyncPacket.h index c6f34747c09..ff96948573c 100644 --- a/Server/mods/deathmatch/logic/net/CSimVehiclePuresyncPacket.h +++ b/Server/mods/deathmatch/logic/net/CSimVehiclePuresyncPacket.h @@ -17,7 +17,6 @@ struct STrailerInfo class CSimVehiclePuresyncPacket : public CSimPacket { public: - ZERO_ON_NEW CSimVehiclePuresyncPacket(ElementID PlayerID, ushort usPlayerLatency, uchar ucPlayerSyncTimeContext, bool bPlayerHasOccupiedVehicle, ushort usVehicleGotModel, uchar ucPlayerGotOccupiedVehicleSeat, uchar ucPlayerGotWeaponType, float fPlayerGotWeaponRange, CControllerState& sharedControllerState, uint m_uiDamageInfoSendPhase, const SSimVehicleDamageInfo& damageInfo); @@ -41,23 +40,23 @@ class CSimVehiclePuresyncPacket : public CSimPacket // Set in constructor const ElementID m_PlayerID; - const ushort m_usPlayerLatency; - const uchar m_ucPlayerSyncTimeContext; - const bool m_bPlayerHasOccupiedVehicle; - const ushort m_usVehicleGotModel; - const uchar m_ucPlayerGotOccupiedVehicleSeat; - const uchar m_ucPlayerGotWeaponType; - const float m_fPlayerGotWeaponRange; + const ushort m_usPlayerLatency = 0; + const uchar m_ucPlayerSyncTimeContext = 0; + const bool m_bPlayerHasOccupiedVehicle = false; + const ushort m_usVehicleGotModel = 0; + const uchar m_ucPlayerGotOccupiedVehicleSeat = 0; + const uchar m_ucPlayerGotWeaponType = 0; + const float m_fPlayerGotWeaponRange = 0.0f; CControllerState& m_sharedControllerState; - const uint m_uiDamageInfoSendPhase; + const uint m_uiDamageInfoSendPhase = 0; const SSimVehicleDamageInfo& m_DamageInfo; // Set in Read() struct { - uchar ucTimeContext; + uchar ucTimeContext = 0; - int iModelID; + int iModelID = 0; CVector PlrPosition; CVector vecCamPosition; @@ -68,34 +67,34 @@ class CSimVehiclePuresyncPacket : public CSimPacket CVector BothVelocity; CVector VehTurnSpeed; - float fVehHealth; + float fVehHealth = 0.0f; std::vector TrailerList; - float fPlrHealth; - float fArmor; - SVehiclePuresyncFlags flags; + float fPlrHealth = 0.0f; + float fArmor = 0.0f; + SVehiclePuresyncFlags flags = {}; - uchar ucWeaponSlot; + uchar ucWeaponSlot = 0; - ushort usAmmoInClip; - ushort usTotalAmmo; + ushort usAmmoInClip = 0; + ushort usTotalAmmo = 0; - float fAimDirection; + float fAimDirection = 0.0f; CVector vecSniperSource; CVector vecTargetting; - uchar ucDriveByDirection; + uchar ucDriveByDirection = 0; - float fTurretX; - float fTurretY; - ushort usAdjustableProperty; + float fTurretX = 0.0f; + float fTurretY = 0.0f; + ushort usAdjustableProperty = 0; - float fRailPosition; - uchar ucRailTrack; - bool bRailDirection; - float fRailSpeed; + float fRailPosition = 0.0f; + uchar ucRailTrack = 0; + bool bRailDirection = false; + float fRailSpeed = 0.0f; - SFixedArray fDoorOpenRatio; + SFixedArray fDoorOpenRatio = {}; } m_Cache; }; diff --git a/Server/mods/deathmatch/utils/CFunctionUseLogger.h b/Server/mods/deathmatch/utils/CFunctionUseLogger.h index 352f51b18f1..8aa020040b0 100644 --- a/Server/mods/deathmatch/utils/CFunctionUseLogger.h +++ b/Server/mods/deathmatch/utils/CFunctionUseLogger.h @@ -23,8 +23,6 @@ struct SFuncCallRecord class CFunctionUseLogger { public: - ZERO_ON_NEW - CFunctionUseLogger(const SString& strLogFilename); ~CFunctionUseLogger(); diff --git a/Server/mods/deathmatch/utils/CHqComms.h b/Server/mods/deathmatch/utils/CHqComms.h index 2ac6245c01f..341812f9d36 100644 --- a/Server/mods/deathmatch/utils/CHqComms.h +++ b/Server/mods/deathmatch/utils/CHqComms.h @@ -23,8 +23,6 @@ enum class CHqComms : public CRefCountable { public: - ZERO_ON_NEW - CHqComms() { m_iPollInterval = TICKS_FROM_MINUTES(60); @@ -245,9 +243,9 @@ class CHqComms : public CRefCountable protected: ~CHqComms() {} // Must use Release() - int m_iPollInterval; - int m_iPrevBadFileHashesRev; - uint m_Stage; + int m_iPollInterval = 0; + int m_iPrevBadFileHashesRev = 0; + uint m_Stage = 0; CElapsedTime m_CheckTimer; SString m_strURL; SString m_strPrevMessage; diff --git a/Server/mods/deathmatch/utils/CMasterServerAnnouncer.h b/Server/mods/deathmatch/utils/CMasterServerAnnouncer.h index 7aa8c38236a..bcf5aedf5e4 100644 --- a/Server/mods/deathmatch/utils/CMasterServerAnnouncer.h +++ b/Server/mods/deathmatch/utils/CMasterServerAnnouncer.h @@ -10,11 +10,11 @@ struct SMasterServerDefinition { - bool bAcceptsPush; - bool bDoReminders; - bool bHideProblems; - bool bHideSuccess; - uint uiReminderIntervalMins; + bool bAcceptsPush = false; + bool bDoReminders = false; + bool bHideProblems = false; + bool bHideSuccess = false; + uint uiReminderIntervalMins = 0; SString strDesc; SString strURL; }; @@ -35,8 +35,6 @@ enum class CMasterServer : public CRefCountable { public: - ZERO_ON_NEW - CMasterServer(const SMasterServerDefinition& definition) : m_Definition(definition) { m_Stage = ANNOUNCE_STAGE_INITIAL; @@ -180,13 +178,13 @@ class CMasterServer : public CRefCountable static CNetHTTPDownloadManagerInterface* GetDownloadManager() { return g_pNetServer->GetHTTPDownloadManager(EDownloadMode::ASE); } protected: - bool m_bStatusBusy; - uint m_Stage; - uint m_uiInitialAnnounceRetryAttempts; - uint m_uiInitialAnnounceRetryInterval; - uint m_uiPushInterval; - long long m_llLastAnnounceTime; - long long m_llLastPushTime; + bool m_bStatusBusy = false; + uint m_Stage = 0; + uint m_uiInitialAnnounceRetryAttempts = 0; + uint m_uiInitialAnnounceRetryInterval = 0; + uint m_uiPushInterval = 0; + long long m_llLastAnnounceTime = 0; + long long m_llLastPushTime = 0; const SMasterServerDefinition m_Definition; }; @@ -198,8 +196,6 @@ class CMasterServer : public CRefCountable class CMasterServerAnnouncer { public: - ZERO_ON_NEW - ~CMasterServerAnnouncer() { while (!m_MasterServerList.empty()) diff --git a/Server/mods/deathmatch/utils/COpenPortsTester.h b/Server/mods/deathmatch/utils/COpenPortsTester.h index 24722fde4e0..a427c513a3f 100644 --- a/Server/mods/deathmatch/utils/COpenPortsTester.h +++ b/Server/mods/deathmatch/utils/COpenPortsTester.h @@ -11,8 +11,6 @@ class COpenPortsTester { public: - ZERO_ON_NEW - // // Start a new test // @@ -133,5 +131,5 @@ class COpenPortsTester static CNetHTTPDownloadManagerInterface* GetDownloadManager() { return g_pNetServer->GetHTTPDownloadManager(EDownloadMode::ASE); } protected: - int m_iPortTestStage; + int m_iPortTestStage = 0; }; diff --git a/Server/sdk/net/ns_common.h b/Server/sdk/net/ns_common.h index a1fdf5eea0d..5f429fc8c23 100644 --- a/Server/sdk/net/ns_common.h +++ b/Server/sdk/net/ns_common.h @@ -113,33 +113,33 @@ struct NetStatistics struct SBandwidthStatistics { - long long llOutgoingUDPByteCount; - long long llIncomingUDPByteCount; - long long llIncomingUDPByteCountBlocked; - long long llOutgoingUDPPacketCount; - long long llIncomingUDPPacketCount; - long long llIncomingUDPPacketCountBlocked; - long long llOutgoingUDPByteResentCount; - long long llOutgoingUDPMessageResentCount; + long long llOutgoingUDPByteCount = 0; + long long llIncomingUDPByteCount = 0; + long long llIncomingUDPByteCountBlocked = 0; + long long llOutgoingUDPPacketCount = 0; + long long llIncomingUDPPacketCount = 0; + long long llIncomingUDPPacketCountBlocked = 0; + long long llOutgoingUDPByteResentCount = 0; + long long llOutgoingUDPMessageResentCount = 0; SThreadCPUTimes threadCPUTimes; }; struct SNetPerformanceStatistics { - uint uiUpdateCycleRecvTimeAvgUs; - uint uiUpdateCycleSendTimeAvgUs; - uint uiUpdateCycleRecvTimeMaxUs; - uint uiUpdateCycleSendTimeMaxUs; - float fUpdateCycleRecvDatagramsAvg; - uint uiUpdateCycleRecvDatagramsMax; - float fUpdateCycleDatagramsAvg; - uint uiUpdateCycleDatagramsMax; - uint uiUpdateCycleDatagramsLimit; - float fUpdateCycleMessagesAvg; - uint uiUpdateCycleMessagesMax; - uint uiUpdateCycleMessagesLimit; - uint uiUpdateCycleSendsLimitedTotal; - float fUpdateCycleSendsLimitedPercent; + uint uiUpdateCycleRecvTimeAvgUs = 0; + uint uiUpdateCycleSendTimeAvgUs = 0; + uint uiUpdateCycleRecvTimeMaxUs = 0; + uint uiUpdateCycleSendTimeMaxUs = 0; + float fUpdateCycleRecvDatagramsAvg = 0.0f; + uint uiUpdateCycleRecvDatagramsMax = 0; + float fUpdateCycleDatagramsAvg = 0.0f; + uint uiUpdateCycleDatagramsMax = 0; + uint uiUpdateCycleDatagramsLimit = 0; + float fUpdateCycleMessagesAvg = 0.0f; + uint uiUpdateCycleMessagesMax = 0; + uint uiUpdateCycleMessagesLimit = 0; + uint uiUpdateCycleSendsLimitedTotal = 0; + float fUpdateCycleSendsLimitedPercent = 0.0f; }; struct SSyncThreadStatistics diff --git a/Server/sdk/net/ns_playerid.h b/Server/sdk/net/ns_playerid.h index 7abda1d075e..91a294545f1 100644 --- a/Server/sdk/net/ns_playerid.h +++ b/Server/sdk/net/ns_playerid.h @@ -21,11 +21,10 @@ class SNetExtraInfo : public CRefCountable ~SNetExtraInfo() {} public: - ZERO_ON_NEW SNetExtraInfo() {} - bool m_bHasPing; - uint m_uiPing; + bool m_bHasPing = false; + uint m_uiPing = 0; }; class NetServerPlayerID diff --git a/Shared/mods/deathmatch/logic/CDebugHookManager.h b/Shared/mods/deathmatch/logic/CDebugHookManager.h index 4a5f54e68e2..dcb935d288c 100644 --- a/Shared/mods/deathmatch/logic/CDebugHookManager.h +++ b/Shared/mods/deathmatch/logic/CDebugHookManager.h @@ -31,7 +31,6 @@ struct SDebugHookCallInfo class CDebugHookManager { public: - ZERO_ON_NEW CDebugHookManager(); ~CDebugHookManager(); bool AddDebugHook(EDebugHookType hookType, const CLuaFunctionRef& functionRef, const std::vector& allowedNameList); @@ -54,7 +53,7 @@ class CDebugHookManager bool MustNameBeExplicitlyAllowed(const SString& strName); void MaybeMaskArgumentValues(const SString& strFunctionName, CLuaArguments& FunctionArguments); - uint m_uiPostFunctionOverride; + uint m_uiPostFunctionOverride = 0; std::vector m_PreEventHookList; std::vector m_PostEventHookList; std::vector m_PreFunctionHookList; diff --git a/Shared/mods/deathmatch/logic/CLatentTransferManager.h b/Shared/mods/deathmatch/logic/CLatentTransferManager.h index 45107ef3fd0..de59b8d0e85 100644 --- a/Shared/mods/deathmatch/logic/CLatentTransferManager.h +++ b/Shared/mods/deathmatch/logic/CLatentTransferManager.h @@ -103,7 +103,6 @@ struct SSendStatus class CLatentSendQueue { public: - ZERO_ON_NEW CLatentSendQueue(NetPlayerID remoteId, ushort usBitStreamVersion); ~CLatentSendQueue(); void DoPulse(int iTimeMsBetweenCalls); @@ -119,12 +118,12 @@ class CLatentSendQueue void PostQueueRemove(); void UpdateEstimatedDurations(); - const NetPlayerID m_RemoteId; - const ushort m_usBitStreamVersion; + const NetPlayerID m_RemoteId = 0; + const ushort m_usBitStreamVersion =0; std::list m_TxQueue; - uint m_uiCurrentRate; - uint m_uiNextSendId; - int m_iBytesOwing; + uint m_uiCurrentRate = 0; + uint m_uiNextSendId = 0; + int m_iBytesOwing = 0; }; /////////////////////////////////////////////////////////////// @@ -137,7 +136,6 @@ class CLatentSendQueue class CLatentReceiver { public: - ZERO_ON_NEW CLatentReceiver(NetPlayerID remoteId, ushort usBitStreamVersion); ~CLatentReceiver(); void OnReceive(NetBitStreamInterface* pBitStream); @@ -145,8 +143,8 @@ class CLatentReceiver protected: void OnReceiveError(const SString& strMessage); - const NetPlayerID m_RemoteId; - const ushort m_usBitStreamVersion; + const NetPlayerID m_RemoteId = 0; + const ushort m_usBitStreamVersion = 0; SReceiveItem activeRx; }; @@ -160,7 +158,6 @@ class CLatentReceiver class CLatentTransferManager { public: - ZERO_ON_NEW CLatentTransferManager(); ~CLatentTransferManager(); void DoPulse(); @@ -187,13 +184,13 @@ class CLatentTransferManager CLatentReceiver* FindReceiverForRemote(NetPlayerID remoteId); CTickCount m_LastTimeMs; - int m_iTimeMsBetweenCalls; - uint m_uiNumSends; + int m_iTimeMsBetweenCalls = 0; + uint m_uiNumSends = 0; // Send variables std::vector m_SendQueueList; std::map m_SendQueueMap; - CBufferRef* m_pBatchBufferRef; + CBufferRef* m_pBatchBufferRef = nullptr; // Receive variables std::map m_ReceiverMap; diff --git a/Shared/sdk/Common.h b/Shared/sdk/Common.h index 1879ee4369e..67f2bd9a87b 100644 --- a/Shared/sdk/Common.h +++ b/Shared/sdk/Common.h @@ -76,7 +76,7 @@ struct ElementID const unsigned int& Value() const { return m_value; } private: - unsigned int m_value; + unsigned int m_value = 0; }; // Event name characteristics diff --git a/Shared/sdk/SharedUtil.IntervalCounter.h b/Shared/sdk/SharedUtil.IntervalCounter.h index 8c076ae3c36..d9803890145 100644 --- a/Shared/sdk/SharedUtil.IntervalCounter.h +++ b/Shared/sdk/SharedUtil.IntervalCounter.h @@ -16,7 +16,6 @@ namespace SharedUtil class CIntervalCounter : public CRefCountable { public: - ZERO_ON_NEW typedef uchar T; CIntervalCounter(uint uiMinIntervalMs, T* pCounter); @@ -30,18 +29,18 @@ namespace SharedUtil protected: // Main thread variables - CThreadHandle* m_pServiceThreadHandle; - uint m_uiMinIntervalMs; + CThreadHandle* m_pServiceThreadHandle = nullptr; + uint m_uiMinIntervalMs = 0; // Sync thread variables - T m_InternalCounter; + T m_InternalCounter = 0; // Shared variables struct { - T* m_pCounter; - bool m_bTerminateThread; - bool m_bThreadTerminated; + T* m_pCounter = 0; + bool m_bTerminateThread = false; + bool m_bThreadTerminated = false; CComboMutex m_Mutex; } shared; }; diff --git a/Shared/sdk/SharedUtil.Misc.h b/Shared/sdk/SharedUtil.Misc.h index 5dd45e7dfe0..924b393fef9 100644 --- a/Shared/sdk/SharedUtil.Misc.h +++ b/Shared/sdk/SharedUtil.Misc.h @@ -173,13 +173,13 @@ namespace SharedUtil // CPU stats struct SThreadCPUTimes { - uint uiProcessorNumber; - float fUserPercent; - float fKernelPercent; - float fTotalCPUPercent; - float fUserPercentAvg; - float fKernelPercentAvg; - float fTotalCPUPercentAvg; + uint uiProcessorNumber = 0; + float fUserPercent = 0.0f; + float fKernelPercent = 0.0f; + float fTotalCPUPercent = 0.0f; + float fUserPercentAvg = 0.0f; + float fKernelPercentAvg = 0.0f; + float fTotalCPUPercentAvg = 0.0f; }; struct SThreadCPUTimesStore : SThreadCPUTimes { @@ -459,7 +459,7 @@ namespace SharedUtil unsigned long ulARGB; }; - SColor() {} + SColor() { ulARGB = 0; } SColor(unsigned long ulValue) { ulARGB = ulValue; } operator unsigned long() const { return ulARGB; } @@ -544,7 +544,7 @@ namespace SharedUtil void Unlock(); private: - void* m_pCriticalSection; + void* m_pCriticalSection = nullptr; }; // @@ -1541,8 +1541,8 @@ namespace SharedUtil /////////////////////////////////////////////////////////////// class CRefCountable { - int m_iRefCount; - CCriticalSection* m_pCS; // Use a pointer incase the static variable exists more than once + int m_iRefCount = 0; + CCriticalSection* m_pCS = nullptr; // Use a pointer incase the static variable exists more than once static CCriticalSection ms_CS; protected: diff --git a/Shared/sdk/SharedUtil.Profiling.h b/Shared/sdk/SharedUtil.Profiling.h index c5daace5654..ea453d9c0f9 100644 --- a/Shared/sdk/SharedUtil.Profiling.h +++ b/Shared/sdk/SharedUtil.Profiling.h @@ -136,7 +136,7 @@ namespace SharedUtil void FrameEnd(); SStatResultCollection m_CollectionCombo; - float m_fNextMaxClearTime; + float m_fNextMaxClearTime = 0.0f; }; } // namespace SharedUtil diff --git a/Shared/sdk/SharedUtil.Time.h b/Shared/sdk/SharedUtil.Time.h index 68d0e4e9a8e..a7560af6dbd 100644 --- a/Shared/sdk/SharedUtil.Time.h +++ b/Shared/sdk/SharedUtil.Time.h @@ -61,7 +61,7 @@ namespace SharedUtil // class CTickCount { - long long m_llTicks; + long long m_llTicks = 0; public: // Constructors @@ -140,10 +140,10 @@ namespace SharedUtil protected: long long DoGetTickCount() { return m_bUseModuleTickCount ? GetModuleTickCount64() : GetTickCount64_(); } - long long m_llUpdateTime; - unsigned long long m_ullElapsedTime; - long long m_llMaxIncrement; - bool m_bUseModuleTickCount; + long long m_llUpdateTime = 0; + unsigned long long m_ullElapsedTime = 0; + long long m_llMaxIncrement = 0; + bool m_bUseModuleTickCount = false; }; // @@ -203,7 +203,7 @@ namespace SharedUtil uint m_uiMaxIncrement; uint m_uiElapsedTime; uchar* m_pucCounterValue; - CRefCountable** m_ppIntervalCounter; + CRefCountable** m_ppIntervalCounter = nullptr; }; // diff --git a/Shared/sdk/net/SyncStructures.h b/Shared/sdk/net/SyncStructures.h index b4bc6d4fba7..ff797be70b5 100644 --- a/Shared/sdk/net/SyncStructures.h +++ b/Shared/sdk/net/SyncStructures.h @@ -965,8 +965,8 @@ struct SVehicleTurretSync : public ISyncStructure struct { - float fTurretX; - float fTurretY; + float fTurretX = 0.0f; + float fTurretY = 0.0f; } data; }; From 450e13b6312a7fe43ac6f62ba0a0251df075dfbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20St=C3=BCcker?= Date: Mon, 10 Jun 2019 04:31:43 +0200 Subject: [PATCH 2/2] Update Server/mods/deathmatch/logic/CAccount.h Co-Authored-By: Qais Patankar --- Server/mods/deathmatch/logic/CAccount.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/mods/deathmatch/logic/CAccount.h b/Server/mods/deathmatch/logic/CAccount.h index 1354579691e..7e7bf8a75a1 100644 --- a/Server/mods/deathmatch/logic/CAccount.h +++ b/Server/mods/deathmatch/logic/CAccount.h @@ -116,7 +116,7 @@ class CAccount CAccountManager* m_pManager; - EAccountType m_AccountType = EAcountType::Guest; + EAccountType m_AccountType = EAccountType::Guest; SString m_strName; CAccountPassword m_Password; SString m_strHttpPassAppend;