From 3c04446aba9e8310d62f9b961136c9419f158f7f Mon Sep 17 00:00:00 2001 From: Marek Kulik Date: Sat, 12 Jan 2019 17:55:49 +0100 Subject: [PATCH] Replace (void) with () --- Client/cefweb/CWebCore.cpp | 2 +- Client/cefweb/CWebCore.h | 10 +- .../core/CAdditionalVertexStreamManager.cpp | 8 +- Client/core/CAdditionalVertexStreamManager.h | 12 +- Client/core/CChat.cpp | 22 +- Client/core/CChat.h | 48 +-- Client/core/CClientVariables.cpp | 10 +- Client/core/CClientVariables.h | 14 +- Client/core/CCommands.cpp | 8 +- Client/core/CCommands.h | 14 +- Client/core/CCompressorJobQueue.cpp | 30 +- Client/core/CCompressorJobQueue.h | 14 +- Client/core/CConnectManager.cpp | 10 +- Client/core/CConnectManager.h | 10 +- Client/core/CConsole.cpp | 32 +- Client/core/CConsole.h | 32 +- Client/core/CConsoleHistory.cpp | 2 +- Client/core/CConsoleHistory.h | 2 +- Client/core/CCore.cpp | 108 +++---- Client/core/CCore.h | 194 ++++++------ Client/core/CCrashDumpWriter.cpp | 8 +- Client/core/CCrashDumpWriter.h | 8 +- Client/core/CCredits.cpp | 8 +- Client/core/CCredits.h | 8 +- Client/core/CExceptionInformation_Impl.cpp | 4 +- Client/core/CExceptionInformation_Impl.h | 46 +-- Client/core/CFileFormatJpeg.cpp | 8 +- Client/core/CGUI.cpp | 40 +-- Client/core/CGUI.h | 46 +-- Client/core/CGraphStats.cpp | 18 +- Client/core/CGraphStats.h | 8 +- Client/core/CJoystickManager.cpp | 78 ++--- Client/core/CJoystickManager.h | 28 +- Client/core/CKeyBinds.cpp | 28 +- Client/core/CKeyBinds.h | 32 +- Client/core/CLanguage.cpp | 2 +- Client/core/CLanguage.h | 8 +- Client/core/CLanguageSelector.cpp | 4 +- Client/core/CLanguageSelector.h | 6 +- Client/core/CLocalization.cpp | 12 +- Client/core/CLocalization.h | 14 +- Client/core/CMainMenu.cpp | 18 +- Client/core/CMainMenu.h | 34 +- Client/core/CMemStats.cpp | 34 +- Client/core/CMemStats.h | 8 +- Client/core/CMessageLoopHook.cpp | 2 +- Client/core/CMessageLoopHook.h | 2 +- Client/core/CModManager.cpp | 24 +- Client/core/CModManager.h | 22 +- Client/core/CModelCacheManager.cpp | 22 +- Client/core/CModelCacheManager.h | 8 +- Client/core/CModuleLoader.cpp | 2 +- Client/core/CModuleLoader.h | 2 +- Client/core/CMouseControl.cpp | 6 +- Client/core/CMouseControl.h | 6 +- Client/core/CNewsBrowser.cpp | 14 +- Client/core/CNewsBrowser.h | 14 +- Client/core/CNickGen.cpp | 2 +- Client/core/CNickGen.h | 2 +- Client/core/CQuestionBox.cpp | 16 +- Client/core/CQuestionBox.h | 16 +- Client/core/CQuickConnect.cpp | 10 +- Client/core/CQuickConnect.h | 10 +- Client/core/CScreenGrabber.cpp | 34 +- Client/core/CScreenShot.cpp | 6 +- Client/core/CScreenShot.h | 8 +- Client/core/CSetCursorPosHook.cpp | 14 +- Client/core/CSetCursorPosHook.h | 14 +- Client/core/CSettings.cpp | 42 +-- Client/core/CSettings.h | 48 +-- Client/core/CTimingCheckpoints.hpp | 14 +- Client/core/CTrayIcon.cpp | 8 +- Client/core/CTrayIcon.h | 10 +- Client/core/CVersionUpdater.Util.hpp | 34 +- Client/core/CVersionUpdater.cpp | 298 +++++++++--------- Client/core/CVersionUpdater.h | 12 +- .../core/CVertexStreamBoundingBoxManager.cpp | 6 +- Client/core/CVertexStreamBoundingBoxManager.h | 10 +- Client/core/CrashHandler.cpp | 20 +- Client/core/CrashHandler.h | 4 +- Client/core/DXHook/CDirect3DData.cpp | 12 +- Client/core/DXHook/CDirect3DData.h | 14 +- Client/core/DXHook/CDirect3DEvents9.cpp | 4 +- Client/core/DXHook/CDirect3DEvents9.h | 4 +- Client/core/DXHook/CProxyDirect3D9.cpp | 8 +- Client/core/DXHook/CProxyDirect3D9.h | 8 +- Client/core/DXHook/CProxyDirect3DDevice9.cpp | 22 +- Client/core/DXHook/CProxyDirect3DDevice9.h | 24 +- Client/core/DXHook/CProxyDirect3DEffect.cpp | 4 +- Client/core/DXHook/CProxyDirect3DEffect.h | 24 +- .../core/DXHook/CProxyDirect3DIndexBuffer.cpp | 4 +- .../core/DXHook/CProxyDirect3DIndexBuffer.h | 16 +- Client/core/DXHook/CProxyDirect3DTexture.cpp | 4 +- Client/core/DXHook/CProxyDirect3DTexture.h | 22 +- .../DXHook/CProxyDirect3DVertexBuffer.cpp | 4 +- .../core/DXHook/CProxyDirect3DVertexBuffer.h | 16 +- .../CProxyDirect3DVertexDeclaration.cpp | 4 +- .../DXHook/CProxyDirect3DVertexDeclaration.h | 8 +- Client/core/DXHook/CProxyDirectInput8.cpp | 4 +- Client/core/DXHook/CProxyDirectInput8.h | 4 +- .../core/DXHook/CProxyDirectInputDevice8.cpp | 10 +- Client/core/DXHook/CProxyDirectInputDevice8.h | 10 +- Client/core/Graphics/CAspectRatioConverter.h | 4 +- Client/core/Graphics/CGraphics.cpp | 42 +-- Client/core/Graphics/CGraphics.h | 52 +-- Client/core/Graphics/CLine3DBatcher.cpp | 4 +- Client/core/Graphics/CLine3DBatcher.h | 6 +- .../core/Graphics/CMaterialLine3DBatcher.cpp | 4 +- Client/core/Graphics/CMaterialLine3DBatcher.h | 6 +- Client/core/Graphics/CPixelsManager.cpp | 6 +- Client/core/Graphics/CPixelsManager.h | 6 +- Client/core/Graphics/CPrimitiveBatcher.cpp | 4 +- Client/core/Graphics/CPrimitiveBatcher.h | 6 +- .../Graphics/CPrimitiveMaterialBatcher.cpp | 4 +- .../core/Graphics/CPrimitiveMaterialBatcher.h | 6 +- Client/core/Graphics/CRenderItem.DxFont.cpp | 10 +- .../Graphics/CRenderItem.EffectCloner.cpp | 2 +- .../core/Graphics/CRenderItem.EffectCloner.h | 2 +- .../Graphics/CRenderItem.EffectParameters.cpp | 12 +- .../Graphics/CRenderItem.EffectParameters.h | 14 +- .../Graphics/CRenderItem.EffectTemplate.cpp | 14 +- .../Graphics/CRenderItem.EffectTemplate.h | 16 +- .../core/Graphics/CRenderItem.EffectWrap.cpp | 14 +- .../core/Graphics/CRenderItem.FileTexture.cpp | 10 +- Client/core/Graphics/CRenderItem.GuiFont.cpp | 10 +- .../Graphics/CRenderItem.RenderTarget.cpp | 12 +- .../Graphics/CRenderItem.ScreenSource.cpp | 12 +- Client/core/Graphics/CRenderItem.Shader.cpp | 16 +- .../Graphics/CRenderItem.ShaderInstance.cpp | 12 +- .../core/Graphics/CRenderItem.WebBrowser.cpp | 10 +- Client/core/Graphics/CRenderItem.cpp | 8 +- Client/core/Graphics/CRenderItemManager.cpp | 30 +- Client/core/Graphics/CRenderItemManager.h | 36 +-- Client/core/Graphics/CTileBatcher.cpp | 8 +- Client/core/Graphics/CTileBatcher.h | 8 +- Client/core/Graphics/CVideoModeManager.cpp | 66 ++-- Client/core/Graphics/CVideoModeManager.h | 20 +- .../CServerBrowser.MasterServerManager.cpp | 18 +- .../CServerBrowser.MasterServerManager.h | 8 +- .../CServerBrowser.RemoteMasterServer.cpp | 32 +- .../CServerBrowser.RemoteMasterServer.h | 6 +- Client/core/ServerBrowser/CServerBrowser.cpp | 26 +- Client/core/ServerBrowser/CServerBrowser.h | 36 +-- Client/core/ServerBrowser/CServerCache.cpp | 16 +- Client/core/ServerBrowser/CServerCache.h | 2 +- Client/core/ServerBrowser/CServerInfo.cpp | 16 +- Client/core/ServerBrowser/CServerInfo.h | 16 +- Client/core/ServerBrowser/CServerList.cpp | 36 +-- Client/core/ServerBrowser/CServerList.h | 82 ++--- Client/game_sa/C3DMarkersSA.h | 2 +- Client/game_sa/CAEVehicleAudioEntitySA.cpp | 6 +- Client/game_sa/CAEVehicleAudioEntitySA.h | 6 +- Client/game_sa/CAnimBlendAssocGroupSA.cpp | 10 +- Client/game_sa/CAnimBlendAssocGroupSA.h | 12 +- Client/game_sa/CAnimBlendAssociationSA.cpp | 2 +- Client/game_sa/CAnimBlendHierarchySA.cpp | 12 +- Client/game_sa/CAnimBlendHierarchySA.h | 2 +- Client/game_sa/CAnimBlendSequenceSA.cpp | 2 +- Client/game_sa/CAnimBlendSequenceSA.h | 14 +- Client/game_sa/CAnimBlockSA.cpp | 2 +- Client/game_sa/CAnimBlockSA.h | 18 +- Client/game_sa/CAnimManagerSA.cpp | 26 +- Client/game_sa/CAnimManagerSA.h | 30 +- .../game_sa/CAudioContainerLookupTableSA.cpp | 2 +- Client/game_sa/CAudioContainerLookupTableSA.h | 2 +- Client/game_sa/CAudioContainerSA.cpp | 4 +- Client/game_sa/CAudioContainerSA.h | 4 +- Client/game_sa/CAudioEngine.h | 2 +- Client/game_sa/CAudioEngineSA.cpp | 8 +- Client/game_sa/CAudioEngineSA.h | 8 +- Client/game_sa/CAutomobileSA.cpp | 32 +- Client/game_sa/CAutomobileSA.h | 34 +- Client/game_sa/CBmxSA.h | 2 +- Client/game_sa/CBoatSA.h | 2 +- Client/game_sa/CCamSA.cpp | 2 +- Client/game_sa/CCameraSA.cpp | 20 +- Client/game_sa/CCameraSA.h | 20 +- Client/game_sa/CCheckpointsSA.cpp | 2 +- Client/game_sa/CCheckpointsSA.h | 2 +- Client/game_sa/CColModelSA.cpp | 4 +- Client/game_sa/CColModelSA.h | 8 +- Client/game_sa/CColPointSA.cpp | 4 +- Client/game_sa/CColPointSA.h | 26 +- Client/game_sa/CControllerConfigManagerSA.cpp | 2 +- Client/game_sa/CControllerConfigManagerSA.h | 6 +- Client/game_sa/CDamageManagerSA.cpp | 4 +- Client/game_sa/CDamageManagerSA.h | 4 +- Client/game_sa/CDoorSA.h | 6 +- Client/game_sa/CEntitySA.cpp | 18 +- Client/game_sa/CEntitySA.h | 38 +-- Client/game_sa/CEventDamageSA.cpp | 14 +- Client/game_sa/CEventDamageSA.h | 36 +-- Client/game_sa/CEventGunShotSA.h | 2 +- Client/game_sa/CEventSA.h | 12 +- Client/game_sa/CExplosionManagerSA.h | 8 +- Client/game_sa/CExplosionSA.cpp | 18 +- Client/game_sa/CExplosionSA.h | 20 +- Client/game_sa/CFireManagerSA.cpp | 2 +- Client/game_sa/CFireManagerSA.h | 2 +- Client/game_sa/CFxSystemSA.cpp | 10 +- Client/game_sa/CFxSystemSA.h | 14 +- Client/game_sa/CGameSA.cpp | 46 +-- Client/game_sa/CGameSA.h | 44 +-- Client/game_sa/CHandlingEntrySA.cpp | 4 +- Client/game_sa/CHandlingEntrySA.h | 76 ++--- Client/game_sa/CHandlingManagerSA.cpp | 10 +- Client/game_sa/CHandlingManagerSA.h | 10 +- Client/game_sa/CHudSA.cpp | 8 +- Client/game_sa/CHudSA.h | 8 +- Client/game_sa/CMarkerSA.cpp | 2 +- Client/game_sa/CMarkerSA.h | 2 +- Client/game_sa/CModelInfoSA.cpp | 30 +- Client/game_sa/CModelInfoSA.h | 116 +++---- Client/game_sa/CObjectSA.cpp | 2 +- Client/game_sa/CObjectSA.h | 10 +- Client/game_sa/COffsets.cpp | 10 +- Client/game_sa/COffsets.h | 10 +- Client/game_sa/CPadSA.cpp | 6 +- Client/game_sa/CPadSA.h | 6 +- .../CPedDamageResponseCalculatorSA.cpp | 2 +- .../game_sa/CPedDamageResponseCalculatorSA.h | 2 +- Client/game_sa/CPedDamageResponseSA.h | 2 +- Client/game_sa/CPedIntelligenceSA.cpp | 12 +- Client/game_sa/CPedIntelligenceSA.h | 16 +- Client/game_sa/CPedModelInfoSA.cpp | 4 +- Client/game_sa/CPedModelInfoSA.h | 6 +- Client/game_sa/CPedSA.cpp | 52 +-- Client/game_sa/CPedSA.h | 62 ++-- Client/game_sa/CPedSoundSA.cpp | 4 +- Client/game_sa/CPedSoundSA.h | 10 +- Client/game_sa/CPhysicalSA.cpp | 24 +- Client/game_sa/CPhysicalSA.h | 26 +- Client/game_sa/CPickupsSA.cpp | 2 +- Client/game_sa/CPickupsSA.h | 4 +- Client/game_sa/CPlayerInfoSA.cpp | 10 +- Client/game_sa/CPlayerInfoSA.h | 30 +- Client/game_sa/CPlayerPedSA.cpp | 12 +- Client/game_sa/CPlayerPedSA.h | 14 +- Client/game_sa/CPoolsSA.cpp | 16 +- Client/game_sa/CProjectileInfoSA.cpp | 4 +- Client/game_sa/CProjectileInfoSA.h | 6 +- Client/game_sa/CProjectileSA.cpp | 2 +- Client/game_sa/CProjectileSA.h | 2 +- Client/game_sa/CQuadBikeSA.h | 2 +- .../CRenderWareSA.ClothesReplacing.cpp | 4 +- .../game_sa/CRenderWareSA.ShaderMatching.cpp | 10 +- Client/game_sa/CRenderWareSA.ShaderMatching.h | 16 +- .../game_sa/CRenderWareSA.ShaderSupport.cpp | 14 +- Client/game_sa/CRenderWareSA.ShaderSupport.h | 6 +- Client/game_sa/CRenderWareSA.cpp | 2 +- Client/game_sa/CRenderWareSA.h | 20 +- Client/game_sa/CSettingsSA.cpp | 60 ++-- Client/game_sa/CSettingsSA.h | 72 ++--- Client/game_sa/CStreamingSA.cpp | 2 +- Client/game_sa/CTaskManagementSystemSA.cpp | 4 +- Client/game_sa/CTaskManagementSystemSA.h | 4 +- Client/game_sa/CTasksSA.cpp | 6 +- Client/game_sa/CTasksSA.h | 6 +- Client/game_sa/CTheCarGeneratorsSA.cpp | 2 +- Client/game_sa/CTrailerSA.h | 2 +- Client/game_sa/CVehicleSA.cpp | 82 ++--- Client/game_sa/CVehicleSA.h | 70 ++-- Client/game_sa/CWantedSA.cpp | 4 +- Client/game_sa/CWantedSA.h | 6 +- Client/game_sa/CWaterManagerSA.cpp | 4 +- Client/game_sa/CWaterManagerSA.h | 6 +- Client/game_sa/CWaterSA.cpp | 6 +- Client/game_sa/CWaterSA.h | 4 +- Client/game_sa/CWeaponInfoSA.h | 60 ++-- Client/game_sa/CWeaponSA.cpp | 2 +- Client/game_sa/CWeaponSA.h | 2 +- Client/game_sa/CWeaponStatManagerSA.cpp | 2 +- Client/game_sa/CWeaponStatManagerSA.h | 10 +- Client/game_sa/CWeaponStatSA.h | 74 ++--- Client/game_sa/CWeatherSA.cpp | 10 +- Client/game_sa/CWeatherSA.h | 10 +- Client/game_sa/CWorldSA.cpp | 12 +- Client/game_sa/CWorldSA.h | 12 +- Client/game_sa/HeapTrace.cpp | 4 +- Client/game_sa/HeapTrace.h | 2 +- Client/game_sa/TaskAttackSA.cpp | 18 +- Client/game_sa/TaskAttackSA.h | 24 +- Client/game_sa/TaskBasicSA.h | 22 +- Client/game_sa/TaskCarAccessoriesSA.h | 6 +- Client/game_sa/TaskCarSA.h | 10 +- Client/game_sa/TaskGoToSA.h | 2 +- Client/game_sa/TaskIKSA.cpp | 2 +- Client/game_sa/TaskIKSA.h | 8 +- Client/game_sa/TaskJumpFallSA.h | 4 +- Client/game_sa/TaskPhysicalResponseSA.cpp | 10 +- Client/game_sa/TaskPhysicalResponseSA.h | 12 +- Client/game_sa/TaskSA.h | 26 +- Client/game_sa/TaskSecondarySA.h | 2 +- Client/game_sa/gamesa_renderware.h | 12 +- Client/gui/CGUIButton_Impl.cpp | 2 +- Client/gui/CGUIButton_Impl.h | 4 +- Client/gui/CGUICheckBox_Impl.cpp | 4 +- Client/gui/CGUICheckBox_Impl.h | 6 +- Client/gui/CGUIComboBox_Impl.cpp | 16 +- Client/gui/CGUIComboBox_Impl.h | 18 +- Client/gui/CGUIEdit_Impl.cpp | 22 +- Client/gui/CGUIEdit_Impl.h | 24 +- Client/gui/CGUIElement_Impl.cpp | 64 ++-- Client/gui/CGUIElement_Impl.h | 66 ++-- Client/gui/CGUIElement_Inc.h | 54 ++-- Client/gui/CGUIFont_Impl.cpp | 8 +- Client/gui/CGUIFont_Impl.h | 8 +- Client/gui/CGUIGridList_Impl.cpp | 28 +- Client/gui/CGUIGridList_Impl.h | 30 +- Client/gui/CGUILabel_Impl.cpp | 14 +- Client/gui/CGUILabel_Impl.h | 16 +- Client/gui/CGUIListItem_Impl.cpp | 8 +- Client/gui/CGUIListItem_Impl.h | 10 +- Client/gui/CGUIMemo_Impl.cpp | 24 +- Client/gui/CGUIMemo_Impl.h | 26 +- Client/gui/CGUIMessageBox_Impl.cpp | 8 +- Client/gui/CGUIMessageBox_Impl.h | 8 +- Client/gui/CGUIProgressBar_Impl.cpp | 4 +- Client/gui/CGUIProgressBar_Impl.h | 6 +- Client/gui/CGUIRadioButton_Impl.cpp | 4 +- Client/gui/CGUIRadioButton_Impl.h | 6 +- Client/gui/CGUIScrollBar_Impl.cpp | 4 +- Client/gui/CGUIScrollBar_Impl.h | 6 +- Client/gui/CGUIScrollPane_Impl.cpp | 10 +- Client/gui/CGUIScrollPane_Impl.h | 12 +- Client/gui/CGUIStaticImage_Impl.cpp | 10 +- Client/gui/CGUIStaticImage_Impl.h | 12 +- Client/gui/CGUITabList.h | 4 +- Client/gui/CGUITabListItem.h | 2 +- Client/gui/CGUITabPanel_Impl.cpp | 8 +- Client/gui/CGUITabPanel_Impl.h | 10 +- Client/gui/CGUITab_Impl.cpp | 6 +- Client/gui/CGUITab_Impl.h | 8 +- Client/gui/CGUITexture_Impl.cpp | 8 +- Client/gui/CGUITexture_Impl.h | 8 +- Client/gui/CGUIWindow_Impl.cpp | 12 +- Client/gui/CGUIWindow_Impl.h | 14 +- Client/gui/CGUI_Impl.cpp | 62 ++-- Client/gui/CGUI_Impl.h | 66 ++-- Client/loader/CExePatchedStatus.cpp | 14 +- Client/loader/CExePatchedStatus.h | 16 +- Client/loader/CInstallManager.cpp | 52 +-- Client/loader/CInstallManager.h | 40 +-- Client/loader/CSequencer.h | 10 +- Client/loader/D3DStuff.cpp | 6 +- Client/loader/D3DStuff.h | 4 +- Client/loader/Dialogs.cpp | 20 +- Client/loader/Dialogs.h | 16 +- Client/loader/Install.cpp | 4 +- Client/loader/MainFunctions.cpp | 36 +-- Client/loader/MainFunctions.h | 20 +- Client/loader/Utils.cpp | 62 ++-- Client/loader/Utils.h | 58 ++-- Client/mods/deathmatch/CClient.cpp | 8 +- Client/mods/deathmatch/CClient.h | 8 +- Client/mods/deathmatch/CVoiceRecorder.cpp | 10 +- Client/mods/deathmatch/CVoiceRecorder.h | 16 +- Client/mods/deathmatch/HeapTrace.cpp | 4 +- Client/mods/deathmatch/HeapTrace.h | 2 +- Client/mods/deathmatch/logic/CAntiCheat.cpp | 8 +- Client/mods/deathmatch/logic/CAntiCheat.h | 8 +- .../deathmatch/logic/CAntiCheatModule.cpp | 2 +- .../mods/deathmatch/logic/CAntiCheatModule.h | 4 +- Client/mods/deathmatch/logic/CBassAudio.cpp | 30 +- Client/mods/deathmatch/logic/CBassAudio.h | 30 +- Client/mods/deathmatch/logic/CBitStream.h | 4 +- .../mods/deathmatch/logic/CBlendedWeather.cpp | 6 +- .../mods/deathmatch/logic/CBlendedWeather.h | 12 +- Client/mods/deathmatch/logic/CCallback.h | 4 +- .../mods/deathmatch/logic/CClient3DMarker.cpp | 10 +- .../mods/deathmatch/logic/CClient3DMarker.h | 20 +- .../mods/deathmatch/logic/CClientCamera.cpp | 12 +- Client/mods/deathmatch/logic/CClientCamera.h | 22 +- .../deathmatch/logic/CClientCheckpoint.cpp | 14 +- .../mods/deathmatch/logic/CClientCheckpoint.h | 28 +- .../mods/deathmatch/logic/CClientCivilian.cpp | 20 +- .../mods/deathmatch/logic/CClientCivilian.h | 24 +- .../logic/CClientCivilianManager.cpp | 4 +- .../deathmatch/logic/CClientCivilianManager.h | 14 +- .../deathmatch/logic/CClientColCircle.cpp | 2 +- .../mods/deathmatch/logic/CClientColCircle.h | 6 +- .../deathmatch/logic/CClientColCuboid.cpp | 2 +- .../mods/deathmatch/logic/CClientColCuboid.h | 6 +- .../deathmatch/logic/CClientColManager.cpp | 6 +- .../mods/deathmatch/logic/CClientColManager.h | 8 +- .../mods/deathmatch/logic/CClientColModel.cpp | 4 +- .../mods/deathmatch/logic/CClientColModel.h | 10 +- .../logic/CClientColModelManager.cpp | 4 +- .../deathmatch/logic/CClientColModelManager.h | 8 +- .../deathmatch/logic/CClientColPolygon.cpp | 2 +- .../mods/deathmatch/logic/CClientColPolygon.h | 10 +- .../deathmatch/logic/CClientColRectangle.cpp | 2 +- .../deathmatch/logic/CClientColRectangle.h | 6 +- .../mods/deathmatch/logic/CClientColShape.cpp | 12 +- .../mods/deathmatch/logic/CClientColShape.h | 24 +- .../deathmatch/logic/CClientColSphere.cpp | 2 +- .../mods/deathmatch/logic/CClientColSphere.h | 6 +- .../mods/deathmatch/logic/CClientColTube.cpp | 2 +- Client/mods/deathmatch/logic/CClientColTube.h | 8 +- .../mods/deathmatch/logic/CClientCorona.cpp | 8 +- Client/mods/deathmatch/logic/CClientCorona.h | 18 +- Client/mods/deathmatch/logic/CClientDFF.cpp | 6 +- Client/mods/deathmatch/logic/CClientDFF.h | 12 +- .../deathmatch/logic/CClientDFFManager.cpp | 4 +- .../mods/deathmatch/logic/CClientDFFManager.h | 8 +- .../mods/deathmatch/logic/CClientDisplay.cpp | 2 +- Client/mods/deathmatch/logic/CClientDisplay.h | 20 +- .../logic/CClientDisplayManager.cpp | 8 +- .../deathmatch/logic/CClientDisplayManager.h | 10 +- Client/mods/deathmatch/logic/CClientDummy.cpp | 4 +- Client/mods/deathmatch/logic/CClientDummy.h | 8 +- .../mods/deathmatch/logic/CClientDxFont.cpp | 2 +- Client/mods/deathmatch/logic/CClientDxFont.h | 6 +- Client/mods/deathmatch/logic/CClientEffect.h | 14 +- .../deathmatch/logic/CClientEffectManager.h | 6 +- .../mods/deathmatch/logic/CClientEntity.cpp | 36 +-- Client/mods/deathmatch/logic/CClientEntity.h | 88 +++--- .../logic/CClientExplosionManager.cpp | 2 +- .../logic/CClientExplosionManager.h | 2 +- .../deathmatch/logic/CClientGUIElement.cpp | 4 +- .../mods/deathmatch/logic/CClientGUIElement.h | 18 +- .../deathmatch/logic/CClientGUIManager.cpp | 8 +- .../mods/deathmatch/logic/CClientGUIManager.h | 12 +- Client/mods/deathmatch/logic/CClientGame.cpp | 86 ++--- Client/mods/deathmatch/logic/CClientGame.h | 226 ++++++------- .../mods/deathmatch/logic/CClientGroups.cpp | 2 +- Client/mods/deathmatch/logic/CClientGroups.h | 6 +- .../mods/deathmatch/logic/CClientGuiFont.cpp | 6 +- Client/mods/deathmatch/logic/CClientGuiFont.h | 10 +- .../mods/deathmatch/logic/CClientManager.cpp | 12 +- Client/mods/deathmatch/logic/CClientManager.h | 92 +++--- .../mods/deathmatch/logic/CClientMarker.cpp | 26 +- Client/mods/deathmatch/logic/CClientMarker.h | 30 +- .../deathmatch/logic/CClientMarkerCommon.cpp | 6 +- .../deathmatch/logic/CClientMarkerCommon.h | 18 +- .../deathmatch/logic/CClientMarkerManager.cpp | 6 +- .../deathmatch/logic/CClientMarkerManager.h | 8 +- .../mods/deathmatch/logic/CClientMaterial.h | 2 +- .../logic/CClientModelCacheManager.cpp | 24 +- .../logic/CClientModelCacheManager.h | 6 +- .../logic/CClientModelRequestManager.cpp | 6 +- .../logic/CClientModelRequestManager.h | 6 +- .../mods/deathmatch/logic/CClientObject.cpp | 44 +-- Client/mods/deathmatch/logic/CClientObject.h | 68 ++-- .../deathmatch/logic/CClientObjectManager.cpp | 18 +- .../deathmatch/logic/CClientObjectManager.h | 22 +- .../logic/CClientPacketRecorder.cpp | 14 +- .../deathmatch/logic/CClientPacketRecorder.h | 14 +- Client/mods/deathmatch/logic/CClientPad.cpp | 2 +- Client/mods/deathmatch/logic/CClientPad.h | 2 +- .../deathmatch/logic/CClientPathManager.cpp | 8 +- .../deathmatch/logic/CClientPathManager.h | 14 +- .../mods/deathmatch/logic/CClientPathNode.cpp | 6 +- .../mods/deathmatch/logic/CClientPathNode.h | 20 +- Client/mods/deathmatch/logic/CClientPed.cpp | 156 ++++----- Client/mods/deathmatch/logic/CClientPed.h | 262 +++++++-------- .../deathmatch/logic/CClientPedManager.cpp | 4 +- .../mods/deathmatch/logic/CClientPedManager.h | 12 +- .../logic/CClientPerfStat.LibMemory.cpp | 18 +- .../logic/CClientPerfStat.LuaMemory.cpp | 18 +- .../logic/CClientPerfStat.LuaTiming.cpp | 16 +- .../logic/CClientPerfStat.PacketUsage.cpp | 20 +- .../logic/CClientPerfStatManager.cpp | 18 +- .../deathmatch/logic/CClientPerfStatManager.h | 6 +- .../deathmatch/logic/CClientPerfStatModule.h | 32 +- .../mods/deathmatch/logic/CClientPickup.cpp | 12 +- Client/mods/deathmatch/logic/CClientPickup.h | 30 +- .../deathmatch/logic/CClientPickupManager.cpp | 6 +- .../deathmatch/logic/CClientPickupManager.h | 18 +- .../mods/deathmatch/logic/CClientPlayer.cpp | 12 +- Client/mods/deathmatch/logic/CClientPlayer.h | 62 ++-- .../deathmatch/logic/CClientPlayerClothes.cpp | 4 +- .../deathmatch/logic/CClientPlayerClothes.h | 4 +- .../deathmatch/logic/CClientPlayerManager.cpp | 10 +- .../deathmatch/logic/CClientPlayerManager.h | 18 +- .../deathmatch/logic/CClientPlayerVoice.cpp | 22 +- .../deathmatch/logic/CClientPlayerVoice.h | 28 +- .../deathmatch/logic/CClientPointLights.cpp | 6 +- .../deathmatch/logic/CClientPointLights.h | 20 +- .../logic/CClientPointLightsManager.cpp | 6 +- .../logic/CClientPointLightsManager.h | 14 +- .../deathmatch/logic/CClientProjectile.cpp | 14 +- .../mods/deathmatch/logic/CClientProjectile.h | 38 +-- .../logic/CClientProjectileManager.cpp | 6 +- .../logic/CClientProjectileManager.h | 10 +- .../deathmatch/logic/CClientRadarArea.cpp | 6 +- .../mods/deathmatch/logic/CClientRadarArea.h | 18 +- .../logic/CClientRadarAreaManager.cpp | 6 +- .../logic/CClientRadarAreaManager.h | 12 +- .../deathmatch/logic/CClientRadarMarker.cpp | 18 +- .../deathmatch/logic/CClientRadarMarker.h | 32 +- .../logic/CClientRadarMarkerManager.cpp | 8 +- .../logic/CClientRadarMarkerManager.h | 14 +- .../deathmatch/logic/CClientRenderElement.cpp | 4 +- .../deathmatch/logic/CClientRenderElement.h | 6 +- .../logic/CClientRenderElementManager.cpp | 2 +- .../logic/CClientRenderElementManager.h | 16 +- Client/mods/deathmatch/logic/CClientShader.h | 4 +- Client/mods/deathmatch/logic/CClientSound.cpp | 36 +-- Client/mods/deathmatch/logic/CClientSound.h | 46 +-- .../deathmatch/logic/CClientSoundManager.cpp | 4 +- .../deathmatch/logic/CClientSoundManager.h | 10 +- .../logic/CClientSpatialDatabase.cpp | 4 +- .../deathmatch/logic/CClientStreamElement.cpp | 12 +- .../deathmatch/logic/CClientStreamElement.h | 30 +- .../deathmatch/logic/CClientStreamSector.cpp | 2 +- .../deathmatch/logic/CClientStreamSector.h | 14 +- .../logic/CClientStreamSectorRow.cpp | 2 +- .../deathmatch/logic/CClientStreamSectorRow.h | 12 +- .../mods/deathmatch/logic/CClientStreamer.cpp | 2 +- .../mods/deathmatch/logic/CClientStreamer.h | 12 +- Client/mods/deathmatch/logic/CClientTXD.cpp | 2 +- Client/mods/deathmatch/logic/CClientTXD.h | 6 +- Client/mods/deathmatch/logic/CClientTask.cpp | 6 +- Client/mods/deathmatch/logic/CClientTask.h | 16 +- Client/mods/deathmatch/logic/CClientTeam.cpp | 6 +- Client/mods/deathmatch/logic/CClientTeam.h | 20 +- .../deathmatch/logic/CClientTeamManager.cpp | 6 +- .../deathmatch/logic/CClientTeamManager.h | 10 +- .../deathmatch/logic/CClientTextDisplay.cpp | 4 +- .../deathmatch/logic/CClientTextDisplay.h | 10 +- Client/mods/deathmatch/logic/CClientTexture.h | 12 +- .../mods/deathmatch/logic/CClientVehicle.cpp | 162 +++++----- Client/mods/deathmatch/logic/CClientVehicle.h | 250 +++++++-------- .../logic/CClientVehicleManager.cpp | 8 +- .../deathmatch/logic/CClientVehicleManager.h | 18 +- Client/mods/deathmatch/logic/CClientWater.cpp | 4 +- Client/mods/deathmatch/logic/CClientWater.h | 4 +- .../deathmatch/logic/CClientWaterManager.cpp | 6 +- .../deathmatch/logic/CClientWaterManager.h | 14 +- .../mods/deathmatch/logic/CClientWeapon.cpp | 20 +- Client/mods/deathmatch/logic/CClientWeapon.h | 38 +-- .../deathmatch/logic/CClientWeaponManager.cpp | 4 +- .../deathmatch/logic/CClientWeaponManager.h | 4 +- Client/mods/deathmatch/logic/CCustomData.h | 4 +- .../deathmatch/logic/CDeathmatchObject.cpp | 8 +- .../mods/deathmatch/logic/CDeathmatchObject.h | 8 +- .../deathmatch/logic/CDeathmatchVehicle.cpp | 6 +- .../deathmatch/logic/CDeathmatchVehicle.h | 8 +- .../logic/CDownloadableResource.cpp | 10 +- .../deathmatch/logic/CDownloadableResource.h | 32 +- .../mods/deathmatch/logic/CDynamicLibrary.cpp | 8 +- .../mods/deathmatch/logic/CDynamicLibrary.h | 8 +- .../mods/deathmatch/logic/CElementArray.cpp | 4 +- Client/mods/deathmatch/logic/CElementArray.h | 4 +- .../mods/deathmatch/logic/CElementGroup.cpp | 2 +- Client/mods/deathmatch/logic/CElementGroup.h | 2 +- Client/mods/deathmatch/logic/CEvents.cpp | 12 +- Client/mods/deathmatch/logic/CEvents.h | 16 +- Client/mods/deathmatch/logic/CFileReader.cpp | 4 +- Client/mods/deathmatch/logic/CFileReader.h | 4 +- Client/mods/deathmatch/logic/CFoo.cpp | 2 +- Client/mods/deathmatch/logic/CFoo.h | 4 +- .../mods/deathmatch/logic/CIFPAnimations.cpp | 4 +- Client/mods/deathmatch/logic/CIFPAnimations.h | 4 +- Client/mods/deathmatch/logic/CLocalServer.cpp | 6 +- Client/mods/deathmatch/logic/CLocalServer.h | 8 +- Client/mods/deathmatch/logic/CMapEvent.cpp | 2 +- Client/mods/deathmatch/logic/CMapEvent.h | 16 +- .../deathmatch/logic/CMapEventManager.cpp | 8 +- .../mods/deathmatch/logic/CMapEventManager.h | 10 +- Client/mods/deathmatch/logic/CModelNames.cpp | 2 +- Client/mods/deathmatch/logic/CModelNames.h | 2 +- .../logic/CMovingObjectsManager.cpp | 2 +- .../deathmatch/logic/CMovingObjectsManager.h | 2 +- Client/mods/deathmatch/logic/CNametags.cpp | 8 +- Client/mods/deathmatch/logic/CNametags.h | 14 +- Client/mods/deathmatch/logic/CNetAPI.cpp | 6 +- Client/mods/deathmatch/logic/CNetAPI.h | 10 +- .../mods/deathmatch/logic/CNetworkStats.cpp | 6 +- Client/mods/deathmatch/logic/CNetworkStats.h | 6 +- .../deathmatch/logic/CObjectRespawner.cpp | 2 +- .../mods/deathmatch/logic/CObjectRespawner.h | 6 +- Client/mods/deathmatch/logic/CObjectSync.cpp | 6 +- Client/mods/deathmatch/logic/CObjectSync.h | 10 +- Client/mods/deathmatch/logic/CPedSync.cpp | 6 +- Client/mods/deathmatch/logic/CPedSync.h | 10 +- Client/mods/deathmatch/logic/CRadarMap.cpp | 26 +- Client/mods/deathmatch/logic/CRadarMap.h | 40 +-- .../deathmatch/logic/CRegisteredCommands.cpp | 8 +- .../deathmatch/logic/CRegisteredCommands.h | 8 +- Client/mods/deathmatch/logic/CRemoteCalls.cpp | 4 +- Client/mods/deathmatch/logic/CRemoteCalls.h | 4 +- Client/mods/deathmatch/logic/CResource.cpp | 14 +- Client/mods/deathmatch/logic/CResource.h | 62 ++-- .../deathmatch/logic/CResourceConfigItem.cpp | 6 +- .../deathmatch/logic/CResourceConfigItem.h | 10 +- .../logic/CResourceFileDownloadManager.cpp | 4 +- .../logic/CResourceFileDownloadManager.h | 8 +- .../deathmatch/logic/CResourceManager.cpp | 8 +- .../mods/deathmatch/logic/CResourceManager.h | 8 +- .../deathmatch/logic/CScriptDebugging.cpp | 4 +- .../mods/deathmatch/logic/CScriptDebugging.h | 8 +- Client/mods/deathmatch/logic/CScriptFile.cpp | 16 +- Client/mods/deathmatch/logic/CScriptFile.h | 28 +- .../mods/deathmatch/logic/CScriptKeyBinds.cpp | 4 +- .../mods/deathmatch/logic/CScriptKeyBinds.h | 24 +- Client/mods/deathmatch/logic/CServer.cpp | 12 +- Client/mods/deathmatch/logic/CServer.h | 20 +- .../deathmatch/logic/CServerIdManager.cpp | 16 +- .../mods/deathmatch/logic/CServerIdManager.h | 4 +- .../deathmatch/logic/CSimulatedPlayPosition.h | 6 +- .../logic/CSingularFileDownload.cpp | 8 +- .../deathmatch/logic/CSingularFileDownload.h | 18 +- .../logic/CSingularFileDownloadManager.cpp | 8 +- .../logic/CSingularFileDownloadManager.h | 8 +- .../logic/CStaticFunctionDefinitions.cpp | 36 +-- .../logic/CStaticFunctionDefinitions.h | 42 +-- Client/mods/deathmatch/logic/CSyncDebug.cpp | 10 +- Client/mods/deathmatch/logic/CSyncDebug.h | 14 +- Client/mods/deathmatch/logic/CTransferBox.cpp | 10 +- Client/mods/deathmatch/logic/CTransferBox.h | 12 +- .../logic/CUnoccupiedVehicleSync.cpp | 10 +- .../deathmatch/logic/CUnoccupiedVehicleSync.h | 14 +- .../deathmatch/logic/CVehicleUpgrades.cpp | 4 +- .../mods/deathmatch/logic/CVehicleUpgrades.h | 6 +- Client/mods/deathmatch/logic/Utils.cpp | 4 +- Client/mods/deathmatch/logic/Utils.h | 4 +- .../deathmatch/logic/lua/CLuaArgument.cpp | 6 +- .../mods/deathmatch/logic/lua/CLuaArgument.h | 20 +- .../deathmatch/logic/lua/CLuaArguments.cpp | 8 +- .../mods/deathmatch/logic/lua/CLuaArguments.h | 18 +- .../deathmatch/logic/lua/CLuaCFunctions.cpp | 2 +- .../deathmatch/logic/lua/CLuaCFunctions.h | 10 +- .../deathmatch/logic/lua/CLuaFunctionRef.cpp | 8 +- .../deathmatch/logic/lua/CLuaFunctionRef.h | 8 +- Client/mods/deathmatch/logic/lua/CLuaMain.cpp | 18 +- Client/mods/deathmatch/logic/lua/CLuaMain.h | 34 +- .../mods/deathmatch/logic/lua/CLuaManager.cpp | 8 +- .../mods/deathmatch/logic/lua/CLuaManager.h | 12 +- .../mods/deathmatch/logic/lua/CLuaTimer.cpp | 6 +- Client/mods/deathmatch/logic/lua/CLuaTimer.h | 16 +- .../deathmatch/logic/lua/CLuaTimerManager.cpp | 2 +- .../deathmatch/logic/lua/CLuaTimerManager.h | 12 +- Client/mods/deathmatch/logic/lua/LuaCommon.h | 2 +- .../logic/luadefs/CLuaAudioDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaAudioDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaBlipDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaBlipDefs.h | 2 +- .../logic/luadefs/CLuaBrowserDefs.cpp | 2 +- .../logic/luadefs/CLuaBrowserDefs.h | 2 +- .../logic/luadefs/CLuaCameraDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaCameraDefs.h | 2 +- .../logic/luadefs/CLuaColShapeDefs.cpp | 2 +- .../logic/luadefs/CLuaColShapeDefs.h | 2 +- .../logic/luadefs/CLuaDrawingDefs.cpp | 2 +- .../logic/luadefs/CLuaDrawingDefs.h | 2 +- .../logic/luadefs/CLuaEffectDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaEffectDefs.h | 2 +- .../logic/luadefs/CLuaElementDefs.cpp | 2 +- .../logic/luadefs/CLuaElementDefs.h | 2 +- .../logic/luadefs/CLuaEngineDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaEngineDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaFireDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaFireDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaGUIDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaGUIDefs.h | 2 +- .../logic/luadefs/CLuaMarkerDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaMarkerDefs.h | 2 +- .../logic/luadefs/CLuaObjectDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaObjectDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaPedDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaPedDefs.h | 2 +- .../logic/luadefs/CLuaPickupDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaPickupDefs.h | 2 +- .../logic/luadefs/CLuaPlayerDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaPlayerDefs.h | 2 +- .../logic/luadefs/CLuaPointLightDefs.cpp | 2 +- .../logic/luadefs/CLuaPointLightDefs.h | 2 +- .../logic/luadefs/CLuaProjectileDefs.cpp | 2 +- .../logic/luadefs/CLuaProjectileDefs.h | 2 +- .../logic/luadefs/CLuaRadarAreaDefs.cpp | 2 +- .../logic/luadefs/CLuaRadarAreaDefs.h | 2 +- .../logic/luadefs/CLuaResourceDefs.cpp | 2 +- .../logic/luadefs/CLuaResourceDefs.h | 2 +- .../logic/luadefs/CLuaSearchLightDefs.cpp | 2 +- .../logic/luadefs/CLuaSearchLightDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaTaskDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaTaskDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaTeamDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaTeamDefs.h | 2 +- .../logic/luadefs/CLuaTimerDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaTimerDefs.h | 2 +- .../logic/luadefs/CLuaVehicleDefs.cpp | 2 +- .../logic/luadefs/CLuaVehicleDefs.h | 2 +- .../logic/luadefs/CLuaWaterDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaWaterDefs.h | 2 +- .../logic/luadefs/CLuaWeaponDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaWeaponDefs.h | 2 +- .../mods/deathmatch/logic/rpc/CAudioRPCs.cpp | 2 +- Client/mods/deathmatch/logic/rpc/CAudioRPCs.h | 2 +- .../mods/deathmatch/logic/rpc/CBlipRPCs.cpp | 2 +- Client/mods/deathmatch/logic/rpc/CBlipRPCs.h | 2 +- .../mods/deathmatch/logic/rpc/CCameraRPCs.cpp | 2 +- .../mods/deathmatch/logic/rpc/CCameraRPCs.h | 2 +- .../deathmatch/logic/rpc/CElementRPCs.cpp | 2 +- .../mods/deathmatch/logic/rpc/CElementRPCs.h | 2 +- .../deathmatch/logic/rpc/CHandlingRPCs.cpp | 2 +- .../mods/deathmatch/logic/rpc/CHandlingRPCs.h | 2 +- .../mods/deathmatch/logic/rpc/CInputRPCs.cpp | 2 +- Client/mods/deathmatch/logic/rpc/CInputRPCs.h | 2 +- .../mods/deathmatch/logic/rpc/CMarkerRPCs.cpp | 2 +- .../mods/deathmatch/logic/rpc/CMarkerRPCs.h | 2 +- .../mods/deathmatch/logic/rpc/CObjectRPCs.cpp | 2 +- .../mods/deathmatch/logic/rpc/CObjectRPCs.h | 2 +- .../mods/deathmatch/logic/rpc/COutputRPCs.cpp | 2 +- .../mods/deathmatch/logic/rpc/COutputRPCs.h | 2 +- Client/mods/deathmatch/logic/rpc/CPedRPCs.cpp | 2 +- Client/mods/deathmatch/logic/rpc/CPedRPCs.h | 2 +- .../mods/deathmatch/logic/rpc/CPickupRPCs.cpp | 2 +- .../mods/deathmatch/logic/rpc/CPickupRPCs.h | 2 +- .../mods/deathmatch/logic/rpc/CPlayerRPCs.cpp | 2 +- .../mods/deathmatch/logic/rpc/CPlayerRPCs.h | 2 +- .../deathmatch/logic/rpc/CRPCFunctions.cpp | 4 +- .../mods/deathmatch/logic/rpc/CRPCFunctions.h | 4 +- .../mods/deathmatch/logic/rpc/CRadarRPCs.cpp | 2 +- Client/mods/deathmatch/logic/rpc/CRadarRPCs.h | 2 +- .../mods/deathmatch/logic/rpc/CTeamRPCs.cpp | 2 +- Client/mods/deathmatch/logic/rpc/CTeamRPCs.h | 2 +- .../deathmatch/logic/rpc/CVehicleRPCs.cpp | 2 +- .../mods/deathmatch/logic/rpc/CVehicleRPCs.h | 2 +- .../mods/deathmatch/logic/rpc/CWaterRPCs.cpp | 2 +- Client/mods/deathmatch/logic/rpc/CWaterRPCs.h | 2 +- .../mods/deathmatch/logic/rpc/CWeaponRPCs.cpp | 2 +- .../mods/deathmatch/logic/rpc/CWeaponRPCs.h | 2 +- .../mods/deathmatch/logic/rpc/CWorldRPCs.cpp | 2 +- Client/mods/deathmatch/logic/rpc/CWorldRPCs.h | 2 +- Client/multiplayer_sa/CMultiplayerSA.cpp | 44 +-- Client/multiplayer_sa/CMultiplayerSA.h | 64 ++-- Client/multiplayer_sa/CMultiplayerSA_1.3.cpp | 8 +- .../CMultiplayerSA_ClothesCache.cpp | 12 +- .../CMultiplayerSA_ClothesMemFix.cpp | 6 +- .../CMultiplayerSA_ClothesSpeedUp.cpp | 4 +- .../CMultiplayerSA_CrashFixHacks.cpp | 12 +- .../CMultiplayerSA_Direct3D.cpp | 2 +- .../multiplayer_sa/CMultiplayerSA_Files.cpp | 2 +- .../CMultiplayerSA_FixBadAnimId.cpp | 2 +- .../CMultiplayerSA_FixLineOfSightArgs.cpp | 2 +- .../CMultiplayerSA_HookDestructors.cpp | 2 +- .../CMultiplayerSA_LicensePlate.cpp | 4 +- .../CMultiplayerSA_ObjectLODSystem.cpp | 2 +- .../CMultiplayerSA_Rendering.cpp | 12 +- .../CMultiplayerSA_RwResources.cpp | 2 +- .../CMultiplayerSA_VehicleDamage.cpp | 2 +- .../CMultiplayerSA_VehicleLights.cpp | 2 +- .../CMultiplayerSA_VehicleWeapons.cpp | 2 +- .../multiplayer_sa/CMultiplayerSA_Weapons.cpp | 10 +- Client/multiplayer_sa/COffsets.cpp | 10 +- Client/multiplayer_sa/COffsets.h | 10 +- Client/multiplayer_sa/multiplayer_keysync.cpp | 2 +- .../multiplayer_sa/multiplayer_shotsync.cpp | 12 +- Client/sdk/CSingleton.h | 8 +- Client/sdk/core/CClientBase.h | 8 +- Client/sdk/core/CCommandsInterface.h | 10 +- Client/sdk/core/CConsoleInterface.h | 14 +- Client/sdk/core/CCoreInterface.h | 102 +++--- Client/sdk/core/CExceptionInformation.h | 42 +-- Client/sdk/core/CGraphicsInterface.h | 26 +- Client/sdk/core/CKeyBindsInterface.h | 40 +-- Client/sdk/core/CLocalizationInterface.h | 10 +- Client/sdk/core/CModManagerInterface.h | 6 +- Client/sdk/core/CPixelsManagerInterface.h | 12 +- Client/sdk/core/CRenderItemManagerInterface.h | 174 +++++----- Client/sdk/core/CScreenGrabberInterface.h | 14 +- Client/sdk/core/CSetCursorPosHookInterface.h | 10 +- Client/sdk/core/CTrayIconInterface.h | 6 +- Client/sdk/core/CWebCoreInterface.h | 2 +- Client/sdk/game/C3DMarker.h | 2 +- Client/sdk/game/CAERadioTrackManager.h | 8 +- Client/sdk/game/CAEVehicleAudioEntity.h | 6 +- Client/sdk/game/CAnimBlendAssocGroup.h | 10 +- Client/sdk/game/CAnimBlendSequence.h | 14 +- Client/sdk/game/CAnimBlock.h | 16 +- Client/sdk/game/CAnimManager.h | 26 +- Client/sdk/game/CAudioEngine.h | 6 +- Client/sdk/game/CAutomobile.h | 32 +- Client/sdk/game/CBike.h | 2 +- Client/sdk/game/CBmx.h | 2 +- Client/sdk/game/CBoat.h | 2 +- Client/sdk/game/CBuilding.h | 2 +- Client/sdk/game/CCamera.h | 16 +- Client/sdk/game/CCivilianPed.h | 2 +- Client/sdk/game/CColModel.h | 4 +- Client/sdk/game/CColPoint.h | 30 +- Client/sdk/game/CControllerConfigManager.h | 4 +- Client/sdk/game/CDamageManager.h | 6 +- Client/sdk/game/CEntity.h | 22 +- Client/sdk/game/CEvent.h | 2 +- Client/sdk/game/CEventDamage.h | 32 +- Client/sdk/game/CEventGunShot.h | 2 +- Client/sdk/game/CExplosion.h | 16 +- Client/sdk/game/CExplosionManager.h | 4 +- Client/sdk/game/CFxSystem.h | 4 +- Client/sdk/game/CGame.h | 42 +-- Client/sdk/game/CHandlingEntry.h | 92 +++--- Client/sdk/game/CHandlingManager.h | 4 +- Client/sdk/game/CHud.h | 4 +- Client/sdk/game/CModelInfo.h | 20 +- Client/sdk/game/CObject.h | 10 +- Client/sdk/game/CPad.h | 6 +- Client/sdk/game/CPed.h | 46 +-- Client/sdk/game/CPedDamageResponse.h | 2 +- Client/sdk/game/CPedIntelligence.h | 10 +- Client/sdk/game/CPedSound.h | 10 +- Client/sdk/game/CPhysical.h | 26 +- Client/sdk/game/CPlane.h | 2 +- Client/sdk/game/CPlayerInfo.h | 28 +- Client/sdk/game/CPlayerPed.h | 10 +- Client/sdk/game/CProjectile.h | 2 +- Client/sdk/game/CProjectileInfo.h | 6 +- Client/sdk/game/CQuadBike.h | 2 +- Client/sdk/game/CRenderWare.h | 6 +- Client/sdk/game/CSettings.h | 64 ++-- Client/sdk/game/CTasks.h | 4 +- Client/sdk/game/CTrailer.h | 2 +- Client/sdk/game/CVehicle.h | 42 +-- Client/sdk/game/CWanted.h | 2 +- Client/sdk/game/CWaterManager.h | 4 +- Client/sdk/game/CWeapon.h | 2 +- Client/sdk/game/CWeaponInfo.h | 62 ++-- Client/sdk/game/CWeaponStat.h | 68 ++-- Client/sdk/game/CWeaponStatManager.h | 4 +- Client/sdk/game/CWeather.h | 10 +- Client/sdk/game/CWorld.h | 14 +- Client/sdk/game/Task.h | 10 +- Client/sdk/game/TaskAttack.h | 6 +- Client/sdk/game/TaskBasic.h | 22 +- Client/sdk/game/TaskCar.h | 10 +- Client/sdk/game/TaskCarAccessories.h | 6 +- Client/sdk/game/TaskGoTo.h | 4 +- Client/sdk/game/TaskIK.h | 8 +- Client/sdk/game/TaskJumpFall.h | 4 +- Client/sdk/game/TaskPhysicalResponse.h | 12 +- Client/sdk/game/TaskSecondary.h | 2 +- Client/sdk/gui/CGUI.h | 44 +-- Client/sdk/gui/CGUIButton.h | 2 +- Client/sdk/gui/CGUICallback.h | 2 +- Client/sdk/gui/CGUICheckBox.h | 4 +- Client/sdk/gui/CGUIComboBox.h | 16 +- Client/sdk/gui/CGUIEdit.h | 20 +- Client/sdk/gui/CGUIElement.h | 56 ++-- Client/sdk/gui/CGUIFont.h | 6 +- Client/sdk/gui/CGUIGridList.h | 26 +- Client/sdk/gui/CGUILabel.h | 14 +- Client/sdk/gui/CGUIListItem.h | 8 +- Client/sdk/gui/CGUIMemo.h | 22 +- Client/sdk/gui/CGUIMessageBox.h | 8 +- Client/sdk/gui/CGUIProgressBar.h | 4 +- Client/sdk/gui/CGUIRadioButton.h | 4 +- Client/sdk/gui/CGUIScrollBar.h | 4 +- Client/sdk/gui/CGUIScrollPane.h | 10 +- Client/sdk/gui/CGUISize.h | 2 +- Client/sdk/gui/CGUIStaticImage.h | 8 +- Client/sdk/gui/CGUITab.h | 2 +- Client/sdk/gui/CGUITabPanel.h | 8 +- Client/sdk/gui/CGUITexture.h | 6 +- Client/sdk/gui/CGUITypes.h | 2 +- Client/sdk/gui/CGUIWindow.h | 12 +- Client/sdk/multiplayer/CMultiplayer.h | 64 ++-- Client/sdk/net/CNet.h | 48 +-- Server/core/CCrashHandler.cpp | 2 +- Server/core/CCrashHandler.h | 2 +- Server/core/CCrashHandlerAPI.cpp | 20 +- Server/core/CCrashHandlerAPI.h | 4 +- Server/core/CDynamicLibrary.cpp | 8 +- Server/core/CDynamicLibrary.h | 8 +- Server/core/CExceptionInformation_Impl.cpp | 4 +- Server/core/CExceptionInformation_Impl.h | 46 +-- Server/core/CModManagerImpl.cpp | 12 +- Server/core/CModManagerImpl.h | 18 +- Server/core/CServerImpl.cpp | 26 +- Server/core/CServerImpl.h | 28 +- Server/dbconmy/CDatabaseConnectionMySql.cpp | 38 +-- Server/launcher/CDynamicLibrary.cpp | 8 +- Server/launcher/CDynamicLibrary.h | 8 +- Server/mods/deathmatch/CServer.cpp | 8 +- Server/mods/deathmatch/CServer.h | 12 +- Server/mods/deathmatch/logic/ASE.cpp | 20 +- Server/mods/deathmatch/logic/ASE.h | 44 +-- Server/mods/deathmatch/logic/ASEQuerySDK.h | 20 +- .../deathmatch/logic/CAccessControlList.cpp | 6 +- .../deathmatch/logic/CAccessControlList.h | 14 +- .../logic/CAccessControlListGroup.cpp | 6 +- .../logic/CAccessControlListGroup.h | 24 +- .../logic/CAccessControlListManager.cpp | 20 +- .../logic/CAccessControlListManager.h | 34 +- .../logic/CAccessControlListRight.h | 12 +- Server/mods/deathmatch/logic/CAccount.cpp | 12 +- Server/mods/deathmatch/logic/CAccount.h | 48 +-- .../mods/deathmatch/logic/CAccountManager.cpp | 10 +- .../mods/deathmatch/logic/CAccountManager.h | 26 +- .../deathmatch/logic/CAccountPassword.cpp | 4 +- Server/mods/deathmatch/logic/CAclRightName.h | 8 +- Server/mods/deathmatch/logic/CBan.cpp | 10 +- Server/mods/deathmatch/logic/CBan.h | 32 +- Server/mods/deathmatch/logic/CBanManager.cpp | 12 +- Server/mods/deathmatch/logic/CBanManager.h | 18 +- .../deathmatch/logic/CBandwidthSettings.h | 10 +- .../mods/deathmatch/logic/CBlendedWeather.cpp | 6 +- .../mods/deathmatch/logic/CBlendedWeather.h | 12 +- Server/mods/deathmatch/logic/CBlip.cpp | 6 +- Server/mods/deathmatch/logic/CBlip.h | 8 +- Server/mods/deathmatch/logic/CBlipManager.cpp | 4 +- Server/mods/deathmatch/logic/CBlipManager.h | 12 +- .../mods/deathmatch/logic/CBuildingRemoval.h | 10 +- .../logic/CBuildingRemovalManager.cpp | 6 +- .../logic/CBuildingRemovalManager.h | 10 +- .../logic/CCameraSpatialDatabase.cpp | 4 +- .../deathmatch/logic/CCameraSpatialDatabase.h | 2 +- Server/mods/deathmatch/logic/CClient.cpp | 6 +- Server/mods/deathmatch/logic/CClient.h | 12 +- Server/mods/deathmatch/logic/CClock.cpp | 4 +- Server/mods/deathmatch/logic/CClock.h | 4 +- Server/mods/deathmatch/logic/CColCircle.cpp | 2 +- Server/mods/deathmatch/logic/CColCircle.h | 6 +- Server/mods/deathmatch/logic/CColCuboid.cpp | 2 +- Server/mods/deathmatch/logic/CColCuboid.h | 6 +- Server/mods/deathmatch/logic/CColManager.cpp | 8 +- Server/mods/deathmatch/logic/CColManager.h | 12 +- Server/mods/deathmatch/logic/CColPolygon.cpp | 2 +- Server/mods/deathmatch/logic/CColPolygon.h | 10 +- .../mods/deathmatch/logic/CColRectangle.cpp | 2 +- Server/mods/deathmatch/logic/CColRectangle.h | 6 +- Server/mods/deathmatch/logic/CColShape.cpp | 10 +- Server/mods/deathmatch/logic/CColShape.h | 22 +- Server/mods/deathmatch/logic/CColSphere.cpp | 2 +- Server/mods/deathmatch/logic/CColSphere.h | 6 +- Server/mods/deathmatch/logic/CColTube.cpp | 2 +- Server/mods/deathmatch/logic/CColTube.h | 8 +- Server/mods/deathmatch/logic/CCommandFile.cpp | 4 +- Server/mods/deathmatch/logic/CCommandFile.h | 6 +- .../deathmatch/logic/CCommandLineParser.cpp | 2 +- .../deathmatch/logic/CCommandLineParser.h | 2 +- .../mods/deathmatch/logic/CConnectHistory.cpp | 6 +- .../mods/deathmatch/logic/CConnectHistory.h | 8 +- Server/mods/deathmatch/logic/CConsole.cpp | 4 +- Server/mods/deathmatch/logic/CConsole.h | 20 +- Server/mods/deathmatch/logic/CConsoleClient.h | 8 +- .../mods/deathmatch/logic/CConsoleCommand.h | 8 +- Server/mods/deathmatch/logic/CCustomData.cpp | 2 +- Server/mods/deathmatch/logic/CCustomData.h | 10 +- .../mods/deathmatch/logic/CCustomWeapon.cpp | 6 +- Server/mods/deathmatch/logic/CCustomWeapon.h | 36 +-- .../deathmatch/logic/CCustomWeaponManager.cpp | 2 +- .../deathmatch/logic/CCustomWeaponManager.h | 10 +- .../logic/CDatabaseConnectionSqlite.cpp | 38 +-- .../deathmatch/logic/CDatabaseJobQueue.cpp | 30 +- .../mods/deathmatch/logic/CDatabaseJobQueue.h | 6 +- .../logic/CDatabaseJobQueueManager.cpp | 6 +- .../logic/CDatabaseJobQueueManager.h | 6 +- .../deathmatch/logic/CDatabaseManager.cpp | 30 +- .../mods/deathmatch/logic/CDatabaseManager.h | 32 +- Server/mods/deathmatch/logic/CDatabaseType.h | 24 +- .../deathmatch/logic/CDatabaseTypeMySql.cpp | 18 +- .../deathmatch/logic/CDatabaseTypeSqlite.cpp | 18 +- Server/mods/deathmatch/logic/CDummy.cpp | 4 +- Server/mods/deathmatch/logic/CDummy.h | 6 +- .../mods/deathmatch/logic/CDynamicLibrary.cpp | 8 +- .../mods/deathmatch/logic/CDynamicLibrary.h | 8 +- Server/mods/deathmatch/logic/CElement.cpp | 30 +- Server/mods/deathmatch/logic/CElement.h | 90 +++--- .../mods/deathmatch/logic/CElementDeleter.cpp | 2 +- .../mods/deathmatch/logic/CElementDeleter.h | 4 +- .../mods/deathmatch/logic/CElementGroup.cpp | 2 +- Server/mods/deathmatch/logic/CElementGroup.h | 6 +- Server/mods/deathmatch/logic/CElementIDs.cpp | 2 +- Server/mods/deathmatch/logic/CElementIDs.h | 2 +- Server/mods/deathmatch/logic/CEvents.cpp | 12 +- Server/mods/deathmatch/logic/CEvents.h | 18 +- Server/mods/deathmatch/logic/CGame.cpp | 32 +- Server/mods/deathmatch/logic/CGame.h | 192 +++++------ Server/mods/deathmatch/logic/CGroups.cpp | 2 +- Server/mods/deathmatch/logic/CGroups.h | 10 +- Server/mods/deathmatch/logic/CHTTPD.cpp | 6 +- Server/mods/deathmatch/logic/CHTTPD.h | 8 +- Server/mods/deathmatch/logic/CHandlingEntry.h | 90 +++--- .../deathmatch/logic/CHandlingManager.cpp | 8 +- .../mods/deathmatch/logic/CHandlingManager.h | 8 +- Server/mods/deathmatch/logic/CKeyBinds.cpp | 4 +- Server/mods/deathmatch/logic/CKeyBinds.h | 26 +- .../mods/deathmatch/logic/CLanBroadcast.cpp | 4 +- Server/mods/deathmatch/logic/CLanBroadcast.h | 6 +- Server/mods/deathmatch/logic/CLogger.cpp | 10 +- Server/mods/deathmatch/logic/CLogger.h | 10 +- Server/mods/deathmatch/logic/CMainConfig.cpp | 44 +-- Server/mods/deathmatch/logic/CMainConfig.h | 156 ++++----- Server/mods/deathmatch/logic/CMapEvent.cpp | 2 +- Server/mods/deathmatch/logic/CMapEvent.h | 12 +- .../deathmatch/logic/CMapEventManager.cpp | 8 +- .../mods/deathmatch/logic/CMapEventManager.h | 10 +- Server/mods/deathmatch/logic/CMapManager.cpp | 14 +- Server/mods/deathmatch/logic/CMapManager.h | 26 +- Server/mods/deathmatch/logic/CMarker.cpp | 6 +- Server/mods/deathmatch/logic/CMarker.h | 20 +- .../mods/deathmatch/logic/CMarkerManager.cpp | 2 +- Server/mods/deathmatch/logic/CMarkerManager.h | 10 +- Server/mods/deathmatch/logic/CObject.cpp | 14 +- Server/mods/deathmatch/logic/CObject.h | 34 +- .../mods/deathmatch/logic/CObjectManager.cpp | 6 +- Server/mods/deathmatch/logic/CObjectManager.h | 12 +- Server/mods/deathmatch/logic/CObjectSync.cpp | 4 +- Server/mods/deathmatch/logic/CObjectSync.h | 4 +- .../deathmatch/logic/CPacketTranslator.cpp | 2 +- .../mods/deathmatch/logic/CPacketTranslator.h | 2 +- Server/mods/deathmatch/logic/CPad.cpp | 2 +- Server/mods/deathmatch/logic/CPad.h | 6 +- Server/mods/deathmatch/logic/CPed.cpp | 10 +- Server/mods/deathmatch/logic/CPed.h | 82 ++--- Server/mods/deathmatch/logic/CPedManager.cpp | 6 +- Server/mods/deathmatch/logic/CPedManager.h | 12 +- Server/mods/deathmatch/logic/CPedSync.cpp | 4 +- Server/mods/deathmatch/logic/CPedSync.h | 4 +- .../deathmatch/logic/CPerPlayerEntity.cpp | 6 +- .../mods/deathmatch/logic/CPerPlayerEntity.h | 14 +- .../logic/CPerfStat.BandwidthReduction.cpp | 20 +- .../logic/CPerfStat.BandwidthUsage.cpp | 34 +- .../deathmatch/logic/CPerfStat.DebugInfo.cpp | 18 +- .../deathmatch/logic/CPerfStat.DebugTable.cpp | 16 +- .../logic/CPerfStat.EventPacketUsage.cpp | 22 +- .../logic/CPerfStat.FunctionTiming.cpp | 20 +- .../deathmatch/logic/CPerfStat.LibMemory.cpp | 18 +- .../deathmatch/logic/CPerfStat.LuaMemory.cpp | 18 +- .../deathmatch/logic/CPerfStat.LuaTiming.cpp | 16 +- .../logic/CPerfStat.PacketUsage.cpp | 20 +- .../logic/CPerfStat.PlayerPacketUsage.cpp | 20 +- .../logic/CPerfStat.RPCPacketUsage.cpp | 20 +- .../deathmatch/logic/CPerfStat.ServerInfo.cpp | 24 +- .../logic/CPerfStat.ServerTiming.cpp | 16 +- .../logic/CPerfStat.SqliteTiming.cpp | 16 +- .../deathmatch/logic/CPerfStatManager.cpp | 22 +- .../mods/deathmatch/logic/CPerfStatManager.h | 8 +- .../mods/deathmatch/logic/CPerfStatModule.h | 102 +++--- Server/mods/deathmatch/logic/CPickup.cpp | 6 +- Server/mods/deathmatch/logic/CPickup.h | 40 +-- .../mods/deathmatch/logic/CPickupManager.cpp | 2 +- Server/mods/deathmatch/logic/CPickupManager.h | 14 +- Server/mods/deathmatch/logic/CPlayer.cpp | 36 +-- Server/mods/deathmatch/logic/CPlayer.h | 182 +++++------ .../mods/deathmatch/logic/CPlayerCamera.cpp | 6 +- Server/mods/deathmatch/logic/CPlayerCamera.h | 18 +- .../mods/deathmatch/logic/CPlayerClothes.cpp | 6 +- Server/mods/deathmatch/logic/CPlayerClothes.h | 6 +- .../mods/deathmatch/logic/CPlayerManager.cpp | 14 +- Server/mods/deathmatch/logic/CPlayerManager.h | 22 +- Server/mods/deathmatch/logic/CPlayerStats.cpp | 2 +- Server/mods/deathmatch/logic/CPlayerStats.h | 8 +- Server/mods/deathmatch/logic/CPlayerTasks.cpp | 4 +- Server/mods/deathmatch/logic/CPlayerTasks.h | 14 +- .../deathmatch/logic/CPlayerTextManager.cpp | 2 +- .../deathmatch/logic/CPlayerTextManager.h | 6 +- .../mods/deathmatch/logic/CRPCFunctions.cpp | 6 +- Server/mods/deathmatch/logic/CRPCFunctions.h | 6 +- Server/mods/deathmatch/logic/CRadarArea.cpp | 4 +- Server/mods/deathmatch/logic/CRadarArea.h | 10 +- .../deathmatch/logic/CRadarAreaManager.cpp | 6 +- .../mods/deathmatch/logic/CRadarAreaManager.h | 12 +- .../deathmatch/logic/CRegisteredCommands.cpp | 6 +- .../deathmatch/logic/CRegisteredCommands.h | 6 +- Server/mods/deathmatch/logic/CRegistry.cpp | 8 +- Server/mods/deathmatch/logic/CRegistry.h | 24 +- .../deathmatch/logic/CRegistryManager.cpp | 4 +- .../mods/deathmatch/logic/CRegistryManager.h | 4 +- Server/mods/deathmatch/logic/CRemoteCalls.cpp | 4 +- Server/mods/deathmatch/logic/CRemoteCalls.h | 4 +- .../deathmatch/logic/CResource.AclRequest.cpp | 10 +- .../logic/CResourceClientConfigItem.cpp | 6 +- .../logic/CResourceClientConfigItem.h | 8 +- .../logic/CResourceClientFileItem.cpp | 6 +- .../logic/CResourceClientFileItem.h | 8 +- .../logic/CResourceClientScriptItem.cpp | 6 +- .../logic/CResourceClientScriptItem.h | 6 +- .../deathmatch/logic/CResourceConfigItem.cpp | 6 +- .../deathmatch/logic/CResourceConfigItem.h | 10 +- .../mods/deathmatch/logic/CResourceFile.cpp | 2 +- Server/mods/deathmatch/logic/CResourceFile.h | 12 +- .../deathmatch/logic/CResourceHTMLItem.cpp | 6 +- .../mods/deathmatch/logic/CResourceHTMLItem.h | 12 +- .../deathmatch/logic/CResourceManager.cpp | 24 +- .../mods/deathmatch/logic/CResourceManager.h | 34 +- .../deathmatch/logic/CResourceScriptItem.cpp | 6 +- .../deathmatch/logic/CResourceScriptItem.h | 6 +- .../deathmatch/logic/CScriptDebugging.cpp | 6 +- .../mods/deathmatch/logic/CScriptDebugging.h | 10 +- Server/mods/deathmatch/logic/CScriptFile.cpp | 14 +- Server/mods/deathmatch/logic/CScriptFile.h | 22 +- Server/mods/deathmatch/logic/CSettings.cpp | 2 +- Server/mods/deathmatch/logic/CSettings.h | 2 +- .../deathmatch/logic/CSpatialDatabase.cpp | 4 +- .../mods/deathmatch/logic/CSpatialDatabase.h | 2 +- .../logic/CStaticFunctionDefinitions.cpp | 28 +- .../logic/CStaticFunctionDefinitions.h | 40 +-- Server/mods/deathmatch/logic/CTeam.cpp | 6 +- Server/mods/deathmatch/logic/CTeam.h | 16 +- Server/mods/deathmatch/logic/CTeamManager.cpp | 6 +- Server/mods/deathmatch/logic/CTeamManager.h | 10 +- Server/mods/deathmatch/logic/CTextDisplay.cpp | 4 +- Server/mods/deathmatch/logic/CTextDisplay.h | 6 +- Server/mods/deathmatch/logic/CTextItem.cpp | 2 +- Server/mods/deathmatch/logic/CTextItem.h | 22 +- .../logic/CUnoccupiedVehicleSync.cpp | 4 +- .../deathmatch/logic/CUnoccupiedVehicleSync.h | 4 +- Server/mods/deathmatch/logic/CVehicle.cpp | 46 +-- Server/mods/deathmatch/logic/CVehicle.h | 160 +++++----- .../deathmatch/logic/CVehicleColorManager.cpp | 4 +- .../deathmatch/logic/CVehicleColorManager.h | 8 +- .../mods/deathmatch/logic/CVehicleManager.cpp | 6 +- .../mods/deathmatch/logic/CVehicleManager.h | 16 +- .../deathmatch/logic/CVehicleUpgrades.cpp | 4 +- .../mods/deathmatch/logic/CVehicleUpgrades.h | 6 +- .../mods/deathmatch/logic/CWaterManager.cpp | 2 +- Server/mods/deathmatch/logic/CWaterManager.h | 2 +- Server/mods/deathmatch/logic/CWeaponStat.h | 78 ++--- .../deathmatch/logic/CWeaponStatManager.cpp | 2 +- .../deathmatch/logic/CWeaponStatManager.h | 6 +- Server/mods/deathmatch/logic/CXMLConfig.cpp | 2 +- Server/mods/deathmatch/logic/CXMLConfig.h | 10 +- Server/mods/deathmatch/logic/Utils.cpp | 8 +- Server/mods/deathmatch/logic/Utils.h | 8 +- .../mods/deathmatch/logic/common/CBitStream.h | 8 +- .../deathmatch/logic/lua/CLuaArgument.cpp | 6 +- .../mods/deathmatch/logic/lua/CLuaArgument.h | 18 +- .../deathmatch/logic/lua/CLuaArguments.cpp | 6 +- .../mods/deathmatch/logic/lua/CLuaArguments.h | 16 +- .../deathmatch/logic/lua/CLuaCFunctions.cpp | 2 +- .../deathmatch/logic/lua/CLuaCFunctions.h | 8 +- .../mods/deathmatch/logic/lua/CLuaCallback.h | 2 +- .../deathmatch/logic/lua/CLuaFunctionRef.cpp | 8 +- .../deathmatch/logic/lua/CLuaFunctionRef.h | 8 +- Server/mods/deathmatch/logic/lua/CLuaMain.cpp | 20 +- Server/mods/deathmatch/logic/lua/CLuaMain.h | 58 ++-- .../mods/deathmatch/logic/lua/CLuaManager.cpp | 6 +- .../mods/deathmatch/logic/lua/CLuaManager.h | 12 +- .../mods/deathmatch/logic/lua/CLuaModule.cpp | 10 +- Server/mods/deathmatch/logic/lua/CLuaModule.h | 18 +- .../logic/lua/CLuaModuleManager.cpp | 4 +- .../deathmatch/logic/lua/CLuaModuleManager.h | 8 +- .../mods/deathmatch/logic/lua/CLuaTimer.cpp | 6 +- Server/mods/deathmatch/logic/lua/CLuaTimer.h | 16 +- .../deathmatch/logic/lua/CLuaTimerManager.cpp | 2 +- .../deathmatch/logic/lua/CLuaTimerManager.h | 12 +- Server/mods/deathmatch/logic/lua/LuaCommon.h | 2 +- .../deathmatch/logic/luadefs/CLuaACLDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaACLDefs.h | 2 +- .../logic/luadefs/CLuaAccountDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaBanDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaBlipDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaCameraDefs.h | 2 +- .../logic/luadefs/CLuaColShapeDefs.h | 2 +- .../logic/luadefs/CLuaDatabaseDefs.h | 2 +- .../logic/luadefs/CLuaElementDefs.h | 2 +- .../logic/luadefs/CLuaHandlingDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaMarkerDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaObjectDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaPedDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaPickupDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaPlayerDefs.h | 2 +- .../logic/luadefs/CLuaRadarAreaDefs.h | 2 +- .../logic/luadefs/CLuaResourceDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaTeamDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaTextDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaTimerDefs.h | 2 +- .../logic/luadefs/CLuaVehicleDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaVoiceDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaWaterDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaWorldDefs.h | 2 +- .../mods/deathmatch/logic/net/CNetBuffer.cpp | 26 +- Server/mods/deathmatch/logic/net/CNetBuffer.h | 30 +- .../logic/net/CNetBufferWatchDog.cpp | 18 +- .../deathmatch/logic/net/CNetBufferWatchDog.h | 18 +- .../logic/net/CSimBulletsyncPacket.h | 4 +- .../mods/deathmatch/logic/net/CSimControl.cpp | 8 +- .../mods/deathmatch/logic/net/CSimControl.h | 8 +- .../deathmatch/logic/net/CSimKeysyncPacket.h | 4 +- .../deathmatch/logic/net/CSimPedTaskPacket.h | 4 +- Server/mods/deathmatch/logic/net/CSimPlayer.h | 12 +- .../logic/net/CSimPlayerManager.cpp | 6 +- .../deathmatch/logic/net/CSimPlayerManager.h | 4 +- .../logic/net/CSimPlayerPuresyncPacket.h | 14 +- .../logic/net/CSimVehiclePuresyncPacket.h | 4 +- .../logic/packets/CBulletsyncPacket.h | 8 +- .../logic/packets/CCameraSyncPacket.h | 4 +- .../logic/packets/CChatEchoPacket.h | 6 +- .../deathmatch/logic/packets/CCommandPacket.h | 10 +- .../logic/packets/CConsoleEchoPacket.h | 8 +- .../logic/packets/CCustomDataPacket.cpp | 4 +- .../logic/packets/CCustomDataPacket.h | 14 +- .../packets/CCustomWeaponBulletSyncPacket.h | 14 +- .../logic/packets/CDebugEchoPacket.h | 6 +- .../logic/packets/CDestroySatchelsPacket.cpp | 2 +- .../logic/packets/CDestroySatchelsPacket.h | 6 +- .../logic/packets/CDetonateSatchelsPacket.cpp | 2 +- .../logic/packets/CDetonateSatchelsPacket.h | 6 +- .../logic/packets/CElementRPCPacket.h | 4 +- .../logic/packets/CEntityAddPacket.h | 6 +- .../logic/packets/CEntityRemovePacket.h | 6 +- .../logic/packets/CExplosionSyncPacket.cpp | 2 +- .../logic/packets/CExplosionSyncPacket.h | 6 +- .../logic/packets/CFireSyncPacket.cpp | 2 +- .../logic/packets/CFireSyncPacket.h | 6 +- .../deathmatch/logic/packets/CKeysyncPacket.h | 8 +- .../logic/packets/CLightsyncPacket.h | 4 +- .../logic/packets/CLuaEventPacket.cpp | 2 +- .../logic/packets/CLuaEventPacket.h | 12 +- .../deathmatch/logic/packets/CLuaPacket.h | 4 +- .../deathmatch/logic/packets/CMapInfoPacket.h | 4 +- .../logic/packets/CObjectStartSyncPacket.h | 4 +- .../logic/packets/CObjectStopSyncPacket.h | 4 +- .../logic/packets/CObjectSyncPacket.cpp | 2 +- .../logic/packets/CObjectSyncPacket.h | 10 +- .../mods/deathmatch/logic/packets/CPacket.cpp | 4 +- .../mods/deathmatch/logic/packets/CPacket.h | 24 +- .../logic/packets/CPedStartSyncPacket.h | 4 +- .../logic/packets/CPedStopSyncPacket.h | 4 +- .../logic/packets/CPedSyncPacket.cpp | 2 +- .../deathmatch/logic/packets/CPedSyncPacket.h | 12 +- .../logic/packets/CPedTaskPacket.cpp | 2 +- .../deathmatch/logic/packets/CPedTaskPacket.h | 8 +- .../logic/packets/CPedWastedPacket.cpp | 2 +- .../logic/packets/CPedWastedPacket.h | 6 +- .../logic/packets/CPickupHideShowPacket.h | 10 +- .../logic/packets/CPickupHitConfirmPacket.h | 4 +- .../logic/packets/CPlayerACInfoPacket.h | 4 +- .../logic/packets/CPlayerChangeNickPacket.h | 6 +- .../logic/packets/CPlayerClothesPacket.cpp | 2 +- .../logic/packets/CPlayerClothesPacket.h | 8 +- .../packets/CPlayerConnectCompletePacket.h | 4 +- .../logic/packets/CPlayerDiagnosticPacket.h | 4 +- .../logic/packets/CPlayerDisconnectedPacket.h | 6 +- .../packets/CPlayerJoinCompletePacket.cpp | 2 +- .../logic/packets/CPlayerJoinCompletePacket.h | 6 +- .../logic/packets/CPlayerJoinDataPacket.h | 24 +- .../logic/packets/CPlayerJoinPacket.h | 6 +- .../logic/packets/CPlayerListPacket.h | 8 +- .../logic/packets/CPlayerModInfoPacket.h | 4 +- .../packets/CPlayerNetworkStatusPacket.h | 6 +- .../logic/packets/CPlayerNoSocketPacket.h | 6 +- .../logic/packets/CPlayerPuresyncPacket.h | 8 +- .../logic/packets/CPlayerQuitPacket.cpp | 2 +- .../logic/packets/CPlayerQuitPacket.h | 10 +- .../logic/packets/CPlayerScreenShotPacket.h | 4 +- .../logic/packets/CPlayerSpawnPacket.cpp | 2 +- .../logic/packets/CPlayerSpawnPacket.h | 20 +- .../logic/packets/CPlayerStatsPacket.cpp | 4 +- .../logic/packets/CPlayerStatsPacket.h | 10 +- .../logic/packets/CPlayerTimeoutPacket.h | 4 +- .../packets/CPlayerTransgressionPacket.h | 4 +- .../logic/packets/CPlayerWastedPacket.cpp | 2 +- .../logic/packets/CPlayerWastedPacket.h | 6 +- .../logic/packets/CProjectileSyncPacket.cpp | 2 +- .../logic/packets/CProjectileSyncPacket.h | 6 +- .../packets/CResourceClientScriptsPacket.h | 4 +- .../logic/packets/CResourceStartPacket.h | 4 +- .../logic/packets/CResourceStopPacket.h | 4 +- .../logic/packets/CReturnSyncPacket.h | 4 +- .../logic/packets/CServerTextItemPacket.h | 4 +- .../logic/packets/CSyncSettingsPacket.h | 6 +- .../packets/CUnoccupiedVehiclePushPacket.h | 6 +- .../CUnoccupiedVehicleStartSyncPacket.h | 4 +- .../CUnoccupiedVehicleStopSyncPacket.h | 4 +- .../packets/CUnoccupiedVehicleSyncPacket.cpp | 2 +- .../packets/CUnoccupiedVehicleSyncPacket.h | 12 +- .../logic/packets/CUpdateInfoPacket.cpp | 2 +- .../logic/packets/CUpdateInfoPacket.h | 6 +- .../logic/packets/CVehicleDamageSyncPacket.h | 4 +- .../logic/packets/CVehicleInOutPacket.cpp | 4 +- .../logic/packets/CVehicleInOutPacket.h | 26 +- .../logic/packets/CVehiclePuresyncPacket.h | 8 +- .../logic/packets/CVehicleResyncPacket.h | 4 +- .../logic/packets/CVehicleSpawnPacket.h | 6 +- .../logic/packets/CVehicleTrailerPacket.h | 18 +- .../logic/packets/CVoiceDataPacket.cpp | 2 +- .../logic/packets/CVoiceDataPacket.h | 8 +- .../logic/packets/CVoiceEndPacket.h | 8 +- .../deathmatch/utils/CFunctionUseLogger.cpp | 4 +- .../deathmatch/utils/CFunctionUseLogger.h | 4 +- Server/mods/deathmatch/utils/CHqComms.h | 8 +- .../deathmatch/utils/CMasterServerAnnouncer.h | 14 +- .../mods/deathmatch/utils/COpenPortsTester.h | 4 +- Server/mods/deathmatch/utils/CZipMaker.cpp | 4 +- Server/mods/deathmatch/utils/CZipMaker.h | 6 +- Server/sdk/core/CExceptionInformation.h | 42 +-- Server/sdk/core/CModManager.h | 4 +- Server/sdk/core/CServerBase.h | 8 +- Server/sdk/core/CServerInterface.h | 14 +- Server/sdk/net/CNetServer.h | 22 +- Server/sdk/net/ns_playerid.h | 12 +- Shared/XML/CXMLArray.cpp | 6 +- Shared/XML/CXMLArray.h | 6 +- Shared/XML/CXMLAttributeImpl.cpp | 8 +- Shared/XML/CXMLAttributeImpl.h | 14 +- Shared/XML/CXMLAttributesImpl.cpp | 12 +- Shared/XML/CXMLAttributesImpl.h | 18 +- Shared/XML/CXMLFileImpl.cpp | 24 +- Shared/XML/CXMLFileImpl.h | 32 +- Shared/XML/CXMLImpl.cpp | 6 +- Shared/XML/CXMLImpl.h | 6 +- Shared/XML/CXMLNodeImpl.cpp | 24 +- Shared/XML/CXMLNodeImpl.h | 36 +-- Shared/animation/CEasingCurve.cpp | 2 +- .../deathmatch/logic/CDebugHookManager.cpp | 4 +- .../mods/deathmatch/logic/CDebugHookManager.h | 6 +- Shared/mods/deathmatch/logic/CIdArray.cpp | 6 +- Shared/mods/deathmatch/logic/CIdArray.h | 6 +- .../mods/deathmatch/logic/CLatentReceiver.cpp | 2 +- .../deathmatch/logic/CLatentSendQueue.cpp | 8 +- .../logic/CLatentTransferManager.cpp | 8 +- .../deathmatch/logic/CLatentTransferManager.h | 22 +- .../deathmatch/logic/CScriptDebugging.cpp | 2 +- .../mods/deathmatch/logic/CTickRateSettings.h | 2 +- Shared/mods/deathmatch/logic/CZoneNames.cpp | 2 +- Shared/mods/deathmatch/logic/CZoneNames.h | 2 +- .../mods/deathmatch/logic/lua/CLuaMatrix.cpp | 4 +- Shared/mods/deathmatch/logic/lua/CLuaMatrix.h | 6 +- .../mods/deathmatch/logic/lua/CLuaShared.cpp | 2 +- Shared/mods/deathmatch/logic/lua/CLuaShared.h | 2 +- .../mods/deathmatch/logic/lua/CLuaVector2.cpp | 4 +- .../mods/deathmatch/logic/lua/CLuaVector2.h | 6 +- .../mods/deathmatch/logic/lua/CLuaVector3.cpp | 4 +- .../mods/deathmatch/logic/lua/CLuaVector3.h | 6 +- .../mods/deathmatch/logic/lua/CLuaVector4.cpp | 4 +- .../mods/deathmatch/logic/lua/CLuaVector4.h | 6 +- .../deathmatch/logic/luadefs/CLuaBitDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaBitDefs.h | 2 +- .../logic/luadefs/CLuaCryptDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaCryptDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaFileDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaFileDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaUTFDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaUTFDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaUtilDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaUtilDefs.h | 2 +- .../deathmatch/logic/luadefs/CLuaXMLDefs.cpp | 2 +- .../deathmatch/logic/luadefs/CLuaXMLDefs.h | 2 +- Shared/publicsdk/CThread.cpp | 8 +- Shared/publicsdk/CThread.h | 8 +- Shared/publicsdk/CThreadData.cpp | 4 +- Shared/publicsdk/CThreadData.h | 4 +- Shared/publicsdk/extra/CLuaArgument.cpp | 4 +- Shared/publicsdk/extra/CLuaArgument.h | 14 +- Shared/publicsdk/extra/CLuaArguments.cpp | 4 +- Shared/publicsdk/extra/CLuaArguments.h | 14 +- Shared/sdk/CDuplicateLineFilter.h | 2 +- Shared/sdk/CFastList.h | 56 ++-- Shared/sdk/CMatrix.h | 8 +- Shared/sdk/CMatrix4.h | 4 +- Shared/sdk/CScriptArgReader.h | 18 +- Shared/sdk/CVector.h | 12 +- Shared/sdk/CVector2D.h | 6 +- Shared/sdk/CVector4D.h | 6 +- Shared/sdk/SString.h | 12 +- Shared/sdk/SString.hpp | 6 +- Shared/sdk/SharedUtil.AllocTracking.h | 6 +- Shared/sdk/SharedUtil.AllocTracking.hpp | 4 +- Shared/sdk/SharedUtil.Buffer.h | 22 +- Shared/sdk/SharedUtil.FastHashMap.h | 2 +- Shared/sdk/SharedUtil.FastHashSet.h | 2 +- Shared/sdk/SharedUtil.File.h | 28 +- Shared/sdk/SharedUtil.File.hpp | 28 +- Shared/sdk/SharedUtil.Game.h | 14 +- Shared/sdk/SharedUtil.Game.hpp | 12 +- Shared/sdk/SharedUtil.Hash.h | 10 +- Shared/sdk/SharedUtil.Hash.hpp | 10 +- Shared/sdk/SharedUtil.IntervalCounter.h | 6 +- Shared/sdk/SharedUtil.IntervalCounter.hpp | 6 +- Shared/sdk/SharedUtil.Logging.h | 6 +- Shared/sdk/SharedUtil.Logging.hpp | 4 +- Shared/sdk/SharedUtil.MemAccess.h | 2 +- Shared/sdk/SharedUtil.MemAccess.hpp | 2 +- Shared/sdk/SharedUtil.Misc.h | 152 ++++----- Shared/sdk/SharedUtil.Misc.hpp | 72 ++--- Shared/sdk/SharedUtil.Profiling.h | 6 +- Shared/sdk/SharedUtil.Profiling.hpp | 6 +- Shared/sdk/SharedUtil.SysInfo.h | 16 +- Shared/sdk/SharedUtil.SysInfo.hpp | 6 +- Shared/sdk/SharedUtil.Tests.hpp | 40 +-- Shared/sdk/SharedUtil.Thread.h | 16 +- Shared/sdk/SharedUtil.Time.h | 50 +-- Shared/sdk/SharedUtil.Time.hpp | 30 +- Shared/sdk/SharedUtil.Win32Utf8FileHooks.hpp | 4 +- Shared/sdk/WString.h | 12 +- Shared/sdk/WString.hpp | 8 +- .../net/CNetHTTPDownloadManagerInterface.h | 14 +- Shared/sdk/net/SyncStructures.h | 12 +- Shared/sdk/net/bitstream.h | 28 +- Shared/sdk/sha2.hpp | 2 +- Shared/sdk/xml/CXML.h | 2 +- Shared/sdk/xml/CXMLAttribute.h | 8 +- Shared/sdk/xml/CXMLAttributes.h | 8 +- Shared/sdk/xml/CXMLCommon.h | 6 +- Shared/sdk/xml/CXMLFile.h | 16 +- Shared/sdk/xml/CXMLNode.h | 24 +- 1391 files changed, 9601 insertions(+), 9601 deletions(-) diff --git a/Client/cefweb/CWebCore.cpp b/Client/cefweb/CWebCore.cpp index 011b3f597d7..f5ae22a7d95 100644 --- a/Client/cefweb/CWebCore.cpp +++ b/Client/cefweb/CWebCore.cpp @@ -148,7 +148,7 @@ CWebView* CWebCore::FindWebView(CefRefPtr browser) return nullptr; } -void CWebCore::AddEventToEventQueue(std::function event, CWebView* pWebView, const SString& name) +void CWebCore::AddEventToEventQueue(std::function event, CWebView* pWebView, const SString& name) { #ifndef MTA_DEBUG UNREFERENCED_PARAMETER(name); diff --git a/Client/cefweb/CWebCore.h b/Client/cefweb/CWebCore.h index 0a8531e83c9..ebe66ca00a9 100644 --- a/Client/cefweb/CWebCore.h +++ b/Client/cefweb/CWebCore.h @@ -30,15 +30,15 @@ class CWebCore : public CWebCoreInterface { struct EventEntry { - std::function callback; - CWebView* pWebView; + std::function callback; + CWebView* pWebView; #ifdef MTA_DEBUG SString name; #endif - EventEntry(const std::function& callback_, CWebView* pWebView_) : callback(callback_), pWebView(pWebView_) {} + EventEntry(const std::function& callback_, CWebView* pWebView_) : callback(callback_), pWebView(pWebView_) {} #ifdef MTA_DEBUG - EventEntry(const std::function& callback_, CWebView* pWebView_, const SString& name_) + EventEntry(const std::function& callback_, CWebView* pWebView_, const SString& name_) : callback(callback_), pWebView(pWebView_), name(name_) { } @@ -55,7 +55,7 @@ class CWebCore : public CWebCoreInterface void DoPulse(); CWebView* FindWebView(CefRefPtr browser); - void AddEventToEventQueue(std::function func, CWebView* pWebView, const SString& name); + void AddEventToEventQueue(std::function func, CWebView* pWebView, const SString& name); void RemoveWebViewEvents(CWebView* pWebView); void DoEventQueuePulse(); diff --git a/Client/core/CAdditionalVertexStreamManager.cpp b/Client/core/CAdditionalVertexStreamManager.cpp index 30ec640d55a..f9253e0a65d 100644 --- a/Client/core/CAdditionalVertexStreamManager.cpp +++ b/Client/core/CAdditionalVertexStreamManager.cpp @@ -54,7 +54,7 @@ namespace // // /////////////////////////////////////////////////////////////// -CAdditionalVertexStreamManager::CAdditionalVertexStreamManager(void) +CAdditionalVertexStreamManager::CAdditionalVertexStreamManager() { } @@ -65,7 +65,7 @@ CAdditionalVertexStreamManager::CAdditionalVertexStreamManager(void) // // /////////////////////////////////////////////////////////////// -CAdditionalVertexStreamManager::~CAdditionalVertexStreamManager(void) +CAdditionalVertexStreamManager::~CAdditionalVertexStreamManager() { } @@ -76,7 +76,7 @@ CAdditionalVertexStreamManager::~CAdditionalVertexStreamManager(void) // Static function // /////////////////////////////////////////////////////////////// -CAdditionalVertexStreamManager* CAdditionalVertexStreamManager::GetSingleton(void) +CAdditionalVertexStreamManager* CAdditionalVertexStreamManager::GetSingleton() { if (!ms_Singleton) ms_Singleton = new CAdditionalVertexStreamManager(); @@ -186,7 +186,7 @@ void CAdditionalVertexStreamManager::SetAdditionalVertexStream(SCurrentStateInfo // // /////////////////////////////////////////////////////////////// -void CAdditionalVertexStreamManager::MaybeUnsetAdditionalVertexStream(void) +void CAdditionalVertexStreamManager::MaybeUnsetAdditionalVertexStream() { HRESULT hr; if (m_pOldVertexDeclaration) diff --git a/Client/core/CAdditionalVertexStreamManager.h b/Client/core/CAdditionalVertexStreamManager.h index 17468440ff1..dd0e3aae80d 100644 --- a/Client/core/CAdditionalVertexStreamManager.h +++ b/Client/core/CAdditionalVertexStreamManager.h @@ -27,9 +27,9 @@ struct SCurrentStateInfo SCurrentStateInfo& operator=(const SCurrentStateInfo& other); public: - SCurrentStateInfo(void) { ZERO_POD_STRUCT(this); } + SCurrentStateInfo() { ZERO_POD_STRUCT(this); } - ~SCurrentStateInfo(void) + ~SCurrentStateInfo() { SAFE_RELEASE(stream1.pStreamData); SAFE_RELEASE(pIndexData); @@ -73,17 +73,17 @@ class CAdditionalVertexStreamManager { public: ZERO_ON_NEW - CAdditionalVertexStreamManager(void); - virtual ~CAdditionalVertexStreamManager(void); + CAdditionalVertexStreamManager(); + virtual ~CAdditionalVertexStreamManager(); void OnDeviceCreate(IDirect3DDevice9* pDevice); bool MaybeSetAdditionalVertexStream(D3DPRIMITIVETYPE PrimitiveType, INT BaseVertexIndex, UINT MinVertexIndex, UINT NumVertices, UINT startIndex, UINT primCount); - void MaybeUnsetAdditionalVertexStream(void); + void MaybeUnsetAdditionalVertexStream(); void OnVertexBufferDestroy(IDirect3DVertexBuffer9* pStreamData1); void OnVertexBufferRangeInvalidated(IDirect3DVertexBuffer9* pStreamData, uint Offset, uint Size); - static CAdditionalVertexStreamManager* GetSingleton(void); + static CAdditionalVertexStreamManager* GetSingleton(); protected: void SetAdditionalVertexStream(SCurrentStateInfo& renderState); diff --git a/Client/core/CChat.cpp b/Client/core/CChat.cpp index eddd9704f4a..fa3081b8316 100644 --- a/Client/core/CChat.cpp +++ b/Client/core/CChat.cpp @@ -87,7 +87,7 @@ CChat::CChat(CGUI* pManager, const CVector2D& vecPosition) UpdateGUI(); } -CChat::~CChat(void) +CChat::~CChat() { Clear(); ClearInput(); @@ -102,13 +102,13 @@ CChat::~CChat(void) g_pChat = NULL; } -void CChat::OnModLoad(void) +void CChat::OnModLoad() { // Set handlers m_pManager->SetCharacterKeyHandler(INPUT_MOD, GUI_CALLBACK_KEY(&CChat::CharacterKeyHandler, this)); } -void CChat::LoadCVars(void) +void CChat::LoadCVars() { unsigned int Font; float fWidth = 1; @@ -497,7 +497,7 @@ void CChat::Output(const char* szText, bool bColorCoded) } while (szRemainingText); } -void CChat::Clear(void) +void CChat::Clear() { for (int i = 0; i < CHAT_MAX_LINES; i++) { @@ -508,7 +508,7 @@ void CChat::Clear(void) m_iCacheTextureRevision = -1; } -void CChat::ClearInput(void) +void CChat::ClearInput() { m_strInputText.clear(); m_InputLine.Clear(); @@ -776,7 +776,7 @@ void CChat::SetDxFont(LPD3DXFONT pDXFont) } } -void CChat::UpdateGUI(void) +void CChat::UpdateGUI() { m_vecBackgroundSize = CVector2D(m_fNativeWidth * m_vecScale.fX, CChat::GetFontHeight(m_vecScale.fY) * (float(m_uiNumLines) + 0.5f)); m_vecBackgroundSize.fX = Round(m_vecBackgroundSize.fX); @@ -799,7 +799,7 @@ void CChat::UpdateGUI(void) UpdatePosition(); } -void CChat::UpdatePosition(void) +void CChat::UpdatePosition() { CVector2D vecResolution = m_pManager->GetResolution(); @@ -864,7 +864,7 @@ void CChat::SetInputColor(const CColor& Color) m_pInput->LoadFromTexture(m_pInputTexture); } -const char* CChat::GetInputPrefix(void) +const char* CChat::GetInputPrefix() { return m_InputLine.m_Prefix.GetText(); } @@ -874,7 +874,7 @@ void CChat::SetInputPrefix(const char* szPrefix) m_InputLine.m_Prefix.SetText(szPrefix); } -CVector2D CChat::CalcInputSize(void) +CVector2D CChat::CalcInputSize() { return CVector2D(m_vecBackgroundSize.fX, (GetFontHeight(m_vecScale.fY) * ((float)m_InputLine.m_ExtraLines.size() + 1.25f))); } @@ -998,7 +998,7 @@ void CChat::DrawTextString(const char* szText, CRect2D DrawArea, float fZ, CRect } } -CChatLine::CChatLine(void) +CChatLine::CChatLine() { m_bActive = false; UpdateCreationTime(); @@ -1157,7 +1157,7 @@ void CChatInputLine::Draw(CVector2D& vecPosition, unsigned char ucAlpha, bool bS } } -void CChatInputLine::Clear(void) +void CChatInputLine::Clear() { m_Sections.clear(); m_ExtraLines.clear(); diff --git a/Client/core/CChat.h b/Client/core/CChat.h index 99174a3ea83..4b575a83afc 100644 --- a/Client/core/CChat.h +++ b/Client/core/CChat.h @@ -25,7 +25,7 @@ class CChatLineSection; class CColor { public: - CColor(void) { R = G = B = A = 255; } + CColor() { R = G = B = A = 255; } CColor(unsigned char _R, unsigned char _G, unsigned char _B, unsigned char _A = 255) { R = _R; @@ -66,8 +66,8 @@ class CChatLineSection CChatLineSection& operator=(const CChatLineSection& other); void Draw(const CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, bool bOutline, const CRect2D& RenderBounds); - float GetWidth(void); - const char* GetText(void) { return m_strText.c_str(); } + float GetWidth(); + const char* GetText() { return m_strText.c_str(); } void SetText(const char* szText) { m_strText = szText; } void GetColor(CColor& color) { color = m_Color; } void SetColor(const CColor& color) { m_Color = color; } @@ -82,16 +82,16 @@ class CChatLineSection class CChatLine { public: - CChatLine(void); + CChatLine(); virtual const char* Format(const char* szText, float fWidth, CColor& color, bool bColorCoded); virtual void Draw(const CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, bool bOutline, const CRect2D& RenderBounds); - virtual float GetWidth(void); - bool IsActive(void) { return m_bActive; } + virtual float GetWidth(); + bool IsActive() { return m_bActive; } void SetActive(bool bActive) { m_bActive = bActive; } - unsigned long GetCreationTime(void) { return m_ulCreationTime; } - void UpdateCreationTime(void); + unsigned long GetCreationTime() { return m_ulCreationTime; } + void UpdateCreationTime(); protected: bool m_bActive; @@ -103,7 +103,7 @@ class CChatInputLine : public CChatLine { public: void Draw(CVector2D& vecPosition, unsigned char ucAlpha, bool bShadow, bool bOutline); - void Clear(void); + void Clear(); CChatLineSection m_Prefix; std::vector m_ExtraLines; @@ -153,29 +153,29 @@ class CChat friend class CChatLineSection; public: - CChat(void){}; + CChat(){}; CChat(CGUI* pManager, const CVector2D& vecPosition); virtual ~CChat(); virtual void Draw(bool bUseCacheTexture, bool bAllowOutline); virtual void Output(const char* szText, bool bColorCoded = true); - void Clear(void); - void ClearInput(void); + void Clear(); + void ClearInput(); bool CharacterKeyHandler(CGUIKeyEventArgs KeyboardArgs); void SetDxFont(LPD3DXFONT pDXFont); - bool IsVisible(void) { return m_bVisible; } + bool IsVisible() { return m_bVisible; } void SetVisible(bool bVisible); - bool IsInputVisible(void) { return m_bVisible && m_bInputVisible; } + bool IsInputVisible() { return m_bVisible && m_bInputVisible; } void SetInputVisible(bool bVisible); - const char* GetInputPrefix(void); + const char* GetInputPrefix(); void SetInputPrefix(const char* szPrefix); - const char* GetInputText(void) { return m_strInputText.c_str(); } + const char* GetInputText() { return m_strInputText.c_str(); } void SetInputText(const char* szText); - const char* GetCommand(void) { return m_strCommand.c_str(); } + const char* GetCommand() { return m_strCommand.c_str(); } void SetCommand(const char* szCommand); - CVector2D CalcInputSize(void); + CVector2D CalcInputSize(); static float GetFontHeight(float fScale = 1.0f); static float GetTextExtent(const char* szText, float fScale = 1.0f); @@ -188,19 +188,19 @@ class CChat void SetNumLines(unsigned int uiNumLines); void Scroll(int iState) { m_iScrollState = iState; }; - void ScrollUp(void); - void ScrollDown(void); + void ScrollUp(); + void ScrollDown(); void SetChatFont(eChatFont Font); - void OnModLoad(void); + void OnModLoad(); private: - void LoadCVars(void); + void LoadCVars(); protected: - virtual void UpdatePosition(void); + virtual void UpdatePosition(); - void UpdateGUI(void); + void UpdateGUI(); void UpdateSmoothScroll(float* pfPixelScroll, int* piLineScroll); void DrawDrawList(const SDrawList& drawList, const CVector2D& topLeftOffset = CVector2D(0, 0)); void GetDrawList(SDrawList& outDrawList, bool bUsingOutline); diff --git a/Client/core/CClientVariables.cpp b/Client/core/CClientVariables.cpp index 4516a4813b6..1d1a86995a0 100644 --- a/Client/core/CClientVariables.cpp +++ b/Client/core/CClientVariables.cpp @@ -14,18 +14,18 @@ template <> CClientVariables* CSingleton::m_pSingleton = NULL; -CClientVariables::CClientVariables(void) +CClientVariables::CClientVariables() { m_pStorage = NULL; m_bLoaded = false; m_iRevision = 1; } -CClientVariables::~CClientVariables(void) +CClientVariables::~CClientVariables() { } -bool CClientVariables::Load(void) +bool CClientVariables::Load() { // Get the root node CXMLNode* pRoot = CCore::GetSingleton().GetConfig(); @@ -227,7 +227,7 @@ void CClientVariables::ClampValue(const std::string& strVariable, CVector2D minV } // Ensure CVars are within reasonable limits -void CClientVariables::ValidateValues(void) +void CClientVariables::ValidateValues() { uint uiViewportWidth = CCore::GetSingleton().GetGraphics()->GetViewportWidth(); uint uiViewportHeight = CCore::GetSingleton().GetGraphics()->GetViewportHeight(); @@ -258,7 +258,7 @@ void CClientVariables::ValidateValues(void) ClampValue("mapalpha", 0, 255); } -void CClientVariables::LoadDefaults(void) +void CClientVariables::LoadDefaults() { #define DEFAULT(__x,__y) if(!Exists(__x)) \ Set(__x,__y) diff --git a/Client/core/CClientVariables.h b/Client/core/CClientVariables.h index 91afafa239a..fe064ae8b64 100644 --- a/Client/core/CClientVariables.h +++ b/Client/core/CClientVariables.h @@ -32,8 +32,8 @@ class CClientVariables : public CCVarsInterface, public CSingleton CCommands* CSingleton::m_pSingleton = NULL; -CCommands::CCommands(void) +CCommands::CCommands() { WriteDebugEvent("CCommands::CCommands"); m_pfnExecuteHandler = NULL; } -CCommands::~CCommands(void) +CCommands::~CCommands() { WriteDebugEvent("CCommands::~CCommands"); DeleteAll(); @@ -61,7 +61,7 @@ void CCommands::Add(const char* szCommand, const char* szDescription, PFNCOMMAND m_CommandList.push_back(pCommand); } -unsigned int CCommands::Count(void) +unsigned int CCommands::Count() { return static_cast(m_CommandList.size()); } @@ -230,7 +230,7 @@ void CCommands::Delete(const char* szCommand) } } -void CCommands::DeleteAll(void) +void CCommands::DeleteAll() { // Delete all the commands list::iterator iter = m_CommandList.begin(); diff --git a/Client/core/CCommands.h b/Client/core/CCommands.h index b9512a8ef03..ba8da18e7cb 100644 --- a/Client/core/CCommands.h +++ b/Client/core/CCommands.h @@ -18,27 +18,27 @@ class CCommands : public CCommandsInterface, public CSingleton { public: - CCommands(void); - ~CCommands(void); + CCommands(); + ~CCommands(); void Add(const char* szCommand, const char* szDescription, PFNCOMMANDHANDLER pfnHandler, bool bModCommand = false, bool bAllowScriptedBind = false); - unsigned int Count(void); + unsigned int Count(); bool Exists(const char* szCommand); bool Execute(const char* szCommandLine); bool Execute(const char* szCommand, const char* szParameters, bool bHandleRemotely = false, bool bIsScriptedBind = false); void Delete(const char* szCommand); - void DeleteAll(void); + void DeleteAll(); void SetExecuteHandler(pfnExecuteCommandHandler pfnHandler) { m_pfnExecuteHandler = pfnHandler; } - pfnExecuteCommandHandler GetExecuteHandler(void) { return m_pfnExecuteHandler; } + pfnExecuteCommandHandler GetExecuteHandler() { return m_pfnExecuteHandler; } tagCOMMANDENTRY* Get(const char* szCommand, bool bCheckIfMod = false, bool bModCommand = false); - std::list::iterator IterBegin(void) { return m_CommandList.begin(); } - std::list::iterator IterEnd(void) { return m_CommandList.end(); } + std::list::iterator IterBegin() { return m_CommandList.begin(); } + std::list::iterator IterEnd() { return m_CommandList.end(); } private: void ExecuteHandler(PFNCOMMAND pfnHandler, const char* szParameters); diff --git a/Client/core/CCompressorJobQueue.cpp b/Client/core/CCompressorJobQueue.cpp index 9bbd887d049..a8ee0109214 100644 --- a/Client/core/CCompressorJobQueue.cpp +++ b/Client/core/CCompressorJobQueue.cpp @@ -24,24 +24,24 @@ class CCompressorJobQueueImpl : public CCompressorJobQueue { public: ZERO_ON_NEW - CCompressorJobQueueImpl(void); - virtual ~CCompressorJobQueueImpl(void); + CCompressorJobQueueImpl(); + virtual ~CCompressorJobQueueImpl(); // Main thread functions - virtual void DoPulse(void); + virtual void DoPulse(); virtual CCompressJobData* AddCommand(uint uiSizeX, uint uiSizeY, uint uiQuality, uint uiTimeSpentInQueue, PFN_SCREENSHOT_CALLBACK pfnScreenShotCallback, const CBuffer& buffer); virtual bool PollCommand(CCompressJobData* pJobData, uint uiTimeout); virtual bool FreeCommand(CCompressJobData* pJobData); protected: - void StopThread(void); - void RemoveUnwantedResults(void); + void StopThread(); + void RemoveUnwantedResults(); void IgnoreJobResults(CCompressJobData* pJobData); // Other thread functions static void* StaticThreadProc(void* pContext); - void* ThreadProc(void); + void* ThreadProc(); void ProcessCommand(CCompressJobData* pJobData); void ProcessCompress(uint uiSizeX, uint uiSizeY, uint uiQuality, const CBuffer& inBuffer, CBuffer& outBuffer); @@ -67,7 +67,7 @@ class CCompressorJobQueueImpl : public CCompressorJobQueue /////////////////////////////////////////////////////////////// // Object creation /////////////////////////////////////////////////////////////// -CCompressorJobQueue* NewCompressorJobQueue(void) +CCompressorJobQueue* NewCompressorJobQueue() { return new CCompressorJobQueueImpl(); } @@ -79,7 +79,7 @@ CCompressorJobQueue* NewCompressorJobQueue(void) // Init known database types and start the job service thread // /////////////////////////////////////////////////////////////// -CCompressorJobQueueImpl::CCompressorJobQueueImpl(void) +CCompressorJobQueueImpl::CCompressorJobQueueImpl() { // Start the job queue processing thread m_pServiceThreadHandle = new CThreadHandle(CCompressorJobQueueImpl::StaticThreadProc, this); @@ -92,7 +92,7 @@ CCompressorJobQueueImpl::CCompressorJobQueueImpl(void) // Stop threads and delete everything // /////////////////////////////////////////////////////////////// -CCompressorJobQueueImpl::~CCompressorJobQueueImpl(void) +CCompressorJobQueueImpl::~CCompressorJobQueueImpl() { // Stop the job queue processing thread StopThread(); @@ -108,7 +108,7 @@ CCompressorJobQueueImpl::~CCompressorJobQueueImpl(void) // Stop the job queue processing thread // /////////////////////////////////////////////////////////////// -void CCompressorJobQueueImpl::StopThread(void) +void CCompressorJobQueueImpl::StopThread() { // Stop the job queue processing thread shared.m_Mutex.Lock(); @@ -165,7 +165,7 @@ CCompressJobData* CCompressorJobQueueImpl::AddCommand(uint uiSizeX, uint uiSizeY // Check if any callback functions are due // /////////////////////////////////////////////////////////////// -void CCompressorJobQueueImpl::DoPulse(void) +void CCompressorJobQueueImpl::DoPulse() { shared.m_Mutex.Lock(); @@ -215,7 +215,7 @@ void CCompressorJobQueueImpl::DoPulse(void) // * Must be called from inside a locked section * // /////////////////////////////////////////////////////////////// -void CCompressorJobQueueImpl::RemoveUnwantedResults(void) +void CCompressorJobQueueImpl::RemoveUnwantedResults() { if (m_IgnoreResultList.empty()) return; @@ -383,7 +383,7 @@ void* CCompressorJobQueueImpl::StaticThreadProc(void* pContext) // Job service loop // /////////////////////////////////////////////////////////////// -void* CCompressorJobQueueImpl::ThreadProc(void) +void* CCompressorJobQueueImpl::ThreadProc() { shared.m_Mutex.Lock(); while (!shared.m_bTerminateThread) @@ -507,7 +507,7 @@ bool CCompressJobData::SetCallback(PFN_SCREENSHOT_CALLBACK pfnScreenShotCallback // Returns true if callback has been set and has not been called yet // /////////////////////////////////////////////////////////////// -bool CCompressJobData::HasCallback(void) +bool CCompressJobData::HasCallback() { return callback.bSet && !callback.bDone; } @@ -519,7 +519,7 @@ bool CCompressJobData::HasCallback(void) // Do callback // /////////////////////////////////////////////////////////////// -void CCompressJobData::ProcessCallback(void) +void CCompressJobData::ProcessCallback() { assert(HasCallback()); callback.bDone = true; diff --git a/Client/core/CCompressorJobQueue.h b/Client/core/CCompressorJobQueue.h index 3b77377cd8a..503e368d47e 100644 --- a/Client/core/CCompressorJobQueue.h +++ b/Client/core/CCompressorJobQueue.h @@ -42,11 +42,11 @@ class CCompressJobData public: ZERO_ON_NEW bool SetCallback(PFN_SCREENSHOT_CALLBACK pfnScreenShotCallback, uint uiTimeSpentInQueue); - bool HasCallback(void); - void ProcessCallback(void); + bool HasCallback(); + void ProcessCallback(); - CCompressJobData(void) { DEBUG_CREATE_COUNT("CCompressJobData"); } - ~CCompressJobData(void) { DEBUG_DESTROY_COUNT("CCompressJobData"); } + CCompressJobData() { DEBUG_CREATE_COUNT("CCompressJobData"); } + ~CCompressJobData() { DEBUG_DESTROY_COUNT("CCompressJobData"); } EJobStageType stage; @@ -83,13 +83,13 @@ class CCompressJobData class CCompressorJobQueue { public: - virtual ~CCompressorJobQueue(void) {} + virtual ~CCompressorJobQueue() {} - virtual void DoPulse(void) = 0; + virtual void DoPulse() = 0; virtual CCompressJobData* AddCommand(uint uiSizeX, uint uiSizeY, uint uiQuality, uint uiTimeSpentInQueue, PFN_SCREENSHOT_CALLBACK pfnScreenShotCallback, const CBuffer& buffer) = 0; virtual bool PollCommand(CCompressJobData* pJobData, uint uiTimeout) = 0; virtual bool FreeCommand(CCompressJobData* pJobData) = 0; }; -CCompressorJobQueue* NewCompressorJobQueue(void); +CCompressorJobQueue* NewCompressorJobQueue(); diff --git a/Client/core/CConnectManager.cpp b/Client/core/CConnectManager.cpp index 1a5974986fe..378ee13e36f 100644 --- a/Client/core/CConnectManager.cpp +++ b/Client/core/CConnectManager.cpp @@ -16,7 +16,7 @@ using namespace std; static CConnectManager* g_pConnectManager = NULL; extern CCore* g_pCore; -CConnectManager::CConnectManager(void) +CConnectManager::CConnectManager() { g_pConnectManager = this; @@ -34,7 +34,7 @@ CConnectManager::CConnectManager(void) m_bNotifyServerBrowser = false; } -CConnectManager::~CConnectManager(void) +CConnectManager::~CConnectManager() { if (m_pOnCancelClick) { @@ -196,7 +196,7 @@ bool CConnectManager::Event_OnCancelClick(CGUIElement* pElement) return true; } -bool CConnectManager::Abort(void) +bool CConnectManager::Abort() { // Stop the attempt CNet* pNet = CCore::GetSingleton().GetNetwork(); @@ -219,7 +219,7 @@ bool CConnectManager::Abort(void) return true; } -void CConnectManager::DoPulse(void) +void CConnectManager::DoPulse() { // Are we connecting? if (m_bIsConnecting) @@ -449,7 +449,7 @@ bool CConnectManager::CheckNickProvided(const char* szNick) // // Called at least once (maybe more) if a MTA server exists at the current address/port // -void CConnectManager::OnServerExists(void) +void CConnectManager::OnServerExists() { if (m_bNotifyServerBrowser) { diff --git a/Client/core/CConnectManager.h b/Client/core/CConnectManager.h index 036511fea68..c81c899da24 100644 --- a/Client/core/CConnectManager.h +++ b/Client/core/CConnectManager.h @@ -18,17 +18,17 @@ class CConnectManager { public: - CConnectManager(void); - ~CConnectManager(void); + CConnectManager(); + ~CConnectManager(); bool Connect(const char* szHost, unsigned short usPort, const char* szNick, const char* szPassword, bool bNotifyServerBrowser = false); bool Reconnect(const char* szHost, unsigned short usPort, const char* szPassword, bool bSave = true); - bool Abort(void); + bool Abort(); - void DoPulse(void); + void DoPulse(); - void OnServerExists(void); + void OnServerExists(); static void OpenServerFirewall(in_addr Address, ushort usHttpPort = 80, bool bHighPriority = false); diff --git a/Client/core/CConsole.cpp b/Client/core/CConsole.cpp index eba8a7f9ae2..fa302bac632 100644 --- a/Client/core/CConsole.cpp +++ b/Client/core/CConsole.cpp @@ -55,7 +55,7 @@ CConsole::CConsole(CGUI* pManager, CGUIElement* pParent) m_pConsoleHistory->LoadFromFile(); } -CConsole::~CConsole(void) +CConsole::~CConsole() { // Delete the GUI elements DestroyElements(); @@ -104,7 +104,7 @@ void CConsole::Printf(const char* szFormat, ...) Echo(szBuffer); } -void CConsole::Clear(void) +void CConsole::Clear() { // Clear the history buffer. // This crashes if there is more than one line in the console @@ -115,7 +115,7 @@ void CConsole::Clear(void) } } -bool CConsole::IsEnabled(void) +bool CConsole::IsEnabled() { return m_bIsEnabled; } @@ -139,7 +139,7 @@ void CConsole::SetEnabled(bool bEnabled) } } -bool CConsole::IsVisible(void) +bool CConsole::IsVisible() { return m_pWindow->IsVisible(); } @@ -168,22 +168,22 @@ void CConsole::SetVisible(bool bVisible) } } -void CConsole::Show(void) +void CConsole::Show() { SetVisible(true); } -void CConsole::Hide(void) +void CConsole::Hide() { SetVisible(false); } -bool CConsole::IsInputActive(void) +bool CConsole::IsInputActive() { return IsVisible() && m_pInput->IsActive(); } -void CConsole::ActivateInput(void) +void CConsole::ActivateInput() { m_pInput->Activate(); } @@ -281,7 +281,7 @@ bool CConsole::GracefullyMoveEditboxCaret(CGUIElement* pElement) return true; } -void CConsole::SetNextHistoryText(void) +void CConsole::SetNextHistoryText() { // Don't set history back if we aren't focused. if (!m_pInput->IsActive()) @@ -325,7 +325,7 @@ void CConsole::SetNextHistoryText(void) } } -void CConsole::SetPreviousHistoryText(void) +void CConsole::SetPreviousHistoryText() { // Don't set history back if we aren't focused. if (!m_pInput->IsActive()) @@ -361,12 +361,12 @@ void CConsole::SetPreviousHistoryText(void) } } -void CConsole::ResetAutoCompleteMatch(void) +void CConsole::ResetAutoCompleteMatch() { m_iAutoCompleteIndex = -1; } -void CConsole::SetNextAutoCompleteMatch(void) +void CConsole::SetNextAutoCompleteMatch() { // Update match list if required if (m_iAutoCompleteIndex == -1) @@ -457,13 +457,13 @@ void CConsole::CreateElements(CGUIElement* pParent) m_pInput->SetHeight(m_fInputHeight); } -void CConsole::DestroyElements(void) +void CConsole::DestroyElements() { if (m_pWindow) delete m_pWindow; } -CVector2D CConsole::GetPosition(void) +CVector2D CConsole::GetPosition() { if (m_pWindow) { @@ -480,7 +480,7 @@ void CConsole::SetPosition(CVector2D& vecPosition) } } -CVector2D CConsole::GetSize(void) +CVector2D CConsole::GetSize() { if (m_pWindow) { @@ -518,7 +518,7 @@ bool CConsole::OnWindowSize(CGUIElement* pElement) } // Send saved console adds to the actual gui window -void CConsole::FlushPendingAdd(void) +void CConsole::FlushPendingAdd() { if (!m_strPendingAdd.empty()) { diff --git a/Client/core/CConsole.h b/Client/core/CConsole.h index 37678c15a16..cfa525c270c 100644 --- a/Client/core/CConsole.h +++ b/Client/core/CConsole.h @@ -23,49 +23,49 @@ class CConsole : public CConsoleInterface { public: CConsole(CGUI* pManager, CGUIElement* pParent = NULL); - ~CConsole(void); + ~CConsole(); void Echo(const char* szText); void Print(const char* szText); void Printf(const char* szFormat, ...); - void Clear(void); + void Clear(); - bool IsEnabled(void); + bool IsEnabled(); void SetEnabled(bool bEnabled); - bool IsVisible(void); + bool IsVisible(); void SetVisible(bool bVisible); - void Show(void); - void Hide(void); - bool IsInputActive(void); - void ActivateInput(void); + void Show(); + void Hide(); + bool IsInputActive(); + void ActivateInput(); void HandleTextAccepted(bool bHandled); void GetCommandInfo(const std::string& strIn, std::string& strCmdOut, std::string& strCmdLineOut); - void SetNextHistoryText(void); - void SetPreviousHistoryText(void); - void SetNextAutoCompleteMatch(void); - void ResetAutoCompleteMatch(void); + void SetNextHistoryText(); + void SetPreviousHistoryText(); + void SetNextAutoCompleteMatch(); + void ResetAutoCompleteMatch(); - CVector2D GetPosition(void); + CVector2D GetPosition(); void SetPosition(CVector2D& vecPosition); - CVector2D GetSize(void); + CVector2D GetSize(); void SetSize(CVector2D& vecSize); protected: bool OnCloseButtonClick(CGUIElement* pElement); bool Edit_OnTextAccepted(CGUIElement* pElement); bool History_OnTextChanged(CGUIElement* pElement); - void FlushPendingAdd(void); + void FlushPendingAdd(); void GracefullySetEditboxText(const char* szText); bool GracefullyMoveEditboxCaret(CGUIElement* pElement); private: void CreateElements(CGUIElement* pParent = NULL); - void DestroyElements(void); + void DestroyElements(); bool OnWindowSize(CGUIElement* pElement); diff --git a/Client/core/CConsoleHistory.cpp b/Client/core/CConsoleHistory.cpp index 8afd4bfcf10..2b5b90e3d6a 100644 --- a/Client/core/CConsoleHistory.cpp +++ b/Client/core/CConsoleHistory.cpp @@ -16,7 +16,7 @@ CConsoleHistory::CConsoleHistory(unsigned int uiHistoryLength) m_uiHistoryLength = uiHistoryLength; } -void CConsoleHistory::LoadFromFile(void) +void CConsoleHistory::LoadFromFile() { m_strFilename = CalcMTASAPath(MTA_CONSOLE_INPUT_LOG_PATH); diff --git a/Client/core/CConsoleHistory.h b/Client/core/CConsoleHistory.h index 6a292a8f572..d6c8174eeaf 100644 --- a/Client/core/CConsoleHistory.h +++ b/Client/core/CConsoleHistory.h @@ -13,7 +13,7 @@ class CConsoleHistory { public: CConsoleHistory(unsigned int uiHistoryLength); - void LoadFromFile(void); + void LoadFromFile(); void Add(const char* szLine); const char* Get(unsigned int uiIndex); diff --git a/Client/core/CCore.cpp b/Client/core/CCore.cpp index 8dc41155bd8..e0a75370c28 100644 --- a/Client/core/CCore.cpp +++ b/Client/core/CCore.cpp @@ -31,7 +31,7 @@ extern CCore* g_pCore; bool g_bBoundsChecker = false; SString g_strJingleBells; -BOOL AC_RestrictAccess(VOID) +BOOL AC_RestrictAccess() { EXPLICIT_ACCESS NewAccess; PACL pTempDacl; @@ -82,7 +82,7 @@ BOOL AC_RestrictAccess(VOID) template <> CCore* CSingleton::m_pSingleton = NULL; -CCore::CCore(void) +CCore::CCore() { // Initialize the global pointer g_pCore = this; @@ -178,7 +178,7 @@ CCore::CCore(void) m_pTrayIcon = new CTrayIcon(); } -CCore::~CCore(void) +CCore::~CCore() { WriteDebugEvent("CCore::~CCore"); @@ -244,42 +244,42 @@ CCore::~CCore(void) delete m_pMessageLoopHook; } -eCoreVersion CCore::GetVersion(void) +eCoreVersion CCore::GetVersion() { return MTACORE_20; } -CConsoleInterface* CCore::GetConsole(void) +CConsoleInterface* CCore::GetConsole() { return m_pLocalGUI->GetConsole(); } -CCommandsInterface* CCore::GetCommands(void) +CCommandsInterface* CCore::GetCommands() { return m_pCommands; } -CGame* CCore::GetGame(void) +CGame* CCore::GetGame() { return m_pGame; } -CGraphicsInterface* CCore::GetGraphics(void) +CGraphicsInterface* CCore::GetGraphics() { return m_pGraphics; } -CModManagerInterface* CCore::GetModManager(void) +CModManagerInterface* CCore::GetModManager() { return m_pModManager; } -CMultiplayer* CCore::GetMultiplayer(void) +CMultiplayer* CCore::GetMultiplayer() { return m_pMultiplayer; } -CXMLNode* CCore::GetConfig(void) +CXMLNode* CCore::GetConfig() { if (!m_pConfigFile) return NULL; @@ -289,22 +289,22 @@ CXMLNode* CCore::GetConfig(void) return pRoot; } -CGUI* CCore::GetGUI(void) +CGUI* CCore::GetGUI() { return m_pGUI; } -CNet* CCore::GetNetwork(void) +CNet* CCore::GetNetwork() { return m_pNet; } -CKeyBindsInterface* CCore::GetKeyBinds(void) +CKeyBindsInterface* CCore::GetKeyBinds() { return m_pKeyBinds; } -CLocalGUI* CCore::GetLocalGUI(void) +CLocalGUI* CCore::GetLocalGUI() { return m_pLocalGUI; } @@ -374,7 +374,7 @@ void CCore::SetDebugVisible(bool bVisible) } } -bool CCore::IsDebugVisible(void) +bool CCore::IsDebugVisible() { if (m_pLocalGUI) return m_pLocalGUI->IsDebugViewVisible(); @@ -412,7 +412,7 @@ void CCore::DebugPrintfColor(const char* szFormat, unsigned char R, unsigned cha } } -void CCore::DebugClear(void) +void CCore::DebugClear() { CDebugView* pDebugView = m_pLocalGUI->GetDebugView(); if (pDebugView) @@ -482,7 +482,7 @@ void CCore::SetChatVisible(bool bVisible) } } -bool CCore::IsChatVisible(void) +bool CCore::IsChatVisible() { if (m_pLocalGUI) { @@ -505,7 +505,7 @@ bool CCore::ClearChat() return false; } -void CCore::TakeScreenShot(void) +void CCore::TakeScreenShot() { bScreenShot = true; } @@ -524,7 +524,7 @@ void CCore::EnableChatInput(char* szCommand, DWORD dwColor) } } -bool CCore::IsChatInputEnabled(void) +bool CCore::IsChatInputEnabled() { if (m_pLocalGUI) { @@ -534,7 +534,7 @@ bool CCore::IsChatInputEnabled(void) return false; } -bool CCore::IsSettingsVisible(void) +bool CCore::IsSettingsVisible() { if (m_pLocalGUI) { @@ -544,7 +544,7 @@ bool CCore::IsSettingsVisible(void) return false; } -bool CCore::IsMenuVisible(void) +bool CCore::IsMenuVisible() { if (m_pLocalGUI) { @@ -554,7 +554,7 @@ bool CCore::IsMenuVisible(void) return false; } -bool CCore::IsCursorForcedVisible(void) +bool CCore::IsCursorForcedVisible() { if (m_pLocalGUI) { @@ -564,7 +564,7 @@ bool CCore::IsCursorForcedVisible(void) return false; } -void CCore::ApplyConsoleSettings(void) +void CCore::ApplyConsoleSettings() { CVector2D vec; CConsole* pConsole = m_pLocalGUI->GetConsole(); @@ -575,7 +575,7 @@ void CCore::ApplyConsoleSettings(void) pConsole->SetSize(vec); } -void CCore::ApplyGameSettings(void) +void CCore::ApplyGameSettings() { bool bval; int iVal; @@ -612,7 +612,7 @@ void CCore::SetConnected(bool bConnected) UpdateIsWindowMinimized(); // Force update of stuff } -bool CCore::IsConnected(void) +bool CCore::IsConnected() { return m_pLocalGUI->GetMainMenu() && m_pLocalGUI->GetMainMenu()->GetIsIngame(); } @@ -752,17 +752,17 @@ bool CCore::CheckDiskSpace(uint uiResourcesPathMinMB, uint uiDataPathMinMB) return true; } -HWND CCore::GetHookedWindow(void) +HWND CCore::GetHookedWindow() { return CMessageLoopHook::GetSingleton().GetHookedWindowHandle(); } -void CCore::HideMainMenu(void) +void CCore::HideMainMenu() { m_pLocalGUI->GetMainMenu()->SetVisible(false); } -void CCore::HideQuickConnect(void) +void CCore::HideQuickConnect() { m_pLocalGUI->GetMainMenu()->GetQuickConnectWindow()->SetVisible(false); } @@ -972,7 +972,7 @@ void CCore::CreateMultiplayer() m_pMultiplayer->SetIdleHandler(CCore::StaticIdleHandler); } -void CCore::DeinitGUI(void) +void CCore::DeinitGUI() { } @@ -986,7 +986,7 @@ void CCore::InitGUI(IDirect3DDevice9* pDevice) CScreenShot::SetPath(strScreenShotPath.c_str()); } -void CCore::CreateGUI(void) +void CCore::CreateGUI() { LoadModule(m_GUIModule, "GUI", "cgui"); } @@ -1131,7 +1131,7 @@ void CCore::DestroyWeb() m_WebCoreModule.UnloadModule(); } -void CCore::UpdateIsWindowMinimized(void) +void CCore::UpdateIsWindowMinimized() { m_bIsWindowMinimized = IsIconic(GetHookedWindow()) ? true : false; // Update CPU saver for when minimized and not connected @@ -1150,7 +1150,7 @@ void CCore::UpdateIsWindowMinimized(void) } } -bool CCore::IsWindowMinimized(void) +bool CCore::IsWindowMinimized() { return m_bIsWindowMinimized; } @@ -1449,7 +1449,7 @@ void CCore::Quit(bool bInstantly) } } -bool CCore::WasLaunchedWithConnectURI(void) +bool CCore::WasLaunchedWithConnectURI() { if (m_szCommandLineArgs && strnicmp(m_szCommandLineArgs, "mtasa://", 8) == 0) return true; @@ -1777,7 +1777,7 @@ void CCore::SetClientScriptFrameRateLimit(uint uiClientScriptFrameRateLimit) // // Make sure the frame rate limit has been applied since the last call // -void CCore::EnsureFrameRateLimitApplied(void) +void CCore::EnsureFrameRateLimitApplied() { if (!m_bDoneFrameRateLimit) { @@ -1847,7 +1847,7 @@ void CCore::ApplyQueuedFrameRateLimit() // // This is called once a frame even if minimized // -void CCore::DoReliablePulse(void) +void CCore::DoReliablePulse() { ms_TimingCheckpoints.BeginTimingCheckpoints(); TIMING_CHECKPOINT("+CallIdle2"); @@ -1864,7 +1864,7 @@ void CCore::DoReliablePulse(void) // // Debug timings // -bool CCore::IsTimingCheckpoints(void) +bool CCore::IsTimingCheckpoints() { return ms_TimingCheckpoints.IsTimingCheckpoints(); } @@ -1882,7 +1882,7 @@ void CCore::OnTimingDetail(const char* szTag) // // OnDeviceRestore // -void CCore::OnDeviceRestore(void) +void CCore::OnDeviceRestore() { m_iUnminimizeFrameCounter = 4; // Tell script we have restored after 4 frames to avoid double sends m_bDidRecreateRenderTargets = true; @@ -1891,7 +1891,7 @@ void CCore::OnDeviceRestore(void) // // OnPreFxRender // -void CCore::OnPreFxRender(void) +void CCore::OnPreFxRender() { // Don't do nothing if nothing won't be drawn if (!CGraphics::GetSingleton().HasLine3DPreGUIQueueItems()) @@ -1907,7 +1907,7 @@ void CCore::OnPreFxRender(void) // // OnPreHUDRender // -void CCore::OnPreHUDRender(void) +void CCore::OnPreHUDRender() { IDirect3DDevice9* pDevice = CGraphics::GetSingleton().GetDevice(); @@ -1953,7 +1953,7 @@ void CCore::OnPreHUDRender(void) // Max should be no less than 96MB // Gap between min and max should be no less than 32MB // -void CCore::CalculateStreamingMemoryRange(void) +void CCore::CalculateStreamingMemoryRange() { // Only need to do this once if (m_fMinStreamingMemory != 0) @@ -1993,7 +1993,7 @@ void CCore::CalculateStreamingMemoryRange(void) // // GetMinStreamingMemory // -uint CCore::GetMinStreamingMemory(void) +uint CCore::GetMinStreamingMemory() { CalculateStreamingMemoryRange(); @@ -2006,7 +2006,7 @@ uint CCore::GetMinStreamingMemory(void) // // GetMaxStreamingMemory // -uint CCore::GetMaxStreamingMemory(void) +uint CCore::GetMaxStreamingMemory() { CalculateStreamingMemoryRange(); return m_fMaxStreamingMemory; @@ -2052,7 +2052,7 @@ bool CCore::GetDebugIdEnabled(uint uiDebugId) return (uiDebugId == 0) || !debugIdFilterMap.IsFiltered(uiDebugId); } -EDiagnosticDebugType CCore::GetDiagnosticDebug(void) +EDiagnosticDebugType CCore::GetDiagnosticDebug() { return m_DiagnosticDebug; } @@ -2062,7 +2062,7 @@ void CCore::SetDiagnosticDebug(EDiagnosticDebugType value) m_DiagnosticDebug = value; } -CModelCacheManager* CCore::GetModelCacheManager(void) +CModelCacheManager* CCore::GetModelCacheManager() { if (!m_pModelCacheManager) m_pModelCacheManager = NewModelCacheManager(); @@ -2074,27 +2074,27 @@ void CCore::AddModelToPersistentCache(ushort usModelId) return GetModelCacheManager()->AddModelToPersistentCache(usModelId); } -void CCore::StaticIdleHandler(void) +void CCore::StaticIdleHandler() { g_pCore->IdleHandler(); } // Gets called every game loop, after GTA has been loaded for the first time -void CCore::IdleHandler(void) +void CCore::IdleHandler() { m_bGettingIdleCallsFromMultiplayer = true; HandleIdlePulse(); } // Gets called every 50ms, before GTA has been loaded for the first time -void CCore::WindowsTimerHandler(void) +void CCore::WindowsTimerHandler() { if (!m_bGettingIdleCallsFromMultiplayer) HandleIdlePulse(); } // Always called, even if minimized -void CCore::HandleIdlePulse(void) +void CCore::HandleIdlePulse() { UpdateIsWindowMinimized(); @@ -2110,7 +2110,7 @@ void CCore::HandleIdlePulse(void) // // Handle encryption of Windows crash dump files // -void CCore::HandleCrashDumpEncryption(void) +void CCore::HandleCrashDumpEncryption() { const int iMaxFiles = 10; SString strDumpDirPath = CalcMTASAPath("mta\\dumps"); @@ -2178,7 +2178,7 @@ void CCore::SetModulesLoaded(bool bLoaded) m_bModulesLoaded = bLoaded; } -bool CCore::AreModulesLoaded(void) +bool CCore::AreModulesLoaded() { return m_bModulesLoaded; } @@ -2238,7 +2238,7 @@ bool CCore::GetRequiredDisplayResolution(int& iOutWidth, int& iOutHeight, int& i return GetVideoModeManager()->GetRequiredDisplayResolution(iOutWidth, iOutHeight, iOutColorBits, iOutAdapterIndex); } -bool CCore::GetDeviceSelectionEnabled(void) +bool CCore::GetDeviceSelectionEnabled() { return GetApplicationSettingInt("device-selection-disabled") ? false : true; } @@ -2249,7 +2249,7 @@ void CCore::NotifyRenderingGrass(bool bIsRenderingGrass) CDirect3DEvents9::CloseActiveShader(); } -bool CCore::GetRightSizeTxdEnabled(void) +bool CCore::GetRightSizeTxdEnabled() { if (g_pCore->GetDiagnosticDebug() == EDiagnosticDebug::RESIZE_NEVER_0000) return false; @@ -2268,7 +2268,7 @@ bool CCore::GetRightSizeTxdEnabled(void) return false; } -SString CCore::GetBlueCopyrightString(void) +SString CCore::GetBlueCopyrightString() { SString strCopyright = BLUE_COPYRIGHT_STRING; return strCopyright.Replace("%BUILD_YEAR%", std::to_string(BUILD_YEAR).c_str()); diff --git a/Client/core/CCore.h b/Client/core/CCore.h index 8d233cafd30..81ffbbbfbab 100644 --- a/Client/core/CCore.h +++ b/Client/core/CCore.h @@ -79,29 +79,29 @@ class CCore : public CCoreInterface, public CSingleton { public: ZERO_ON_NEW - CCore(void); - ~CCore(void); + CCore(); + ~CCore(); // Subsystems (query) - eCoreVersion GetVersion(void); - CConsoleInterface* GetConsole(void); - CCommandsInterface* GetCommands(void); - CConnectManager* GetConnectManager(void) { return m_pConnectManager; }; - CGame* GetGame(void); - CGUI* GetGUI(void); - CGraphicsInterface* GetGraphics(void); - CModManagerInterface* GetModManager(void); - CMultiplayer* GetMultiplayer(void); - CNet* GetNetwork(void); - CXML* GetXML(void) { return m_pXML; }; - CXMLNode* GetConfig(void); - CClientVariables* GetCVars(void) { return &m_ClientVariables; }; - CKeyBindsInterface* GetKeyBinds(void); - CMouseControl* GetMouseControl(void) { return m_pMouseControl; }; - CLocalGUI* GetLocalGUI(void); - CLocalizationInterface* GetLocalization(void) { return g_pLocalization; }; - CWebCoreInterface* GetWebCore(void); - CTrayIconInterface* GetTrayIcon(void) { return m_pTrayIcon; }; + eCoreVersion GetVersion(); + CConsoleInterface* GetConsole(); + CCommandsInterface* GetCommands(); + CConnectManager* GetConnectManager() { return m_pConnectManager; }; + CGame* GetGame(); + CGUI* GetGUI(); + CGraphicsInterface* GetGraphics(); + CModManagerInterface* GetModManager(); + CMultiplayer* GetMultiplayer(); + CNet* GetNetwork(); + CXML* GetXML() { return m_pXML; }; + CXMLNode* GetConfig(); + CClientVariables* GetCVars() { return &m_ClientVariables; }; + CKeyBindsInterface* GetKeyBinds(); + CMouseControl* GetMouseControl() { return m_pMouseControl; }; + CLocalGUI* GetLocalGUI(); + CLocalizationInterface* GetLocalization() { return g_pLocalization; }; + CWebCoreInterface* GetWebCore(); + CTrayIconInterface* GetTrayIcon() { return m_pTrayIcon; }; void SaveConfig(bool bWaitUntilFinished = false); @@ -109,10 +109,10 @@ class CCore : public CCoreInterface, public CSingleton void DebugEcho(const char* szText); void DebugPrintf(const char* szFormat, ...); void SetDebugVisible(bool bVisible); - bool IsDebugVisible(void); + bool IsDebugVisible(); void DebugEchoColor(const char* szText, unsigned char R, unsigned char G, unsigned char B); void DebugPrintfColor(const char* szFormat, unsigned char R, unsigned char G, unsigned char B, ...); - void DebugClear(void); + void DebugClear(); // Chat void ChatEcho(const char* szText, bool bColorCoded = false); @@ -120,34 +120,34 @@ class CCore : public CCoreInterface, public CSingleton void ChatPrintf(const char* szFormat, bool bColorCoded, ...); void ChatPrintfColor(const char* szFormat, bool bColorCoded, unsigned char R, unsigned char G, unsigned char B, ...); void SetChatVisible(bool bVisible); - bool IsChatVisible(void); + bool IsChatVisible(); void EnableChatInput(char* szCommand, DWORD dwColor); - bool IsChatInputEnabled(void); + bool IsChatInputEnabled(); bool ClearChat(); - void OnGameTimerUpdate(void); + void OnGameTimerUpdate(); // Screenshots - void TakeScreenShot(void); + void TakeScreenShot(); // GUI - bool IsSettingsVisible(void); - bool IsMenuVisible(void); - bool IsCursorForcedVisible(void); - bool IsCursorControlsToggled(void) { return m_bCursorToggleControls; } - void HideMainMenu(void); - void HideQuickConnect(void); + bool IsSettingsVisible(); + bool IsMenuVisible(); + bool IsCursorForcedVisible(); + bool IsCursorControlsToggled() { return m_bCursorToggleControls; } + void HideMainMenu(); + void HideQuickConnect(); void SetCenterCursor(bool bEnabled); void ShowServerInfo(unsigned int WindowType); // Configuration - void ApplyConsoleSettings(void); - void ApplyGameSettings(void); - void UpdateRecentlyPlayed(void); + void ApplyConsoleSettings(); + void ApplyGameSettings(); + void UpdateRecentlyPlayed(); // Net void SetConnected(bool bConnected); - bool IsConnected(void); + bool IsConnected(); bool Reconnect(const char* szHost, unsigned short usPort, const char* szPassword, bool bSave = true); // Mod @@ -159,122 +159,122 @@ class CCore : public CCoreInterface, public CSingleton void ShowErrorMessageBox(const SString& strTitle, SString strMessage, const SString& strTroubleLink = ""); void ShowNetErrorMessageBox(const SString& strTitle, SString strMessage, SString strTroubleLink = "", bool bLinkRequiresErrorCode = false); static void ErrorMessageBoxCallBack(void* pData, uint uiButton); - bool IsOfflineMod(void) { return m_bIsOfflineMod; } + bool IsOfflineMod() { return m_bIsOfflineMod; } const char* GetModInstallRoot(const char* szModName); bool CheckDiskSpace(uint uiResourcesPathMinMB = 10, uint uiDataPathMinMB = 10); // Subsystems - void CreateGame(void); - void CreateMultiplayer(void); - void CreateNetwork(void); - void CreateXML(void); + void CreateGame(); + void CreateMultiplayer(); + void CreateNetwork(); + void CreateXML(); void InitGUI(IDirect3DDevice9* pDevice); - void CreateGUI(void); - void DestroyGame(void); - void DestroyMultiplayer(void); - void DestroyNetwork(void); - void DestroyXML(void); - void DeinitGUI(void); - void DestroyGUI(void); + void CreateGUI(); + void DestroyGame(); + void DestroyMultiplayer(); + void DestroyNetwork(); + void DestroyXML(); + void DeinitGUI(); + void DestroyGUI(); // Web - bool IsWebCoreLoaded(void) { return m_pWebCore != nullptr; } - void DestroyWeb(void); + bool IsWebCoreLoaded() { return m_pWebCore != nullptr; } + void DestroyWeb(); // Hooks - void ApplyHooks(void); - void ApplyHooks2(void); + void ApplyHooks(); + void ApplyHooks2(); void ApplyHooks3(bool bEnable); - HWND GetHookedWindow(void); + HWND GetHookedWindow(); void SwitchRenderWindow(HWND hWnd, HWND hWndInput); void CallSetCursorPos(int X, int Y); void SetClientMessageProcessor(pfnProcessMessage pfnMessageProcessor) { m_pfnMessageProcessor = pfnMessageProcessor; }; - pfnProcessMessage GetClientMessageProcessor(void) { return m_pfnMessageProcessor; } + pfnProcessMessage GetClientMessageProcessor() { return m_pfnMessageProcessor; } void ChangeResolution(long width, long height, long depth); - bool IsFocused(void) { return (GetForegroundWindow() == GetHookedWindow()); }; - bool IsWindowMinimized(void); - void UpdateIsWindowMinimized(void); + bool IsFocused() { return (GetForegroundWindow() == GetHookedWindow()); }; + bool IsWindowMinimized(); + void UpdateIsWindowMinimized(); // Pulse - void DoPreFramePulse(void); - void DoPostFramePulse(void); + void DoPreFramePulse(); + void DoPostFramePulse(); // Events - void OnModUnload(void); + void OnModUnload(); // Misc - void RegisterCommands(void); + void RegisterCommands(); bool IsValidNick(const char* szNick); // Move somewhere else void Quit(bool bInstantly = true); void InitiateUpdate(const char* szType, const char* szData, const char* szHost) { m_pLocalGUI->InitiateUpdate(szType, szData, szHost); } bool IsOptionalUpdateInfoRequired(const char* szHost) { return m_pLocalGUI->IsOptionalUpdateInfoRequired(szHost); } - void InitiateDataFilesFix(void) { m_pLocalGUI->InitiateDataFilesFix(); } + void InitiateDataFilesFix() { m_pLocalGUI->InitiateDataFilesFix(); } - uint GetFrameRateLimit(void) { return m_uiFrameRateLimit; } + uint GetFrameRateLimit() { return m_uiFrameRateLimit; } void RecalculateFrameRateLimit(uint uiServerFrameRateLimit = -1, bool bLogToConsole = true); void ApplyFrameRateLimit(uint uiOverrideRate = -1); - void ApplyQueuedFrameRateLimit(void); - void EnsureFrameRateLimitApplied(void); + void ApplyQueuedFrameRateLimit(); + void EnsureFrameRateLimitApplied(); void SetClientScriptFrameRateLimit(uint uiClientScriptFrameRateLimit); - void DoReliablePulse(void); + void DoReliablePulse(); - bool IsTimingCheckpoints(void); + bool IsTimingCheckpoints(); void OnTimingCheckpoint(const char* szTag); void OnTimingDetail(const char* szTag); - void CalculateStreamingMemoryRange(void); - uint GetMinStreamingMemory(void); - uint GetMaxStreamingMemory(void); + void CalculateStreamingMemoryRange(); + uint GetMinStreamingMemory(); + uint GetMaxStreamingMemory(); SString GetConnectCommandFromURI(const char* szURI); void GetConnectParametersFromURI(const char* szURI, std::string& strHost, unsigned short& usPort, std::string& strNick, std::string& strPassword); bool bScreenShot; - std::map& GetCommandLineOptions(void) { return m_CommandLineOptions; } + std::map& GetCommandLineOptions() { return m_CommandLineOptions; } const char* GetCommandLineOption(const char* szOption); - const char* GetCommandLineArgs(void) { return m_szCommandLineArgs; } - void RequestNewNickOnStart(void) { m_bWaitToSetNick = true; }; - bool WillRequestNewNickOnStart(void) { return m_bWaitToSetNick; }; - bool WasLaunchedWithConnectURI(void); - void HandleCrashDumpEncryption(void); - - void OnPreFxRender(void); - void OnPreHUDRender(void); - void OnDeviceRestore(void); + const char* GetCommandLineArgs() { return m_szCommandLineArgs; } + void RequestNewNickOnStart() { m_bWaitToSetNick = true; }; + bool WillRequestNewNickOnStart() { return m_bWaitToSetNick; }; + bool WasLaunchedWithConnectURI(); + void HandleCrashDumpEncryption(); + + void OnPreFxRender(); + void OnPreHUDRender(); + void OnDeviceRestore(); void OnCrashAverted(uint uiId); void OnEnterCrashZone(uint uiId); void LogEvent(uint uiDebugId, const char* szType, const char* szContext, const char* szBody, uint uiAddReportLogId = 0); bool GetDebugIdEnabled(uint uiDebugId); - EDiagnosticDebugType GetDiagnosticDebug(void); + EDiagnosticDebugType GetDiagnosticDebug(); void SetDiagnosticDebug(EDiagnosticDebugType value); - CModelCacheManager* GetModelCacheManager(void); + CModelCacheManager* GetModelCacheManager(); void AddModelToPersistentCache(ushort usModelId); - static void StaticIdleHandler(void); - void IdleHandler(void); - void WindowsTimerHandler(void); - void HandleIdlePulse(void); + static void StaticIdleHandler(); + void IdleHandler(); + void WindowsTimerHandler(); + void HandleIdlePulse(); void SetModulesLoaded(bool bLoaded); - bool AreModulesLoaded(void); + bool AreModulesLoaded(); void UpdateDummyProgress(int iValue = -1, const char* szType = ""); void SetDummyProgressUpdateAlways(bool bAlways) { m_bDummyProgressUpdateAlways = bAlways; } - bool GetDummyProgressUpdateAlways(void) { return m_bDummyProgressUpdateAlways; } + bool GetDummyProgressUpdateAlways() { return m_bDummyProgressUpdateAlways; } void OnPreCreateDevice(IDirect3D9* pDirect3D, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD& BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters); HRESULT OnPostCreateDevice(HRESULT hResult, IDirect3D9* pDirect3D, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DDevice9** ppReturnedDeviceInterface); - bool GetDeviceSelectionEnabled(void); + bool GetDeviceSelectionEnabled(); bool GetRequiredDisplayResolution(int& iOutWidth, int& iOutHeight, int& iOutColorBits, int& iOutAdapterIndex, bool& bOutAllowUnsafeResolutions); void NotifyRenderingGrass(bool bIsRenderingGrass); - bool IsRenderingGrass(void) { return m_bIsRenderingGrass; } - bool GetRightSizeTxdEnabled(void); - const char* GetProductRegistryPath(void) { return SharedUtil::GetProductRegistryPath(); } - const char* GetProductCommonDataDir(void) { return SharedUtil::GetProductCommonDataDir(); } - const char* GetProductVersion(void) { return SharedUtil::GetProductVersion(); } + bool IsRenderingGrass() { return m_bIsRenderingGrass; } + bool GetRightSizeTxdEnabled(); + const char* GetProductRegistryPath() { return SharedUtil::GetProductRegistryPath(); } + const char* GetProductCommonDataDir() { return SharedUtil::GetProductCommonDataDir(); } + const char* GetProductVersion() { return SharedUtil::GetProductVersion(); } void SetFakeLagCommandEnabled(bool bEnabled) { m_bFakeLagCommandEnabled = bEnabled; } - bool IsFakeLagCommandEnabled(void) { return m_bFakeLagCommandEnabled; } - SString GetBlueCopyrightString(void); + bool IsFakeLagCommandEnabled() { return m_bFakeLagCommandEnabled; } + SString GetBlueCopyrightString(); bool IsHostSmotraServer(); diff --git a/Client/core/CCrashDumpWriter.cpp b/Client/core/CCrashDumpWriter.cpp index d87c9b4f7da..329abd4be65 100644 --- a/Client/core/CCrashDumpWriter.cpp +++ b/Client/core/CCrashDumpWriter.cpp @@ -28,7 +28,7 @@ struct SLogEventLine SString strBody; SString strType; SString strContext; - operator SString&(void) { return strBody; } + operator SString&() { return strBody; } bool operator==(const SLogEventLine& other) const { return strBody == other.strBody && strType == other.strType && strContext == other.strContext; } }; @@ -116,7 +116,7 @@ void CCrashDumpWriter::LogEvent(const char* szType, const char* szContext, const // Static function. Initialize handlers for crash situations // /////////////////////////////////////////////////////////////// -void CCrashDumpWriter::SetHandlers(void) +void CCrashDumpWriter::SetHandlers() { #ifndef MTA_DEBUG _set_invalid_parameter_handler(CCrashDumpWriter::HandleInvalidParameter); @@ -132,7 +132,7 @@ void CCrashDumpWriter::SetHandlers(void) // Static function. Called every so often, you know // /////////////////////////////////////////////////////////////// -void CCrashDumpWriter::UpdateCounters(void) +void CCrashDumpWriter::UpdateCounters() { if (ms_uiInvalidParameterCount > ms_uiInvalidParameterCountLogged && ms_uiInvalidParameterCountLogged < 10) { @@ -168,7 +168,7 @@ void CCrashDumpWriter::ReserveMemoryKBForCrashDumpProcessing(uint uiMemoryKB) ms_pReservedMemory = malloc(uiMemoryKB * 1024); } -void CCrashDumpWriter::FreeMemoryForCrashDumpProcessing(void) +void CCrashDumpWriter::FreeMemoryForCrashDumpProcessing() { if (ms_pReservedMemory) { diff --git a/Client/core/CCrashDumpWriter.h b/Client/core/CCrashDumpWriter.h index 2bb01c8086b..0ef47e3e8b0 100644 --- a/Client/core/CCrashDumpWriter.h +++ b/Client/core/CCrashDumpWriter.h @@ -49,10 +49,10 @@ class CCrashDumpWriter static void OnCrashAverted(uint uiId); static void OnEnterCrashZone(uint uiId); static void LogEvent(const char* szType, const char* szContext, const char* szBody); - static SString GetCrashAvertedStatsSoFar(void); + static SString GetCrashAvertedStatsSoFar(); static void ReserveMemoryKBForCrashDumpProcessing(uint uiMemoryKB); - static void FreeMemoryForCrashDumpProcessing(void); - static void SetHandlers(void); - static void UpdateCounters(void); + static void FreeMemoryForCrashDumpProcessing(); + static void SetHandlers(); + static void UpdateCounters(); static void HandleInvalidParameter(const wchar_t* expression, const wchar_t* function, const wchar_t* file, unsigned int line, uintptr_t pReserved); }; diff --git a/Client/core/CCredits.cpp b/Client/core/CCredits.cpp index 6fa072662a0..08fba9c408f 100644 --- a/Client/core/CCredits.cpp +++ b/Client/core/CCredits.cpp @@ -20,7 +20,7 @@ namespace CCreditsGUI } // namespace CCreditsGUI using namespace CCreditsGUI; -CCredits::CCredits(void) +CCredits::CCredits() { CGUI* pManager = g_pCore->GetGUI(); @@ -276,7 +276,7 @@ CCredits::CCredits(void) m_pWindow->SetEnterKeyHandler(GUI_CALLBACK(&CCredits::OnOKButtonClick, this)); } -CCredits::~CCredits(void) +CCredits::~CCredits() { // Delete all the labels int i = 0; @@ -296,7 +296,7 @@ CCredits::~CCredits(void) delete m_pWindow; } -void CCredits::Update(void) +void CCredits::Update() { if (m_pWindow->IsVisible()) { @@ -338,7 +338,7 @@ void CCredits::SetVisible(bool bVisible) m_clkStart = clock(); } -bool CCredits::IsVisible(void) +bool CCredits::IsVisible() { return m_pWindow->IsVisible(); } diff --git a/Client/core/CCredits.h b/Client/core/CCredits.h index 576262ae573..69d1e9b862c 100644 --- a/Client/core/CCredits.h +++ b/Client/core/CCredits.h @@ -19,13 +19,13 @@ class CCredits; class CCredits { public: - CCredits(void); - ~CCredits(void); + CCredits(); + ~CCredits(); void SetVisible(bool bVisible); - bool IsVisible(void); + bool IsVisible(); - void Update(void); + void Update(); bool OnOKButtonClick(CGUIElement* pElement); diff --git a/Client/core/CExceptionInformation_Impl.cpp b/Client/core/CExceptionInformation_Impl.cpp index 8659599a419..57d76639f63 100644 --- a/Client/core/CExceptionInformation_Impl.cpp +++ b/Client/core/CExceptionInformation_Impl.cpp @@ -13,7 +13,7 @@ #define MAX_MODULE_PATH 512 -CExceptionInformation_Impl::CExceptionInformation_Impl(void) +CExceptionInformation_Impl::CExceptionInformation_Impl() { m_uiCode = 0; m_pAddress = NULL; @@ -38,7 +38,7 @@ CExceptionInformation_Impl::CExceptionInformation_Impl(void) m_ulEFlags = 0; } -CExceptionInformation_Impl::~CExceptionInformation_Impl(void) +CExceptionInformation_Impl::~CExceptionInformation_Impl() { if (m_szModulePathName) delete m_szModulePathName; diff --git a/Client/core/CExceptionInformation_Impl.h b/Client/core/CExceptionInformation_Impl.h index 3b91148972a..7c953458338 100644 --- a/Client/core/CExceptionInformation_Impl.h +++ b/Client/core/CExceptionInformation_Impl.h @@ -17,32 +17,32 @@ class CExceptionInformation_Impl : public CExceptionInformation { public: - CExceptionInformation_Impl(void); - ~CExceptionInformation_Impl(void); // {}; + CExceptionInformation_Impl(); + ~CExceptionInformation_Impl(); // {}; - unsigned int GetCode(void) { return m_uiCode; }; - void* GetAddress(void) { return m_pAddress; }; + unsigned int GetCode() { return m_uiCode; }; + void* GetAddress() { return m_pAddress; }; bool GetModule(void* pQueryAddress, char* szModuleName, int nOutputNameLength, void** ppModuleBaseAddress); - virtual const char* GetModulePathName(void) { return m_szModulePathName; }; - virtual const char* GetModuleBaseName(void) { return m_szModuleBaseName; }; - virtual uint GetAddressModuleOffset(void) { return m_uiAddressModuleOffset; }; + virtual const char* GetModulePathName() { return m_szModulePathName; }; + virtual const char* GetModuleBaseName() { return m_szModuleBaseName; }; + virtual uint GetAddressModuleOffset() { return m_uiAddressModuleOffset; }; - unsigned long GetEAX(void) { return m_ulEAX; }; - unsigned long GetEBX(void) { return m_ulEBX; }; - unsigned long GetECX(void) { return m_ulECX; }; - unsigned long GetEDX(void) { return m_ulEDX; }; - unsigned long GetESI(void) { return m_ulESI; }; - unsigned long GetEDI(void) { return m_ulEDI; }; - unsigned long GetEBP(void) { return m_ulEBP; }; - unsigned long GetESP(void) { return m_ulESP; }; - unsigned long GetEIP(void) { return m_ulEIP; }; - unsigned long GetCS(void) { return m_ulCS; }; - unsigned long GetDS(void) { return m_ulDS; }; - unsigned long GetES(void) { return m_ulES; }; - unsigned long GetFS(void) { return m_ulFS; }; - unsigned long GetGS(void) { return m_ulGS; }; - unsigned long GetSS(void) { return m_ulSS; }; - unsigned long GetEFlags(void) { return m_ulEFlags; }; + unsigned long GetEAX() { return m_ulEAX; }; + unsigned long GetEBX() { return m_ulEBX; }; + unsigned long GetECX() { return m_ulECX; }; + unsigned long GetEDX() { return m_ulEDX; }; + unsigned long GetESI() { return m_ulESI; }; + unsigned long GetEDI() { return m_ulEDI; }; + unsigned long GetEBP() { return m_ulEBP; }; + unsigned long GetESP() { return m_ulESP; }; + unsigned long GetEIP() { return m_ulEIP; }; + unsigned long GetCS() { return m_ulCS; }; + unsigned long GetDS() { return m_ulDS; }; + unsigned long GetES() { return m_ulES; }; + unsigned long GetFS() { return m_ulFS; }; + unsigned long GetGS() { return m_ulGS; }; + unsigned long GetSS() { return m_ulSS; }; + unsigned long GetEFlags() { return m_ulEFlags; }; void Set(unsigned int iCode, _EXCEPTION_POINTERS* pException); diff --git a/Client/core/CFileFormatJpeg.cpp b/Client/core/CFileFormatJpeg.cpp index 86c359f62e0..238660e44e8 100644 --- a/Client/core/CFileFormatJpeg.cpp +++ b/Client/core/CFileFormatJpeg.cpp @@ -65,13 +65,13 @@ bool JpegDecode(const void* pData, uint uiDataSize, CBuffer* pOutBuffer, uint& u jpeg_mem_src(&cinfo, (uchar*)pData, uiDataSize); /* Read file header, set default decompression parameters */ - (void)jpeg_read_header(&cinfo, TRUE); + jpeg_read_header(&cinfo, TRUE); /* default decompression parameters */ // TODO /* Start decompressor */ - (void)jpeg_start_decompress(&cinfo); + jpeg_start_decompress(&cinfo); /* Write output file header */ JDIMENSION uiWidth = cinfo.output_width; /* scaled image width */ @@ -108,7 +108,7 @@ bool JpegDecode(const void* pData, uint uiDataSize, CBuffer* pOutBuffer, uint& u } // Finish decompression and release memory. - (void)jpeg_finish_decompress(&cinfo); + jpeg_finish_decompress(&cinfo); } jpeg_destroy_decompress(&cinfo); @@ -167,7 +167,7 @@ bool JpegEncode(uint uiWidth, uint uiHeight, uint uiQuality, const void* pData, pRowTemp[i * 3 + 2] = pRowSrc[i * 4 + 0]; } row_pointer[0] = (JSAMPROW)pRowTemp; - (void)jpeg_write_scanlines(&cinfo, row_pointer, 1); + jpeg_write_scanlines(&cinfo, row_pointer, 1); } /* Finish compression and release memory */ diff --git a/Client/core/CGUI.cpp b/Client/core/CGUI.cpp index 10be55a8b71..e5f3421def6 100644 --- a/Client/core/CGUI.cpp +++ b/Client/core/CGUI.cpp @@ -25,7 +25,7 @@ CLocalGUI* CSingleton::m_pSingleton = NULL; const char* const DEFAULT_SKIN_NAME = "Default"; // TODO: Change to whatever the default skin is if it changes -CLocalGUI::CLocalGUI(void) +CLocalGUI::CLocalGUI() { m_pConsole = NULL; m_pMainMenu = NULL; @@ -44,7 +44,7 @@ CLocalGUI::CLocalGUI(void) m_LocaleChangeCounter = 0; } -CLocalGUI::~CLocalGUI(void) +CLocalGUI::~CLocalGUI() { // Destroy all GUI elements DestroyObjects(); @@ -173,7 +173,7 @@ void CLocalGUI::CreateObjects(IUnknown* pDevice) CreateWindows(false); } -void CLocalGUI::DestroyWindows(void) +void CLocalGUI::DestroyWindows() { SAFE_DELETE(m_pLabelVersionTag); SAFE_DELETE(m_pConsole); @@ -182,7 +182,7 @@ void CLocalGUI::DestroyWindows(void) SAFE_DELETE(m_pDebugView); } -void CLocalGUI::DestroyObjects(void) +void CLocalGUI::DestroyObjects() { DestroyWindows(); @@ -190,7 +190,7 @@ void CLocalGUI::DestroyObjects(void) SAFE_DELETE(m_pLabelVersionTag); } -void CLocalGUI::DoPulse(void) +void CLocalGUI::DoPulse() { m_pVersionUpdater->DoPulse(); @@ -256,7 +256,7 @@ void CLocalGUI::DoPulse(void) } } -void CLocalGUI::Draw(void) +void CLocalGUI::Draw() { // Get the game interface CGame* pGame = CCore::GetSingleton().GetGame(); @@ -321,7 +321,7 @@ void CLocalGUI::Draw(void) } } -void CLocalGUI::Invalidate(void) +void CLocalGUI::Invalidate() { CGUI* pGUI = CCore::GetSingleton().GetGUI(); @@ -332,7 +332,7 @@ void CLocalGUI::Invalidate(void) } } -void CLocalGUI::Restore(void) +void CLocalGUI::Restore() { CGUI* pGUI = CCore::GetSingleton().GetGUI(); @@ -343,14 +343,14 @@ void CLocalGUI::Restore(void) } } -void CLocalGUI::DrawMouseCursor(void) +void CLocalGUI::DrawMouseCursor() { CGUI* pGUI = CCore::GetSingleton().GetGUI(); pGUI->DrawMouseCursor(); } -CConsole* CLocalGUI::GetConsole(void) +CConsole* CLocalGUI::GetConsole() { return m_pConsole; } @@ -374,7 +374,7 @@ void CLocalGUI::SetConsoleVisible(bool bVisible) } } -bool CLocalGUI::IsConsoleVisible(void) +bool CLocalGUI::IsConsoleVisible() { if (m_pConsole) { @@ -391,7 +391,7 @@ void CLocalGUI::EchoConsole(const char* szText) } } -CMainMenu* CLocalGUI::GetMainMenu(void) +CMainMenu* CLocalGUI::GetMainMenu() { return m_pMainMenu; } @@ -423,7 +423,7 @@ void CLocalGUI::SetMainMenuVisible(bool bVisible) } } -bool CLocalGUI::IsMainMenuVisible(void) +bool CLocalGUI::IsMainMenuVisible() { if (m_pMainMenu) { @@ -432,12 +432,12 @@ bool CLocalGUI::IsMainMenuVisible(void) return false; } -CChat* CLocalGUI::GetChat(void) +CChat* CLocalGUI::GetChat() { return m_pChat; } -CDebugView* CLocalGUI::GetDebugView(void) +CDebugView* CLocalGUI::GetDebugView() { return m_pDebugView; } @@ -462,7 +462,7 @@ void CLocalGUI::SetDebugViewVisible(bool bVisible) } } -bool CLocalGUI::IsChatBoxVisible(void) +bool CLocalGUI::IsChatBoxVisible() { if (m_pChat) { @@ -471,7 +471,7 @@ bool CLocalGUI::IsChatBoxVisible(void) return false; } -bool CLocalGUI::IsDebugViewVisible(void) +bool CLocalGUI::IsDebugViewVisible() { if (m_pDebugView) { @@ -488,7 +488,7 @@ void CLocalGUI::SetChatBoxInputEnabled(bool bInputEnabled) } } -bool CLocalGUI::IsChatBoxInputEnabled(void) +bool CLocalGUI::IsChatBoxInputEnabled() { if (m_pChat) { @@ -681,7 +681,7 @@ bool CLocalGUI::ProcessMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara return false; } -bool CLocalGUI::InputGoesToGUI(void) +bool CLocalGUI::InputGoesToGUI() { CGUI* pGUI = CCore::GetSingleton().GetGUI(); if (!pGUI) @@ -698,7 +698,7 @@ void CLocalGUI::ForceCursorVisible(bool bVisible) m_bForceCursorVisible = bVisible; } -void CLocalGUI::UpdateCursor(void) +void CLocalGUI::UpdateCursor() { CGUI* pGUI = CCore::GetSingleton().GetGUI(); diff --git a/Client/core/CGUI.h b/Client/core/CGUI.h index ee441975385..09c43c7af60 100644 --- a/Client/core/CGUI.h +++ b/Client/core/CGUI.h @@ -39,61 +39,61 @@ class CDebugView; class CLocalGUI : public CSingleton { public: - CLocalGUI(void); - ~CLocalGUI(void); + CLocalGUI(); + ~CLocalGUI(); void SetSkin(const char* szName); void ChangeLocale(const char* szName); void CreateWindows(bool bGameIsAlreadyLoaded); - void DestroyWindows(void); + void DestroyWindows(); void CreateObjects(IUnknown* pDevice); - void DestroyObjects(void); + void DestroyObjects(); - void DoPulse(void); + void DoPulse(); - void Draw(void); - void Invalidate(void); - void Restore(void); + void Draw(); + void Invalidate(); + void Restore(); - void DrawMouseCursor(void); + void DrawMouseCursor(); void SetCursorPos(int iX, int iY, bool bForce = false, bool overrideStored = true); - CConsole* GetConsole(void); + CConsole* GetConsole(); void SetConsoleVisible(bool bVisible); - bool IsConsoleVisible(void); + bool IsConsoleVisible(); void EchoConsole(const char* szText); - CMainMenu* GetMainMenu(void); + CMainMenu* GetMainMenu(); void SetMainMenuVisible(bool bVisible); - bool IsMainMenuVisible(void); + bool IsMainMenuVisible(); - CChat* GetChat(void); + CChat* GetChat(); void SetChatBoxVisible(bool bVisible); - bool IsChatBoxVisible(void); + bool IsChatBoxVisible(); void SetChatBoxInputEnabled(bool bInputEnabled); - bool IsChatBoxInputEnabled(void); + bool IsChatBoxInputEnabled(); void EchoChat(const char* szText, bool bColorCoded); - bool IsWebRequestGUIVisible(void); + bool IsWebRequestGUIVisible(); - CDebugView* GetDebugView(void); + CDebugView* GetDebugView(); void SetDebugViewVisible(bool bVisible); - bool IsDebugViewVisible(void); + bool IsDebugViewVisible(); void EchoDebug(const char* szText); bool ProcessMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - bool InputGoesToGUI(void); - bool IsCursorForcedVisible(void) { return m_bForceCursorVisible; } + bool InputGoesToGUI(); + bool IsCursorForcedVisible() { return m_bForceCursorVisible; } void ForceCursorVisible(bool bVisible); void InitiateUpdate(const char* szType, const char* szData, const char* szHost) { m_pVersionUpdater->InitiateUpdate(szType, szData, szHost); } bool IsOptionalUpdateInfoRequired(const char* szHost) { return m_pVersionUpdater->IsOptionalUpdateInfoRequired(szHost); } - void InitiateDataFilesFix(void) { m_pVersionUpdater->InitiateDataFilesFix(); } + void InitiateDataFilesFix() { m_pVersionUpdater->InitiateDataFilesFix(); } private: - void UpdateCursor(void); + void UpdateCursor(); DWORD TranslateScanCodeToGUIKey(DWORD dwCharacter); diff --git a/Client/core/CGraphStats.cpp b/Client/core/CGraphStats.cpp index 6762b7edc36..7a00c6b1e3d 100644 --- a/Client/core/CGraphStats.cpp +++ b/Client/core/CGraphStats.cpp @@ -33,13 +33,13 @@ class CGraphStats : public CGraphStatsInterface { public: ZERO_ON_NEW - CGraphStats(void); - ~CGraphStats(void); + CGraphStats(); + ~CGraphStats(); // CGraphStatsInterface methods - virtual void Draw(void); + virtual void Draw(); virtual void SetEnabled(bool bEnabled); - virtual bool IsEnabled(void); + virtual bool IsEnabled(); virtual void AddTimingPoint(const char* szName); protected: @@ -55,7 +55,7 @@ class CGraphStats : public CGraphStatsInterface /////////////////////////////////////////////////////////////// CGraphStats* g_pGraphStats = NULL; -CGraphStatsInterface* GetGraphStats(void) +CGraphStatsInterface* GetGraphStats() { if (!g_pGraphStats) g_pGraphStats = new CGraphStats(); @@ -67,11 +67,11 @@ CGraphStatsInterface* GetGraphStats(void) // CGraphStats implementation // /////////////////////////////////////////////////////////////// -CGraphStats::CGraphStats(void) +CGraphStats::CGraphStats() { } -CGraphStats::~CGraphStats(void) +CGraphStats::~CGraphStats() { } @@ -96,7 +96,7 @@ void CGraphStats::SetEnabled(bool bEnabled) // // /////////////////////////////////////////////////////////////// -bool CGraphStats::IsEnabled(void) +bool CGraphStats::IsEnabled() { return m_bEnabled; } @@ -193,7 +193,7 @@ void CGraphStats::AddTimingPoint(const char* szName) // // /////////////////////////////////////////////////////////////// -void CGraphStats::Draw(void) +void CGraphStats::Draw() { if (!m_bEnabled) return; diff --git a/Client/core/CGraphStats.h b/Client/core/CGraphStats.h index ab8ce9d1c23..c7f1bae8fdd 100644 --- a/Client/core/CGraphStats.h +++ b/Client/core/CGraphStats.h @@ -17,12 +17,12 @@ class CGraphStatsInterface { public: - virtual ~CGraphStatsInterface(void) {} + virtual ~CGraphStatsInterface() {} - virtual void Draw(void) = 0; + virtual void Draw() = 0; virtual void SetEnabled(bool bEnabled) = 0; - virtual bool IsEnabled(void) = 0; + virtual bool IsEnabled() = 0; virtual void AddTimingPoint(const char* szName) = 0; }; -CGraphStatsInterface* GetGraphStats(void); +CGraphStatsInterface* GetGraphStats(); diff --git a/Client/core/CJoystickManager.cpp b/Client/core/CJoystickManager.cpp index 324797b5e57..939482697f1 100644 --- a/Client/core/CJoystickManager.cpp +++ b/Client/core/CJoystickManager.cpp @@ -132,35 +132,35 @@ class CJoystickManager : public CJoystickManagerInterface { public: ZERO_ON_NEW - CJoystickManager(void); - ~CJoystickManager(void); + CJoystickManager(); + ~CJoystickManager(); // CJoystickManagerInterface methods virtual void OnSetDataFormat(IDirectInputDevice8A* pDevice, LPCDIDATAFORMAT a) {} virtual void RemoveDevice(IDirectInputDevice8A* pDevice); - virtual void DoPulse(void); + virtual void DoPulse(); virtual void ApplyAxes(CControllerState& cs, bool bInVehicle); // Status - virtual bool IsJoypadConnected(void); + virtual bool IsJoypadConnected(); // Settings - virtual string GetControllerName(void); - virtual int GetDeadZone(void); - virtual int GetSaturation(void); + virtual string GetControllerName(); + virtual int GetDeadZone(); + virtual int GetSaturation(); virtual void SetDeadZone(int iDeadZone); virtual void SetSaturation(int iSaturation); - virtual int GetSettingsRevision(void); - virtual void SetDefaults(void); - virtual bool SaveToXML(void); + virtual int GetSettingsRevision(); + virtual void SetDefaults(); + virtual bool SaveToXML(); // Binding - virtual int GetOutputCount(void); + virtual int GetOutputCount(); virtual string GetOutputName(int iOutputIndex); virtual string GetOutputInputName(int iOutputIndex); virtual bool BindNextUsedAxisToOutput(int iOutputIndex); - virtual bool IsAxisBindComplete(void); - virtual bool IsCapturingAxis(void); + virtual bool IsAxisBindComplete(); + virtual bool IsCapturingAxis(); virtual void CancelCaptureAxis(bool bClearBinding); // CJoystickManager methods @@ -170,13 +170,13 @@ class CJoystickManager : public CJoystickManagerInterface private: bool ReadInputSubsystem(DIJOYSTATE2& js); bool HandleXInputGetState(XINPUT_STATE& XInputState); - bool IsXInputDeviceAttached(void); - bool IsJoypadValid(void); - void EnumAxes(void); - void InitDirectInput(void); - void ReadCurrentState(void); + bool IsXInputDeviceAttached(); + bool IsJoypadValid(); + void EnumAxes(); + void InitDirectInput(); + void ReadCurrentState(); CXMLNode* GetConfigNode(bool bCreateIfRequired); - bool LoadFromXML(void); + bool LoadFromXML(); bool m_bDoneInit; int m_SettingsRevision; @@ -204,7 +204,7 @@ class CJoystickManager : public CJoystickManagerInterface // CJoystickManager instantiation // /////////////////////////////////////////////////////////////// -CJoystickManagerInterface* NewJoystickManager(void) +CJoystickManagerInterface* NewJoystickManager() { return new CJoystickManager(); } @@ -212,7 +212,7 @@ CJoystickManagerInterface* NewJoystickManager(void) // This is nice so there CJoystickManagerInterface* g_pJoystickManager = NULL; -CJoystickManagerInterface* GetJoystickManager(void) +CJoystickManagerInterface* GetJoystickManager() { if (!g_pJoystickManager) g_pJoystickManager = NewJoystickManager(); @@ -224,7 +224,7 @@ CJoystickManagerInterface* GetJoystickManager(void) // CJoystickManager implementation // /////////////////////////////////////////////////////////////// -CJoystickManager::CJoystickManager(void) +CJoystickManager::CJoystickManager() { m_iAutoDeadZoneCounter = 20; m_bAutoDeadZoneEnabled = true; @@ -247,7 +247,7 @@ CJoystickManager::CJoystickManager(void) SetDefaults(); } -CJoystickManager::~CJoystickManager(void) +CJoystickManager::~CJoystickManager() { } @@ -431,7 +431,7 @@ BOOL CJoystickManager::DoEnumObjectsCallback(const DIDEVICEOBJECTINSTANCE* pdido // Starts the enumeration of the joystick axes. // /////////////////////////////////////////////////////////////// -void CJoystickManager::EnumAxes(void) +void CJoystickManager::EnumAxes() { if (!m_DevInfo.pDevice) return; @@ -468,7 +468,7 @@ void CJoystickManager::EnumAxes(void) // Create a joystick device if possible // /////////////////////////////////////////////////////////////// -void CJoystickManager::InitDirectInput(void) +void CJoystickManager::InitDirectInput() { if (m_bUseXInput) return; @@ -534,7 +534,7 @@ void CJoystickManager::InitDirectInput(void) // buttons state changes. // /////////////////////////////////////////////////////////////// -void CJoystickManager::DoPulse(void) +void CJoystickManager::DoPulse() { if (!m_bDoneInit) { @@ -687,7 +687,7 @@ void CJoystickManager::DoPulse(void) // Puts current state of the joystick into m_JoystickState. // /////////////////////////////////////////////////////////////// -void CJoystickManager::ReadCurrentState(void) +void CJoystickManager::ReadCurrentState() { // Clear current state for (int i = 0; i < NUMELMS(m_JoystickState.rgfAxis); i++) @@ -958,7 +958,7 @@ bool CJoystickManager::HandleXInputGetState(XINPUT_STATE& XInputState) // Also attempts reattach if required // /////////////////////////////////////////////////////////////// -bool CJoystickManager::IsXInputDeviceAttached(void) +bool CJoystickManager::IsXInputDeviceAttached() { if (!m_bXInputDeviceAttached) { @@ -1167,7 +1167,7 @@ void CJoystickManager::ApplyAxes(CControllerState& cs, bool bInVehicle) // /////////////////////////////////////////////////////////////// -bool CJoystickManager::IsJoypadConnected(void) +bool CJoystickManager::IsJoypadConnected() { if (m_bUseXInput) return IsXInputDeviceAttached(); @@ -1180,17 +1180,17 @@ bool CJoystickManager::IsJoypadConnected(void) // /////////////////////////////////////////////////////////////// -string CJoystickManager::GetControllerName(void) +string CJoystickManager::GetControllerName() { return m_DevInfo.strProductName; } -int CJoystickManager::GetDeadZone(void) +int CJoystickManager::GetDeadZone() { return m_DevInfo.iDeadZone; } -int CJoystickManager::GetSaturation(void) +int CJoystickManager::GetSaturation() { return m_DevInfo.iSaturation; } @@ -1209,12 +1209,12 @@ void CJoystickManager::SetSaturation(int iSaturation) m_DevInfo.iSaturation = Clamp(51, iSaturation, 100); } -int CJoystickManager::GetSettingsRevision(void) +int CJoystickManager::GetSettingsRevision() { return m_SettingsRevision; } -bool CJoystickManager::IsJoypadValid(void) +bool CJoystickManager::IsJoypadValid() { if (m_bUseXInput) return IsXInputDeviceAttached(); @@ -1298,7 +1298,7 @@ CXMLNode* CJoystickManager::GetConfigNode(bool bCreateIfRequired) // Set the default axes mapping for the current joypad. // /////////////////////////////////////////////////////////////// -void CJoystickManager::SetDefaults(void) +void CJoystickManager::SetDefaults() { m_SettingsRevision++; @@ -1364,7 +1364,7 @@ void CJoystickManager::SetDefaults(void) // Load axes mapping for the current joypad. // /////////////////////////////////////////////////////////////// -bool CJoystickManager::LoadFromXML(void) +bool CJoystickManager::LoadFromXML() { m_SettingsRevision++; @@ -1462,7 +1462,7 @@ bool CJoystickManager::LoadFromXML(void) // Save axes mapping for the current joypad. // /////////////////////////////////////////////////////////////// -bool CJoystickManager::SaveToXML(void) +bool CJoystickManager::SaveToXML() { if (!IsJoypadValid()) return false; @@ -1690,7 +1690,7 @@ bool CJoystickManager::BindNextUsedAxisToOutput(int iOutputIndex) // Axis capture. // /////////////////////////////////////////////////////////////// -bool CJoystickManager::IsAxisBindComplete(void) +bool CJoystickManager::IsAxisBindComplete() { return !m_bCaptureAxis; } @@ -1702,7 +1702,7 @@ bool CJoystickManager::IsAxisBindComplete(void) // Axis capture. // /////////////////////////////////////////////////////////////// -bool CJoystickManager::IsCapturingAxis(void) +bool CJoystickManager::IsCapturingAxis() { return m_bCaptureAxis; } diff --git a/Client/core/CJoystickManager.h b/Client/core/CJoystickManager.h index efa07a37292..492aa7b2cfc 100644 --- a/Client/core/CJoystickManager.h +++ b/Client/core/CJoystickManager.h @@ -14,38 +14,38 @@ class CJoystickManagerInterface { public: - virtual ~CJoystickManagerInterface(void) {} + virtual ~CJoystickManagerInterface() {} virtual void OnSetDataFormat(IDirectInputDevice8A* pDevice, LPCDIDATAFORMAT a) = 0; virtual void RemoveDevice(IDirectInputDevice8A* pDevice) = 0; - virtual void DoPulse(void) = 0; + virtual void DoPulse() = 0; virtual void ApplyAxes(class CControllerState& cs, bool bInVehicle) = 0; // Status - virtual bool IsJoypadConnected(void) = 0; + virtual bool IsJoypadConnected() = 0; // Settings - virtual std::string GetControllerName(void) = 0; - virtual int GetDeadZone(void) = 0; - virtual int GetSaturation(void) = 0; + virtual std::string GetControllerName() = 0; + virtual int GetDeadZone() = 0; + virtual int GetSaturation() = 0; virtual void SetDeadZone(int iDeadZone) = 0; virtual void SetSaturation(int iSaturation) = 0; - virtual int GetSettingsRevision(void) = 0; - virtual void SetDefaults(void) = 0; - virtual bool SaveToXML(void) = 0; + virtual int GetSettingsRevision() = 0; + virtual void SetDefaults() = 0; + virtual bool SaveToXML() = 0; // Binding - virtual int GetOutputCount(void) = 0; + virtual int GetOutputCount() = 0; virtual std::string GetOutputName(int iOutputIndex) = 0; virtual std::string GetOutputInputName(int iOutputIndex) = 0; virtual bool BindNextUsedAxisToOutput(int iOutputIndex) = 0; - virtual bool IsAxisBindComplete(void) = 0; - virtual bool IsCapturingAxis(void) = 0; + virtual bool IsAxisBindComplete() = 0; + virtual bool IsCapturingAxis() = 0; virtual void CancelCaptureAxis(bool bClear) = 0; }; -CJoystickManagerInterface* NewJoystickManager(void); -CJoystickManagerInterface* GetJoystickManager(void); +CJoystickManagerInterface* NewJoystickManager(); +CJoystickManagerInterface* GetJoystickManager(); // Custom VK_ codes for the joystick buttons - Starts at VK_JOY(1) #define VK_JOY(x) ( 0x100+(x) ) diff --git a/Client/core/CKeyBinds.cpp b/Client/core/CKeyBinds.cpp index 78714b9cd23..89d9ddc5432 100644 --- a/Client/core/CKeyBinds.cpp +++ b/Client/core/CKeyBinds.cpp @@ -285,7 +285,7 @@ CKeyBinds::CKeyBinds(CCore* pCore) m_bWaitingToLoadDefaults = false; } -CKeyBinds::~CKeyBinds(void) +CKeyBinds::~CKeyBinds() { Clear(); delete m_pList; @@ -498,7 +498,7 @@ void CKeyBinds::Remove(CKeyBind* pKeyBind) } } -void CKeyBinds::Clear(void) +void CKeyBinds::Clear() { list::const_iterator iter = m_pList->begin(); for (; iter != m_pList->end(); iter++) @@ -509,7 +509,7 @@ void CKeyBinds::Clear(void) m_pList->clear(); } -void CKeyBinds::RemoveDeletedBinds(void) +void CKeyBinds::RemoveDeletedBinds() { list::iterator iter = m_pList->begin(); while (iter != m_pList->end()) @@ -524,7 +524,7 @@ void CKeyBinds::RemoveDeletedBinds(void) } } -void CKeyBinds::ClearCommandsAndControls(void) +void CKeyBinds::ClearCommandsAndControls() { list* keyList = new list; list::const_iterator iter = m_pList->begin(); @@ -730,7 +730,7 @@ bool CKeyBinds::RemoveAllCommands(const char* szKey, bool bCheckState, bool bSta return bFound; } -bool CKeyBinds::RemoveAllCommands(void) +bool CKeyBinds::RemoveAllCommands() { bool bFound = false; list cloneList = *m_pList; @@ -953,7 +953,7 @@ void CKeyBinds::UserChangeCommandBoundKey(CCommandBind* pBind, const SBindableKe // // Sort command binds for consistency in settings gui // -void CKeyBinds::SortCommandBinds(void) +void CKeyBinds::SortCommandBinds() { struct Sorter { @@ -1106,7 +1106,7 @@ bool CKeyBinds::RemoveAllGTAControls(const char* szKey) return bFound; } -bool CKeyBinds::RemoveAllGTAControls(void) +bool CKeyBinds::RemoveAllGTAControls() { bool bFound = false; list::iterator iter = m_pList->begin(); @@ -1376,7 +1376,7 @@ void CKeyBinds::ResetGTAControlState(SBindableGTAControl* pControl) } } -void CKeyBinds::ResetAllGTAControlStates(void) +void CKeyBinds::ResetAllGTAControlStates() { // Set all our control states to false for (int i = 0; *g_bcControls[i].szControl != NULL; i++) @@ -1518,7 +1518,7 @@ bool CKeyBinds::RemoveAllFunctions(KeyFunctionBindHandler Handler) return bFound; } -bool CKeyBinds::RemoveAllFunctions(void) +bool CKeyBinds::RemoveAllFunctions() { bool bFound = false; list::iterator iter = m_pList->begin(); @@ -1700,7 +1700,7 @@ bool CKeyBinds::RemoveAllControlFunctions(ControlFunctionBindHandler Handler) return bFound; } -bool CKeyBinds::RemoveAllControlFunctions(void) +bool CKeyBinds::RemoveAllControlFunctions() { bool bFound = false; list::iterator iter = m_pList->begin(); @@ -2013,7 +2013,7 @@ unsigned int CKeyBinds::Count(eKeyBindType bindType) return uiCount; } -void CKeyBinds::DoPreFramePulse(void) +void CKeyBinds::DoPreFramePulse() { CControllerState cs; m_pCore->GetGame()->GetPad()->GetCurrentControllerState(&cs); @@ -2053,7 +2053,7 @@ void CKeyBinds::DoPreFramePulse(void) } } -void CKeyBinds::DoPostFramePulse(void) +void CKeyBinds::DoPostFramePulse() { eSystemState SystemState = CCore::GetSingleton().GetGame()->GetSystemState(); @@ -2422,7 +2422,7 @@ bool CKeyBinds::SaveToXML(CXMLNode* pMainNode) return false; } -void CKeyBinds::LoadDefaultBinds(void) +void CKeyBinds::LoadDefaultBinds() { ClearCommandsAndControls(); @@ -2440,7 +2440,7 @@ void CKeyBinds::LoadDefaultCommands(bool bForce) } } -void CKeyBinds::LoadControlsFromGTA(void) +void CKeyBinds::LoadControlsFromGTA() { for (int i = FIRE; i <= GROUP_CONTROL_BACK; i++) { diff --git a/Client/core/CKeyBinds.h b/Client/core/CKeyBinds.h index 7e931d15aa1..54e3b4e13a0 100644 --- a/Client/core/CKeyBinds.h +++ b/Client/core/CKeyBinds.h @@ -32,7 +32,7 @@ class CKeyBinds : public CKeyBindsInterface { public: CKeyBinds(class CCore* pCore); - ~CKeyBinds(void); + ~CKeyBinds(); bool ProcessMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -44,13 +44,13 @@ class CKeyBinds : public CKeyBindsInterface // Basic funcs void Add(CKeyBind* pKeyBind); void Remove(CKeyBind* pKeyBind); - void Clear(void); - void RemoveDeletedBinds(void); - void ClearCommandsAndControls(void); + void Clear(); + void RemoveDeletedBinds(); + void ClearCommandsAndControls(); bool Call(CKeyBind* pKeyBind); - std::list::const_iterator IterBegin(void) { return m_pList->begin(); } - std::list::const_iterator IterEnd(void) { return m_pList->end(); } + std::list::const_iterator IterBegin() { return m_pList->begin(); } + std::list::const_iterator IterEnd() { return m_pList->end(); } // Command-bind funcs bool AddCommand(const char* szKey, const char* szCommand, const char* szArguments, bool bState, const char* szResource = NULL, bool bScriptCreated = false, @@ -58,7 +58,7 @@ class CKeyBinds : public CKeyBindsInterface bool AddCommand(const SBindableKey* pKey, const char* szCommand, const char* szArguments = NULL, bool bState = true); bool RemoveCommand(const char* szKey, const char* szCommand, bool bCheckState = false, bool bState = true); bool RemoveAllCommands(const char* szKey, bool bCheckState = false, bool bState = true); - bool RemoveAllCommands(void); + bool RemoveAllCommands(); bool CommandExists(const char* szKey, const char* szCommand, bool bCheckState = false, bool bState = true, const char* szArguments = NULL, const char* szResource = NULL, bool bCheckScriptCreated = false, bool bScriptCreated = false); bool SetCommandActive(const char* szKey, const char* szCommand, bool bState, const char* szArguments, const char* szResource, bool bActive, @@ -73,14 +73,14 @@ class CKeyBinds : public CKeyBindsInterface CCommandBind* FindMatchingUpBind(CCommandBind* pBind); CCommandBind* FindCommandMatch(const char* szKey, const char* szCommand, const char* szArguments, const char* szResource, const char* szOriginalScriptKey, bool bCheckState, bool bState, bool bCheckScriptCreated, bool bScriptCreated); - void SortCommandBinds(void); + void SortCommandBinds(); // Control-bind funcs bool AddGTAControl(const char* szKey, const char* szControl); bool AddGTAControl(const SBindableKey* pKey, SBindableGTAControl* pControl); bool RemoveGTAControl(const char* szKey, const char* szControl); bool RemoveAllGTAControls(const char* szKey); - bool RemoveAllGTAControls(void); + bool RemoveAllGTAControls(); bool GTAControlExists(const char* szKey, const char* szControl); bool GTAControlExists(const SBindableKey* pKey, SBindableGTAControl* pControl); void CallGTAControlBind(CGTAControlBind* pBind, bool bState); @@ -93,7 +93,7 @@ class CKeyBinds : public CKeyBindsInterface bool SetControlEnabled(const char* szControl, bool bEnabled); void SetAllControlsEnabled(bool bGameControls, bool bMTAControls, bool bEnabled); void ResetGTAControlState(SBindableGTAControl* pControl); - void ResetAllGTAControlStates(void); + void ResetAllGTAControlStates(); // Function-bind funcs bool AddFunction(const char* szKey, KeyFunctionBindHandler Handler, bool bState = true, bool bIgnoreGUI = false); @@ -101,7 +101,7 @@ class CKeyBinds : public CKeyBindsInterface bool RemoveFunction(const char* szKey, KeyFunctionBindHandler Handler, bool bCheckState = false, bool bState = true); bool RemoveFunction(const SBindableKey* pKey, KeyFunctionBindHandler Handler, bool bCheckState = false, bool bState = true); bool RemoveAllFunctions(KeyFunctionBindHandler Handler); - bool RemoveAllFunctions(void); + bool RemoveAllFunctions(); bool FunctionExists(const char* szKey, KeyFunctionBindHandler Handler, bool bCheckState = false, bool bState = true); bool FunctionExists(const SBindableKey* pKey, KeyFunctionBindHandler Handler, bool bCheckState = false, bool bState = true); @@ -111,7 +111,7 @@ class CKeyBinds : public CKeyBindsInterface bool RemoveControlFunction(const char* szControl, ControlFunctionBindHandler Handler, bool bCheckState = false, bool bState = true); bool RemoveControlFunction(SBindableGTAControl* pControl, ControlFunctionBindHandler Handler, bool bCheckState = false, bool bState = true); bool RemoveAllControlFunctions(ControlFunctionBindHandler Handler); - bool RemoveAllControlFunctions(void); + bool RemoveAllControlFunctions(); bool ControlFunctionExists(const char* szControl, ControlFunctionBindHandler Handler, bool bCheckState = false, bool bState = true); bool ControlFunctionExists(SBindableGTAControl* pControl, ControlFunctionBindHandler Handler, bool bCheckState = false, bool bState = true); @@ -135,14 +135,14 @@ class CKeyBinds : public CKeyBindsInterface unsigned int Count(eKeyBindType bindType = KEY_BIND_UNDEFINED); - void DoPreFramePulse(void); - void DoPostFramePulse(void); + void DoPreFramePulse(); + void DoPostFramePulse(); bool LoadFromXML(CXMLNode* pMainNode); bool SaveToXML(CXMLNode* pMainNode); - void LoadDefaultBinds(void); + void LoadDefaultBinds(); void LoadDefaultCommands(bool bForce); - void LoadControlsFromGTA(void); + void LoadControlsFromGTA(); void BindCommand(const char* szCmdLine); void UnbindCommand(const char* szCmdLine); diff --git a/Client/core/CLanguage.cpp b/Client/core/CLanguage.cpp index 19bfed3cdee..5830ea2b17e 100644 --- a/Client/core/CLanguage.cpp +++ b/Client/core/CLanguage.cpp @@ -26,7 +26,7 @@ CLanguage::CLanguage(const SString& strPOPath) in.close(); } -CLanguage::~CLanguage(void) +CLanguage::~CLanguage() { } diff --git a/Client/core/CLanguage.h b/Client/core/CLanguage.h index dc569109b5e..fd193e0906d 100644 --- a/Client/core/CLanguage.h +++ b/Client/core/CLanguage.h @@ -18,16 +18,16 @@ class CLanguage public: CLanguage(const Dictionary& Dict, const SString& strLocale = "", const SString& strLangName = ""); CLanguage(const SString& strPOPath); - ~CLanguage(void); + ~CLanguage(); SString Translate(const SString& strMessage); SString TranslateWithContext(const SString& strContext, const SString& strMessage); SString TranslatePlural(const SString& strSingular, const SString& strPlural, int iNum); SString TranslatePluralWithContext(const SString& strContext, const SString& strSingular, const SString& strPlural, int iNum); - SString GetCode(void) { return m_strCode; } - SString GetName(void) { return m_strName; } - Dictionary& GetDictionary(void) { return m_Dict; } + SString GetCode() { return m_strCode; } + SString GetName() { return m_strName; } + Dictionary& GetDictionary() { return m_Dict; } private: Dictionary m_Dict; diff --git a/Client/core/CLanguageSelector.cpp b/Client/core/CLanguageSelector.cpp index a2a53756695..f787c588687 100644 --- a/Client/core/CLanguageSelector.cpp +++ b/Client/core/CLanguageSelector.cpp @@ -52,7 +52,7 @@ CLanguageSelector::CLanguageSelector(CGUIElement* pMainMenuCanvas) // Delete GUI items // /////////////////////////////////////////////////////////////// -CLanguageSelector::~CLanguageSelector(void) +CLanguageSelector::~CLanguageSelector() { SAFE_DELETE(m_pButtonWindow); SAFE_DELETE(m_pListWindow); @@ -200,7 +200,7 @@ CLangListItem CLanguageSelector::CreateGUILangItem(CGUIElement* pGUIParent, cons // Update visibilty & animations // /////////////////////////////////////////////////////////////// -void CLanguageSelector::DoPulse(void) +void CLanguageSelector::DoPulse() { if (CLocalGUI::GetSingleton().GetMainMenu()->GetIsIngame()) { diff --git a/Client/core/CLanguageSelector.h b/Client/core/CLanguageSelector.h index ac5641bf9a7..585c79d3ca6 100644 --- a/Client/core/CLanguageSelector.h +++ b/Client/core/CLanguageSelector.h @@ -10,7 +10,7 @@ struct CLangListItem { - CLangListItem(void) : fFocusEffectPos(0), fFocusEffectTarget(0), pContainerPane(nullptr), pFlag(nullptr), pLabel(nullptr) {} + CLangListItem() : fFocusEffectPos(0), fFocusEffectTarget(0), pContainerPane(nullptr), pFlag(nullptr), pLabel(nullptr) {} float fFocusEffectPos; float fFocusEffectTarget; SString strLocale; @@ -28,8 +28,8 @@ class CLanguageSelector public: ZERO_ON_NEW CLanguageSelector(CGUIElement* pMainMenuCanvas); - ~CLanguageSelector(void); - void DoPulse(void); + ~CLanguageSelector(); + void DoPulse(); protected: void CreateGUI(CGUIElement* pMainMenuCanvas); diff --git a/Client/core/CLocalization.cpp b/Client/core/CLocalization.cpp index 75ba2fc2c18..2dc74e5c2f1 100644 --- a/Client/core/CLocalization.cpp +++ b/Client/core/CLocalization.cpp @@ -29,7 +29,7 @@ CLocalization::CLocalization(const SString& strLocale, const SString& strLocaleP SetCurrentLanguage(strLocale); } -CLocalization::~CLocalization(void) +CLocalization::~CLocalization() { for (auto iter : m_LanguageMap) { @@ -124,7 +124,7 @@ SString CLocalization::GetTranslators() return ""; } -std::vector CLocalization::GetAvailableLocales(void) +std::vector CLocalization::GetAvailableLocales() { std::vector localeList = {"en_US"}; for (const auto& language : m_DictManager.get_languages(MTA_LOCALE_TEXTDOMAIN)) @@ -135,25 +135,25 @@ std::vector CLocalization::GetAvailableLocales(void) } // Tell whether the client is translated -bool CLocalization::IsLocalized(void) +bool CLocalization::IsLocalized() { std::string strLocale; CVARS_GET("locale", strLocale); return strLocale != "en_US"; } -SString CLocalization::GetLanguageCode(void) +SString CLocalization::GetLanguageCode() { return m_pCurrentLang->GetCode(); } -SString CLocalization::GetLanguageName(void) +SString CLocalization::GetLanguageName() { return m_pCurrentLang->GetName(); } // Get the file directory of the current language -SString CLocalization::GetLanguageDirectory(void) +SString CLocalization::GetLanguageDirectory() { SString strFullPath = m_pCurrentLang->GetDictionary().get_filepath(); diff --git a/Client/core/CLocalization.h b/Client/core/CLocalization.h index 016e6a638ba..565021e1f93 100644 --- a/Client/core/CLocalization.h +++ b/Client/core/CLocalization.h @@ -21,19 +21,19 @@ class CLocalization : public CLocalizationInterface { public: CLocalization(const SString& strLocale = "", const SString& strLocalePath = ""); - ~CLocalization(void); + ~CLocalization(); SString Translate(const SString& strMessage); SString TranslateWithContext(const SString& strContext, const SString& strMessage); SString TranslatePlural(const SString& strSingular, const SString& strPlural, int iNum); SString TranslatePluralWithContext(const SString& strContext, const SString& strSingular, const SString& strPlural, int iNum); - SString GetTranslators(void); - std::vector GetAvailableLocales(void); - bool IsLocalized(void); - SString GetLanguageDirectory(void); - SString GetLanguageCode(void); - SString GetLanguageName(void); + SString GetTranslators(); + std::vector GetAvailableLocales(); + bool IsLocalized(); + SString GetLanguageDirectory(); + SString GetLanguageCode(); + SString GetLanguageName(); SString ValidateLocale(SString strLocale); void SetCurrentLanguage(SString strLocale = ""); CLanguage* GetLanguage(SString strLocale = ""); diff --git a/Client/core/CMainMenu.cpp b/Client/core/CMainMenu.cpp index 1337da1ea7e..cb2e65f71ae 100644 --- a/Client/core/CMainMenu.cpp +++ b/Client/core/CMainMenu.cpp @@ -322,7 +322,7 @@ CMainMenu::CMainMenu(CGUI* pManager) #endif } -CMainMenu::~CMainMenu(void) +CMainMenu::~CMainMenu() { // Destroy GUI items delete m_pBackground; @@ -395,7 +395,7 @@ void CMainMenu::SetMenuUnhovered() // Dehighlight all our items } } -void CMainMenu::Update(void) +void CMainMenu::Update() { if (g_pCore->GetDiagnosticDebug() == EDiagnosticDebug::JOYSTICK_0000) { @@ -663,13 +663,13 @@ void CMainMenu::Show(bool bOverlay) SetVisible(true, bOverlay); } -void CMainMenu::Hide(void) +void CMainMenu::Hide() { SetVisible(false); } // When escape key pressed and not connected, hide these windows -void CMainMenu::OnEscapePressedOffLine(void) +void CMainMenu::OnEscapePressedOffLine() { m_ServerBrowser.SetVisible(false); m_Credits.SetVisible(false); @@ -716,7 +716,7 @@ void CMainMenu::SetVisible(bool bVisible, bool bOverlay, bool bFrameDelay) m_bHideGame = !bOverlay; } -bool CMainMenu::IsVisible(void) +bool CMainMenu::IsVisible() { return m_bIsVisible; } @@ -752,7 +752,7 @@ void CMainMenu::SetIsIngame(bool bIsIngame) } } -bool CMainMenu::GetIsIngame(void) +bool CMainMenu::GetIsIngame() { return m_bIsIngame; } @@ -867,7 +867,7 @@ bool CMainMenu::OnBrowseServersButtonClick(CGUIElement* pElement) return true; } -void CMainMenu::HideServerInfo(void) +void CMainMenu::HideServerInfo() { m_ServerInfo.Hide(); } @@ -884,7 +884,7 @@ bool CMainMenu::OnDisconnectButtonClick(CGUIElement* pElement) return true; } -bool CMainMenu::OnHostGameButtonClick(void) +bool CMainMenu::OnHostGameButtonClick() { // Return if we haven't faded in yet if (m_ucFade != FADE_VISIBLE) @@ -896,7 +896,7 @@ bool CMainMenu::OnHostGameButtonClick(void) return true; } -bool CMainMenu::OnEditorButtonClick(void) +bool CMainMenu::OnEditorButtonClick() { // Return if we haven't faded in yet if (m_ucFade != FADE_VISIBLE) diff --git a/Client/core/CMainMenu.h b/Client/core/CMainMenu.h index 5969c73adeb..a488a2b038e 100644 --- a/Client/core/CMainMenu.h +++ b/Client/core/CMainMenu.h @@ -45,34 +45,34 @@ class CMainMenu public: CMainMenu(CGUI* pManager); - ~CMainMenu(void); + ~CMainMenu(); - void Update(void); + void Update(); void Show(bool bOverlay); - void Hide(void); + void Hide(); void SetVisible(bool bVisible, bool bOverlay = true, bool bFrameDelay = true); - bool IsVisible(void); - bool IsFading(void) { return m_ucFade == FADE_IN || m_ucFade == FADE_OUT; } + bool IsVisible(); + bool IsFading() { return m_ucFade == FADE_IN || m_ucFade == FADE_OUT; } void SetIsIngame(bool bIsIngame); - bool GetIsIngame(void); + bool GetIsIngame(); - CServerBrowser* GetServerBrowser(void) { return &m_ServerBrowser; }; - CSettings* GetSettingsWindow(void) { return &m_Settings; }; - CQuickConnect* GetQuickConnectWindow(void) { return &m_QuickConnect; }; - CQuestionBox* GetQuestionWindow(void) { return &m_QuestionBox; }; - CNewsBrowser* GetNewsBrowser(void) { return m_pNewsBrowser; }; + CServerBrowser* GetServerBrowser() { return &m_ServerBrowser; }; + CSettings* GetSettingsWindow() { return &m_Settings; }; + CQuickConnect* GetQuickConnectWindow() { return &m_QuickConnect; }; + CQuestionBox* GetQuestionWindow() { return &m_QuestionBox; }; + CNewsBrowser* GetNewsBrowser() { return m_pNewsBrowser; }; void SetMenuVerticalPosition(int iPosY); - void SetMenuUnhovered(void); + void SetMenuUnhovered(); - bool HasStarted(void) { return m_bStarted; }; + bool HasStarted() { return m_bStarted; }; void SetNewsHeadline(int iIndex, const SString& strHeadline, const SString& strDate, bool bIsNew); void ReloadNews(); - void OnEscapePressedOffLine(void); + void OnEscapePressedOffLine(); static void StaticWantsToDisconnectCallBack(void* pData, uint uiButton); void WantsToDisconnectCallBack(void* pData, uint uiButton); @@ -88,15 +88,15 @@ class CMainMenu bool OnQuickConnectButtonClick(CGUIElement* pElement); bool OnResumeButtonClick(CGUIElement* pElement); bool OnBrowseServersButtonClick(CGUIElement* pElement); - bool OnHostGameButtonClick(void); + bool OnHostGameButtonClick(); bool OnDisconnectButtonClick(CGUIElement* pElement); - bool OnEditorButtonClick(void); + bool OnEditorButtonClick(); bool OnSettingsButtonClick(CGUIElement* pElement); bool OnAboutButtonClick(CGUIElement* pElement); bool OnQuitButtonClick(CGUIElement* pElement); bool OnNewsButtonClick(CGUIElement* pElement); - void HideServerInfo(void); + void HideServerInfo(); CGUI* m_pManager; diff --git a/Client/core/CMemStats.cpp b/Client/core/CMemStats.cpp index f61e9d69950..dc598010241 100644 --- a/Client/core/CMemStats.cpp +++ b/Client/core/CMemStats.cpp @@ -207,9 +207,9 @@ namespace m_uiNumRows++; } - uint GetPixelWidth(void) const { return m_uiTotalWidth; } + uint GetPixelWidth() const { return m_uiTotalWidth; } - uint GetPixelHeight(void) const { return m_uiNumRows * 15; } + uint GetPixelHeight() const { return m_uiNumRows * 15; } // Draw the table with D3D void Draw(float fX, float fY, DWORD dwBackColor, uint uiBorderLeft, uint uiBorderRight, uint uiBorderUp, uint uiBorderDown) @@ -254,19 +254,19 @@ class CMemStats : public CMemStatsInterface { public: ZERO_ON_NEW - CMemStats(void); - ~CMemStats(void); + CMemStats(); + ~CMemStats(); // CMemStatsInterface methods - virtual void Draw(void); + virtual void Draw(); virtual void SetEnabled(bool bEnabled); - virtual bool IsEnabled(void); + virtual bool IsEnabled(); virtual void SampleState(SMemStatsInfo& memStatsInfo); protected: - void UpdateFrameStats(void); - void UpdateIntervalStats(void); - void CreateTables(void); + void UpdateFrameStats(); + void UpdateIntervalStats(); + void CreateTables(); CElapsedTime m_UpdateTimer; bool m_bEnabled; @@ -285,7 +285,7 @@ class CMemStats : public CMemStatsInterface /////////////////////////////////////////////////////////////// CMemStats* g_pMemStats = NULL; -CMemStatsInterface* GetMemStats(void) +CMemStatsInterface* GetMemStats() { if (!g_pMemStats) g_pMemStats = new CMemStats(); @@ -297,11 +297,11 @@ CMemStatsInterface* GetMemStats(void) // CVideoModeManager implementation // /////////////////////////////////////////////////////////////// -CMemStats::CMemStats(void) +CMemStats::CMemStats() { } -CMemStats::~CMemStats(void) +CMemStats::~CMemStats() { } @@ -334,7 +334,7 @@ void CMemStats::SetEnabled(bool bEnabled) // // /////////////////////////////////////////////////////////////// -bool CMemStats::IsEnabled(void) +bool CMemStats::IsEnabled() { return m_bEnabled; } @@ -346,7 +346,7 @@ bool CMemStats::IsEnabled(void) // // /////////////////////////////////////////////////////////////// -void CMemStats::Draw(void) +void CMemStats::Draw() { if (!m_bEnabled) return; @@ -404,7 +404,7 @@ void CMemStats::Draw(void) // Update values that are measured each frame // /////////////////////////////////////////////////////////////// -void CMemStats::UpdateFrameStats(void) +void CMemStats::UpdateFrameStats() { m_MemStatsNow.d3dMemory = g_pDeviceState->MemoryState; @@ -524,7 +524,7 @@ void CMemStats::SampleState(SMemStatsInfo& memStatsInfo) // Update stats which are sampled at regular intervals // /////////////////////////////////////////////////////////////// -void CMemStats::UpdateIntervalStats(void) +void CMemStats::UpdateIntervalStats() { MemStatsInfoClear(m_MemStatsNow); MemStatsInfoClear(m_MemStatsDelta); @@ -655,7 +655,7 @@ void CMemStats::UpdateIntervalStats(void) // Create formatted tables for drawing with // /////////////////////////////////////////////////////////////// -void CMemStats::CreateTables(void) +void CMemStats::CreateTables() { m_TableList.clear(); diff --git a/Client/core/CMemStats.h b/Client/core/CMemStats.h index 5764deca1aa..78154c35b52 100644 --- a/Client/core/CMemStats.h +++ b/Client/core/CMemStats.h @@ -63,12 +63,12 @@ struct SMemStatsInfo class CMemStatsInterface { public: - virtual ~CMemStatsInterface(void) {} + virtual ~CMemStatsInterface() {} - virtual void Draw(void) = 0; + virtual void Draw() = 0; virtual void SetEnabled(bool bEnabled) = 0; - virtual bool IsEnabled(void) = 0; + virtual bool IsEnabled() = 0; virtual void SampleState(SMemStatsInfo& memStatsInfo) = 0; }; -CMemStatsInterface* GetMemStats(void); +CMemStatsInterface* GetMemStats(); diff --git a/Client/core/CMessageLoopHook.cpp b/Client/core/CMessageLoopHook.cpp index 0e0ff24b457..3704f961a60 100644 --- a/Client/core/CMessageLoopHook.cpp +++ b/Client/core/CMessageLoopHook.cpp @@ -89,7 +89,7 @@ void CMessageLoopHook::SetRefreshMsgQueueEnabled(bool bEnable) } // Process one message every 5 seconds during busy periods to stop Windows 'Not responding' stuff -void CMessageLoopHook::MaybeRefreshMsgQueue(void) +void CMessageLoopHook::MaybeRefreshMsgQueue() { if (m_ProcessMessageTimer.Get() < 5000) return; diff --git a/Client/core/CMessageLoopHook.h b/Client/core/CMessageLoopHook.h index 3194cc9e3e2..9a999a03e4b 100644 --- a/Client/core/CMessageLoopHook.h +++ b/Client/core/CMessageLoopHook.h @@ -27,7 +27,7 @@ class CMessageLoopHook : public CSingleton void ApplyHook(HWND hFocusWindow); void RemoveHook(); HWND GetHookedWindowHandle() const; - void MaybeRefreshMsgQueue(void); + void MaybeRefreshMsgQueue(); void SetRefreshMsgQueueEnabled(bool bEnable); void StartWindowMovement(); diff --git a/Client/core/CModManager.cpp b/Client/core/CModManager.cpp index a348b7fb900..aa58ed1fcb5 100644 --- a/Client/core/CModManager.cpp +++ b/Client/core/CModManager.cpp @@ -19,7 +19,7 @@ using SharedUtil::CalcMTASAPath; template <> CModManager* CSingleton::m_pSingleton = NULL; -CModManager::CModManager(void) +CModManager::CModManager() { // Init m_hClientDLL = NULL; @@ -33,7 +33,7 @@ CModManager::CModManager(void) InitializeModList(CalcMTASAPath("mods\\")); } -CModManager::~CModManager(void) +CModManager::~CModManager() { // Unload the current loaded mod (if loaded) Unload(); @@ -66,13 +66,13 @@ void CModManager::RequestLoadDefault(const char* szArguments) RequestLoad(m_strDefaultModName.c_str(), szArguments); } -void CModManager::RequestUnload(void) +void CModManager::RequestUnload() { RequestLoad(NULL, NULL); CCore::GetSingletonPtr()->OnModUnload(); } -void CModManager::ClearRequest(void) +void CModManager::ClearRequest() { // Free the old mod name m_strRequestedMod = ""; @@ -84,7 +84,7 @@ void CModManager::ClearRequest(void) m_bUnloadRequested = false; } -bool CModManager::IsLoaded(void) +bool CModManager::IsLoaded() { return (m_hClientDLL != NULL); } @@ -135,7 +135,7 @@ CClientBase* CModManager::Load(const char* szName, const char* szArguments) } // Get the address of InitClient - typedef CClientBase*(__cdecl pfnClientInitializer)(void); /* FIXME: Should probably not be here */ + typedef CClientBase*(__cdecl pfnClientInitializer)(); /* FIXME: Should probably not be here */ pfnClientInitializer* pClientInitializer = reinterpret_cast(GetProcAddress(m_hClientDLL, "InitClient")); if (pClientInitializer == NULL) @@ -169,7 +169,7 @@ CClientBase* CModManager::Load(const char* szName, const char* szArguments) return m_pClientBase; } -void CModManager::Unload(void) +void CModManager::Unload() { CMessageLoopHook::GetSingleton().SetRefreshMsgQueueEnabled(false); @@ -232,7 +232,7 @@ void CModManager::Unload(void) CMessageLoopHook::GetSingleton().SetRefreshMsgQueueEnabled(true); } -void CModManager::DoPulsePreFrame(void) +void CModManager::DoPulsePreFrame() { if (m_pClientBase) { @@ -248,7 +248,7 @@ void CModManager::DoPulsePreHUDRender(bool bDidUnminimize, bool bDidRecreateRend } } -void CModManager::DoPulsePostFrame(void) +void CModManager::DoPulsePostFrame() { // Load/unload requested? if (m_bUnloadRequested) @@ -299,12 +299,12 @@ void CModManager::DoPulsePostFrame(void) } } -CClientBase* CModManager::GetCurrentMod(void) +CClientBase* CModManager::GetCurrentMod() { return m_pClientBase; } -void CModManager::RefreshMods(void) +void CModManager::RefreshMods() { // Clear the list, and load it again Clear(); @@ -347,7 +347,7 @@ void CModManager::InitializeModList(const char* szModFolderPath) filePathTranslator.UnSetCurrentWorkingDirectory(); } -void CModManager::Clear(void) +void CModManager::Clear() { // Clear the list m_ModDLLFiles.clear(); diff --git a/Client/core/CModManager.h b/Client/core/CModManager.h index 3dc60a094c7..e26250be8c1 100644 --- a/Client/core/CModManager.h +++ b/Client/core/CModManager.h @@ -25,30 +25,30 @@ class CModManager : public CModManagerInterface, public CSingleton { public: - CModManager(void); - ~CModManager(void); + CModManager(); + ~CModManager(); void RequestLoad(const char* szModName, const char* szArguments); void RequestLoadDefault(const char* szArguments); - void RequestUnload(void); - void ClearRequest(void); + void RequestUnload(); + void ClearRequest(); - bool IsLoaded(void); + bool IsLoaded(); CClientBase* Load(const char* szName, const char* szArguments); - void Unload(void); + void Unload(); - void DoPulsePreFrame(void); + void DoPulsePreFrame(); void DoPulsePreHUDRender(bool bDidUnminimize, bool bDidRecreateRenderTargets); - void DoPulsePostFrame(void); + void DoPulsePostFrame(); - CClientBase* GetCurrentMod(void); + CClientBase* GetCurrentMod(); - void RefreshMods(void); + void RefreshMods(); private: void InitializeModList(const char* szModFolderPath); - void Clear(void); + void Clear(); void VerifyAndAddEntry(const char* szModFolderPath, const char* szName); diff --git a/Client/core/CModelCacheManager.cpp b/Client/core/CModelCacheManager.cpp index 84d24e3cda1..494842555fb 100644 --- a/Client/core/CModelCacheManager.cpp +++ b/Client/core/CModelCacheManager.cpp @@ -14,7 +14,7 @@ namespace { struct SModelCacheInfo { - SModelCacheInfo(void) : fClosestDistSq(0), bIsModelCachedHere(false), bIsModelLoadedByGame(false) {} + SModelCacheInfo() : fClosestDistSq(0), bIsModelCachedHere(false), bIsModelLoadedByGame(false) {} CTickCount lastNeeded; CTickCount firstNeeded; float fClosestDistSq; @@ -36,20 +36,20 @@ class CModelCacheManagerImpl : public CModelCacheManager ZERO_ON_NEW // CModelCacheManager interface - virtual void DoPulse(void); + virtual void DoPulse(); virtual void GetStats(SModelCacheStats& outStats); virtual bool UnloadModel(ushort usModelId); virtual void OnRestreamModel(ushort usModelId); - virtual void OnClientClose(void); + virtual void OnClientClose(); virtual void UpdatePedModelCaching(const std::map& newNeedCacheList); virtual void UpdateVehicleModelCaching(const std::map& newNeedCacheList); virtual void AddModelToPersistentCache(ushort usModelId); // CModelCacheManagerImpl methods - CModelCacheManagerImpl(void); - ~CModelCacheManagerImpl(void); + CModelCacheManagerImpl(); + ~CModelCacheManagerImpl(); - void PreLoad(void); + void PreLoad(); void RemoveCacheRefs(std::map& currentCacheInfoMap); void UpdateModelCaching(const std::map& newNeededList, std::map& currentCacheInfoMap, uint uiMaxCachedAllowed); int GetModelRefCount(ushort usModelId); @@ -84,7 +84,7 @@ CModelCacheManager* NewModelCacheManager() // CModelCacheManagerImpl::CModelCacheManagerImpl // /////////////////////////////////////////////////////////////// -CModelCacheManagerImpl::CModelCacheManagerImpl(void) +CModelCacheManagerImpl::CModelCacheManagerImpl() { m_pGame = CCore::GetSingleton().GetGame(); } @@ -96,7 +96,7 @@ CModelCacheManagerImpl::CModelCacheManagerImpl(void) // Clean up when quitting // /////////////////////////////////////////////////////////////// -CModelCacheManagerImpl::~CModelCacheManagerImpl(void) +CModelCacheManagerImpl::~CModelCacheManagerImpl() { } @@ -107,7 +107,7 @@ CModelCacheManagerImpl::~CModelCacheManagerImpl(void) // Clean up when client.dll unloads // /////////////////////////////////////////////////////////////// -void CModelCacheManagerImpl::OnClientClose(void) +void CModelCacheManagerImpl::OnClientClose() { // Remove all extra refs applied here } @@ -125,7 +125,7 @@ void CModelCacheManagerImpl::OnClientClose(void) // Vehicles(500-599) KB: 14,888 // /////////////////////////////////////////////////////////////// -void CModelCacheManagerImpl::PreLoad(void) +void CModelCacheManagerImpl::PreLoad() { if (m_bDonePreLoad) return; @@ -213,7 +213,7 @@ void CModelCacheManagerImpl::GetStats(SModelCacheStats& outStats) // CModelCacheManagerImpl::DoPulse // /////////////////////////////////////////////////////////////// -void CModelCacheManagerImpl::DoPulse(void) +void CModelCacheManagerImpl::DoPulse() { m_TickCountNow = CTickCount::Now(); diff --git a/Client/core/CModelCacheManager.h b/Client/core/CModelCacheManager.h index a885d30f536..693a334d922 100644 --- a/Client/core/CModelCacheManager.h +++ b/Client/core/CModelCacheManager.h @@ -12,17 +12,17 @@ struct SModelCacheStats; class CModelCacheManager { public: - virtual ~CModelCacheManager(void) {} + virtual ~CModelCacheManager() {} // CModelCacheManager interface - virtual void DoPulse(void) = 0; + virtual void DoPulse() = 0; virtual void GetStats(SModelCacheStats& outStats) = 0; virtual bool UnloadModel(ushort usModelId) = 0; virtual void OnRestreamModel(ushort usModelId) = 0; - virtual void OnClientClose(void) = 0; + virtual void OnClientClose() = 0; virtual void UpdatePedModelCaching(const std::map& newNeedCacheList) = 0; virtual void UpdateVehicleModelCaching(const std::map& newNeedCacheList) = 0; virtual void AddModelToPersistentCache(ushort usModelId) = 0; }; -CModelCacheManager* NewModelCacheManager(void); +CModelCacheManager* NewModelCacheManager(); diff --git a/Client/core/CModuleLoader.cpp b/Client/core/CModuleLoader.cpp index d3c2a8ed43a..2eccbf4aaa6 100644 --- a/Client/core/CModuleLoader.cpp +++ b/Client/core/CModuleLoader.cpp @@ -72,7 +72,7 @@ PVOID CModuleLoader::GetFunctionPointer(const string& FunctionName) return NULL; } -const SString& CModuleLoader::GetLastErrorMessage(void) const +const SString& CModuleLoader::GetLastErrorMessage() const { return m_strLastError; } diff --git a/Client/core/CModuleLoader.h b/Client/core/CModuleLoader.h index a53f5c0b07d..800ceb2386c 100644 --- a/Client/core/CModuleLoader.h +++ b/Client/core/CModuleLoader.h @@ -25,7 +25,7 @@ class CModuleLoader void UnloadModule(); bool IsOk() const { return m_bStatus; } - const SString& GetLastErrorMessage(void) const; + const SString& GetLastErrorMessage() const; PVOID GetFunctionPointer(const std::string& FunctionName); diff --git a/Client/core/CMouseControl.cpp b/Client/core/CMouseControl.cpp index cbfc1f9fcc6..ff773f7f5d0 100644 --- a/Client/core/CMouseControl.cpp +++ b/Client/core/CMouseControl.cpp @@ -25,7 +25,7 @@ extern CCore* g_pCore; // // //////////////////////////////////////////////////// -CMouseControl::CMouseControl(void) +CMouseControl::CMouseControl() { m_usLeftStickX = 0; m_usLeftStickY = 0; @@ -38,7 +38,7 @@ CMouseControl::CMouseControl(void) // // //////////////////////////////////////////////////// -CMouseControl::~CMouseControl(void) +CMouseControl::~CMouseControl() { } @@ -114,7 +114,7 @@ bool CMouseControl::ProcessMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam) // // //////////////////////////////////////////////////// -void CMouseControl::Reset(void) +void CMouseControl::Reset() { m_usLeftStickX = 0; m_usLeftStickY = 0; diff --git a/Client/core/CMouseControl.h b/Client/core/CMouseControl.h index 003ae8d0a6e..e9a73d1866a 100644 --- a/Client/core/CMouseControl.h +++ b/Client/core/CMouseControl.h @@ -24,10 +24,10 @@ enum MouseControlVehicleType class CMouseControl { public: - CMouseControl(void); - ~CMouseControl(void); + CMouseControl(); + ~CMouseControl(); - void Reset(void); + void Reset(); bool ProcessMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam); void ApplyAxes(CControllerState& cs); diff --git a/Client/core/CNewsBrowser.cpp b/Client/core/CNewsBrowser.cpp index dfe8dd44872..8b173f384d3 100644 --- a/Client/core/CNewsBrowser.cpp +++ b/Client/core/CNewsBrowser.cpp @@ -21,7 +21,7 @@ extern CCore* g_pCore; // // //////////////////////////////////////////////////// -CNewsBrowser::CNewsBrowser(void) +CNewsBrowser::CNewsBrowser() { m_pWindow = NULL; m_pTabPanel = NULL; @@ -35,7 +35,7 @@ CNewsBrowser::CNewsBrowser(void) // // //////////////////////////////////////////////////// -CNewsBrowser::~CNewsBrowser(void) +CNewsBrowser::~CNewsBrowser() { DestroyGUI(); } @@ -47,7 +47,7 @@ CNewsBrowser::~CNewsBrowser(void) // // //////////////////////////////////////////////////// -void CNewsBrowser::InitNewsItemList(void) +void CNewsBrowser::InitNewsItemList() { m_NewsitemList.clear(); @@ -122,7 +122,7 @@ void CNewsBrowser::InitNewsItemList(void) // // //////////////////////////////////////////////////// -void CNewsBrowser::CreateHeadlines(void) +void CNewsBrowser::CreateHeadlines() { InitNewsItemList(); bool bNewsUpdated = GetApplicationSettingInt("news-updated") == 1; @@ -144,7 +144,7 @@ void CNewsBrowser::CreateHeadlines(void) // // //////////////////////////////////////////////////// -void CNewsBrowser::CreateGUI(void) +void CNewsBrowser::CreateGUI() { CreateHeadlines(); CGUI* pManager = g_pCore->GetGUI(); @@ -189,7 +189,7 @@ void CNewsBrowser::CreateGUI(void) // // //////////////////////////////////////////////////// -void CNewsBrowser::DestroyGUI(void) +void CNewsBrowser::DestroyGUI() { // Destroy for (uint i = 0; i < m_TabList.size(); i++) @@ -357,7 +357,7 @@ void CNewsBrowser::SetVisible(bool bVisible) // // //////////////////////////////////////////////////// -bool CNewsBrowser::IsVisible(void) +bool CNewsBrowser::IsVisible() { return m_pWindow && m_pWindow->IsVisible(); } diff --git a/Client/core/CNewsBrowser.h b/Client/core/CNewsBrowser.h index 5c1c8530e58..f71cb9cd77f 100644 --- a/Client/core/CNewsBrowser.h +++ b/Client/core/CNewsBrowser.h @@ -24,20 +24,20 @@ class CNewsBrowser { public: ZERO_ON_NEW - CNewsBrowser(void); - ~CNewsBrowser(void); + CNewsBrowser(); + ~CNewsBrowser(); void SetVisible(bool bVisible); - bool IsVisible(void); - void CreateHeadlines(void); + bool IsVisible(); + void CreateHeadlines(); void SwitchToTab(int iIndex); protected: - void InitNewsItemList(void); + void InitNewsItemList(); void AddNewsTab(const SNewsItem& newsItem); CGUIWindow* LoadLayoutAndImages(CGUIElement* pParent, const SNewsItem& newsItem); - void CreateGUI(void); - void DestroyGUI(void); + void CreateGUI(); + void DestroyGUI(); bool OnOKButtonClick(CGUIElement* pElement); std::vector m_NewsitemList; diff --git a/Client/core/CNickGen.cpp b/Client/core/CNickGen.cpp index 3f3e142799c..c2e60c6702a 100644 --- a/Client/core/CNickGen.cpp +++ b/Client/core/CNickGen.cpp @@ -198,7 +198,7 @@ const char* const CNickGen::m_szNouns[] = { "Conductor", "Wheelman", "Vampire", "Parasite", "Tramp", "Bum", "Hobo", "Hitchhiker", "Deadbeat", "Acrobat", }; -SString CNickGen::GetRandomNickname(void) +SString CNickGen::GetRandomNickname() { srand((unsigned int)time(NULL)); int iAdjective = rand() % NICKGEN_NUM_ADJECTIVES; diff --git a/Client/core/CNickGen.h b/Client/core/CNickGen.h index 8e134477111..e07f08f53e8 100644 --- a/Client/core/CNickGen.h +++ b/Client/core/CNickGen.h @@ -17,5 +17,5 @@ class CNickGen public: static const char* const m_szAdjectives[NICKGEN_NUM_ADJECTIVES]; static const char* const m_szNouns[NICKGEN_NUM_NOUNS]; - static SString GetRandomNickname(void); + static SString GetRandomNickname(); }; diff --git a/Client/core/CQuestionBox.cpp b/Client/core/CQuestionBox.cpp index 0b43b259b1d..27f664cf62d 100644 --- a/Client/core/CQuestionBox.cpp +++ b/Client/core/CQuestionBox.cpp @@ -14,7 +14,7 @@ extern CCore* g_pCore; -CQuestionBox::CQuestionBox(void) +CQuestionBox::CQuestionBox() { m_pWindow = NULL; m_pMessage = NULL; @@ -38,7 +38,7 @@ CQuestionBox::CQuestionBox(void) m_pMessage = reinterpret_cast(pManager->CreateLabel(m_pWindow, "")); } -CQuestionBox::~CQuestionBox(void) +CQuestionBox::~CQuestionBox() { for (unsigned int i = 0; i < m_ButtonList.size(); i++) delete m_ButtonList[i]; @@ -46,12 +46,12 @@ CQuestionBox::~CQuestionBox(void) delete m_pWindow; } -void CQuestionBox::Hide(void) +void CQuestionBox::Hide() { m_pWindow->SetVisible(false); } -void CQuestionBox::Show(void) +void CQuestionBox::Show() { // Layout - Calc how many lines of text SString strMsg = m_pMessage->GetText(); @@ -105,7 +105,7 @@ void CQuestionBox::Show(void) AddReportLog(9100, SString("QuestionBox::Show [%s] %s", m_pWindow->GetText().c_str(), *m_strMsg.Left(200).Replace("\n", "|"))); } -void CQuestionBox::Reset(void) +void CQuestionBox::Reset() { Hide(); m_uiLastButton = -1; @@ -196,14 +196,14 @@ void CQuestionBox::SetOnLineHelpOption(const SString& strTroubleLink) SetCallback(CCore::ErrorMessageBoxCallBack, new SString(strTroubleLink)); } -unsigned int CQuestionBox::PollButtons(void) +unsigned int CQuestionBox::PollButtons() { if (!m_pWindow->IsVisible()) return -1; return m_uiLastButton; } -bool CQuestionBox::IsVisible(void) +bool CQuestionBox::IsVisible() { return m_pWindow->IsVisible(); } @@ -227,7 +227,7 @@ void CQuestionBox::SetAutoCloseOnConnect(bool bEnable) m_bAutoCloseOnConnect = bEnable; } -void CQuestionBox::OnConnect(void) +void CQuestionBox::OnConnect() { if (m_bAutoCloseOnConnect) Hide(); diff --git a/Client/core/CQuestionBox.h b/Client/core/CQuestionBox.h index 235b7397f04..a2baba49442 100644 --- a/Client/core/CQuestionBox.h +++ b/Client/core/CQuestionBox.h @@ -22,12 +22,12 @@ typedef void (*pfnQuestionEditCallback)(void*, unsigned int, std::string); class CQuestionBox { public: - CQuestionBox(void); - ~CQuestionBox(void); + CQuestionBox(); + ~CQuestionBox(); - void Hide(void); - void Show(void); - void Reset(void); + void Hide(); + void Show(); + void Reset(); void SetTitle(const SString& strTitle); void SetMessage(const SString& strMsg); void AppendMessage(const SString& strMsg); @@ -36,10 +36,10 @@ class CQuestionBox void SetCallback(pfnQuestionCallback callback, void* ptr = NULL); void SetCallbackEdit(pfnQuestionEditCallback callback, void* ptr = NULL); void SetOnLineHelpOption(const SString& strTroubleType); - unsigned int PollButtons(void); - bool IsVisible(void); + unsigned int PollButtons(); + bool IsVisible(); void SetAutoCloseOnConnect(bool bEnable); - void OnConnect(void); + void OnConnect(); private: bool OnButtonClick(CGUIElement* pElement); diff --git a/Client/core/CQuickConnect.cpp b/Client/core/CQuickConnect.cpp index f9b5d0aeae4..4c0136f0740 100644 --- a/Client/core/CQuickConnect.cpp +++ b/Client/core/CQuickConnect.cpp @@ -13,7 +13,7 @@ extern CCore* g_pCore; -CQuickConnect::CQuickConnect(void) +CQuickConnect::CQuickConnect() { CGUI* pManager = g_pCore->GetGUI(); @@ -87,7 +87,7 @@ CQuickConnect::CQuickConnect(void) m_pWindow->SetEnterKeyHandler(GUI_CALLBACK(&CQuickConnect::OnConnectButtonClick, this)); } -CQuickConnect::~CQuickConnect(void) +CQuickConnect::~CQuickConnect() { delete m_pButtonBack; delete m_pButtonConnect; @@ -121,12 +121,12 @@ void CQuickConnect::SetVisible(bool bVisible) } } -bool CQuickConnect::IsVisible(void) +bool CQuickConnect::IsVisible() { return m_pWindow->IsVisible(); } -void CQuickConnect::Reset(void) +void CQuickConnect::Reset() { m_pEditHost->SetText(""); m_pEditPort->SetText(""); @@ -262,7 +262,7 @@ bool CQuickConnect::OnHostChanged(CGUIElement* pElement) return true; } -void CQuickConnect::LoadData(void) +void CQuickConnect::LoadData() { std::string val; unsigned int uval; diff --git a/Client/core/CQuickConnect.h b/Client/core/CQuickConnect.h index b1a7e8bf4d9..b633ed71260 100644 --- a/Client/core/CQuickConnect.h +++ b/Client/core/CQuickConnect.h @@ -18,19 +18,19 @@ class CQuickConnect; class CQuickConnect { public: - CQuickConnect(void); - ~CQuickConnect(void); + CQuickConnect(); + ~CQuickConnect(); void SetVisible(bool bVisible); - bool IsVisible(void); - void Reset(void); + bool IsVisible(); + void Reset(); private: bool OnConnectButtonClick(CGUIElement* pElement); bool OnBackButtonClick(CGUIElement* pElement); bool OnHostChanged(CGUIElement* pElement); - void LoadData(void); + void LoadData(); CGUIWindow* m_pWindow; CGUIEdit* m_pEditHost; diff --git a/Client/core/CScreenGrabber.cpp b/Client/core/CScreenGrabber.cpp index 00a4a094b8c..7262836e262 100644 --- a/Client/core/CScreenGrabber.cpp +++ b/Client/core/CScreenGrabber.cpp @@ -29,21 +29,21 @@ class CScreenGrabber : public CScreenGrabberInterface { public: ZERO_ON_NEW - CScreenGrabber(void); - ~CScreenGrabber(void); + CScreenGrabber(); + ~CScreenGrabber(); // CScreenGrabberInterface virtual void OnDeviceCreate(IDirect3DDevice9* pDevice); - virtual void OnLostDevice(void); - virtual void OnResetDevice(void); - virtual void DoPulse(void); + virtual void OnLostDevice(); + virtual void OnResetDevice(); + virtual void DoPulse(); virtual void QueueScreenShot(uint uiSizeX, uint uiSizeY, uint uiQuality, PFN_SCREENSHOT_CALLBACK pfnScreenShotCallback); - virtual void ClearScreenShotQueue(void); + virtual void ClearScreenShotQueue(); virtual bool GetBackBufferPixels(uint uiSizeX, uint uiSizeY, CBuffer& buffer, SString& strOutError); - virtual bool IsQueueEmpty(void); + virtual bool IsQueueEmpty(); // CScreenGrabber - void ProcessScreenShotQueue(void); + void ProcessScreenShotQueue(); protected: IDirect3DDevice9* m_pDevice; @@ -56,7 +56,7 @@ class CScreenGrabber : public CScreenGrabberInterface /////////////////////////////////////////////////////////////// // Object creation /////////////////////////////////////////////////////////////// -CScreenGrabberInterface* NewScreenGrabber(void) +CScreenGrabberInterface* NewScreenGrabber() { return new CScreenGrabber(); } @@ -68,7 +68,7 @@ CScreenGrabberInterface* NewScreenGrabber(void) // // //////////////////////////////////////////////////////////////// -CScreenGrabber::CScreenGrabber(void) +CScreenGrabber::CScreenGrabber() { m_pCompressorJobQueue = NewCompressorJobQueue(); } @@ -80,7 +80,7 @@ CScreenGrabber::CScreenGrabber(void) // // //////////////////////////////////////////////////////////////// -CScreenGrabber::~CScreenGrabber(void) +CScreenGrabber::~CScreenGrabber() { SAFE_DELETE(m_pCompressorJobQueue); } @@ -104,7 +104,7 @@ void CScreenGrabber::OnDeviceCreate(IDirect3DDevice9* pDevice) // // //////////////////////////////////////////////////////////////// -void CScreenGrabber::OnLostDevice(void) +void CScreenGrabber::OnLostDevice() { SAFE_RELEASE(m_pScreenShotTemp); } @@ -116,7 +116,7 @@ void CScreenGrabber::OnLostDevice(void) // // //////////////////////////////////////////////////////////////// -void CScreenGrabber::OnResetDevice(void) +void CScreenGrabber::OnResetDevice() { } @@ -127,7 +127,7 @@ void CScreenGrabber::OnResetDevice(void) // // //////////////////////////////////////////////////////////////// -void CScreenGrabber::DoPulse(void) +void CScreenGrabber::DoPulse() { m_pCompressorJobQueue->DoPulse(); ProcessScreenShotQueue(); @@ -158,7 +158,7 @@ void CScreenGrabber::QueueScreenShot(uint uiSizeX, uint uiSizeY, uint uiQuality, // Process queued requests // //////////////////////////////////////////////////////////////// -void CScreenGrabber::ProcessScreenShotQueue(void) +void CScreenGrabber::ProcessScreenShotQueue() { // Check if busy if (m_pCompressJobData) @@ -273,7 +273,7 @@ bool CScreenGrabber::GetBackBufferPixels(uint uiSizeX, uint uiSizeY, CBuffer& bu // Remove queued requests and finish current job // //////////////////////////////////////////////////////////////// -void CScreenGrabber::ClearScreenShotQueue(void) +void CScreenGrabber::ClearScreenShotQueue() { m_ScreenShotQueue.clear(); @@ -289,7 +289,7 @@ void CScreenGrabber::ClearScreenShotQueue(void) // Checks whether the queue is empty // //////////////////////////////////////////////////////////////// -bool CScreenGrabber::IsQueueEmpty(void) +bool CScreenGrabber::IsQueueEmpty() { return m_ScreenShotQueue.empty(); } diff --git a/Client/core/CScreenShot.cpp b/Client/core/CScreenShot.cpp index 86884961de4..fbe479f81e1 100644 --- a/Client/core/CScreenShot.cpp +++ b/Client/core/CScreenShot.cpp @@ -63,7 +63,7 @@ void CScreenShot::SetPath(const char* szPath) File::Mkdir(szPath); } -int CScreenShot::GetScreenShots(void) +int CScreenShot::GetScreenShots() { int iNumberOfFiles = 0; HANDLE hFind; @@ -88,7 +88,7 @@ int CScreenShot::GetScreenShots(void) return iNumberOfFiles; } -SString CScreenShot::GetValidScreenshotFilename(void) +SString CScreenShot::GetValidScreenshotFilename() { // Get the system time SYSTEMTIME sysTime; @@ -232,7 +232,7 @@ void CScreenShot::BeginSave(const char* szFileName, void* pData, uint uiDataSize } // Static function -bool CScreenShot::IsSaving(void) +bool CScreenShot::IsSaving() { return ms_bIsSaving; } diff --git a/Client/core/CScreenShot.h b/Client/core/CScreenShot.h index a7ca8ac64a0..31cba87dc83 100644 --- a/Client/core/CScreenShot.h +++ b/Client/core/CScreenShot.h @@ -17,15 +17,15 @@ class CScreenShot { public: - static SString PreScreenShot(void); + static SString PreScreenShot(); static void PostScreenShot(const SString& strFileName); static void SetPath(const char* szPath); static SString GetScreenShotPath(int iNumber); - static SString GetValidScreenshotFilename(void); - static int GetScreenShots(void); + static SString GetValidScreenshotFilename(); + static int GetScreenShots(); static void BeginSave(const char* szFileName, void* pData, uint uiDataSize, uint uiWidth, uint uiHeight); - static bool IsSaving(void); + static bool IsSaving(); static DWORD ThreadProc(LPVOID lpdwThreadParam); }; diff --git a/Client/core/CSetCursorPosHook.cpp b/Client/core/CSetCursorPosHook.cpp index c6f7402c096..b84276a9e4c 100644 --- a/Client/core/CSetCursorPosHook.cpp +++ b/Client/core/CSetCursorPosHook.cpp @@ -15,7 +15,7 @@ template <> CSetCursorPosHook* CSingleton::m_pSingleton = NULL; -CSetCursorPosHook::CSetCursorPosHook(void) +CSetCursorPosHook::CSetCursorPosHook() { WriteDebugEvent("CSetCursorPosHook::CSetCursorPosHook"); @@ -23,7 +23,7 @@ CSetCursorPosHook::CSetCursorPosHook(void) m_pfnSetCursorPos = NULL; } -CSetCursorPosHook::~CSetCursorPosHook(void) +CSetCursorPosHook::~CSetCursorPosHook() { WriteDebugEvent("CSetCursorPosHook::~CSetCursorPosHook"); @@ -33,14 +33,14 @@ CSetCursorPosHook::~CSetCursorPosHook(void) } } -void CSetCursorPosHook::ApplyHook(void) +void CSetCursorPosHook::ApplyHook() { // Hook SetCursorPos m_pfnSetCursorPos = reinterpret_cast(DetourFunction(DetourFindFunction("User32.dll", "SetCursorPos"), reinterpret_cast(API_SetCursorPos))); } -void CSetCursorPosHook::RemoveHook(void) +void CSetCursorPosHook::RemoveHook() { // Remove hook if (m_pfnSetCursorPos) @@ -53,17 +53,17 @@ void CSetCursorPosHook::RemoveHook(void) m_bCanCall = true; } -void CSetCursorPosHook::DisableSetCursorPos(void) +void CSetCursorPosHook::DisableSetCursorPos() { m_bCanCall = false; } -void CSetCursorPosHook::EnableSetCursorPos(void) +void CSetCursorPosHook::EnableSetCursorPos() { m_bCanCall = true; } -bool CSetCursorPosHook::IsSetCursorPosEnabled(void) +bool CSetCursorPosHook::IsSetCursorPosEnabled() { return m_bCanCall; } diff --git a/Client/core/CSetCursorPosHook.h b/Client/core/CSetCursorPosHook.h index d68d1dfccf7..bd3ec33f3f5 100644 --- a/Client/core/CSetCursorPosHook.h +++ b/Client/core/CSetCursorPosHook.h @@ -20,15 +20,15 @@ typedef BOOL(WINAPI* pSetCursorPos)(int X, int Y); class CSetCursorPosHook : public CSetCursorPosHookInterface, public CSingleton { public: - CSetCursorPosHook(void); - ~CSetCursorPosHook(void); + CSetCursorPosHook(); + ~CSetCursorPosHook(); - void ApplyHook(void); - void RemoveHook(void); + void ApplyHook(); + void RemoveHook(); - void DisableSetCursorPos(void); - void EnableSetCursorPos(void); - bool IsSetCursorPosEnabled(void); + void DisableSetCursorPos(); + void EnableSetCursorPos(); + bool IsSetCursorPosEnabled(); BOOL CallSetCursorPos(int X, int Y); diff --git a/Client/core/CSettings.cpp b/Client/core/CSettings.cpp index 499480ab65c..a9015c7edfd 100644 --- a/Client/core/CSettings.cpp +++ b/Client/core/CSettings.cpp @@ -24,7 +24,7 @@ extern CCore* g_pCore; extern SBindableGTAControl g_bcControls[]; extern SBindableKey g_bkKeys[]; -CSettings::CSettings(void) +CSettings::CSettings() { CGameSettings* gameSettings = CCore::GetSingleton().GetGame()->GetSettings(); m_fRadioVolume = (float)gameSettings->GetRadioVolume() / 64.0f; @@ -44,12 +44,12 @@ CSettings::CSettings(void) } } -CSettings::~CSettings(void) +CSettings::~CSettings() { DestroyGUI(); } -void CSettings::CreateGUI(void) +void CSettings::CreateGUI() { if (m_pWindow) DestroyGUI(); @@ -1285,7 +1285,7 @@ void CSettings::CreateGUI(void) LoadSkins(); } -void CSettings::DestroyGUI(void) +void CSettings::DestroyGUI() { // Destroy delete m_pButtonCancel; @@ -1305,7 +1305,7 @@ void RestartCallBack(void* ptr, unsigned int uiButton) } } -void CSettings::ShowRestartQuestion(void) +void CSettings::ShowRestartQuestion() { SString strMessage = _("Some settings will be changed when you next start MTA"); strMessage += _("\n\nDo you want to restart now?"); @@ -1329,7 +1329,7 @@ void DisconnectCallback(void* ptr, unsigned int uiButton) } } -void CSettings::ShowDisconnectQuestion(void) +void CSettings::ShowDisconnectQuestion() { SString strMessage = _("Some settings will be changed when you disconnect the current server"); strMessage += _("\n\nDo you want to disconnect now?"); @@ -1354,7 +1354,7 @@ bool CSettings::OnMouseDoubleClick(CGUIMouseEventArgs Args) return false; } -void CSettings::Update(void) +void CSettings::Update() { // Once each 30 frames if (m_dwFrameCount >= CORE_SETTINGS_UPDATE_INTERVAL) @@ -1409,7 +1409,7 @@ void CSettings::UpdateAudioTab() m_pComboUsertrackMode->SetSelectedItemByIndex(gameSettings->GetUsertrackMode()); } -void CSettings::UpdateVideoTab(void) +void CSettings::UpdateVideoTab() { CGameSettings* gameSettings = CCore::GetSingleton().GetGame()->GetSettings(); @@ -1545,7 +1545,7 @@ void CSettings::UpdateVideoTab(void) // // PopulateResolutionComboBox // -void CSettings::PopulateResolutionComboBox(void) +void CSettings::PopulateResolutionComboBox() { bool bNextWindowed; bool bNextFSMinimize; @@ -1602,7 +1602,7 @@ void CSettings::PopulateResolutionComboBox(void) // // Disable/enable the full screen mode options // -void CSettings::UpdateFullScreenComboBoxEnabled(void) +void CSettings::UpdateFullScreenComboBoxEnabled() { if (m_pCheckBoxWindowed->GetSelected()) { @@ -1621,7 +1621,7 @@ void CSettings::UpdateFullScreenComboBoxEnabled(void) // // Saves the Joypad settings // -void CSettings::ProcessJoypad(void) +void CSettings::ProcessJoypad() { // Update from GUI GetJoystickManager()->SetDeadZone(atoi(m_pEditDeadzone->GetText().c_str())); @@ -1892,7 +1892,7 @@ bool CSettings::OnBindsDefaultClick(CGUIElement* pElement) return true; } -void CSettings::CreateInterfaceTabGUI(void) +void CSettings::CreateInterfaceTabGUI() { if (!m_pTabInterface) { @@ -2292,7 +2292,7 @@ void CSettings::UpdateChatColorPreview(eChatColorType eType) } // Saves the keybinds -void CSettings::ProcessKeyBinds(void) +void CSettings::ProcessKeyBinds() { CKeyBindsInterface* pKeyBinds = CCore::GetSingleton().GetKeyBinds(); @@ -2581,7 +2581,7 @@ bool CSettings::ProcessMessage(UINT uMsg, WPARAM wParam, LPARAM lParam) return false; } -void CSettings::Initialize(void) +void CSettings::Initialize() { // Add binds and sections bool bPrimaryKey = true; @@ -2800,7 +2800,7 @@ void CSettings::SetVisible(bool bVisible) m_pWindow->SetZOrderingEnabled(!bVisible); // Message boxes dont appear on top otherwise } -bool CSettings::IsVisible(void) +bool CSettings::IsVisible() { return m_pWindow->IsVisible(); } @@ -2870,7 +2870,7 @@ bool CSettings::OnCancelButtonClick(CGUIElement* pElement) return true; } -void CSettings::LoadData(void) +void CSettings::LoadData() { // Ensure CVARS ranges ok CClientVariables::GetSingleton().ValidateValues(); @@ -3141,7 +3141,7 @@ void CSettings::LoadData(void) ReloadBrowserLists(); } -void CSettings::ReloadBrowserLists(void) +void CSettings::ReloadBrowserLists() { m_pGridBrowserBlacklist->Clear(); m_pGridBrowserWhitelist->Clear(); @@ -3172,7 +3172,7 @@ bool CSettings::OnTabChanged(CGUIElement* pElement) return true; } -void CSettings::SaveData(void) +void CSettings::SaveData() { std::string strVar; CGameSettings* gameSettings = CCore::GetSingleton().GetGame()->GetSettings(); @@ -3526,7 +3526,7 @@ void CSettings::RemoveKeyBindSection(char* szSectionName) } } -void CSettings::RemoveAllKeyBindSections(void) +void CSettings::RemoveAllKeyBindSections() { list::const_iterator iter = m_pKeyBindSections.begin(); for (; iter != m_pKeyBindSections.end(); iter++) @@ -4433,7 +4433,7 @@ void NewNicknameCallback(void* ptr, unsigned int uiButton, std::string strNick) CCore::GetSingleton().GetLocalGUI()->GetMainMenu()->GetQuestionWindow()->Reset(); } -void CSettings::RequestNewNickname(void) +void CSettings::RequestNewNickname() { std::string strNick; CVARS_GET("nick", strNick); @@ -4530,7 +4530,7 @@ void CSettings::TabSkip(bool bBackwards) } } -bool CSettings::IsActive(void) +bool CSettings::IsActive() { return m_pWindow->IsActive(); } diff --git a/Client/core/CSettings.h b/Client/core/CSettings.h index 0fb9c252a20..355c2bbfa62 100644 --- a/Client/core/CSettings.h +++ b/Client/core/CSettings.h @@ -78,45 +78,45 @@ class CSettings friend class CCore; public: - CSettings(void); - ~CSettings(void); + CSettings(); + ~CSettings(); - void CreateGUI(void); - void DestroyGUI(void); + void CreateGUI(); + void DestroyGUI(); bool ProcessMessage(UINT uMsg, WPARAM wParam, LPARAM lParam); - void Update(void); - void Initialize(void); + void Update(); + void Initialize(); void SetVisible(bool bVisible); - bool IsVisible(void); + bool IsVisible(); void SetIsModLoaded(bool bLoaded); - void LoadData(void); + void LoadData(); - bool IsCapturingKey(void) { return m_bCaptureKey; } + bool IsCapturingKey() { return m_bCaptureKey; } void UpdateCaptureAxis(); void UpdateJoypadTab(); void UpdateAudioTab(); - void UpdateVideoTab(void); - void PopulateResolutionComboBox(void); - void UpdateFullScreenComboBoxEnabled(void); + void UpdateVideoTab(); + void PopulateResolutionComboBox(); + void UpdateFullScreenComboBoxEnabled(); void AddKeyBindSection(char* szSectionName); void RemoveKeyBindSection(char* szSectionName); - void RemoveAllKeyBindSections(void); + void RemoveAllKeyBindSections(); - void RequestNewNickname(void); - void ShowRestartQuestion(void); - void ShowDisconnectQuestion(void); + void RequestNewNickname(); + void ShowRestartQuestion(); + void ShowDisconnectQuestion(); void TabSkip(bool bBackwards); - bool IsActive(void); + bool IsActive(); void SetSelectedIndex(unsigned int uiIndex); @@ -381,20 +381,20 @@ class CSettings bool OnShowAdvancedSettingDescription(CGUIElement* pElement); bool OnHideAdvancedSettingDescription(CGUIElement* pElement); bool OnTabChanged(CGUIElement* pElement); - void ReloadBrowserLists(void); + void ReloadBrowserLists(); private: - void CreateInterfaceTabGUI(void); + void CreateInterfaceTabGUI(); void UpdateChatColorPreview(eChatColorType eType); - void ProcessKeyBinds(void); - void ProcessJoypad(void); + void ProcessKeyBinds(); + void ProcessJoypad(); - void SaveData(void); + void SaveData(); - void LoadSkins(void); + void LoadSkins(); - void LoadChatPresets(void); + void LoadChatPresets(); void CreateChatColorTab(eChatColorType eType, const char* szName, CGUITabPanel* pParent); void LoadChatColorFromCVar(eChatColorType eType, const char* szCVar); void LoadChatColorFromString(eChatColorType eType, const std::string& strColor); diff --git a/Client/core/CTimingCheckpoints.hpp b/Client/core/CTimingCheckpoints.hpp index 62668f0c362..82852f1cf1d 100644 --- a/Client/core/CTimingCheckpoints.hpp +++ b/Client/core/CTimingCheckpoints.hpp @@ -32,7 +32,7 @@ class CTimingCheckpoints std::vector m_CheckpointList; std::vector m_InsideList; - CTimingCheckpoints(void) + CTimingCheckpoints() { m_bEnabled = false; m_FrameStartTimeUs = 0; @@ -46,7 +46,7 @@ class CTimingCheckpoints // Called at start of frame // //////////////////////////////////////// - void BeginTimingCheckpoints(void) + void BeginTimingCheckpoints() { bool bEnabled = (g_pCore->GetDiagnosticDebug() == EDiagnosticDebug::LOG_TIMING_0000); @@ -78,7 +78,7 @@ class CTimingCheckpoints // Called at end of frame // //////////////////////////////////////// - void EndTimingCheckpoints(void) + void EndTimingCheckpoints() { TIMEUS frameTimeUs = GetTimeUs() - m_FrameStartTimeUs; @@ -103,7 +103,7 @@ class CTimingCheckpoints // Check if timings are enabled // //////////////////////////////////////// - bool IsTimingCheckpoints(void) { return m_bEnabled; } + bool IsTimingCheckpoints() { return m_bEnabled; } //////////////////////////////////////// // @@ -138,7 +138,7 @@ class CTimingCheckpoints // struct SSectionInfo { - SSectionInfo(void) : iEnterCount(0), iLeaveCount(0), totalTime(0) {} + SSectionInfo() : iEnterCount(0), iLeaveCount(0), totalTime(0) {} int iEnterCount; int iLeaveCount; TIMEUS totalTime; @@ -182,7 +182,7 @@ class CTimingCheckpoints // Output last frame stats // //////////////////////////////////////// - void DumpTimingCheckpoints(void) + void DumpTimingCheckpoints() { if (!m_bEnabled) return; @@ -268,7 +268,7 @@ class CTimingCheckpoints // Delete log file // //////////////////////////////////////// - void ClearLog(void) { FileDelete(m_LogFileName); } + void ClearLog() { FileDelete(m_LogFileName); } }; CTimingCheckpoints ms_TimingCheckpoints; diff --git a/Client/core/CTrayIcon.cpp b/Client/core/CTrayIcon.cpp index df608b08c4b..5d6e6959677 100644 --- a/Client/core/CTrayIcon.cpp +++ b/Client/core/CTrayIcon.cpp @@ -20,7 +20,7 @@ extern CCore* g_pCore; extern HINSTANCE g_hModule; -CTrayIcon::CTrayIcon(void) : m_bTrayIconExists{false}, m_pNID{new NOTIFYICONDATAW{0}}, m_llLastBalloonTime{0L} +CTrayIcon::CTrayIcon() : m_bTrayIconExists{false}, m_pNID{new NOTIFYICONDATAW{0}}, m_llLastBalloonTime{0L} { m_pNID->cbSize = sizeof(NOTIFYICONDATAW); m_pNID->uID = 0; @@ -29,7 +29,7 @@ CTrayIcon::CTrayIcon(void) : m_bTrayIconExists{false}, m_pNID{new NOTIFYICONDATA StringCchCopyW(m_pNID->szInfoTitle, ARRAYSIZE(m_pNID->szInfoTitle), TRAY_BALLOON_TITLE); } -CTrayIcon::~CTrayIcon(void) +CTrayIcon::~CTrayIcon() { if (m_bTrayIconExists) DestroyTrayIcon(); @@ -37,7 +37,7 @@ CTrayIcon::~CTrayIcon(void) delete m_pNID; } -bool CTrayIcon::CreateTrayIcon(void) +bool CTrayIcon::CreateTrayIcon() { if (m_bTrayIconExists) return true; @@ -55,7 +55,7 @@ bool CTrayIcon::CreateTrayIcon(void) return m_bTrayIconExists; } -void CTrayIcon::DestroyTrayIcon(void) +void CTrayIcon::DestroyTrayIcon() { if (!m_bTrayIconExists) return; diff --git a/Client/core/CTrayIcon.h b/Client/core/CTrayIcon.h index d864e9eed6c..80bbfd04673 100644 --- a/Client/core/CTrayIcon.h +++ b/Client/core/CTrayIcon.h @@ -16,11 +16,11 @@ class CTrayIcon : public CTrayIconInterface { public: - CTrayIcon(void); - ~CTrayIcon(void); - bool DoesTrayIconExist(void) { return m_bTrayIconExists; }; - bool CreateTrayIcon(void); - void DestroyTrayIcon(void); + CTrayIcon(); + ~CTrayIcon(); + bool DoesTrayIconExist() { return m_bTrayIconExists; }; + bool CreateTrayIcon(); + void DestroyTrayIcon(); bool CreateTrayBallon(SString strText, eTrayIconType trayIconType, bool useSound); private: diff --git a/Client/core/CVersionUpdater.Util.hpp b/Client/core/CVersionUpdater.Util.hpp index 7566097e9ed..0ff0ca55292 100644 --- a/Client/core/CVersionUpdater.Util.hpp +++ b/Client/core/CVersionUpdater.Util.hpp @@ -133,7 +133,7 @@ namespace BUTTON_3, }; - CQuestionBox& GetQuestionBox(void) { return *CCore::GetSingleton().GetLocalGUI()->GetMainMenu()->GetQuestionWindow(); } + CQuestionBox& GetQuestionBox() { return *CCore::GetSingleton().GetLocalGUI()->GetMainMenu()->GetQuestionWindow(); } } // namespace @@ -150,7 +150,7 @@ namespace { public: virtual bool SetFromString(const SString& str) = 0; - virtual SString ToString(void) const = 0; + virtual SString ToString() const = 0; }; /////////////////////////////////////////////////////////////// @@ -167,13 +167,13 @@ namespace public: CValueInt(int iValue = 0) : m_iValue(iValue) {} void operator=(int iValue) { m_iValue = iValue; } - operator int(void) const { return m_iValue; } + operator int() const { return m_iValue; } virtual bool SetFromString(const SString& str) { m_iValue = atoi(str); return true; } - virtual SString ToString(void) const { return SString("%d", m_iValue); } + virtual SString ToString() const { return SString("%d", m_iValue); } }; /////////////////////////////////////////////////////////////// @@ -188,7 +188,7 @@ namespace time_t m_Seconds; public: - CTimeSpan(void) : m_Seconds(0) {} + CTimeSpan() : m_Seconds(0) {} CTimeSpan(const SString& strSpan) { SetFromString(strSpan); } void SetFromSeconds(time_t seconds) { m_Seconds = seconds; } @@ -218,9 +218,9 @@ namespace return true; } - time_t ToSeconds(void) const { return m_Seconds; } + time_t ToSeconds() const { return m_Seconds; } - SString ToString(void) const + SString ToString() const { if (m_Seconds < 60) return SString("%ds", m_Seconds); @@ -244,7 +244,7 @@ namespace time_t m_Seconds; public: - CDateTime(void) : m_Seconds(0) {} + CDateTime() : m_Seconds(0) {} CDateTime(const SString& strDate) { SetFromString(strDate); } CDateTime operator-(const CDateTime& other) const @@ -296,9 +296,9 @@ namespace return true; } - time_t ToSeconds(void) const { return m_Seconds; } + time_t ToSeconds() const { return m_Seconds; } - SString ToString(void) const + SString ToString() const { time_t t = ToSeconds(); tm* tmp = localtime(&t); @@ -578,7 +578,7 @@ namespace public: CReportWrap() : iMinSize(DEFAULT_MIN_SIZE), iMaxSize(DEFAULT_MAX_SIZE) { LoadReportSettings(); } - void SaveReportSettings(void) const + void SaveReportSettings() const { CArgMap m_ArgMap("@", ";"); m_ArgMap.Set("filter2", strFilter); @@ -588,7 +588,7 @@ namespace SetApplicationSetting("reportsettings", m_ArgMap.ToString()); } - void LoadReportSettings(void) + void LoadReportSettings() { SString strSettings; CVARS_GET("reportsettings", strSettings); @@ -606,11 +606,11 @@ namespace SaveReportSettings(); } - SString GetFilter(void) const { return strFilter != "" ? strFilter : "+all"; } + SString GetFilter() const { return strFilter != "" ? strFilter : "+all"; } - int GetMinSize(void) const { return iMinSize; } + int GetMinSize() const { return iMinSize; } - int GetMaxSize(void) const { return iMaxSize; } + int GetMaxSize() const { return iMaxSize; } static void ClearLogContents(const SString& strIdFilter) { @@ -768,7 +768,7 @@ namespace /////////////////////////////////////////////////////////////// struct SJobInfo { - SJobInfo(void) + SJobInfo() : iMaxServersToTry(3), iTimeoutConnect(10000), iTimeoutTransfer(25000), @@ -918,7 +918,7 @@ namespace } }; - typedef void (CVersionUpdater::*PFNVOIDVOID)(void); + typedef void (CVersionUpdater::*PFNVOIDVOID)(); enum class EUpdaterProgramType { diff --git a/Client/core/CVersionUpdater.cpp b/Client/core/CVersionUpdater.cpp index e83395e610d..a74a862124a 100644 --- a/Client/core/CVersionUpdater.cpp +++ b/Client/core/CVersionUpdater.cpp @@ -27,116 +27,116 @@ class CVersionUpdater : public CVersionUpdaterInterface ZERO_ON_NEW // CVersionUpdaterInterface interface - CVersionUpdater(void); - virtual ~CVersionUpdater(void); - virtual bool SaveConfigToXML(void); + CVersionUpdater(); + virtual ~CVersionUpdater(); + virtual bool SaveConfigToXML(); virtual void EnableChecking(bool bOn); - virtual void DoPulse(void); + virtual void DoPulse(); virtual void InitiateUpdate(const SString& strType, const SString& strData, const SString& strHost); virtual bool IsOptionalUpdateInfoRequired(const SString& strHost); - virtual void InitiateDataFilesFix(void); - virtual void InitiateManualCheck(void); + virtual void InitiateDataFilesFix(); + virtual void InitiateManualCheck(); virtual void GetAseServerList(std::vector& outResult); virtual void InitiateSidegradeLaunch(const SString& strVersion, const SString& strHost, ushort usPort, const SString& strName, const SString& strPassword); virtual void GetBrowseVersionMaps(std::map& outBlockedVersionMap, std::map& outAllowedVersionMap); virtual void GetNewsSettings(SString& strOutOldestPost, uint& uiOutMaxHistoryLength); - virtual const SString& GetDebugFilterString(void); + virtual const SString& GetDebugFilterString(); // CVersionUpdater functions - bool EnsureLoadedConfigFromXML(void); + bool EnsureLoadedConfigFromXML(); // Command lists void RunProgram(EUpdaterProgramType strProgramName); - void Program_VersionCheck(void); - void Program_ManualCheck(void); - void Program_ManualCheckSim(void); - void Program_ServerSaysUpdate(void); - void Program_ServerSaysRecommend(void); - void Program_ServerSaysDataFilesWrong(void); - void Program_MasterFetch(void); - void Program_SendCrashDump(void); - void Program_SendReportLog(void); - void Program_SidegradeLaunch(void); - void Program_NewsUpdate(void); + void Program_VersionCheck(); + void Program_ManualCheck(); + void Program_ManualCheckSim(); + void Program_ServerSaysUpdate(); + void Program_ServerSaysRecommend(); + void Program_ServerSaysDataFilesWrong(); + void Program_MasterFetch(); + void Program_SendCrashDump(); + void Program_SendReportLog(); + void Program_SidegradeLaunch(); + void Program_NewsUpdate(); // Util CXMLNode* GetXMLConfigNode(bool bCreateIfRequired); - bool IsBusy(void); - void ResetEverything(void); - CReportWrap* GetReportWrap(void); + bool IsBusy(); + void ResetEverything(); + CReportWrap* GetReportWrap(); static std::vector MakeServerList(const CDataInfoSet& infoMap); - void PostChangeMasterConfig(void); - void OnPossibleConfigProblem(void); - CNetHTTPDownloadManagerInterface* GetHTTP(void); + void PostChangeMasterConfig(); + void OnPossibleConfigProblem(); + CNetHTTPDownloadManagerInterface* GetHTTP(); void GetSaveLocationList(std::list& outSaveLocationList, const SString& strFilename); SString GetResumableSaveLocation(const SString& strFilename, const SString& strMD5, uint iFilesize); static void StaticDownloadFinished(const SHttpDownloadResult& result); void DownloadFinished(const SHttpDownloadResult& result); // Commands - void _UseMasterFetchURLs(void); - void _UseVersionQueryURLs(void); - void _UseProvidedURLs(void); - void _UseReportLogURLs(void); - void _UseCrashDumpQueryURLs(void); - void _UseCrashDumpURLs(void); - void _UseSidegradeURLs(void); - void _UseNewsUpdateURLs(void); - void _UseReportLogPostContent(void); - void _UseCrashDumpPostContent(void); - void _ShouldSendCrashDump(void); - void _ResetLastCrashDump(void); - void _ActionReconnect(void); - void _DialogHide(void); - void _ExitGame(void); - void _ResetVersionCheckTimer(void); - void _ResetNewsCheckTimer(void); - void _ResetMasterCheckTimer(void); - void _ResetManualCheckTimer(void); - void _PollQuestionNoYes(void); - void _PollAnyButton(void); - void _DialogConnectingWait(void); - void _DialogChecking(void); - void _DialogNoUpdate(void); - void _DialogDownloading(void); - void _DialogServerSaysUpdateQuestion(void); - void _DialogServerSaysRecommendQuestion(void); - void _DialogUpdateQuestion(void); - void _DialogUpdateQueryError(void); - void _DialogUpdateResult(void); - void _QUpdateResult(void); - void _QUpdateNewsResult(void); - void _DialogDataFilesQuestion(void); - void _DialogExeFilesResult(void); - void _StartDownload(void); - int _PollDownload(void); - void _StartSendPost(void); - int _PollSendPost(void); - void _CheckSidegradeRequirements(void); - void _DoSidegradeLaunch(void); - void _DialogSidegradeDownloadQuestion(void); - void _DialogSidegradeLaunchQuestion(void); - void _DialogSidegradeQueryError(void); - - void _ProcessCrashDumpQuery(void); - void _ProcessMasterFetch(void); - void _ProcessPatchFileQuery(void); - void _ProcessPatchFileDownload(void); - void _QuitCurrentProgram(void); + void _UseMasterFetchURLs(); + void _UseVersionQueryURLs(); + void _UseProvidedURLs(); + void _UseReportLogURLs(); + void _UseCrashDumpQueryURLs(); + void _UseCrashDumpURLs(); + void _UseSidegradeURLs(); + void _UseNewsUpdateURLs(); + void _UseReportLogPostContent(); + void _UseCrashDumpPostContent(); + void _ShouldSendCrashDump(); + void _ResetLastCrashDump(); + void _ActionReconnect(); + void _DialogHide(); + void _ExitGame(); + void _ResetVersionCheckTimer(); + void _ResetNewsCheckTimer(); + void _ResetMasterCheckTimer(); + void _ResetManualCheckTimer(); + void _PollQuestionNoYes(); + void _PollAnyButton(); + void _DialogConnectingWait(); + void _DialogChecking(); + void _DialogNoUpdate(); + void _DialogDownloading(); + void _DialogServerSaysUpdateQuestion(); + void _DialogServerSaysRecommendQuestion(); + void _DialogUpdateQuestion(); + void _DialogUpdateQueryError(); + void _DialogUpdateResult(); + void _QUpdateResult(); + void _QUpdateNewsResult(); + void _DialogDataFilesQuestion(); + void _DialogExeFilesResult(); + void _StartDownload(); + int _PollDownload(); + void _StartSendPost(); + int _PollSendPost(); + void _CheckSidegradeRequirements(); + void _DoSidegradeLaunch(); + void _DialogSidegradeDownloadQuestion(); + void _DialogSidegradeLaunchQuestion(); + void _DialogSidegradeQueryError(); + + void _ProcessCrashDumpQuery(); + void _ProcessMasterFetch(); + void _ProcessPatchFileQuery(); + void _ProcessPatchFileDownload(); + void _QuitCurrentProgram(); // Doers - int DoSendDownloadRequestToNextServer(void); - int DoPollDownload(void); - int DoSendPostToNextServer(void); - int DoPollPost(void); + int DoSendDownloadRequestToNextServer(); + int DoPollDownload(); + int DoSendPostToNextServer(); + int DoPollPost(); static void* StaticThreadProc(void* pContext); - void* ThreadProc(void); - void StopThread(void); + void* ThreadProc(); + void StopThread(); void ProcessCommand(EUpdaterProgramType eProgramType); - void MainStep(void); - void UpdaterYield(void); + void MainStep(); + void UpdaterYield(); SJobInfo m_JobInfo; long long m_llTimeStart; @@ -208,7 +208,7 @@ CVersionUpdaterInterface* GetVersionUpdater() // // /////////////////////////////////////////////////////////////// -CVersionUpdater::CVersionUpdater(void) +CVersionUpdater::CVersionUpdater() { shared.m_Mutex.Lock(); m_pProgramThreadHandle = new CThreadHandle(CVersionUpdater::StaticThreadProc, this); @@ -221,7 +221,7 @@ CVersionUpdater::CVersionUpdater(void) // // /////////////////////////////////////////////////////////////// -CVersionUpdater::~CVersionUpdater(void) +CVersionUpdater::~CVersionUpdater() { StopThread(); SAFE_DELETE(m_pProgramThreadHandle); @@ -235,7 +235,7 @@ CVersionUpdater::~CVersionUpdater(void) // Stop the updater processing thread // /////////////////////////////////////////////////////////////// -void CVersionUpdater::StopThread(void) +void CVersionUpdater::StopThread() { shared.m_bTerminateThread = true; shared.m_Mutex.Signal(); @@ -288,7 +288,7 @@ CXMLNode* CVersionUpdater::GetXMLConfigNode(bool bCreateIfRequired) // Load settings // /////////////////////////////////////////////////////////////// -bool CVersionUpdater::EnsureLoadedConfigFromXML(void) +bool CVersionUpdater::EnsureLoadedConfigFromXML() { if (m_bLoadedConfig) return false; @@ -357,7 +357,7 @@ bool CVersionUpdater::EnsureLoadedConfigFromXML(void) // Save setting // /////////////////////////////////////////////////////////////// -bool CVersionUpdater::SaveConfigToXML(void) +bool CVersionUpdater::SaveConfigToXML() { if (!m_bLoadedConfig) return false; @@ -447,7 +447,7 @@ CReportWrap* CVersionUpdater::GetReportWrap() // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::DoPulse(void) +void CVersionUpdater::DoPulse() { if (!m_bEnabled) return; @@ -597,7 +597,7 @@ bool CVersionUpdater::IsOptionalUpdateInfoRequired(const SString& strHost) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::InitiateDataFilesFix(void) +void CVersionUpdater::InitiateDataFilesFix() { RunProgram(EUpdaterProgramType::ServerSaysDataFilesWrong); } @@ -609,7 +609,7 @@ void CVersionUpdater::InitiateDataFilesFix(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::InitiateManualCheck(void) +void CVersionUpdater::InitiateManualCheck() { if (GetQuestionBox().IsVisible()) { @@ -746,7 +746,7 @@ void CVersionUpdater::GetBrowseVersionMaps(std::map& outBlockedVer // // /////////////////////////////////////////////////////////////// -const SString& CVersionUpdater::GetDebugFilterString(void) +const SString& CVersionUpdater::GetDebugFilterString() { EnsureLoadedConfigFromXML(); return m_MasterConfig.misc.debug.strFilter; @@ -759,7 +759,7 @@ const SString& CVersionUpdater::GetDebugFilterString(void) // Get the HTTP download manager used for all version updater stuff // /////////////////////////////////////////////////////////////// -CNetHTTPDownloadManagerInterface* CVersionUpdater::GetHTTP(void) +CNetHTTPDownloadManagerInterface* CVersionUpdater::GetHTTP() { return g_pCore->GetNetwork()->GetHTTPDownloadManager(EDownloadMode::CORE_UPDATER); } @@ -856,7 +856,7 @@ void CVersionUpdater::ResetEverything() // // /////////////////////////////////////////////////////////////// -bool CVersionUpdater::IsBusy(void) +bool CVersionUpdater::IsBusy() { if (shared.m_CurrentProgram != EUpdaterProgramType::None) return true; @@ -961,7 +961,7 @@ std::vector CVersionUpdater::MakeServerList(const CDataInfoSet& dataInf // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::OnPossibleConfigProblem(void) +void CVersionUpdater::OnPossibleConfigProblem() { // Limit number of times this can be done if (m_iForceMasterConfigRefreshCount < 1) @@ -1004,7 +1004,7 @@ void CVersionUpdater::RunProgram(EUpdaterProgramType strProgramName) // Let the updater thread have some time // /////////////////////////////////////////////////////////////// -void CVersionUpdater::MainStep(void) +void CVersionUpdater::MainStep() { assert(IsMainThread()); shared.m_Mutex.Signal(); @@ -1021,7 +1021,7 @@ void CVersionUpdater::MainStep(void) // Let the main thread continue // /////////////////////////////////////////////////////////////// -void CVersionUpdater::UpdaterYield(void) +void CVersionUpdater::UpdaterYield() { assert(!IsMainThread()); shared.m_Mutex.Signal(); @@ -1060,7 +1060,7 @@ void* CVersionUpdater::StaticThreadProc(void* pContext) // Job service loop // /////////////////////////////////////////////////////////////// -void* CVersionUpdater::ThreadProc(void) +void* CVersionUpdater::ThreadProc() { shared.m_Mutex.Lock(); while (!shared.m_bTerminateThread) @@ -1499,7 +1499,7 @@ void CVersionUpdater::Program_NewsUpdate() // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_CheckSidegradeRequirements(void) +void CVersionUpdater::_CheckSidegradeRequirements() { // Is version allowed to be launched? @@ -1544,7 +1544,7 @@ void CVersionUpdater::_CheckSidegradeRequirements(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DoSidegradeLaunch(void) +void CVersionUpdater::_DoSidegradeLaunch() { SString strURL("mtasa://%s:%s@%s", *m_strSidegradeName, *m_strSidegradePassword, *m_strSidegradeHost); SetOnQuitCommand("open", m_strSidegradePath, strURL); @@ -1558,7 +1558,7 @@ void CVersionUpdater::_DoSidegradeLaunch(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DialogSidegradeDownloadQuestion(void) +void CVersionUpdater::_DialogSidegradeDownloadQuestion() { GetQuestionBox().Reset(); GetQuestionBox().SetTitle(SString(_("MTA:SA %s required"), *m_strSidegradeVersion)); @@ -1578,7 +1578,7 @@ void CVersionUpdater::_DialogSidegradeDownloadQuestion(void) // If can launch other version, ask for user confirmation // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DialogSidegradeLaunchQuestion(void) +void CVersionUpdater::_DialogSidegradeLaunchQuestion() { GetQuestionBox().Reset(); GetQuestionBox().SetTitle(SString(_("MTA:SA %s required"), *m_strSidegradeVersion)); @@ -1596,7 +1596,7 @@ void CVersionUpdater::_DialogSidegradeLaunchQuestion(void) // No download file for other version // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DialogSidegradeQueryError(void) +void CVersionUpdater::_DialogSidegradeQueryError() { GetQuestionBox().Reset(); GetQuestionBox().SetTitle(SString(_("MTA:SA %s required"), *m_strSidegradeVersion)); @@ -1613,7 +1613,7 @@ void CVersionUpdater::_DialogSidegradeQueryError(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_ActionReconnect(void) +void CVersionUpdater::_ActionReconnect() { CCommandFuncs::Reconnect(NULL); } @@ -1637,7 +1637,7 @@ void CVersionUpdater::_DialogHide() // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_QuitCurrentProgram(void) +void CVersionUpdater::_QuitCurrentProgram() { throw ExceptionQuitProgram(); } @@ -1649,7 +1649,7 @@ void CVersionUpdater::_QuitCurrentProgram(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_ExitGame(void) +void CVersionUpdater::_ExitGame() { shared.m_bExitGame = true; _QuitCurrentProgram(); @@ -1662,7 +1662,7 @@ void CVersionUpdater::_ExitGame(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_ResetVersionCheckTimer(void) +void CVersionUpdater::_ResetVersionCheckTimer() { OutputDebugLine(SStringX("[Updater] _ResetVersionCheckTimer")); m_VarConfig.version_lastCheckTime = CDateTime::Now(); @@ -1675,7 +1675,7 @@ void CVersionUpdater::_ResetVersionCheckTimer(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_ResetNewsCheckTimer(void) +void CVersionUpdater::_ResetNewsCheckTimer() { OutputDebugLine(SStringX("[Updater] _ResetNewsCheckTimer")); m_VarConfig.news_lastCheckTime = CDateTime::Now(); @@ -1688,7 +1688,7 @@ void CVersionUpdater::_ResetNewsCheckTimer(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_ResetMasterCheckTimer(void) +void CVersionUpdater::_ResetMasterCheckTimer() { m_VarConfig.master_lastCheckTime = CDateTime::Now(); CCore::GetSingleton().SaveConfig(); @@ -1701,7 +1701,7 @@ void CVersionUpdater::_ResetMasterCheckTimer(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_ResetManualCheckTimer(void) +void CVersionUpdater::_ResetManualCheckTimer() { // Reset delay before recheck allowed m_llTimeLastManualCheck = GetTickCount64_(); @@ -1715,7 +1715,7 @@ void CVersionUpdater::_ResetManualCheckTimer(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_PollAnyButton(void) +void CVersionUpdater::_PollAnyButton() { while (true) { @@ -1741,7 +1741,7 @@ void CVersionUpdater::_PollAnyButton(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_PollQuestionNoYes(void) +void CVersionUpdater::_PollQuestionNoYes() { while (true) { @@ -1779,7 +1779,7 @@ void CVersionUpdater::_PollQuestionNoYes(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DialogConnectingWait(void) +void CVersionUpdater::_DialogConnectingWait() { GetQuestionBox().Reset(); GetQuestionBox().SetTitle(_("Connecting")); @@ -1795,7 +1795,7 @@ void CVersionUpdater::_DialogConnectingWait(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DialogChecking(void) +void CVersionUpdater::_DialogChecking() { GetQuestionBox().Reset(); GetQuestionBox().SetTitle(_("CHECKING")); @@ -1811,7 +1811,7 @@ void CVersionUpdater::_DialogChecking(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DialogNoUpdate(void) +void CVersionUpdater::_DialogNoUpdate() { // Display message GetQuestionBox().Reset(); @@ -1829,7 +1829,7 @@ void CVersionUpdater::_DialogNoUpdate(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DialogDownloading(void) +void CVersionUpdater::_DialogDownloading() { // Display dialog GetQuestionBox().Reset(); @@ -1846,7 +1846,7 @@ void CVersionUpdater::_DialogDownloading(void) // ServerSaysUpdateQuestion // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DialogServerSaysUpdateQuestion(void) +void CVersionUpdater::_DialogServerSaysUpdateQuestion() { // Display message GetQuestionBox().Reset(); @@ -1865,7 +1865,7 @@ void CVersionUpdater::_DialogServerSaysUpdateQuestion(void) // ServerSaysRecommendQuestion // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DialogServerSaysRecommendQuestion(void) +void CVersionUpdater::_DialogServerSaysRecommendQuestion() { // Display message GetQuestionBox().Reset(); @@ -1884,7 +1884,7 @@ void CVersionUpdater::_DialogServerSaysRecommendQuestion(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DialogUpdateQuestion(void) +void CVersionUpdater::_DialogUpdateQuestion() { // Display message GetQuestionBox().Reset(); @@ -1904,7 +1904,7 @@ void CVersionUpdater::_DialogUpdateQuestion(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DialogUpdateQueryError(void) +void CVersionUpdater::_DialogUpdateQueryError() { // Display message GetQuestionBox().Reset(); @@ -1922,7 +1922,7 @@ void CVersionUpdater::_DialogUpdateQueryError(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DialogUpdateResult(void) +void CVersionUpdater::_DialogUpdateResult() { if (m_ConditionMap.IsConditionTrue("Download.Fail")) { @@ -1997,7 +1997,7 @@ void CVersionUpdater::_DialogUpdateResult(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_QUpdateResult(void) +void CVersionUpdater::_QUpdateResult() { if (m_ConditionMap.IsConditionTrue("Download.Ok")) { @@ -2025,7 +2025,7 @@ void CVersionUpdater::_QUpdateResult(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_QUpdateNewsResult(void) +void CVersionUpdater::_QUpdateNewsResult() { if (m_ConditionMap.IsConditionTrue("Download.Ok")) { @@ -2069,7 +2069,7 @@ void CVersionUpdater::_QUpdateNewsResult(void) // Just displays information these days // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DialogDataFilesQuestion(void) +void CVersionUpdater::_DialogDataFilesQuestion() { // If using customized SA files, advise user to stop using customized SA files if (GetApplicationSettingInt("customized-sa-files-using")) @@ -2104,7 +2104,7 @@ void CVersionUpdater::_DialogDataFilesQuestion(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_DialogExeFilesResult(void) +void CVersionUpdater::_DialogExeFilesResult() { // Handle failure if (m_ConditionMap.IsConditionTrue("Download.Fail")) @@ -2168,7 +2168,7 @@ void CVersionUpdater::_DialogExeFilesResult(void) // Called before starting the version check // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_UseVersionQueryURLs(void) +void CVersionUpdater::_UseVersionQueryURLs() { m_JobInfo = SJobInfo(); m_JobInfo.serverList = MakeServerList(m_MasterConfig.version.serverInfoMap); @@ -2182,7 +2182,7 @@ void CVersionUpdater::_UseVersionQueryURLs(void) // Called after getting the version check info from the server // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_ProcessPatchFileQuery(void) +void CVersionUpdater::_ProcessPatchFileQuery() { m_ConditionMap.SetCondition("ProcessResponse", ""); m_ConditionMap.SetCondition("Download", ""); @@ -2307,7 +2307,7 @@ void CVersionUpdater::_ProcessPatchFileQuery(void) // Called before starting the master xml fetch // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_UseMasterFetchURLs(void) +void CVersionUpdater::_UseMasterFetchURLs() { m_JobInfo = SJobInfo(); m_JobInfo.serverList.push_back(UPDATER_MASTER_URL1); @@ -2321,7 +2321,7 @@ void CVersionUpdater::_UseMasterFetchURLs(void) // Called after completing master xml fetch // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_ProcessMasterFetch(void) +void CVersionUpdater::_ProcessMasterFetch() { m_ConditionMap.SetCondition("ProcessResponse", ""); m_ConditionMap.SetCondition("Download", ""); @@ -2384,7 +2384,7 @@ void CVersionUpdater::_ProcessMasterFetch(void) // Transfer certain settings from the master config // /////////////////////////////////////////////////////////////// -void CVersionUpdater::PostChangeMasterConfig(void) +void CVersionUpdater::PostChangeMasterConfig() { // Update trouble url for far away modules std::vector serverList = MakeServerList(m_MasterConfig.trouble.serverInfoMap); @@ -2424,7 +2424,7 @@ void CVersionUpdater::GetNewsSettings(SString& strOutOldestPost, uint& uiOutMaxH // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_UseSidegradeURLs(void) +void CVersionUpdater::_UseSidegradeURLs() { m_JobInfo = SJobInfo(); m_JobInfo.serverList = MakeServerList(m_MasterConfig.sidegrade.serverInfoMap); @@ -2437,7 +2437,7 @@ void CVersionUpdater::_UseSidegradeURLs(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_UseNewsUpdateURLs(void) +void CVersionUpdater::_UseNewsUpdateURLs() { m_JobInfo = SJobInfo(); m_JobInfo.serverList = MakeServerList(m_MasterConfig.news.serverInfoMap); @@ -2452,7 +2452,7 @@ void CVersionUpdater::_UseNewsUpdateURLs(void) // Called before starting the file download // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_UseProvidedURLs(void) +void CVersionUpdater::_UseProvidedURLs() { if (m_JobInfo.slim.iFilesize > 0) { @@ -2500,7 +2500,7 @@ void CVersionUpdater::_UseProvidedURLs(void) // Called after completing a file download // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_ProcessPatchFileDownload(void) +void CVersionUpdater::_ProcessPatchFileDownload() { // Check if the saved filename has already been set if (!m_JobInfo.strSaveLocation.empty()) @@ -2589,7 +2589,7 @@ void CVersionUpdater::_ProcessPatchFileDownload(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_StartDownload(void) +void CVersionUpdater::_StartDownload() { if (!m_JobInfo.strFilename.empty()) { @@ -2687,7 +2687,7 @@ void CVersionUpdater::_StartDownload(void) // // /////////////////////////////////////////////////////////////// -int CVersionUpdater::_PollDownload(void) +int CVersionUpdater::_PollDownload() { while (true) { @@ -2748,7 +2748,7 @@ int CVersionUpdater::_PollDownload(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_UseReportLogURLs(void) +void CVersionUpdater::_UseReportLogURLs() { m_JobInfo = SJobInfo(); m_JobInfo.serverList = MakeServerList(m_MasterConfig.report.serverInfoMap); @@ -2761,7 +2761,7 @@ void CVersionUpdater::_UseReportLogURLs(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_UseReportLogPostContent(void) +void CVersionUpdater::_UseReportLogPostContent() { // Remove unrequired items #ifndef MTA_DEBUG @@ -2792,7 +2792,7 @@ void CVersionUpdater::_UseReportLogPostContent(void) // Check if upload is required by client // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_ShouldSendCrashDump(void) +void CVersionUpdater::_ShouldSendCrashDump() { m_ConditionMap.SetCondition("ProcessResponse", ""); @@ -2857,7 +2857,7 @@ void CVersionUpdater::_ShouldSendCrashDump(void) // Make sure last-dump-save is ignored next time // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_ResetLastCrashDump(void) +void CVersionUpdater::_ResetLastCrashDump() { SetApplicationSetting("diagnostics", "last-dump-save", ""); } @@ -2869,7 +2869,7 @@ void CVersionUpdater::_ResetLastCrashDump(void) // Check if upload is needed by server // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_UseCrashDumpQueryURLs(void) +void CVersionUpdater::_UseCrashDumpQueryURLs() { m_JobInfo = SJobInfo(); m_JobInfo.serverList = MakeServerList(m_MasterConfig.crashdump.serverInfoMap); @@ -2885,7 +2885,7 @@ void CVersionUpdater::_UseCrashDumpQueryURLs(void) // Called after completing a CrashDumpQuery // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_ProcessCrashDumpQuery(void) +void CVersionUpdater::_ProcessCrashDumpQuery() { m_ConditionMap.SetCondition("ProcessResponse", ""); @@ -2906,7 +2906,7 @@ void CVersionUpdater::_ProcessCrashDumpQuery(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_UseCrashDumpURLs(void) +void CVersionUpdater::_UseCrashDumpURLs() { m_JobInfo = SJobInfo(); m_JobInfo.serverList = MakeServerList(m_MasterConfig.crashdump.serverInfoMap); @@ -2919,7 +2919,7 @@ void CVersionUpdater::_UseCrashDumpURLs(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_UseCrashDumpPostContent(void) +void CVersionUpdater::_UseCrashDumpPostContent() { // Get filename to send SString strPathFilename = GetApplicationSetting("diagnostics", "last-dump-save"); @@ -2947,7 +2947,7 @@ void CVersionUpdater::_UseCrashDumpPostContent(void) // // /////////////////////////////////////////////////////////////// -void CVersionUpdater::_StartSendPost(void) +void CVersionUpdater::_StartSendPost() { if (!m_JobInfo.postContent.size()) return; @@ -2988,7 +2988,7 @@ void CVersionUpdater::_StartSendPost(void) // // /////////////////////////////////////////////////////////////// -int CVersionUpdater::_PollSendPost(void) +int CVersionUpdater::_PollSendPost() { while (true) { @@ -3036,7 +3036,7 @@ int CVersionUpdater::_PollSendPost(void) // RES_OK - Query sent // /////////////////////////////////////////////////////////////// -int CVersionUpdater::DoSendDownloadRequestToNextServer(void) +int CVersionUpdater::DoSendDownloadRequestToNextServer() { if (++m_JobInfo.iRetryCount > m_JobInfo.iMaxServersToTry || m_JobInfo.serverList.size() == 0) { @@ -3252,7 +3252,7 @@ void CVersionUpdater::DownloadFinished(const SHttpDownloadResult& result) // RES_POLL - Processing // /////////////////////////////////////////////////////////////// -int CVersionUpdater::DoPollDownload(void) +int CVersionUpdater::DoPollDownload() { m_ConditionMap.SetCondition("Download", ""); GetHTTP()->ProcessQueuedFiles(); @@ -3313,7 +3313,7 @@ int CVersionUpdater::DoPollDownload(void) // RES_OK - Query sent // /////////////////////////////////////////////////////////////// -int CVersionUpdater::DoSendPostToNextServer(void) +int CVersionUpdater::DoSendPostToNextServer() { if (++m_JobInfo.iRetryCount > 1 || m_JobInfo.serverList.size() == 0) { @@ -3368,7 +3368,7 @@ int CVersionUpdater::DoSendPostToNextServer(void) // RES_POLL - Processing // /////////////////////////////////////////////////////////////// -int CVersionUpdater::DoPollPost(void) +int CVersionUpdater::DoPollPost() { if (!GetHTTP()->ProcessQueuedFiles()) { diff --git a/Client/core/CVersionUpdater.h b/Client/core/CVersionUpdater.h index 69a3e90b2bb..9627a9e25c0 100644 --- a/Client/core/CVersionUpdater.h +++ b/Client/core/CVersionUpdater.h @@ -14,20 +14,20 @@ class CVersionUpdaterInterface { public: - virtual ~CVersionUpdaterInterface(void) {} - virtual bool SaveConfigToXML(void) = 0; + virtual ~CVersionUpdaterInterface() {} + virtual bool SaveConfigToXML() = 0; virtual void EnableChecking(bool bOn) = 0; - virtual void DoPulse(void) = 0; + virtual void DoPulse() = 0; virtual void InitiateUpdate(const SString& strType, const SString& strData, const SString& strHost) = 0; virtual bool IsOptionalUpdateInfoRequired(const SString& strHost) = 0; - virtual void InitiateDataFilesFix(void) = 0; - virtual void InitiateManualCheck(void) = 0; + virtual void InitiateDataFilesFix() = 0; + virtual void InitiateManualCheck() = 0; virtual void GetAseServerList(std::vector& outResult) = 0; virtual void InitiateSidegradeLaunch(const SString& strVersion, const SString& strIp, ushort usPort, const SString& strName, const SString& strPassword) = 0; virtual void GetBrowseVersionMaps(std::map& outBlockedVersionMap, std::map& outAllowedVersionMap) = 0; virtual void GetNewsSettings(SString& strOutOldestPost, uint& uiOutMaxHistoryLength) = 0; - virtual const SString& GetDebugFilterString(void) = 0; + virtual const SString& GetDebugFilterString() = 0; }; CVersionUpdaterInterface* GetVersionUpdater(); diff --git a/Client/core/CVertexStreamBoundingBoxManager.cpp b/Client/core/CVertexStreamBoundingBoxManager.cpp index fb3bf97c4fb..fbc9ffe48be 100644 --- a/Client/core/CVertexStreamBoundingBoxManager.cpp +++ b/Client/core/CVertexStreamBoundingBoxManager.cpp @@ -46,7 +46,7 @@ namespace // // /////////////////////////////////////////////////////////////// -CVertexStreamBoundingBoxManager::CVertexStreamBoundingBoxManager(void) +CVertexStreamBoundingBoxManager::CVertexStreamBoundingBoxManager() { } @@ -57,7 +57,7 @@ CVertexStreamBoundingBoxManager::CVertexStreamBoundingBoxManager(void) // // /////////////////////////////////////////////////////////////// -CVertexStreamBoundingBoxManager::~CVertexStreamBoundingBoxManager(void) +CVertexStreamBoundingBoxManager::~CVertexStreamBoundingBoxManager() { } @@ -68,7 +68,7 @@ CVertexStreamBoundingBoxManager::~CVertexStreamBoundingBoxManager(void) // Static function // /////////////////////////////////////////////////////////////// -CVertexStreamBoundingBoxManager* CVertexStreamBoundingBoxManager::GetSingleton(void) +CVertexStreamBoundingBoxManager* CVertexStreamBoundingBoxManager::GetSingleton() { if (!ms_Singleton) ms_Singleton = new CVertexStreamBoundingBoxManager(); diff --git a/Client/core/CVertexStreamBoundingBoxManager.h b/Client/core/CVertexStreamBoundingBoxManager.h index 3d908ceb637..145436d9521 100644 --- a/Client/core/CVertexStreamBoundingBoxManager.h +++ b/Client/core/CVertexStreamBoundingBoxManager.h @@ -76,9 +76,9 @@ struct SCurrentStateInfo2 SCurrentStateInfo2& operator=(const SCurrentStateInfo2& other); public: - SCurrentStateInfo2(void) { ZERO_POD_STRUCT(this); } + SCurrentStateInfo2() { ZERO_POD_STRUCT(this); } - ~SCurrentStateInfo2(void) + ~SCurrentStateInfo2() { SAFE_RELEASE(stream.pStreamData); SAFE_RELEASE(pIndexData); @@ -123,15 +123,15 @@ class CVertexStreamBoundingBoxManager { public: ZERO_ON_NEW - CVertexStreamBoundingBoxManager(void); - virtual ~CVertexStreamBoundingBoxManager(void); + CVertexStreamBoundingBoxManager(); + virtual ~CVertexStreamBoundingBoxManager(); void OnDeviceCreate(IDirect3DDevice9* pDevice); float GetDistanceSqToGeometry(D3DPRIMITIVETYPE PrimitiveType, INT BaseVertexIndex, UINT MinVertexIndex, UINT NumVertices, UINT startIndex, UINT primCount); void OnVertexBufferDestroy(IDirect3DVertexBuffer9* pStreamData); void OnVertexBufferRangeInvalidated(IDirect3DVertexBuffer9* pStreamData, uint Offset, uint Size); - static CVertexStreamBoundingBoxManager* GetSingleton(void); + static CVertexStreamBoundingBoxManager* GetSingleton(); protected: float CalcDistanceSq(const SCurrentStateInfo2& state, const CBox& boundingBox); diff --git a/Client/core/CrashHandler.cpp b/Client/core/CrashHandler.cpp index 9863df59c8d..b215b0d65b7 100644 --- a/Client/core/CrashHandler.cpp +++ b/Client/core/CrashHandler.cpp @@ -95,10 +95,10 @@ LPCTSTR __stdcall InternalGetStackTraceString(DWORD dwOpts, EXCEPTION_POINTERS* BOOL InternalSymGetLineFromAddr(IN HANDLE hProcess, IN DWORD dwAddr, OUT PDWORD pdwDisplacement, OUT PIMAGEHLP_LINE Line); // Initializes the symbol engine if needed -void InitSymEng(void); +void InitSymEng(); // Cleans up the symbol engine if needed -void CleanupSymEng(void); +void CleanupSymEng(); /*////////////////////////////////////////////////////////////////////// Destructor Class @@ -110,8 +110,8 @@ void CleanupSymEng(void); class CleanUpCrashHandler { public: - CleanUpCrashHandler(void) {} - ~CleanUpCrashHandler(void) + CleanUpCrashHandler() {} + ~CleanUpCrashHandler() { // Are there any outstanding memory allocations? if (NULL != g_ahMod) @@ -225,7 +225,7 @@ BOOL __stdcall AddCrashHandlerLimitModule(HMODULE hMod) return (TRUE); } -UINT __stdcall GetLimitModuleCount(void) +UINT __stdcall GetLimitModuleCount() { return (g_uiModCount); } @@ -989,7 +989,7 @@ BOOL InternalSymGetLineFromAddr(IN HANDLE hProcess, IN DWORD dwAddr, OUT PDWORD } // Initializes the symbol engine if needed -void InitSymEng(void) +void InitSymEng() { if (FALSE == g_bSymEngInit) { @@ -1008,7 +1008,7 @@ void InitSymEng(void) } // Cleans up the symbol engine if needed -void CleanupSymEng(void) +void CleanupSymEng() { if (TRUE == g_bSymEngInit) { @@ -1025,7 +1025,7 @@ static BOOL g_bHasVersion = FALSE; // Indicates NT or 95/98. static BOOL g_bIsNT = TRUE; -BOOL __stdcall IsNT(void) +BOOL __stdcall IsNT() { if (TRUE == g_bHasVersion) { @@ -1250,7 +1250,7 @@ RETURNS : TRUE - Everything initialized properly. FALSE - There was a problem. ----------------------------------------------------------------------*/ -static BOOL InitPSAPI(void) +static BOOL InitPSAPI() { if (TRUE == g_bInitialized) { @@ -1498,7 +1498,7 @@ RETURNS : TRUE - Everything initialized properly. FALSE - There was a problem. ----------------------------------------------------------------------*/ -static BOOL InitTOOLHELP32(void) +static BOOL InitTOOLHELP32() { if (TRUE == g_bInitialized) { diff --git a/Client/core/CrashHandler.h b/Client/core/CrashHandler.h index bdd471f1881..cf9bb463723 100644 --- a/Client/core/CrashHandler.h +++ b/Client/core/CrashHandler.h @@ -27,7 +27,7 @@ Copyright (c) 1997-2000 John Robbins -- All rights reserved. // The Win95 version of GetModuleBaseName. static DWORD __stdcall Win95GetModuleBaseName(HANDLE hProcess, HMODULE hModule, LPSTR lpBaseName, DWORD nSize); -BOOL __stdcall IsNT(void); +BOOL __stdcall IsNT(); DWORD __stdcall NTGetModuleBaseName(HANDLE hProcess, HMODULE hModule, LPTSTR lpBaseName, DWORD nSize); BOOL __stdcall NT4GetLoadedModules(DWORD dwPID, UINT uiCount, HMODULE* paModArray, LPDWORD pdwRealCount); BOOL __stdcall TLHELPGetLoadedModules(DWORD dwPID, UINT uiCount, HMODULE* paModArray, LPDWORD pdwRealCount); @@ -92,7 +92,7 @@ extern "C" The item count. This can be zero if not limiting modules have been added. ----------------------------------------------------------------------*/ - UINT BUGSUTIL_DLLINTERFACE __stdcall GetLimitModuleCount(void); + UINT BUGSUTIL_DLLINTERFACE __stdcall GetLimitModuleCount(); /*---------------------------------------------------------------------- FUNCTION : GetLimitModulesArray diff --git a/Client/core/DXHook/CDirect3DData.cpp b/Client/core/DXHook/CDirect3DData.cpp index 73abe0b77b6..ba51892c67f 100644 --- a/Client/core/DXHook/CDirect3DData.cpp +++ b/Client/core/DXHook/CDirect3DData.cpp @@ -16,7 +16,7 @@ using namespace std; template <> CDirect3DData* CSingleton::m_pSingleton = NULL; -CDirect3DData::CDirect3DData(void) +CDirect3DData::CDirect3DData() { // Zero out our matricies. memset(&m_mViewMatrix, 0, sizeof(D3DMATRIX)); @@ -30,7 +30,7 @@ CDirect3DData::CDirect3DData(void) m_dwViewportHeight = 0; } -CDirect3DData::~CDirect3DData(void) +CDirect3DData::~CDirect3DData() { } @@ -89,22 +89,22 @@ void CDirect3DData::StoreViewport(DWORD dwX, DWORD dwY, DWORD dwWidth, DWORD dwH m_dwViewportHeight = dwHeight; } -DWORD CDirect3DData::GetViewportX(void) +DWORD CDirect3DData::GetViewportX() { return m_dwViewportX; } -DWORD CDirect3DData::GetViewportY(void) +DWORD CDirect3DData::GetViewportY() { return m_dwViewportY; } -DWORD CDirect3DData::GetViewportWidth(void) +DWORD CDirect3DData::GetViewportWidth() { return m_dwViewportWidth; } -DWORD CDirect3DData::GetViewportHeight(void) +DWORD CDirect3DData::GetViewportHeight() { return m_dwViewportHeight; } diff --git a/Client/core/DXHook/CDirect3DData.h b/Client/core/DXHook/CDirect3DData.h index 1d1756f0ec4..4bedbd1a19b 100644 --- a/Client/core/DXHook/CDirect3DData.h +++ b/Client/core/DXHook/CDirect3DData.h @@ -17,21 +17,21 @@ class CDirect3DData : public CSingleton { public: - CDirect3DData(void); - ~CDirect3DData(void); + CDirect3DData(); + ~CDirect3DData(); void StoreTransform(D3DTRANSFORMSTATETYPE dwMatrixToStore, const D3DMATRIX* pMatrix); void GetTransform(D3DTRANSFORMSTATETYPE dwRequestedMatrix, D3DMATRIX* pMatrixOut); - HWND GetDeviceWindow(void) { return m_hDeviceWindow; }; + HWND GetDeviceWindow() { return m_hDeviceWindow; }; void StoreDeviceWindow(HWND hDeviceWindow) { m_hDeviceWindow = hDeviceWindow; }; void StoreViewport(DWORD dwX, DWORD dwY, DWORD dwWidth, DWORD dwHeight); - DWORD GetViewportX(void); - DWORD GetViewportY(void); - DWORD GetViewportWidth(void); - DWORD GetViewportHeight(void); + DWORD GetViewportX(); + DWORD GetViewportY(); + DWORD GetViewportWidth(); + DWORD GetViewportHeight(); private: D3DMATRIX m_mViewMatrix; diff --git a/Client/core/DXHook/CDirect3DEvents9.cpp b/Client/core/DXHook/CDirect3DEvents9.cpp index 8a92f907953..d29b521fbc5 100644 --- a/Client/core/DXHook/CDirect3DEvents9.cpp +++ b/Client/core/DXHook/CDirect3DEvents9.cpp @@ -196,7 +196,7 @@ void CDirect3DEvents9::OnPresent(IDirect3DDevice9* pDevice) // Take a screenshot if required and able // ///////////////////////////////////////////////////////////// -void CDirect3DEvents9::CheckForScreenShot(void) +void CDirect3DEvents9::CheckForScreenShot() { // Make a screenshot if needed if (CCore::GetSingleton().bScreenShot && !CScreenShot::IsSaving()) @@ -593,7 +593,7 @@ HRESULT CDirect3DEvents9::DrawIndexedPrimitiveShader(IDirect3DDevice9* pDevice, // Finish the active shader if there is one // ///////////////////////////////////////////////////////////// -void CDirect3DEvents9::CloseActiveShader(void) +void CDirect3DEvents9::CloseActiveShader() { if (!g_pActiveShader) return; diff --git a/Client/core/DXHook/CDirect3DEvents9.h b/Client/core/DXHook/CDirect3DEvents9.h index b64fe351dba..f5ef9cb6f3a 100644 --- a/Client/core/DXHook/CDirect3DEvents9.h +++ b/Client/core/DXHook/CDirect3DEvents9.h @@ -43,9 +43,9 @@ class CDirect3DEvents9 static HRESULT SetStreamSource(IDirect3DDevice9* pDevice, UINT StreamNumber, IDirect3DVertexBuffer9* pStreamData, UINT OffsetInBytes, UINT Stride); static HRESULT CreateVertexDeclaration(IDirect3DDevice9* pDevice, CONST D3DVERTEXELEMENT9* pVertexElements, IDirect3DVertexDeclaration9** ppDecl); static HRESULT SetVertexDeclaration(IDirect3DDevice9* pDevice, IDirect3DVertexDeclaration9* pDecl); - static void CheckForScreenShot(void); + static void CheckForScreenShot(); static ERenderFormat DiscoverReadableDepthFormat(IDirect3DDevice9* pDevice, D3DMULTISAMPLE_TYPE multisampleType, bool bWindowed); - static void CloseActiveShader(void); + static void CloseActiveShader(); static IDirect3DVertexBuffer9* GetRealVertexBuffer(IDirect3DVertexBuffer9* pVertexBuffer); static IDirect3DIndexBuffer9* GetRealIndexBuffer(IDirect3DIndexBuffer9* pIndexBuffer); diff --git a/Client/core/DXHook/CProxyDirect3D9.cpp b/Client/core/DXHook/CProxyDirect3D9.cpp index d2cb2dae87b..b33b68ec7c0 100644 --- a/Client/core/DXHook/CProxyDirect3D9.cpp +++ b/Client/core/DXHook/CProxyDirect3D9.cpp @@ -36,12 +36,12 @@ HRESULT CProxyDirect3D9::QueryInterface(REFIID riid, void** ppvObj) return m_pDevice->QueryInterface(riid, ppvObj); } -ULONG CProxyDirect3D9::AddRef(VOID) +ULONG CProxyDirect3D9::AddRef() { return m_pDevice->AddRef(); } -ULONG CProxyDirect3D9::Release(VOID) +ULONG CProxyDirect3D9::Release() { // Call original function ULONG ulRefCount = m_pDevice->Release(); @@ -56,7 +56,7 @@ HRESULT CProxyDirect3D9::RegisterSoftwareDevice(void* pInitializeFunction) return m_pDevice->RegisterSoftwareDevice(pInitializeFunction); } -UINT CProxyDirect3D9::GetAdapterCount(VOID) +UINT CProxyDirect3D9::GetAdapterCount() { return m_pDevice->GetAdapterCount(); } @@ -126,7 +126,7 @@ HMONITOR CProxyDirect3D9::StaticGetAdapterMonitor(UINT Adapter) return ms_CreatedDirect3D9List[0]->GetAdapterMonitor(Adapter); } -IDirect3D9* CProxyDirect3D9::StaticGetDirect3D(void) +IDirect3D9* CProxyDirect3D9::StaticGetDirect3D() { if (ms_CreatedDirect3D9List.empty()) return NULL; diff --git a/Client/core/DXHook/CProxyDirect3D9.h b/Client/core/DXHook/CProxyDirect3D9.h index f6881abaf85..43015e0d31d 100644 --- a/Client/core/DXHook/CProxyDirect3D9.h +++ b/Client/core/DXHook/CProxyDirect3D9.h @@ -21,12 +21,12 @@ class CProxyDirect3D9 : public IDirect3D9 ~CProxyDirect3D9(); /*** IUnknown methods ***/ virtual HRESULT __stdcall QueryInterface(REFIID riid, void** ppvObj); - virtual ULONG __stdcall AddRef(VOID); - virtual ULONG __stdcall Release(VOID); + virtual ULONG __stdcall AddRef(); + virtual ULONG __stdcall Release(); /*** IDirect3D9 methods ***/ virtual HRESULT __stdcall RegisterSoftwareDevice(void* pInitializeFunction); - virtual UINT __stdcall GetAdapterCount(VOID); + virtual UINT __stdcall GetAdapterCount(); virtual HRESULT __stdcall GetAdapterIdentifier(UINT Adapter, DWORD Flags, D3DADAPTER_IDENTIFIER9* pIdentifier); virtual UINT __stdcall GetAdapterModeCount(UINT Adapter, D3DFORMAT Format); virtual HRESULT __stdcall EnumAdapterModes(UINT Adapter, D3DFORMAT Format, UINT Mode, D3DDISPLAYMODE* pMode); @@ -45,7 +45,7 @@ class CProxyDirect3D9 : public IDirect3D9 D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DDevice9** ppReturnedDeviceInterface); static HMONITOR StaticGetAdapterMonitor(UINT Adapter); - static IDirect3D9* StaticGetDirect3D(void); + static IDirect3D9* StaticGetDirect3D(); private: IDirect3D9* m_pDevice; diff --git a/Client/core/DXHook/CProxyDirect3DDevice9.cpp b/Client/core/DXHook/CProxyDirect3DDevice9.cpp index 568bc9ff152..8cbae37160f 100644 --- a/Client/core/DXHook/CProxyDirect3DDevice9.cpp +++ b/Client/core/DXHook/CProxyDirect3DDevice9.cpp @@ -100,12 +100,12 @@ HRESULT CProxyDirect3DDevice9::QueryInterface(REFIID riid, void** ppvObj) return m_pDevice->QueryInterface(riid, ppvObj); } -ULONG CProxyDirect3DDevice9::AddRef(VOID) +ULONG CProxyDirect3DDevice9::AddRef() { return m_pDevice->AddRef(); } -ULONG CProxyDirect3DDevice9::Release(VOID) +ULONG CProxyDirect3DDevice9::Release() { // Check if will be final release m_pDevice->AddRef(); @@ -122,17 +122,17 @@ ULONG CProxyDirect3DDevice9::Release(VOID) } /*** IDirect3DDevice9 methods ***/ -HRESULT CProxyDirect3DDevice9::TestCooperativeLevel(VOID) +HRESULT CProxyDirect3DDevice9::TestCooperativeLevel() { return m_pDevice->TestCooperativeLevel(); } -UINT CProxyDirect3DDevice9::GetAvailableTextureMem(VOID) +UINT CProxyDirect3DDevice9::GetAvailableTextureMem() { return m_pDevice->GetAvailableTextureMem(); } -HRESULT CProxyDirect3DDevice9::EvictManagedResources(VOID) +HRESULT CProxyDirect3DDevice9::EvictManagedResources() { return m_pDevice->EvictManagedResources(); } @@ -182,7 +182,7 @@ HRESULT CProxyDirect3DDevice9::GetSwapChain(UINT iSwapChain, IDirect3DSwapChain9 return m_pDevice->GetSwapChain(iSwapChain, pSwapChain); } -UINT CProxyDirect3DDevice9::GetNumberOfSwapChains(VOID) +UINT CProxyDirect3DDevice9::GetNumberOfSwapChains() { return m_pDevice->GetNumberOfSwapChains(); } @@ -481,7 +481,7 @@ HRESULT CProxyDirect3DDevice9::GetDepthStencilSurface(IDirect3DSurface9** ppZSte return m_pDevice->GetDepthStencilSurface(ppZStencilSurface); } -HRESULT CProxyDirect3DDevice9::BeginScene(VOID) +HRESULT CProxyDirect3DDevice9::BeginScene() { HRESULT hResult; @@ -507,7 +507,7 @@ HRESULT CProxyDirect3DDevice9::BeginScene(VOID) return hResult; } -HRESULT CProxyDirect3DDevice9::EndScene(VOID) +HRESULT CProxyDirect3DDevice9::EndScene() { // Call our event handler. if (CDirect3DEvents9::OnEndScene(m_pDevice)) @@ -629,7 +629,7 @@ HRESULT CProxyDirect3DDevice9::CreateStateBlock(D3DSTATEBLOCKTYPE Type, IDirect3 return m_pDevice->CreateStateBlock(Type, ppSB); } -HRESULT CProxyDirect3DDevice9::BeginStateBlock(VOID) +HRESULT CProxyDirect3DDevice9::BeginStateBlock() { return m_pDevice->BeginStateBlock(); } @@ -728,7 +728,7 @@ HRESULT CProxyDirect3DDevice9::SetSoftwareVertexProcessing(BOOL bSoftware) return m_pDevice->SetSoftwareVertexProcessing(bSoftware); } -BOOL CProxyDirect3DDevice9::GetSoftwareVertexProcessing(VOID) +BOOL CProxyDirect3DDevice9::GetSoftwareVertexProcessing() { return m_pDevice->GetSoftwareVertexProcessing(); } @@ -738,7 +738,7 @@ HRESULT CProxyDirect3DDevice9::SetNPatchMode(float nSegments) return m_pDevice->SetNPatchMode(nSegments); } -FLOAT CProxyDirect3DDevice9::GetNPatchMode(VOID) +FLOAT CProxyDirect3DDevice9::GetNPatchMode() { return m_pDevice->GetNPatchMode(); } diff --git a/Client/core/DXHook/CProxyDirect3DDevice9.h b/Client/core/DXHook/CProxyDirect3DDevice9.h index 7c4d1f6bd2f..f337d409952 100644 --- a/Client/core/DXHook/CProxyDirect3DDevice9.h +++ b/Client/core/DXHook/CProxyDirect3DDevice9.h @@ -22,13 +22,13 @@ interface CProxyDirect3DDevice9 : public IDirect3DDevice9 /*** IUnknown methods ***/ virtual HRESULT __stdcall QueryInterface(REFIID riid, void** ppvObj); - virtual ULONG __stdcall AddRef(VOID); - virtual ULONG __stdcall Release(VOID); + virtual ULONG __stdcall AddRef(); + virtual ULONG __stdcall Release(); /*** IDirect3DDevice9 methods ***/ - virtual HRESULT __stdcall TestCooperativeLevel(VOID); - virtual UINT __stdcall GetAvailableTextureMem(VOID); - virtual HRESULT __stdcall EvictManagedResources(VOID); + virtual HRESULT __stdcall TestCooperativeLevel(); + virtual UINT __stdcall GetAvailableTextureMem(); + virtual HRESULT __stdcall EvictManagedResources(); virtual HRESULT __stdcall GetDirect3D(IDirect3D9 * *ppD3D9); virtual HRESULT __stdcall GetDeviceCaps(D3DCAPS9 * pCaps); virtual HRESULT __stdcall GetDisplayMode(UINT iSwapChain, D3DDISPLAYMODE * pMode); @@ -38,7 +38,7 @@ interface CProxyDirect3DDevice9 : public IDirect3DDevice9 virtual BOOL __stdcall ShowCursor(BOOL bShow); virtual HRESULT __stdcall CreateAdditionalSwapChain(D3DPRESENT_PARAMETERS * pPresentationParameters, IDirect3DSwapChain9 * *pSwapChain); virtual HRESULT __stdcall GetSwapChain(UINT iSwapChain, IDirect3DSwapChain9 * *pSwapChain); - virtual UINT __stdcall GetNumberOfSwapChains(VOID); + virtual UINT __stdcall GetNumberOfSwapChains(); virtual HRESULT __stdcall Reset(D3DPRESENT_PARAMETERS * pPresentationParameters); virtual HRESULT __stdcall Present(CONST RECT * pSourceRect, CONST RECT * pDestRect, HWND hDestWindowOverride, CONST RGNDATA * pDirtyRegion); virtual HRESULT __stdcall GetBackBuffer(UINT iSwapChain, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9 * *ppBackBuffer); @@ -74,8 +74,8 @@ interface CProxyDirect3DDevice9 : public IDirect3DDevice9 virtual HRESULT __stdcall GetRenderTarget(DWORD RenderTargetIndex, IDirect3DSurface9 * *ppRenderTarget); virtual HRESULT __stdcall SetDepthStencilSurface(IDirect3DSurface9 * pNewZStencil); virtual HRESULT __stdcall GetDepthStencilSurface(IDirect3DSurface9 * *ppZStencilSurface); - virtual HRESULT __stdcall BeginScene(VOID); - virtual HRESULT __stdcall EndScene(VOID); + virtual HRESULT __stdcall BeginScene(); + virtual HRESULT __stdcall EndScene(); virtual HRESULT __stdcall Clear(DWORD Count, CONST D3DRECT * pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil); virtual HRESULT __stdcall SetTransform(D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX * pMatrix); virtual HRESULT __stdcall GetTransform(D3DTRANSFORMSTATETYPE State, D3DMATRIX * pMatrix); @@ -93,7 +93,7 @@ interface CProxyDirect3DDevice9 : public IDirect3DDevice9 virtual HRESULT __stdcall SetRenderState(D3DRENDERSTATETYPE State, DWORD Value); virtual HRESULT __stdcall GetRenderState(D3DRENDERSTATETYPE State, DWORD * pValue); virtual HRESULT __stdcall CreateStateBlock(D3DSTATEBLOCKTYPE Type, IDirect3DStateBlock9 * *ppSB); - virtual HRESULT __stdcall BeginStateBlock(VOID); + virtual HRESULT __stdcall BeginStateBlock(); virtual HRESULT __stdcall EndStateBlock(IDirect3DStateBlock9 * *ppSB); virtual HRESULT __stdcall SetClipStatus(CONST D3DCLIPSTATUS9 * pClipStatus); virtual HRESULT __stdcall GetClipStatus(D3DCLIPSTATUS9 * pClipStatus); @@ -111,9 +111,9 @@ interface CProxyDirect3DDevice9 : public IDirect3DDevice9 virtual HRESULT __stdcall SetScissorRect(CONST RECT * pRect); virtual HRESULT __stdcall GetScissorRect(RECT * pRect); virtual HRESULT __stdcall SetSoftwareVertexProcessing(BOOL bSoftware); - virtual BOOL __stdcall GetSoftwareVertexProcessing(VOID); + virtual BOOL __stdcall GetSoftwareVertexProcessing(); virtual HRESULT __stdcall SetNPatchMode(float nSegments); - virtual FLOAT __stdcall GetNPatchMode(VOID); + virtual FLOAT __stdcall GetNPatchMode(); virtual HRESULT __stdcall DrawPrimitive(D3DPRIMITIVETYPE PrimitiveType, UINT StartVertex, UINT PrimitiveCount); virtual HRESULT __stdcall DrawIndexedPrimitive(D3DPRIMITIVETYPE, INT BaseVertexIndex, UINT MinVertexIndex, UINT NumVertices, UINT startIndex, UINT primCount); @@ -434,7 +434,7 @@ interface CProxyDirect3DDevice9 : public IDirect3DDevice9 struct SD3DVertexDeclState { - SD3DVertexDeclState(void) { ZERO_POD_STRUCT(this); } + SD3DVertexDeclState() { ZERO_POD_STRUCT(this); } bool bUsesStreamAtIndex[2]; DWORD Position; diff --git a/Client/core/DXHook/CProxyDirect3DEffect.cpp b/Client/core/DXHook/CProxyDirect3DEffect.cpp index 8c8664dfd19..15a8ba8d709 100644 --- a/Client/core/DXHook/CProxyDirect3DEffect.cpp +++ b/Client/core/DXHook/CProxyDirect3DEffect.cpp @@ -32,7 +32,7 @@ CProxyDirect3DEffect::CProxyDirect3DEffect(IDirect3DDevice9* InD3DDevice9, ID3DX // // ///////////////////////////////////////////////////////////// -CProxyDirect3DEffect::~CProxyDirect3DEffect(void) +CProxyDirect3DEffect::~CProxyDirect3DEffect() { m_stats.iCurrentCount--; m_stats.iDestroyedCount++; @@ -66,7 +66,7 @@ HRESULT CProxyDirect3DEffect::QueryInterface(REFIID riid, void** ppvObj) // Delete this object on final release of the original // ///////////////////////////////////////////////////////////// -ULONG CProxyDirect3DEffect::Release(void) +ULONG CProxyDirect3DEffect::Release() { // Call original function ULONG count = m_pOriginal->Release(); diff --git a/Client/core/DXHook/CProxyDirect3DEffect.h b/Client/core/DXHook/CProxyDirect3DEffect.h index a368e1c15eb..6d507f7b53b 100644 --- a/Client/core/DXHook/CProxyDirect3DEffect.h +++ b/Client/core/DXHook/CProxyDirect3DEffect.h @@ -15,8 +15,8 @@ class CProxyDirect3DEffect : public ID3DXEffect public: // ID3DXBaseEffect HRESULT __stdcall QueryInterface(REFIID iid, LPVOID* ppv); - ULONG __stdcall AddRef(void) { return m_pOriginal->AddRef(); } - ULONG __stdcall Release(void); + ULONG __stdcall AddRef() { return m_pOriginal->AddRef(); } + ULONG __stdcall Release(); // Descs HRESULT __stdcall GetDesc(D3DXEFFECT_DESC* pDesc) { return m_pOriginal->GetDesc(pDesc); } @@ -114,7 +114,7 @@ class CProxyDirect3DEffect : public ID3DXEffect // Selecting and setting a technique HRESULT __stdcall SetTechnique(D3DXHANDLE hTechnique) { return m_pOriginal->SetTechnique(hTechnique); } - D3DXHANDLE __stdcall GetCurrentTechnique(void) { return m_pOriginal->GetCurrentTechnique(); } + D3DXHANDLE __stdcall GetCurrentTechnique() { return m_pOriginal->GetCurrentTechnique(); } HRESULT __stdcall ValidateTechnique(D3DXHANDLE hTechnique) { return m_pOriginal->ValidateTechnique(hTechnique); } HRESULT __stdcall FindNextValidTechnique(D3DXHANDLE hTechnique, D3DXHANDLE* pTechnique) { @@ -131,22 +131,22 @@ class CProxyDirect3DEffect : public ID3DXEffect // End ends active technique HRESULT __stdcall Begin(UINT* pPasses, DWORD Flags) { return m_pOriginal->Begin(pPasses, Flags); } HRESULT __stdcall BeginPass(UINT Pass) { return m_pOriginal->BeginPass(Pass); } - HRESULT __stdcall CommitChanges(void) { return m_pOriginal->CommitChanges(); } - HRESULT __stdcall EndPass(void) { return m_pOriginal->EndPass(); } - HRESULT __stdcall End(void) { return m_pOriginal->End(); } + HRESULT __stdcall CommitChanges() { return m_pOriginal->CommitChanges(); } + HRESULT __stdcall EndPass() { return m_pOriginal->EndPass(); } + HRESULT __stdcall End() { return m_pOriginal->End(); } // Managing D3D Device HRESULT __stdcall GetDevice(LPDIRECT3DDEVICE9* ppDevice) { return m_pOriginal->GetDevice(ppDevice); } - HRESULT __stdcall OnLostDevice(void) { return m_pOriginal->OnLostDevice(); } - HRESULT __stdcall OnResetDevice(void) { return m_pOriginal->OnResetDevice(); } + HRESULT __stdcall OnLostDevice() { return m_pOriginal->OnLostDevice(); } + HRESULT __stdcall OnResetDevice() { return m_pOriginal->OnResetDevice(); } // Logging device calls HRESULT __stdcall SetStateManager(LPD3DXEFFECTSTATEMANAGER pManager) { return m_pOriginal->SetStateManager(pManager); } HRESULT __stdcall GetStateManager(LPD3DXEFFECTSTATEMANAGER* ppManager) { return m_pOriginal->GetStateManager(ppManager); } // Parameter blocks - HRESULT __stdcall BeginParameterBlock(void) { return m_pOriginal->BeginParameterBlock(); } - D3DXHANDLE __stdcall EndParameterBlock(void) { return m_pOriginal->EndParameterBlock(); } + HRESULT __stdcall BeginParameterBlock() { return m_pOriginal->BeginParameterBlock(); } + D3DXHANDLE __stdcall EndParameterBlock() { return m_pOriginal->EndParameterBlock(); } HRESULT __stdcall ApplyParameterBlock(D3DXHANDLE hParameterBlock) { return m_pOriginal->ApplyParameterBlock(hParameterBlock); } HRESULT __stdcall DeleteParameterBlock(D3DXHANDLE hParameterBlock) { return m_pOriginal->DeleteParameterBlock(hParameterBlock); } @@ -161,9 +161,9 @@ class CProxyDirect3DEffect : public ID3DXEffect // CProxyDirect3DEffect CProxyDirect3DEffect(IDirect3DDevice9* InD3DDevice9, ID3DXEffect* InOriginal); - virtual ~CProxyDirect3DEffect(void); + virtual ~CProxyDirect3DEffect(); - ID3DXEffect* GetOriginal(void) { return m_pOriginal; } + ID3DXEffect* GetOriginal() { return m_pOriginal; } protected: ID3DXEffect* m_pOriginal; diff --git a/Client/core/DXHook/CProxyDirect3DIndexBuffer.cpp b/Client/core/DXHook/CProxyDirect3DIndexBuffer.cpp index 5e5dfd8a869..43c592b162a 100644 --- a/Client/core/DXHook/CProxyDirect3DIndexBuffer.cpp +++ b/Client/core/DXHook/CProxyDirect3DIndexBuffer.cpp @@ -42,7 +42,7 @@ CProxyDirect3DIndexBuffer::CProxyDirect3DIndexBuffer(IDirect3DDevice9* InD3DDevi // // ///////////////////////////////////////////////////////////// -CProxyDirect3DIndexBuffer::~CProxyDirect3DIndexBuffer(void) +CProxyDirect3DIndexBuffer::~CProxyDirect3DIndexBuffer() { m_stats.iCurrentCount--; m_stats.iCurrentBytes -= m_iMemUsed; @@ -78,7 +78,7 @@ HRESULT CProxyDirect3DIndexBuffer::QueryInterface(REFIID riid, void** ppvObj) // Delete this object on final release of the original // ///////////////////////////////////////////////////////////// -ULONG CProxyDirect3DIndexBuffer::Release(void) +ULONG CProxyDirect3DIndexBuffer::Release() { // Call original function ULONG count = m_pOriginal->Release(); diff --git a/Client/core/DXHook/CProxyDirect3DIndexBuffer.h b/Client/core/DXHook/CProxyDirect3DIndexBuffer.h index 233564145e3..c5315a5711f 100644 --- a/Client/core/DXHook/CProxyDirect3DIndexBuffer.h +++ b/Client/core/DXHook/CProxyDirect3DIndexBuffer.h @@ -16,8 +16,8 @@ class CProxyDirect3DIndexBuffer : public IDirect3DIndexBuffer9 public: /*** IUnknown methods ***/ HRESULT __stdcall QueryInterface(REFIID riid, void** ppvObj); - ULONG __stdcall AddRef(void) { return m_pOriginal->AddRef(); } - ULONG __stdcall Release(void); + ULONG __stdcall AddRef() { return m_pOriginal->AddRef(); } + ULONG __stdcall Release(); /*** IDirect3DResource9 methods ***/ HRESULT __stdcall GetDevice(IDirect3DDevice9** ppDevice) { return m_pOriginal->GetDevice(ppDevice); } @@ -28,20 +28,20 @@ class CProxyDirect3DIndexBuffer : public IDirect3DIndexBuffer9 HRESULT __stdcall GetPrivateData(REFGUID refguid, void* pData, DWORD* pSizeOfData) { return m_pOriginal->GetPrivateData(refguid, pData, pSizeOfData); } HRESULT __stdcall FreePrivateData(REFGUID refguid) { return m_pOriginal->FreePrivateData(refguid); } DWORD __stdcall SetPriority(DWORD PriorityNew) { return m_pOriginal->SetPriority(PriorityNew); } - DWORD __stdcall GetPriority(void) { return m_pOriginal->GetPriority(); } - void __stdcall PreLoad(void) { return m_pOriginal->PreLoad(); } - D3DRESOURCETYPE __stdcall GetType(void) { return m_pOriginal->GetType(); } + DWORD __stdcall GetPriority() { return m_pOriginal->GetPriority(); } + void __stdcall PreLoad() { return m_pOriginal->PreLoad(); } + D3DRESOURCETYPE __stdcall GetType() { return m_pOriginal->GetType(); } /*** IDirect3DIndexBuffer9 methods ***/ HRESULT __stdcall Lock(UINT OffsetToLock, UINT SizeToLock, void** ppbData, DWORD Flags); - HRESULT __stdcall Unlock(void) { return m_pOriginal->Unlock(); } + HRESULT __stdcall Unlock() { return m_pOriginal->Unlock(); } HRESULT __stdcall GetDesc(D3DINDEXBUFFER_DESC* pDesc) { return m_pOriginal->GetDesc(pDesc); } // CProxyDirect3DIndexBuffer CProxyDirect3DIndexBuffer(IDirect3DDevice9* InD3DDevice9, IDirect3DIndexBuffer9* InOriginal, UINT Length, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool); - virtual ~CProxyDirect3DIndexBuffer(void); + virtual ~CProxyDirect3DIndexBuffer(); - IDirect3DIndexBuffer9* GetOriginal(void) { return m_pOriginal; } + IDirect3DIndexBuffer9* GetOriginal() { return m_pOriginal; } protected: IDirect3DIndexBuffer9* m_pOriginal; diff --git a/Client/core/DXHook/CProxyDirect3DTexture.cpp b/Client/core/DXHook/CProxyDirect3DTexture.cpp index ca2baac0490..cbc61cf81a1 100644 --- a/Client/core/DXHook/CProxyDirect3DTexture.cpp +++ b/Client/core/DXHook/CProxyDirect3DTexture.cpp @@ -40,7 +40,7 @@ CProxyDirect3DTexture::CProxyDirect3DTexture(IDirect3DDevice9* InD3DDevice9, IDi // // ///////////////////////////////////////////////////////////// -CProxyDirect3DTexture::~CProxyDirect3DTexture(void) +CProxyDirect3DTexture::~CProxyDirect3DTexture() { m_stats.iCurrentCount--; m_stats.iCurrentBytes -= m_iMemUsed; @@ -76,7 +76,7 @@ HRESULT CProxyDirect3DTexture::QueryInterface(REFIID riid, void** ppvObj) // Delete this object on final release of the original // ///////////////////////////////////////////////////////////// -ULONG CProxyDirect3DTexture::Release(void) +ULONG CProxyDirect3DTexture::Release() { // Call original function ULONG count = m_pOriginal->Release(); diff --git a/Client/core/DXHook/CProxyDirect3DTexture.h b/Client/core/DXHook/CProxyDirect3DTexture.h index da0e38c7c0e..f002cde4158 100644 --- a/Client/core/DXHook/CProxyDirect3DTexture.h +++ b/Client/core/DXHook/CProxyDirect3DTexture.h @@ -16,8 +16,8 @@ class CProxyDirect3DTexture : public IDirect3DTexture9 public: /*** IUnknown methods ***/ HRESULT __stdcall QueryInterface(REFIID riid, void** ppvObj); - ULONG __stdcall AddRef(void) { return m_pOriginal->AddRef(); } - ULONG __stdcall Release(void); + ULONG __stdcall AddRef() { return m_pOriginal->AddRef(); } + ULONG __stdcall Release(); /*** IDirect3DResource9 methods ***/ HRESULT __stdcall GetDevice(IDirect3DDevice9** ppDevice) { return m_pOriginal->GetDevice(ppDevice); } @@ -28,18 +28,18 @@ class CProxyDirect3DTexture : public IDirect3DTexture9 HRESULT __stdcall GetPrivateData(REFGUID refguid, void* pData, DWORD* pSizeOfData) { return m_pOriginal->GetPrivateData(refguid, pData, pSizeOfData); } HRESULT __stdcall FreePrivateData(REFGUID refguid) { return m_pOriginal->FreePrivateData(refguid); } DWORD __stdcall SetPriority(DWORD PriorityNew) { return m_pOriginal->SetPriority(PriorityNew); } - DWORD __stdcall GetPriority(void) { return m_pOriginal->GetPriority(); } - void __stdcall PreLoad(void) { return m_pOriginal->PreLoad(); } - D3DRESOURCETYPE __stdcall GetType(void) { return m_pOriginal->GetType(); } + DWORD __stdcall GetPriority() { return m_pOriginal->GetPriority(); } + void __stdcall PreLoad() { return m_pOriginal->PreLoad(); } + D3DRESOURCETYPE __stdcall GetType() { return m_pOriginal->GetType(); } /*** IDirect3DBaseTexture9 methods ***/ DWORD __stdcall SetLOD(DWORD LODNew) { return m_pOriginal->SetLOD(LODNew); } - DWORD __stdcall GetLOD(void) { return m_pOriginal->GetLOD(); } - DWORD __stdcall GetLevelCount(void) { return m_pOriginal->GetLevelCount(); } + DWORD __stdcall GetLOD() { return m_pOriginal->GetLOD(); } + DWORD __stdcall GetLevelCount() { return m_pOriginal->GetLevelCount(); } HRESULT __stdcall SetAutoGenFilterType(D3DTEXTUREFILTERTYPE FilterType) { return m_pOriginal->SetAutoGenFilterType(FilterType); } D3DTEXTUREFILTERTYPE - __stdcall GetAutoGenFilterType(void) { return m_pOriginal->GetAutoGenFilterType(); } - void __stdcall GenerateMipSubLevels(void) { return m_pOriginal->GenerateMipSubLevels(); } + __stdcall GetAutoGenFilterType() { return m_pOriginal->GetAutoGenFilterType(); } + void __stdcall GenerateMipSubLevels() { return m_pOriginal->GenerateMipSubLevels(); } /*** IDirect3DTexture9 methods ***/ HRESULT __stdcall GetLevelDesc(UINT Level, D3DSURFACE_DESC* pDesc) { return m_pOriginal->GetLevelDesc(Level, pDesc); } @@ -51,9 +51,9 @@ class CProxyDirect3DTexture : public IDirect3DTexture9 // CProxyDirect3DTexture CProxyDirect3DTexture(IDirect3DDevice9* InD3DDevice9, IDirect3DTexture9* InOriginal, UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool); - virtual ~CProxyDirect3DTexture(void); + virtual ~CProxyDirect3DTexture(); - IDirect3DTexture9* GetOriginal(void) { return m_pOriginal; } + IDirect3DTexture9* GetOriginal() { return m_pOriginal; } protected: IDirect3DTexture9* m_pOriginal; diff --git a/Client/core/DXHook/CProxyDirect3DVertexBuffer.cpp b/Client/core/DXHook/CProxyDirect3DVertexBuffer.cpp index 8d66429dd93..ce635da2301 100644 --- a/Client/core/DXHook/CProxyDirect3DVertexBuffer.cpp +++ b/Client/core/DXHook/CProxyDirect3DVertexBuffer.cpp @@ -44,7 +44,7 @@ CProxyDirect3DVertexBuffer::CProxyDirect3DVertexBuffer(IDirect3DDevice9* InD3DDe // // ///////////////////////////////////////////////////////////// -CProxyDirect3DVertexBuffer::~CProxyDirect3DVertexBuffer(void) +CProxyDirect3DVertexBuffer::~CProxyDirect3DVertexBuffer() { CAdditionalVertexStreamManager::GetSingleton()->OnVertexBufferDestroy(m_pOriginal); CVertexStreamBoundingBoxManager::GetSingleton()->OnVertexBufferDestroy(m_pOriginal); @@ -83,7 +83,7 @@ HRESULT CProxyDirect3DVertexBuffer::QueryInterface(REFIID riid, void** ppvObj) // Delete this object on final release of the original // ///////////////////////////////////////////////////////////// -ULONG CProxyDirect3DVertexBuffer::Release(void) +ULONG CProxyDirect3DVertexBuffer::Release() { // Call original function ULONG count = m_pOriginal->Release(); diff --git a/Client/core/DXHook/CProxyDirect3DVertexBuffer.h b/Client/core/DXHook/CProxyDirect3DVertexBuffer.h index 80d3ccacd6d..6642806121f 100644 --- a/Client/core/DXHook/CProxyDirect3DVertexBuffer.h +++ b/Client/core/DXHook/CProxyDirect3DVertexBuffer.h @@ -16,8 +16,8 @@ class CProxyDirect3DVertexBuffer : public IDirect3DVertexBuffer9 public: /*** IUnknown methods ***/ HRESULT __stdcall QueryInterface(REFIID riid, void** ppvObj); - ULONG __stdcall AddRef(void) { return m_pOriginal->AddRef(); } - ULONG __stdcall Release(void); + ULONG __stdcall AddRef() { return m_pOriginal->AddRef(); } + ULONG __stdcall Release(); /*** IDirect3DResource9 methods ***/ HRESULT __stdcall GetDevice(IDirect3DDevice9** ppDevice) { return m_pOriginal->GetDevice(ppDevice); } @@ -28,20 +28,20 @@ class CProxyDirect3DVertexBuffer : public IDirect3DVertexBuffer9 HRESULT __stdcall GetPrivateData(REFGUID refguid, void* pData, DWORD* pSizeOfData) { return m_pOriginal->GetPrivateData(refguid, pData, pSizeOfData); } HRESULT __stdcall FreePrivateData(REFGUID refguid) { return m_pOriginal->FreePrivateData(refguid); } DWORD __stdcall SetPriority(DWORD PriorityNew) { return m_pOriginal->SetPriority(PriorityNew); } - DWORD __stdcall GetPriority(void) { return m_pOriginal->GetPriority(); } - void __stdcall PreLoad(void) { return m_pOriginal->PreLoad(); } - D3DRESOURCETYPE __stdcall GetType(void) { return m_pOriginal->GetType(); } + DWORD __stdcall GetPriority() { return m_pOriginal->GetPriority(); } + void __stdcall PreLoad() { return m_pOriginal->PreLoad(); } + D3DRESOURCETYPE __stdcall GetType() { return m_pOriginal->GetType(); } /*** IDirect3DVertexBuffer9 methods ***/ HRESULT __stdcall Lock(UINT OffsetToLock, UINT SizeToLock, void** ppbData, DWORD Flags); - HRESULT __stdcall Unlock(void) { return m_pOriginal->Unlock(); } + HRESULT __stdcall Unlock() { return m_pOriginal->Unlock(); } HRESULT __stdcall GetDesc(D3DVERTEXBUFFER_DESC* pDesc) { return m_pOriginal->GetDesc(pDesc); } // CProxyDirect3DVertexBuffer CProxyDirect3DVertexBuffer(IDirect3DDevice9* InD3DDevice9, IDirect3DVertexBuffer9* InOriginal, UINT Length, DWORD Usage, DWORD FVF, D3DPOOL Pool); - virtual ~CProxyDirect3DVertexBuffer(void); + virtual ~CProxyDirect3DVertexBuffer(); - IDirect3DVertexBuffer9* GetOriginal(void) { return m_pOriginal; } + IDirect3DVertexBuffer9* GetOriginal() { return m_pOriginal; } HRESULT DoLock(UINT OffsetToLock, UINT SizeToLock, void** ppbData, DWORD Flags); protected: diff --git a/Client/core/DXHook/CProxyDirect3DVertexDeclaration.cpp b/Client/core/DXHook/CProxyDirect3DVertexDeclaration.cpp index 19bf5e3c80a..d07f4f45159 100644 --- a/Client/core/DXHook/CProxyDirect3DVertexDeclaration.cpp +++ b/Client/core/DXHook/CProxyDirect3DVertexDeclaration.cpp @@ -80,7 +80,7 @@ CProxyDirect3DVertexDeclaration::CProxyDirect3DVertexDeclaration(IDirect3DDevice // // ///////////////////////////////////////////////////////////// -CProxyDirect3DVertexDeclaration::~CProxyDirect3DVertexDeclaration(void) +CProxyDirect3DVertexDeclaration::~CProxyDirect3DVertexDeclaration() { // Remove from cached info map MapRemove(g_pProxyDevice->m_VertexDeclMap, this); @@ -114,7 +114,7 @@ HRESULT CProxyDirect3DVertexDeclaration::QueryInterface(REFIID riid, void** ppvO // Delete this object on final release of the original // ///////////////////////////////////////////////////////////// -ULONG CProxyDirect3DVertexDeclaration::Release(void) +ULONG CProxyDirect3DVertexDeclaration::Release() { // Call original function ULONG count = m_pOriginal->Release(); diff --git a/Client/core/DXHook/CProxyDirect3DVertexDeclaration.h b/Client/core/DXHook/CProxyDirect3DVertexDeclaration.h index ee7f1ced08c..3d6e38ce40d 100644 --- a/Client/core/DXHook/CProxyDirect3DVertexDeclaration.h +++ b/Client/core/DXHook/CProxyDirect3DVertexDeclaration.h @@ -16,8 +16,8 @@ class CProxyDirect3DVertexDeclaration : public IDirect3DVertexDeclaration9 public: /*** IUnknown methods ***/ HRESULT __stdcall QueryInterface(REFIID riid, void** ppvObj); - ULONG __stdcall AddRef(void) { return m_pOriginal->AddRef(); } - ULONG __stdcall Release(void); + ULONG __stdcall AddRef() { return m_pOriginal->AddRef(); } + ULONG __stdcall Release(); /*** IDirect3DVertexDeclaration9 methods ***/ HRESULT __stdcall GetDevice(IDirect3DDevice9** ppDevice) { return m_pOriginal->GetDevice(ppDevice); } @@ -25,9 +25,9 @@ class CProxyDirect3DVertexDeclaration : public IDirect3DVertexDeclaration9 // CProxyDirect3DVertexDeclaration CProxyDirect3DVertexDeclaration(IDirect3DDevice9* InD3DDevice9, IDirect3DVertexDeclaration9* InOriginal, CONST D3DVERTEXELEMENT9* pVertexElements); - virtual ~CProxyDirect3DVertexDeclaration(void); + virtual ~CProxyDirect3DVertexDeclaration(); - IDirect3DVertexDeclaration9* GetOriginal(void) { return m_pOriginal; } + IDirect3DVertexDeclaration9* GetOriginal() { return m_pOriginal; } protected: IDirect3DVertexDeclaration9* m_pOriginal; diff --git a/Client/core/DXHook/CProxyDirectInput8.cpp b/Client/core/DXHook/CProxyDirectInput8.cpp index acf4bcf6055..04ab7b358a1 100644 --- a/Client/core/DXHook/CProxyDirectInput8.cpp +++ b/Client/core/DXHook/CProxyDirectInput8.cpp @@ -30,12 +30,12 @@ HRESULT CProxyDirectInput8::QueryInterface(REFIID riid, LPVOID* ppvObj) return m_pDevice->QueryInterface(riid, ppvObj); } -ULONG CProxyDirectInput8::AddRef(VOID) +ULONG CProxyDirectInput8::AddRef() { return m_pDevice->AddRef(); } -ULONG CProxyDirectInput8::Release(VOID) +ULONG CProxyDirectInput8::Release() { // Call original function ULONG ulRefCount = m_pDevice->Release(); diff --git a/Client/core/DXHook/CProxyDirectInput8.h b/Client/core/DXHook/CProxyDirectInput8.h index 489e6ef736e..7b84f50e57b 100644 --- a/Client/core/DXHook/CProxyDirectInput8.h +++ b/Client/core/DXHook/CProxyDirectInput8.h @@ -23,8 +23,8 @@ class CProxyDirectInput8 : public IDirectInput8A ~CProxyDirectInput8(); /*** IUnknown methods ***/ virtual HRESULT __stdcall QueryInterface(REFIID riid, LPVOID* ppvObj); - virtual ULONG __stdcall AddRef(VOID); - virtual ULONG __stdcall Release(VOID); + virtual ULONG __stdcall AddRef(); + virtual ULONG __stdcall Release(); /*** IDirectInput8A methods ***/ virtual HRESULT __stdcall CreateDevice(REFGUID, LPDIRECTINPUTDEVICE8A*, LPUNKNOWN); diff --git a/Client/core/DXHook/CProxyDirectInputDevice8.cpp b/Client/core/DXHook/CProxyDirectInputDevice8.cpp index fa95a649e0f..99ca7080aaf 100644 --- a/Client/core/DXHook/CProxyDirectInputDevice8.cpp +++ b/Client/core/DXHook/CProxyDirectInputDevice8.cpp @@ -52,12 +52,12 @@ HRESULT CProxyDirectInputDevice8::QueryInterface(REFIID riid, LPVOID* ppvObj) return m_pDevice->QueryInterface(riid, ppvObj); } -ULONG CProxyDirectInputDevice8::AddRef(VOID) +ULONG CProxyDirectInputDevice8::AddRef() { return m_pDevice->AddRef(); } -ULONG CProxyDirectInputDevice8::Release(VOID) +ULONG CProxyDirectInputDevice8::Release() { // Call original function ULONG ulRefCount = m_pDevice->Release(); @@ -90,12 +90,12 @@ HRESULT CProxyDirectInputDevice8::SetProperty(REFGUID a, LPCDIPROPHEADER b) return m_pDevice->SetProperty(a, b); } -HRESULT CProxyDirectInputDevice8::Acquire(VOID) +HRESULT CProxyDirectInputDevice8::Acquire() { return m_pDevice->Acquire(); } -HRESULT CProxyDirectInputDevice8::Unacquire(VOID) +HRESULT CProxyDirectInputDevice8::Unacquire() { return m_pDevice->Unacquire(); } @@ -229,7 +229,7 @@ HRESULT CProxyDirectInputDevice8::Escape(LPDIEFFESCAPE a) return m_pDevice->Escape(a); } -HRESULT CProxyDirectInputDevice8::Poll(VOID) +HRESULT CProxyDirectInputDevice8::Poll() { return m_pDevice->Poll(); } diff --git a/Client/core/DXHook/CProxyDirectInputDevice8.h b/Client/core/DXHook/CProxyDirectInputDevice8.h index c07687ff534..f4f5f667f8f 100644 --- a/Client/core/DXHook/CProxyDirectInputDevice8.h +++ b/Client/core/DXHook/CProxyDirectInputDevice8.h @@ -21,16 +21,16 @@ class CProxyDirectInputDevice8 : public IDirectInputDevice8A ~CProxyDirectInputDevice8(); /*** IUnknown methods ***/ virtual HRESULT __stdcall QueryInterface(REFIID riid, LPVOID* ppvObj); - virtual ULONG __stdcall AddRef(VOID); - virtual ULONG __stdcall Release(VOID); + virtual ULONG __stdcall AddRef(); + virtual ULONG __stdcall Release(); /*** IDirectInputDevice8A methods ***/ virtual HRESULT __stdcall GetCapabilities(LPDIDEVCAPS a); virtual HRESULT __stdcall EnumObjects(LPDIENUMDEVICEOBJECTSCALLBACKA a, LPVOID b, DWORD c); virtual HRESULT __stdcall GetProperty(REFGUID a, LPDIPROPHEADER b); virtual HRESULT __stdcall SetProperty(REFGUID a, LPCDIPROPHEADER b); - virtual HRESULT __stdcall Acquire(VOID); - virtual HRESULT __stdcall Unacquire(VOID); + virtual HRESULT __stdcall Acquire(); + virtual HRESULT __stdcall Unacquire(); virtual HRESULT __stdcall GetDeviceState(DWORD a, LPVOID b); virtual HRESULT __stdcall GetDeviceData(DWORD a, LPDIDEVICEOBJECTDATA b, LPDWORD c, DWORD d); virtual HRESULT __stdcall SetDataFormat(LPCDIDATAFORMAT a); @@ -47,7 +47,7 @@ class CProxyDirectInputDevice8 : public IDirectInputDevice8A virtual HRESULT __stdcall SendForceFeedbackCommand(DWORD a); virtual HRESULT __stdcall EnumCreatedEffectObjects(LPDIENUMCREATEDEFFECTOBJECTSCALLBACK a, LPVOID b, DWORD c); virtual HRESULT __stdcall Escape(LPDIEFFESCAPE a); - virtual HRESULT __stdcall Poll(VOID); + virtual HRESULT __stdcall Poll(); virtual HRESULT __stdcall SendDeviceData(DWORD a, LPCDIDEVICEOBJECTDATA b, LPDWORD c, DWORD d); virtual HRESULT __stdcall EnumEffectsInFile(LPCSTR a, LPDIENUMEFFECTSINFILECALLBACK b, LPVOID c, DWORD d); virtual HRESULT __stdcall WriteEffectToFile(LPCSTR a, DWORD b, LPDIFILEEFFECT c, DWORD d); diff --git a/Client/core/Graphics/CAspectRatioConverter.h b/Client/core/Graphics/CAspectRatioConverter.h index 2c4582ebace..97abf06f7f4 100644 --- a/Client/core/Graphics/CAspectRatioConverter.h +++ b/Client/core/Graphics/CAspectRatioConverter.h @@ -43,12 +43,12 @@ class CAspectRatioConverter } } - float GetSourceRatioValue(void) const { return m_fSourceRatioValue; } + float GetSourceRatioValue() const { return m_fSourceRatioValue; } // Temp suspend conversion. i.e. When F11 map is displayed void SetSuspended(bool bSuspended) { m_bSuspended = bSuspended; } - bool IsEnabled(void) const { return (m_bValidRatios && !m_bSuspended); } + bool IsEnabled() const { return (m_bValidRatios && !m_bSuspended); } // Convert a y screen position float ConvertPositionForAspectRatio(const float fY) const diff --git a/Client/core/Graphics/CGraphics.cpp b/Client/core/Graphics/CGraphics.cpp index 44d2cebd2b8..10e4eefb64d 100644 --- a/Client/core/Graphics/CGraphics.cpp +++ b/Client/core/Graphics/CGraphics.cpp @@ -67,7 +67,7 @@ CGraphics::CGraphics(CLocalGUI* pGUI) m_pAspectRatioConverter = new CAspectRatioConverter(); } -CGraphics::~CGraphics(void) +CGraphics::~CGraphics() { if (m_pLineInterface) m_pLineInterface->Release(); @@ -286,12 +286,12 @@ void CGraphics::SetAspectRatioAdjustmentEnabled(bool bEnabled, float fSourceRati m_pAspectRatioConverter->SetSourceRatioValue(bEnabled ? fSourceRatio : 0); } -bool CGraphics::IsAspectRatioAdjustmentEnabled(void) +bool CGraphics::IsAspectRatioAdjustmentEnabled() { return m_pAspectRatioConverter->IsEnabled(); } -float CGraphics::GetAspectRatioAdjustmentSourceRatio(void) +float CGraphics::GetAspectRatioAdjustmentSourceRatio() { return m_pAspectRatioConverter->GetSourceRatioValue(); } @@ -319,7 +319,7 @@ void CGraphics::SetBlendMode(EBlendModeType blendMode) m_ActiveBlendMode = blendMode; } -EBlendModeType CGraphics::GetBlendMode(void) +EBlendModeType CGraphics::GetBlendMode() { return m_ActiveBlendMode; } @@ -472,7 +472,7 @@ void CGraphics::BeginDrawBatch(EBlendModeType xxblendMode) // // EndDrawBatch // -void CGraphics::EndDrawBatch(void) +void CGraphics::EndDrawBatch() { if (--m_iDrawBatchRefCount == 0) CheckModes(EDrawMode::NONE, EBlendMode::BLEND); @@ -581,12 +581,12 @@ void CGraphics::CalcScreenCoors(CVector* vecWorld, CVector* vecScreen) vecScreen->fY *= fRecip * (*dwLenY); } -unsigned int CGraphics::GetViewportWidth(void) +unsigned int CGraphics::GetViewportWidth() { return CDirect3DData::GetSingleton().GetViewportWidth(); } -unsigned int CGraphics::GetViewportHeight(void) +unsigned int CGraphics::GetViewportHeight() { return CDirect3DData::GetSingleton().GetViewportHeight(); } @@ -1236,7 +1236,7 @@ static const sFontInfo fontInfos[] = {{"tahoma", 15, FW_NORMAL}, {"beckett", 30, FW_NORMAL}, {"unifont", 14, FW_NORMAL}}; -bool CGraphics::LoadStandardDXFonts(void) +bool CGraphics::LoadStandardDXFonts() { // Add our custom font resources if (m_FontResourceNames.empty()) @@ -1341,7 +1341,7 @@ bool CGraphics::DestroyAdditionalDXFont(std::string strFontPath, ID3DXFont* pD3D return bResult; } -bool CGraphics::DestroyStandardDXFonts(void) +bool CGraphics::DestroyStandardDXFonts() { // Remove our custom font resources (needs to be identical to LoadFonts) for (uint i = 0; i < m_FontResourceNames.size(); i++) @@ -1475,17 +1475,17 @@ void CGraphics::OnDeviceRestore(IDirect3DDevice9* pDevice) m_pScreenGrabber->OnResetDevice(); } -void CGraphics::OnZBufferModified(void) +void CGraphics::OnZBufferModified() { m_pTileBatcher->OnZBufferModified(); } -void CGraphics::DrawPreGUIQueue(void) +void CGraphics::DrawPreGUIQueue() { DrawQueue(m_PreGUIQueue); } -void CGraphics::DrawPostGUIQueue(void) +void CGraphics::DrawPostGUIQueue() { DrawQueue(m_PostGUIQueue); m_pLine3DBatcherPostGUI->Flush(); @@ -1495,13 +1495,13 @@ void CGraphics::DrawPostGUIQueue(void) assert(m_PreGUIQueue.empty() && m_iDebugQueueRefs == 0); } -void CGraphics::DrawLine3DPreGUIQueue(void) +void CGraphics::DrawLine3DPreGUIQueue() { m_pLine3DBatcherPreGUI->Flush(); m_pMaterialLine3DBatcherPreGUI->Flush(); } -bool CGraphics::HasLine3DPreGUIQueueItems(void) +bool CGraphics::HasLine3DPreGUIQueueItems() { return m_pLine3DBatcherPreGUI->HasItems() || m_pMaterialLine3DBatcherPreGUI->HasItems(); } @@ -1759,7 +1759,7 @@ void CGraphics::OnChangingRenderTarget(uint uiNewViewportSizeX, uint uiNewViewpo // Called when entering known areas of MTA rendering activity // //////////////////////////////////////////////////////////////// -void CGraphics::EnteringMTARenderZone(void) +void CGraphics::EnteringMTARenderZone() { SaveGTARenderStates(); m_MTARenderZone = MTA_RZONE_MAIN; @@ -1773,7 +1773,7 @@ void CGraphics::EnteringMTARenderZone(void) // Called when leaving known areas of MTA rendering activity // //////////////////////////////////////////////////////////////// -void CGraphics::LeavingMTARenderZone(void) +void CGraphics::LeavingMTARenderZone() { RestoreGTARenderStates(); m_MTARenderZone = MTA_RZONE_NONE; @@ -1787,7 +1787,7 @@ void CGraphics::LeavingMTARenderZone(void) // Should be called before MTA rendering activity, if there is a chance it will be outside the known areas // //////////////////////////////////////////////////////////////// -void CGraphics::MaybeEnteringMTARenderZone(void) +void CGraphics::MaybeEnteringMTARenderZone() { if (m_MTARenderZone == MTA_RZONE_OUTSIDE) { @@ -1813,7 +1813,7 @@ void CGraphics::MaybeEnteringMTARenderZone(void) // Should be called sometime after MaybeEnteringMTARenderZone // //////////////////////////////////////////////////////////////// -void CGraphics::MaybeLeavingMTARenderZone(void) +void CGraphics::MaybeLeavingMTARenderZone() { if (m_MTARenderZone == MTA_RZONE_OUTSIDE) { @@ -1835,7 +1835,7 @@ void CGraphics::MaybeLeavingMTARenderZone(void) // Handle moving into MTA controlled rendering // //////////////////////////////////////////////////////////////// -void CGraphics::SaveGTARenderStates(void) +void CGraphics::SaveGTARenderStates() { SAFE_RELEASE(m_pSavedStateBlock); // Create a state block. @@ -1857,7 +1857,7 @@ void CGraphics::SaveGTARenderStates(void) // Handle moving out of MTA controlled rendering // //////////////////////////////////////////////////////////////// -void CGraphics::RestoreGTARenderStates(void) +void CGraphics::RestoreGTARenderStates() { // Restore these transforms to fix various weird stuff m_pDevice->SetTransform(D3DTS_PROJECTION, &g_pDeviceState->TransformState.PROJECTION); @@ -1879,7 +1879,7 @@ void CGraphics::RestoreGTARenderStates(void) // Notify that scene rendering is working // //////////////////////////////////////////////////////////////// -void CGraphics::DidRenderScene(void) +void CGraphics::DidRenderScene() { if (m_bProgressVisible) { diff --git a/Client/core/Graphics/CGraphics.h b/Client/core/Graphics/CGraphics.h index cb3029b3f5a..8acb0387143 100644 --- a/Client/core/Graphics/CGraphics.h +++ b/Client/core/Graphics/CGraphics.h @@ -48,7 +48,7 @@ using EDrawMode::EDrawModeType; struct SCustomScaleFontInfo { - SCustomScaleFontInfo(void) : fScale(0), fontType(FONT_DEFAULT), pFont(NULL) {} + SCustomScaleFontInfo() : fScale(0), fontType(FONT_DEFAULT), pFont(NULL) {} float fScale; eFontType fontType; ID3DXFont* pFont; @@ -69,10 +69,10 @@ class CGraphics : public CGraphicsInterface, public CSingleton public: ZERO_ON_NEW CGraphics(CLocalGUI* pGUI); - ~CGraphics(void); + ~CGraphics(); // DirectX misc. functions - IDirect3DDevice9* GetDevice(void) { return m_pDevice; }; + IDirect3DDevice9* GetDevice() { return m_pDevice; }; // Transformation functions void CalcWorldCoors(CVector* vecScreen, CVector* vecWorld); @@ -87,18 +87,18 @@ class CGraphics : public CGraphicsInterface, public CSingleton void DrawStringOutline(const RECT& rect, unsigned long ulColor, const wchar_t* szText, unsigned long ulFormat, LPD3DXFONT pDXFont); void SetBlendMode(EBlendModeType blendMode); - EBlendModeType GetBlendMode(void); + EBlendModeType GetBlendMode(); SColor ModifyColorForBlendMode(SColor color, EBlendModeType blendMode); void BeginDrawBatch(EBlendModeType blendMode = EBlendMode::NONE); - void EndDrawBatch(void); + void EndDrawBatch(); void SetBlendModeRenderStates(EBlendModeType blendMode); - unsigned int GetViewportWidth(void); - unsigned int GetViewportHeight(void); + unsigned int GetViewportWidth(); + unsigned int GetViewportHeight(); void SetAspectRatioAdjustmentEnabled(bool bEnabled, float fSourceRatio = 4 / 3.f); - bool IsAspectRatioAdjustmentEnabled(void); - float GetAspectRatioAdjustmentSourceRatio(void); + bool IsAspectRatioAdjustmentEnabled(); + float GetAspectRatioAdjustmentSourceRatio(); void SetAspectRatioAdjustmentSuspended(bool bSuspended); float ConvertPositionForAspectRatio(float fY); void ConvertSideForAspectRatio(float* pfY, float* pfHeight); @@ -106,8 +106,8 @@ class CGraphics : public CGraphicsInterface, public CSingleton // DirectX font functions ID3DXFont* GetFont(eFontType fontType = FONT_DEFAULT, float* pfOutScaleUsed = NULL, float fRequestedScale = 1, const char* szCustomScaleUser = NULL); - bool LoadStandardDXFonts(void); - bool DestroyStandardDXFonts(void); + bool LoadStandardDXFonts(); + bool DestroyStandardDXFonts(); bool CreateStandardDXFontWithCustomScale(eFontType fontType, float fScale, ID3DXFont** ppD3DXFont); bool LoadAdditionalDXFont(std::string strFontPath, std::string strFontName, unsigned int uiHeight, bool bBold, ID3DXFont** ppD3DXFont); @@ -155,17 +155,17 @@ class CGraphics : public CGraphicsInterface, public CSingleton void OnChangingRenderTarget(uint uiNewViewportSizeX, uint uiNewViewportSizeY); // Subsystems - CRenderItemManagerInterface* GetRenderItemManager(void) { return m_pRenderItemManager; } - CScreenGrabberInterface* GetScreenGrabber(void) { return m_pScreenGrabber; } - CPixelsManagerInterface* GetPixelsManager(void) { return m_pPixelsManager; } + CRenderItemManagerInterface* GetRenderItemManager() { return m_pRenderItemManager; } + CScreenGrabberInterface* GetScreenGrabber() { return m_pScreenGrabber; } + CPixelsManagerInterface* GetPixelsManager() { return m_pPixelsManager; } // Transition between GTA and MTA controlled rendering - virtual void EnteringMTARenderZone(void); - virtual void LeavingMTARenderZone(void); - virtual void MaybeEnteringMTARenderZone(void); - virtual void MaybeLeavingMTARenderZone(void); - void SaveGTARenderStates(void); - void RestoreGTARenderStates(void); + virtual void EnteringMTARenderZone(); + virtual void LeavingMTARenderZone(); + virtual void MaybeEnteringMTARenderZone(); + virtual void MaybeLeavingMTARenderZone(); + void SaveGTARenderStates(); + void RestoreGTARenderStates(); // Texture data manipulation bool ResizeTextureData(const void* pData, uint uiDataPitch, uint uiWidth, uint uiHeight, uint d3dFormat, uint uiNewWidth, uint uiNewHeight, @@ -174,12 +174,12 @@ class CGraphics : public CGraphicsInterface, public CSingleton bool CopyDataFromSurface(IDirect3DSurface9* pSurface, CBuffer& outBuffer); // To draw queued up drawings - void DrawPreGUIQueue(void); - void DrawPostGUIQueue(void); - void DrawLine3DPreGUIQueue(void); - bool HasLine3DPreGUIQueueItems(void); + void DrawPreGUIQueue(); + void DrawPostGUIQueue(); + void DrawLine3DPreGUIQueue(); + bool HasLine3DPreGUIQueueItems(); - void DidRenderScene(void); + void DidRenderScene(); void SetProgressMessage(const SString& strMessage); void DrawProgressMessage(bool bPreserveBackbuffer = true); void DrawRectangleInternal(float fX, float fY, float fWidth, float fHeight, unsigned long ulColor, bool bSubPixelPositioning); @@ -188,7 +188,7 @@ class CGraphics : public CGraphicsInterface, public CSingleton void OnDeviceCreate(IDirect3DDevice9* pDevice); void OnDeviceInvalidate(IDirect3DDevice9* pDevice); void OnDeviceRestore(IDirect3DDevice9* pDevice); - void OnZBufferModified(void); + void OnZBufferModified(); ID3DXFont* MaybeGetBigFont(ID3DXFont* pDXFont, float& fScaleX, float& fScaleY); void CheckModes(EDrawModeType newDrawMode, EBlendModeType newBlendMode = EBlendMode::NONE); void DrawColorCodedTextLine(float fLeft, float fRight, float fY, SColor& currentColor, const wchar_t* wszText, float fScaleX, float fScaleY, diff --git a/Client/core/Graphics/CLine3DBatcher.cpp b/Client/core/Graphics/CLine3DBatcher.cpp index 3a5c241e93b..e0af9312297 100644 --- a/Client/core/Graphics/CLine3DBatcher.cpp +++ b/Client/core/Graphics/CLine3DBatcher.cpp @@ -31,7 +31,7 @@ CLine3DBatcher::CLine3DBatcher(bool bZTest) // // //////////////////////////////////////////////////////////////// -CLine3DBatcher::~CLine3DBatcher(void) +CLine3DBatcher::~CLine3DBatcher() { } @@ -54,7 +54,7 @@ void CLine3DBatcher::OnDeviceCreate(IDirect3DDevice9* pDevice, float fViewportSi // Send all buffered vertices to D3D // //////////////////////////////////////////////////////////////// -void CLine3DBatcher::Flush(void) +void CLine3DBatcher::Flush() { if (m_LineList.empty()) return; diff --git a/Client/core/Graphics/CLine3DBatcher.h b/Client/core/Graphics/CLine3DBatcher.h index c26b1f30c61..e951613881d 100644 --- a/Client/core/Graphics/CLine3DBatcher.h +++ b/Client/core/Graphics/CLine3DBatcher.h @@ -39,11 +39,11 @@ class CLine3DBatcher public: ZERO_ON_NEW CLine3DBatcher(bool bZTest); - ~CLine3DBatcher(void); + ~CLine3DBatcher(); void OnDeviceCreate(IDirect3DDevice9* pDevice, float fViewportSizeX, float fViewportSizeY); - void Flush(void); - bool HasItems(void) { return !m_LineList.empty(); } + void Flush(); + bool HasItems() { return !m_LineList.empty(); } void AddLine3D(const CVector& vecFrom, const CVector& vecTo, float fWidth, ulong ulColor); protected: diff --git a/Client/core/Graphics/CMaterialLine3DBatcher.cpp b/Client/core/Graphics/CMaterialLine3DBatcher.cpp index 6cf298c2013..8a58e6e16bc 100644 --- a/Client/core/Graphics/CMaterialLine3DBatcher.cpp +++ b/Client/core/Graphics/CMaterialLine3DBatcher.cpp @@ -34,7 +34,7 @@ CMaterialLine3DBatcher::CMaterialLine3DBatcher(bool bPreGUI) // // //////////////////////////////////////////////////////////////// -CMaterialLine3DBatcher::~CMaterialLine3DBatcher(void) +CMaterialLine3DBatcher::~CMaterialLine3DBatcher() { } @@ -57,7 +57,7 @@ void CMaterialLine3DBatcher::OnDeviceCreate(IDirect3DDevice9* pDevice, float fVi // Draw all pending lines // //////////////////////////////////////////////////////////////// -void CMaterialLine3DBatcher::Flush(void) +void CMaterialLine3DBatcher::Flush() { if (m_LineList.empty()) return; diff --git a/Client/core/Graphics/CMaterialLine3DBatcher.h b/Client/core/Graphics/CMaterialLine3DBatcher.h index 9f4f1a21e07..41c3f3e463d 100644 --- a/Client/core/Graphics/CMaterialLine3DBatcher.h +++ b/Client/core/Graphics/CMaterialLine3DBatcher.h @@ -33,11 +33,11 @@ class CMaterialLine3DBatcher public: ZERO_ON_NEW CMaterialLine3DBatcher(bool bPreGUI); - ~CMaterialLine3DBatcher(void); + ~CMaterialLine3DBatcher(); void OnDeviceCreate(IDirect3DDevice9* pDevice, float fViewportSizeX, float fViewportSizeY); - void Flush(void); - bool HasItems(void) { return !m_LineList.empty(); } + void Flush(); + bool HasItems() { return !m_LineList.empty(); } void AddLine3D(const CVector& vecFrom, const CVector& vecTo, float fWidth, ulong ulColor, CMaterialItem* pMaterial, float fU, float fV, float fSizeU, float fSizeV, bool bRelativeUV, bool bUseFaceToward, const CVector& vecFaceToward); diff --git a/Client/core/Graphics/CPixelsManager.cpp b/Client/core/Graphics/CPixelsManager.cpp index 4e47abdb3fc..a804600db8c 100644 --- a/Client/core/Graphics/CPixelsManager.cpp +++ b/Client/core/Graphics/CPixelsManager.cpp @@ -15,7 +15,7 @@ /////////////////////////////////////////////////////////////// // Object creation /////////////////////////////////////////////////////////////// -CPixelsManagerInterface* NewPixelsManager(void) +CPixelsManagerInterface* NewPixelsManager() { return new CPixelsManager(); } @@ -27,7 +27,7 @@ CPixelsManagerInterface* NewPixelsManager(void) // // //////////////////////////////////////////////////////////////// -CPixelsManager::CPixelsManager(void) +CPixelsManager::CPixelsManager() { } @@ -38,7 +38,7 @@ CPixelsManager::CPixelsManager(void) // // //////////////////////////////////////////////////////////////// -CPixelsManager::~CPixelsManager(void) +CPixelsManager::~CPixelsManager() { SAFE_RELEASE(m_pTempOffscreenSurface); } diff --git a/Client/core/Graphics/CPixelsManager.h b/Client/core/Graphics/CPixelsManager.h index af9b80dc2ec..393388ee4a9 100644 --- a/Client/core/Graphics/CPixelsManager.h +++ b/Client/core/Graphics/CPixelsManager.h @@ -21,7 +21,7 @@ class CAutoReleaseMe public: CAutoReleaseMe(T*& pPtr) : pPtr(pPtr) {} - ~CAutoReleaseMe(void) { SAFE_RELEASE(pPtr); } + ~CAutoReleaseMe() { SAFE_RELEASE(pPtr); } }; /////////////////////////////////////////////////////////////// @@ -34,8 +34,8 @@ class CPixelsManager : public CPixelsManagerInterface { public: ZERO_ON_NEW - CPixelsManager(void); - ~CPixelsManager(void); + CPixelsManager(); + ~CPixelsManager(); // CPixelsManagerInterface virtual void OnDeviceCreate(IDirect3DDevice9* pDevice); diff --git a/Client/core/Graphics/CPrimitiveBatcher.cpp b/Client/core/Graphics/CPrimitiveBatcher.cpp index ac474de1c89..c05047802e2 100644 --- a/Client/core/Graphics/CPrimitiveBatcher.cpp +++ b/Client/core/Graphics/CPrimitiveBatcher.cpp @@ -28,7 +28,7 @@ CPrimitiveBatcher::CPrimitiveBatcher() // // //////////////////////////////////////////////////////////////// -CPrimitiveBatcher::~CPrimitiveBatcher(void) +CPrimitiveBatcher::~CPrimitiveBatcher() { } //////////////////////////////////////////////////////////////// @@ -126,7 +126,7 @@ void CPrimitiveBatcher::SetDeviceStates() // Send all buffered vertices to D3D // //////////////////////////////////////////////////////////////// -void CPrimitiveBatcher::Flush(void) +void CPrimitiveBatcher::Flush() { if (m_primitiveList.empty()) return; diff --git a/Client/core/Graphics/CPrimitiveBatcher.h b/Client/core/Graphics/CPrimitiveBatcher.h index de559aa515c..2f687d8916f 100644 --- a/Client/core/Graphics/CPrimitiveBatcher.h +++ b/Client/core/Graphics/CPrimitiveBatcher.h @@ -22,14 +22,14 @@ class CPrimitiveBatcher public: ZERO_ON_NEW CPrimitiveBatcher(); - ~CPrimitiveBatcher(void); + ~CPrimitiveBatcher(); void OnDeviceCreate(IDirect3DDevice9* pDevice, float fViewportSizeX, float fViewportSizeY); void OnChangingRenderTarget(uint uiNewViewportSizeX, uint uiNewViewportSizeY); void UpdateMatrices(float fViewportSizeX, float fViewportSizeY); void SetDeviceStates(); - void Flush(void); + void Flush(); void DrawPrimitive(D3DPRIMITIVETYPE eType, size_t iSize, const void* pDataAddr, size_t iVertexStride); - void ClearQueue(void); + void ClearQueue(); void AddPrimitive(D3DPRIMITIVETYPE eType, std::vector* pVecVertices); protected: diff --git a/Client/core/Graphics/CPrimitiveMaterialBatcher.cpp b/Client/core/Graphics/CPrimitiveMaterialBatcher.cpp index ba935e8a717..beeaa4f177b 100644 --- a/Client/core/Graphics/CPrimitiveMaterialBatcher.cpp +++ b/Client/core/Graphics/CPrimitiveMaterialBatcher.cpp @@ -28,7 +28,7 @@ CPrimitiveMaterialBatcher::CPrimitiveMaterialBatcher(CGraphics* graphics) // // //////////////////////////////////////////////////////////////// -CPrimitiveMaterialBatcher::~CPrimitiveMaterialBatcher(void) +CPrimitiveMaterialBatcher::~CPrimitiveMaterialBatcher() { } //////////////////////////////////////////////////////////////// @@ -128,7 +128,7 @@ void CPrimitiveMaterialBatcher::SetDeviceStates() // Send all buffered vertices to D3D // //////////////////////////////////////////////////////////////// -void CPrimitiveMaterialBatcher::Flush(void) +void CPrimitiveMaterialBatcher::Flush() { if (m_primitiveList.empty()) return; diff --git a/Client/core/Graphics/CPrimitiveMaterialBatcher.h b/Client/core/Graphics/CPrimitiveMaterialBatcher.h index db5cf659977..e9f56d8bcec 100644 --- a/Client/core/Graphics/CPrimitiveMaterialBatcher.h +++ b/Client/core/Graphics/CPrimitiveMaterialBatcher.h @@ -24,14 +24,14 @@ class CPrimitiveMaterialBatcher public: ZERO_ON_NEW CPrimitiveMaterialBatcher(CGraphics* graphics); - ~CPrimitiveMaterialBatcher(void); + ~CPrimitiveMaterialBatcher(); void OnDeviceCreate(IDirect3DDevice9* pDevice, float fViewportSizeX, float fViewportSizeY); void OnChangingRenderTarget(uint uiNewViewportSizeX, uint uiNewViewportSizeY); void UpdateMatrices(float fViewportSizeX, float fViewportSizeY); void SetDeviceStates(); - void Flush(void); + void Flush(); void DrawPrimitive(D3DPRIMITIVETYPE eType, size_t iSize, const void* pDataAddr, size_t iVertexStride); - void ClearQueue(void); + void ClearQueue(); void AddPrimitive(D3DPRIMITIVETYPE eType, CMaterialItem* pMaterial, std::vector* pVecVertices); protected: diff --git a/Client/core/Graphics/CRenderItem.DxFont.cpp b/Client/core/Graphics/CRenderItem.DxFont.cpp index ada07f513e0..64d2a676979 100644 --- a/Client/core/Graphics/CRenderItem.DxFont.cpp +++ b/Client/core/Graphics/CRenderItem.DxFont.cpp @@ -33,7 +33,7 @@ void CDxFontItem::PostConstruct(CRenderItemManager* pManager, const SString& str // // //////////////////////////////////////////////////////////////// -void CDxFontItem::PreDestruct(void) +void CDxFontItem::PreDestruct() { ReleaseUnderlyingData(); Super::PreDestruct(); @@ -46,7 +46,7 @@ void CDxFontItem::PreDestruct(void) // Check underlying data is present // //////////////////////////////////////////////////////////////// -bool CDxFontItem::IsValid(void) +bool CDxFontItem::IsValid() { return m_pFntNormal != NULL; } @@ -58,7 +58,7 @@ bool CDxFontItem::IsValid(void) // Release device stuff // //////////////////////////////////////////////////////////////// -void CDxFontItem::OnLostDevice(void) +void CDxFontItem::OnLostDevice() { m_pFntNormal->OnLostDevice(); } @@ -70,7 +70,7 @@ void CDxFontItem::OnLostDevice(void) // Recreate device stuff // //////////////////////////////////////////////////////////////// -void CDxFontItem::OnResetDevice(void) +void CDxFontItem::OnResetDevice() { m_pFntNormal->OnResetDevice(); } @@ -114,7 +114,7 @@ void CDxFontItem::CreateUnderlyingData(uint uiSize, bool bBold, DWORD ulQuality) // // //////////////////////////////////////////////////////////////// -void CDxFontItem::ReleaseUnderlyingData(void) +void CDxFontItem::ReleaseUnderlyingData() { // Release the D3DX font data CCore::GetSingleton().GetGraphics()->DestroyAdditionalDXFont(m_strFullFilePath, m_pFntNormal); diff --git a/Client/core/Graphics/CRenderItem.EffectCloner.cpp b/Client/core/Graphics/CRenderItem.EffectCloner.cpp index b404b4f85c9..c207a25e5f0 100644 --- a/Client/core/Graphics/CRenderItem.EffectCloner.cpp +++ b/Client/core/Graphics/CRenderItem.EffectCloner.cpp @@ -116,7 +116,7 @@ void CEffectCloner::ReleaseD3DEffect(CEffectWrap* pEffectWrap) // // //////////////////////////////////////////////////////////////// -void CEffectCloner::DoPulse(void) +void CEffectCloner::DoPulse() { MaybeTidyUp(); } diff --git a/Client/core/Graphics/CRenderItem.EffectCloner.h b/Client/core/Graphics/CRenderItem.EffectCloner.h index baccc49ea99..ec303dee05e 100644 --- a/Client/core/Graphics/CRenderItem.EffectCloner.h +++ b/Client/core/Graphics/CRenderItem.EffectCloner.h @@ -18,7 +18,7 @@ class CEffectCloner { public: CEffectCloner(CRenderItemManager* pManager); - void DoPulse(void); + void DoPulse(); CEffectWrap* CreateD3DEffect(const SString& strFile, const SString& strRootPath, bool bIsRawData, SString& strOutStatus, bool bDebug); void ReleaseD3DEffect(CEffectWrap* pD3DEffect); void MaybeTidyUp(bool bForceDrasticMeasures = false); diff --git a/Client/core/Graphics/CRenderItem.EffectParameters.cpp b/Client/core/Graphics/CRenderItem.EffectParameters.cpp index 23d981607ad..3503cc63d81 100644 --- a/Client/core/Graphics/CRenderItem.EffectParameters.cpp +++ b/Client/core/Graphics/CRenderItem.EffectParameters.cpp @@ -397,7 +397,7 @@ HRESULT CEffectParameters::Begin(UINT* pPasses, DWORD Flags, bool bWorldRender) // Ensures secondary render targets are unset // //////////////////////////////////////////////////////////////// -HRESULT CEffectParameters::End(void) +HRESULT CEffectParameters::End() { HRESULT hResult = m_pD3DEffect->End(); for (uint i = 0; i < m_SecondaryRenderTargetList.size(); i++) @@ -417,7 +417,7 @@ HRESULT CEffectParameters::End(void) // Called before render // //////////////////////////////////////////////////////////////// -bool CEffectParameters::ApplyCommonHandles(void) +bool CEffectParameters::ApplyCommonHandles() { if (!m_bUsesCommonHandles) return false; @@ -588,7 +588,7 @@ void BOUNDS_CHECK(const void* ptr, int ptrsize, const void* bufstart, int bufsiz // Called before render // //////////////////////////////////////////////////////////////// -bool CEffectParameters::ApplyMappedHandles(void) +bool CEffectParameters::ApplyMappedHandles() { if (!m_bUsesMappedHandles) return false; @@ -834,7 +834,7 @@ void CEffectParameters::NotifyModifiedParameter(D3DXHANDLE hParameter) // Get list of parameters set by any shader instance // //////////////////////////////////////////////////////////////// -const std::set& CEffectParameters::GetModifiedParameters(void) +const std::set& CEffectParameters::GetModifiedParameters() { return m_ModifiedParametersList; } @@ -864,7 +864,7 @@ void CEffectParameters::RestoreParametersDefaultValue(const std::vectorGetDesc(&EffectDesc); @@ -1178,7 +1178,7 @@ void CEffectParameters::AddStateMappedParameter(EStateGroup stateGroup, const SS // Called during parse stage // //////////////////////////////////////////////////////////////// -void CEffectParameters::ReadCommonHandles(void) +void CEffectParameters::ReadCommonHandles() { struct { diff --git a/Client/core/Graphics/CRenderItem.EffectParameters.h b/Client/core/Graphics/CRenderItem.EffectParameters.h index 7e01b2c0f7c..b0f68116e31 100644 --- a/Client/core/Graphics/CRenderItem.EffectParameters.h +++ b/Client/core/Graphics/CRenderItem.EffectParameters.h @@ -91,20 +91,20 @@ struct SRegisterInfo class CEffectParameters : public CRenderItem { DECLARE_CLASS(CEffectParameters, CRenderItem) - CEffectParameters(void) : ClassInit(this) {} - bool ApplyCommonHandles(void); - bool ApplyMappedHandles(void); + CEffectParameters() : ClassInit(this) {} + bool ApplyCommonHandles(); + bool ApplyMappedHandles(); HRESULT Begin(UINT* pPasses, DWORD Flags, bool bWorldRender = true); - HRESULT End(void); + HRESULT End(); void NotifyModifiedParameter(D3DXHANDLE hParameter); - const std::set& GetModifiedParameters(void); + const std::set& GetModifiedParameters(); void RestoreParametersDefaultValue(const std::vector& parameterList); protected: - void ReadParameterHandles(void); + void ReadParameterHandles(); bool TryParseSpecialParameter(D3DXHANDLE hParameter, const D3DXPARAMETER_DESC& ParameterDesc); bool TryMappingParameterToRegister(D3DXHANDLE hParameter, const D3DXPARAMETER_DESC& ParameterDesc); - void ReadCommonHandles(void); + void ReadCommonHandles(); const SRegisterInfo* GetRegisterInfo(EStateGroup stateGroup, const SString& strName); const STypeMapping* MatchTypeMapping(EReadableAsType readableAsType, const D3DXPARAMETER_DESC& desc); void AddStateMappedParameter(EStateGroup stateGroup, const SStateVar& var); diff --git a/Client/core/Graphics/CRenderItem.EffectTemplate.cpp b/Client/core/Graphics/CRenderItem.EffectTemplate.cpp index ba7cf690638..abea0152c22 100644 --- a/Client/core/Graphics/CRenderItem.EffectTemplate.cpp +++ b/Client/core/Graphics/CRenderItem.EffectTemplate.cpp @@ -136,7 +136,7 @@ void CEffectTemplate::PostConstruct(CRenderItemManager* pManager, const SString& // // //////////////////////////////////////////////////////////////// -void CEffectTemplate::PreDestruct(void) +void CEffectTemplate::PreDestruct() { ReleaseUnderlyingData(); Super::PreDestruct(); @@ -149,7 +149,7 @@ void CEffectTemplate::PreDestruct(void) // // //////////////////////////////////////////////////////////////// -int CEffectTemplate::GetTicksSinceLastUsed(void) +int CEffectTemplate::GetTicksSinceLastUsed() { if (m_uiCloneCount != 0) return 0; // Used right now @@ -165,7 +165,7 @@ int CEffectTemplate::GetTicksSinceLastUsed(void) // Check underlying data is present // //////////////////////////////////////////////////////////////// -bool CEffectTemplate::IsValid(void) +bool CEffectTemplate::IsValid() { return m_pD3DEffect != NULL; } @@ -177,7 +177,7 @@ bool CEffectTemplate::IsValid(void) // Release device stuff // //////////////////////////////////////////////////////////////// -void CEffectTemplate::OnLostDevice(void) +void CEffectTemplate::OnLostDevice() { m_pD3DEffect->OnLostDevice(); } @@ -189,7 +189,7 @@ void CEffectTemplate::OnLostDevice(void) // Recreate device stuff // //////////////////////////////////////////////////////////////// -void CEffectTemplate::OnResetDevice(void) +void CEffectTemplate::OnResetDevice() { m_pD3DEffect->OnResetDevice(); } @@ -401,7 +401,7 @@ bool CEffectTemplate::ValidateDepthBufferUsage(D3DXHANDLE hTechnique, SString& s // // //////////////////////////////////////////////////////////////// -void CEffectTemplate::ReleaseUnderlyingData(void) +void CEffectTemplate::ReleaseUnderlyingData() { SAFE_RELEASE(m_pD3DEffect); } @@ -447,7 +447,7 @@ void CEffectTemplate::UnCloneD3DEffect(CEffectWrap* pEffectWrap) // Recheck MD5's to see if the content has changed // //////////////////////////////////////////////////////////////// -bool CEffectTemplate::HaveFilesChanged(void) +bool CEffectTemplate::HaveFilesChanged() { if (!m_bHaveFilesChanged) { diff --git a/Client/core/Graphics/CRenderItem.EffectTemplate.h b/Client/core/Graphics/CRenderItem.EffectTemplate.h index 54c0c8db07c..2571da1c586 100644 --- a/Client/core/Graphics/CRenderItem.EffectTemplate.h +++ b/Client/core/Graphics/CRenderItem.EffectTemplate.h @@ -19,18 +19,18 @@ class CEffectTemplate : public CEffectParameters { DECLARE_CLASS(CEffectTemplate, CEffectParameters) - CEffectTemplate(void) : ClassInit(this) {} + CEffectTemplate() : ClassInit(this) {} virtual void PostConstruct(CRenderItemManager* pManager, const SString& strFile, const SString& strRootPath, bool bIsRawData, SString& strOutStatus, bool bDebug); - virtual void PreDestruct(void); - virtual bool IsValid(void); - virtual void OnLostDevice(void); - virtual void OnResetDevice(void); - bool HaveFilesChanged(void); - int GetTicksSinceLastUsed(void); + virtual void PreDestruct(); + virtual bool IsValid(); + virtual void OnLostDevice(); + virtual void OnResetDevice(); + bool HaveFilesChanged(); + int GetTicksSinceLastUsed(); CEffectWrap* CloneD3DEffect(SString& strOutStatus); void UnCloneD3DEffect(CEffectWrap* pD3DEffect); void CreateUnderlyingData(const SString& strFile, const SString& strRootPath, bool bIsRawData, SString& strOutStatus, bool bDebug); - void ReleaseUnderlyingData(void); + void ReleaseUnderlyingData(); bool ValidateDepthBufferUsage(D3DXHANDLE hTechnique, SString& strOutErrorExtra); bool m_bHaveFilesChanged; diff --git a/Client/core/Graphics/CRenderItem.EffectWrap.cpp b/Client/core/Graphics/CRenderItem.EffectWrap.cpp index e9d173ae258..3f46b808ded 100644 --- a/Client/core/Graphics/CRenderItem.EffectWrap.cpp +++ b/Client/core/Graphics/CRenderItem.EffectWrap.cpp @@ -32,7 +32,7 @@ void CEffectWrap::PostConstruct(CRenderItemManager* pManager, CEffectTemplate* p // // //////////////////////////////////////////////////////////////// -void CEffectWrap::PreDestruct(void) +void CEffectWrap::PreDestruct() { SAFE_RELEASE(m_pEffectTemplate); Super::PreDestruct(); @@ -45,7 +45,7 @@ void CEffectWrap::PreDestruct(void) // Check underlying data is present // //////////////////////////////////////////////////////////////// -bool CEffectWrap::IsValid(void) +bool CEffectWrap::IsValid() { return m_pD3DEffect != NULL; } @@ -57,7 +57,7 @@ bool CEffectWrap::IsValid(void) // Release device stuff // //////////////////////////////////////////////////////////////// -void CEffectWrap::OnLostDevice(void) +void CEffectWrap::OnLostDevice() { // Handled in CEffectTemplate } @@ -69,7 +69,7 @@ void CEffectWrap::OnLostDevice(void) // Recreate device stuff // //////////////////////////////////////////////////////////////// -void CEffectWrap::OnResetDevice(void) +void CEffectWrap::OnResetDevice() { // Handled in CEffectTemplate } @@ -95,7 +95,7 @@ HRESULT CEffectWrap::Begin(UINT* pPasses, DWORD Flags, bool bWorldRender) // Ensures secondary render targets are unset // //////////////////////////////////////////////////////////////// -HRESULT CEffectWrap::End(void) +HRESULT CEffectWrap::End() { return m_pEffectTemplate->End(); } @@ -108,7 +108,7 @@ HRESULT CEffectWrap::End(void) // Called before render // //////////////////////////////////////////////////////////////// -bool CEffectWrap::ApplyCommonHandles(void) +bool CEffectWrap::ApplyCommonHandles() { return m_pEffectTemplate->ApplyCommonHandles(); } @@ -121,7 +121,7 @@ bool CEffectWrap::ApplyCommonHandles(void) // Called before render // //////////////////////////////////////////////////////////////// -bool CEffectWrap::ApplyMappedHandles(void) +bool CEffectWrap::ApplyMappedHandles() { return m_pEffectTemplate->ApplyMappedHandles(); } diff --git a/Client/core/Graphics/CRenderItem.FileTexture.cpp b/Client/core/Graphics/CRenderItem.FileTexture.cpp index 31737bf8bf2..5b4637295d5 100644 --- a/Client/core/Graphics/CRenderItem.FileTexture.cpp +++ b/Client/core/Graphics/CRenderItem.FileTexture.cpp @@ -41,7 +41,7 @@ void CFileTextureItem::PostConstruct(CRenderItemManager* pManager, const SString // // //////////////////////////////////////////////////////////////// -void CFileTextureItem::PreDestruct(void) +void CFileTextureItem::PreDestruct() { ReleaseUnderlyingData(); Super::PreDestruct(); @@ -54,7 +54,7 @@ void CFileTextureItem::PreDestruct(void) // Check underlying data is present // //////////////////////////////////////////////////////////////// -bool CFileTextureItem::IsValid(void) +bool CFileTextureItem::IsValid() { return m_pD3DTexture != NULL; } @@ -66,7 +66,7 @@ bool CFileTextureItem::IsValid(void) // Release device stuff // //////////////////////////////////////////////////////////////// -void CFileTextureItem::OnLostDevice(void) +void CFileTextureItem::OnLostDevice() { // Nothing required for CFileTextureItem } @@ -78,7 +78,7 @@ void CFileTextureItem::OnLostDevice(void) // Recreate device stuff // //////////////////////////////////////////////////////////////// -void CFileTextureItem::OnResetDevice(void) +void CFileTextureItem::OnResetDevice() { // Nothing required for CFileTextureItem } @@ -280,7 +280,7 @@ void CFileTextureItem::CreateUnderlyingData(bool bMipMaps, uint uiSizeX, uint ui // // //////////////////////////////////////////////////////////////// -void CFileTextureItem::ReleaseUnderlyingData(void) +void CFileTextureItem::ReleaseUnderlyingData() { SAFE_RELEASE(m_pD3DTexture); } diff --git a/Client/core/Graphics/CRenderItem.GuiFont.cpp b/Client/core/Graphics/CRenderItem.GuiFont.cpp index 9152d68eb89..c6b4a93fbee 100644 --- a/Client/core/Graphics/CRenderItem.GuiFont.cpp +++ b/Client/core/Graphics/CRenderItem.GuiFont.cpp @@ -31,7 +31,7 @@ void CGuiFontItem::PostConstruct(CRenderItemManager* pManager, const SString& st // // //////////////////////////////////////////////////////////////// -void CGuiFontItem::PreDestruct(void) +void CGuiFontItem::PreDestruct() { ReleaseUnderlyingData(); Super::PreDestruct(); @@ -44,7 +44,7 @@ void CGuiFontItem::PreDestruct(void) // Check underlying data is present // //////////////////////////////////////////////////////////////// -bool CGuiFontItem::IsValid(void) +bool CGuiFontItem::IsValid() { return m_pFntCEGUI != NULL; } @@ -56,7 +56,7 @@ bool CGuiFontItem::IsValid(void) // Release device stuff // //////////////////////////////////////////////////////////////// -void CGuiFontItem::OnLostDevice(void) +void CGuiFontItem::OnLostDevice() { // Nothing required for CGuiFontItem } @@ -68,7 +68,7 @@ void CGuiFontItem::OnLostDevice(void) // Recreate device stuff // //////////////////////////////////////////////////////////////// -void CGuiFontItem::OnResetDevice(void) +void CGuiFontItem::OnResetDevice() { // Nothing required for CGuiFontItem } @@ -123,7 +123,7 @@ void CGuiFontItem::CreateUnderlyingData(const SString& strFullFilePath, const SS // // //////////////////////////////////////////////////////////////// -void CGuiFontItem::ReleaseUnderlyingData(void) +void CGuiFontItem::ReleaseUnderlyingData() { SAFE_DELETE(m_pFntCEGUI); } diff --git a/Client/core/Graphics/CRenderItem.RenderTarget.cpp b/Client/core/Graphics/CRenderItem.RenderTarget.cpp index 80d0b0e5b47..7c044052c24 100644 --- a/Client/core/Graphics/CRenderItem.RenderTarget.cpp +++ b/Client/core/Graphics/CRenderItem.RenderTarget.cpp @@ -36,7 +36,7 @@ void CRenderTargetItem::PostConstruct(CRenderItemManager* pManager, uint uiSizeX // // //////////////////////////////////////////////////////////////// -void CRenderTargetItem::PreDestruct(void) +void CRenderTargetItem::PreDestruct() { ReleaseUnderlyingData(); Super::PreDestruct(); @@ -49,7 +49,7 @@ void CRenderTargetItem::PreDestruct(void) // Check underlying data is present // //////////////////////////////////////////////////////////////// -bool CRenderTargetItem::IsValid(void) +bool CRenderTargetItem::IsValid() { return m_pD3DTexture && m_pD3DRenderTargetSurface && m_pD3DZStencilSurface; } @@ -61,7 +61,7 @@ bool CRenderTargetItem::IsValid(void) // Release device stuff // //////////////////////////////////////////////////////////////// -void CRenderTargetItem::OnLostDevice(void) +void CRenderTargetItem::OnLostDevice() { ReleaseUnderlyingData(); } @@ -73,7 +73,7 @@ void CRenderTargetItem::OnLostDevice(void) // Recreate device stuff // //////////////////////////////////////////////////////////////// -void CRenderTargetItem::OnResetDevice(void) +void CRenderTargetItem::OnResetDevice() { CreateUnderlyingData(); } @@ -85,7 +85,7 @@ void CRenderTargetItem::OnResetDevice(void) // // //////////////////////////////////////////////////////////////// -void CRenderTargetItem::CreateUnderlyingData(void) +void CRenderTargetItem::CreateUnderlyingData() { assert(!m_pD3DRenderTargetSurface); assert(!m_pD3DTexture); @@ -164,7 +164,7 @@ void CRenderTargetItem::CreateUnderlyingData(void) // // //////////////////////////////////////////////////////////////// -void CRenderTargetItem::ReleaseUnderlyingData(void) +void CRenderTargetItem::ReleaseUnderlyingData() { SAFE_RELEASE(m_pD3DRenderTargetSurface) SAFE_RELEASE(m_pD3DTexture) diff --git a/Client/core/Graphics/CRenderItem.ScreenSource.cpp b/Client/core/Graphics/CRenderItem.ScreenSource.cpp index bdd5430c001..2ae4fff6d86 100644 --- a/Client/core/Graphics/CRenderItem.ScreenSource.cpp +++ b/Client/core/Graphics/CRenderItem.ScreenSource.cpp @@ -35,7 +35,7 @@ void CScreenSourceItem::PostConstruct(CRenderItemManager* pManager, uint uiSizeX // // //////////////////////////////////////////////////////////////// -void CScreenSourceItem::PreDestruct(void) +void CScreenSourceItem::PreDestruct() { ReleaseUnderlyingData(); Super::PreDestruct(); @@ -48,7 +48,7 @@ void CScreenSourceItem::PreDestruct(void) // Check underlying data is present // //////////////////////////////////////////////////////////////// -bool CScreenSourceItem::IsValid(void) +bool CScreenSourceItem::IsValid() { return m_pD3DTexture && m_pD3DRenderTargetSurface; } @@ -60,7 +60,7 @@ bool CScreenSourceItem::IsValid(void) // Release device stuff // //////////////////////////////////////////////////////////////// -void CScreenSourceItem::OnLostDevice(void) +void CScreenSourceItem::OnLostDevice() { ReleaseUnderlyingData(); } @@ -72,7 +72,7 @@ void CScreenSourceItem::OnLostDevice(void) // Recreate device stuff // //////////////////////////////////////////////////////////////// -void CScreenSourceItem::OnResetDevice(void) +void CScreenSourceItem::OnResetDevice() { CreateUnderlyingData(); } @@ -84,7 +84,7 @@ void CScreenSourceItem::OnResetDevice(void) // // //////////////////////////////////////////////////////////////// -void CScreenSourceItem::CreateUnderlyingData(void) +void CScreenSourceItem::CreateUnderlyingData() { assert(!m_pD3DRenderTargetSurface); assert(!m_pD3DTexture); @@ -132,7 +132,7 @@ void CScreenSourceItem::CreateUnderlyingData(void) // // //////////////////////////////////////////////////////////////// -void CScreenSourceItem::ReleaseUnderlyingData(void) +void CScreenSourceItem::ReleaseUnderlyingData() { SAFE_RELEASE(m_pD3DRenderTargetSurface) SAFE_RELEASE(m_pD3DTexture) diff --git a/Client/core/Graphics/CRenderItem.Shader.cpp b/Client/core/Graphics/CRenderItem.Shader.cpp index b8852446b9b..93e038f69a2 100644 --- a/Client/core/Graphics/CRenderItem.Shader.cpp +++ b/Client/core/Graphics/CRenderItem.Shader.cpp @@ -42,7 +42,7 @@ void CShaderItem::PostConstruct(CRenderItemManager* pManager, const SString& str // // //////////////////////////////////////////////////////////////// -void CShaderItem::PreDestruct(void) +void CShaderItem::PreDestruct() { ReleaseUnderlyingData(); Super::PreDestruct(); @@ -55,7 +55,7 @@ void CShaderItem::PreDestruct(void) // Check underlying data is present // //////////////////////////////////////////////////////////////// -bool CShaderItem::IsValid(void) +bool CShaderItem::IsValid() { return m_pEffectWrap; } @@ -67,7 +67,7 @@ bool CShaderItem::IsValid(void) // Release device stuff // //////////////////////////////////////////////////////////////// -void CShaderItem::OnLostDevice(void) +void CShaderItem::OnLostDevice() { // Nothing required for CShaderItem } @@ -79,7 +79,7 @@ void CShaderItem::OnLostDevice(void) // Recreate device stuff // //////////////////////////////////////////////////////////////// -void CShaderItem::OnResetDevice(void) +void CShaderItem::OnResetDevice() { // Nothing required for CShaderItem } @@ -114,7 +114,7 @@ void CShaderItem::CreateUnderlyingData(const SString& strFile, const SString& st // // //////////////////////////////////////////////////////////////// -void CShaderItem::ReleaseUnderlyingData(void) +void CShaderItem::ReleaseUnderlyingData() { m_pManager->NotifyShaderItemUsesDepthBuffer(this, false); m_pManager->NotifyShaderItemUsesMultipleRenderTargets(this, false); @@ -247,7 +247,7 @@ void CShaderItem::SetTransform(const SShaderTransform& transform) // If current instance is in use by something else (i.e. in draw queue), we must create a new instance before changing parameter values // //////////////////////////////////////////////////////////////// -void CShaderItem::MaybeRenewShaderInstance(void) +void CShaderItem::MaybeRenewShaderInstance() { if (m_pShaderInstance->m_iRefCount > 1) RenewShaderInstance(); @@ -260,7 +260,7 @@ void CShaderItem::MaybeRenewShaderInstance(void) // Create/clone a new instance // //////////////////////////////////////////////////////////////// -void CShaderItem::RenewShaderInstance(void) +void CShaderItem::RenewShaderInstance() { CShaderInstance* pShaderInstance = new CShaderInstance(); pShaderInstance->PostConstruct(m_pManager, this); @@ -273,7 +273,7 @@ void CShaderItem::RenewShaderInstance(void) // Check if active technique uses a vertex shader // //////////////////////////////////////////////////////////////// -bool CShaderItem::GetUsesVertexShader(void) +bool CShaderItem::GetUsesVertexShader() { return m_pEffectWrap->m_pEffectTemplate->m_bUsesVertexShader; } diff --git a/Client/core/Graphics/CRenderItem.ShaderInstance.cpp b/Client/core/Graphics/CRenderItem.ShaderInstance.cpp index 2160249e824..a14893d8d8d 100644 --- a/Client/core/Graphics/CRenderItem.ShaderInstance.cpp +++ b/Client/core/Graphics/CRenderItem.ShaderInstance.cpp @@ -33,7 +33,7 @@ void CShaderInstance::PostConstruct(CRenderItemManager* pManager, CShaderItem* p // // //////////////////////////////////////////////////////////////// -void CShaderInstance::PreDestruct(void) +void CShaderInstance::PreDestruct() { ReleaseUnderlyingData(); Super::PreDestruct(); @@ -46,7 +46,7 @@ void CShaderInstance::PreDestruct(void) // Check underlying data is present // //////////////////////////////////////////////////////////////// -bool CShaderInstance::IsValid(void) +bool CShaderInstance::IsValid() { return m_pEffectWrap && m_pEffectWrap->m_pD3DEffect; } @@ -58,7 +58,7 @@ bool CShaderInstance::IsValid(void) // Release device stuff // //////////////////////////////////////////////////////////////// -void CShaderInstance::OnLostDevice(void) +void CShaderInstance::OnLostDevice() { // Nothing required for CShaderInstance } @@ -70,7 +70,7 @@ void CShaderInstance::OnLostDevice(void) // Recreate device stuff // //////////////////////////////////////////////////////////////// -void CShaderInstance::OnResetDevice(void) +void CShaderInstance::OnResetDevice() { // Nothing required for CShaderInstance } @@ -122,7 +122,7 @@ void CShaderInstance::CreateUnderlyingData(CShaderItem* pShaderItem) // // //////////////////////////////////////////////////////////////// -void CShaderInstance::ReleaseUnderlyingData(void) +void CShaderInstance::ReleaseUnderlyingData() { SAFE_RELEASE(m_pEffectWrap); @@ -252,7 +252,7 @@ SShaderValue* CShaderInstance::GetParam(D3DXHANDLE hHandle) // // //////////////////////////////////////////////////////////////// -void CShaderInstance::ApplyShaderParameters(void) +void CShaderInstance::ApplyShaderParameters() { // Update list of values that will require the default setting if (m_pEffectWrap->m_pEffectTemplate->m_uiModifiedParametersRevision != m_uiModifiedParametersRevision) diff --git a/Client/core/Graphics/CRenderItem.WebBrowser.cpp b/Client/core/Graphics/CRenderItem.WebBrowser.cpp index 9ec55d4d6e9..ae7e117a759 100644 --- a/Client/core/Graphics/CRenderItem.WebBrowser.cpp +++ b/Client/core/Graphics/CRenderItem.WebBrowser.cpp @@ -35,7 +35,7 @@ void CWebBrowserItem::PostConstruct(CRenderItemManager* pRenderItemManager, uint // // //////////////////////////////////////////////////////////////// -void CWebBrowserItem::PreDestruct(void) +void CWebBrowserItem::PreDestruct() { ReleaseUnderlyingData(); Super::PreDestruct(); @@ -48,7 +48,7 @@ void CWebBrowserItem::PreDestruct(void) // Check underlying data is present // //////////////////////////////////////////////////////////////// -bool CWebBrowserItem::IsValid(void) +bool CWebBrowserItem::IsValid() { return m_pD3DTexture && m_pD3DRenderTargetSurface; } @@ -60,7 +60,7 @@ bool CWebBrowserItem::IsValid(void) // Release device stuff // //////////////////////////////////////////////////////////////// -void CWebBrowserItem::OnLostDevice(void) +void CWebBrowserItem::OnLostDevice() { } @@ -71,7 +71,7 @@ void CWebBrowserItem::OnLostDevice(void) // Recreate device stuff // //////////////////////////////////////////////////////////////// -void CWebBrowserItem::OnResetDevice(void) +void CWebBrowserItem::OnResetDevice() { } @@ -112,7 +112,7 @@ void CWebBrowserItem::CreateUnderlyingData() // // //////////////////////////////////////////////////////////////// -void CWebBrowserItem::ReleaseUnderlyingData(void) +void CWebBrowserItem::ReleaseUnderlyingData() { SAFE_RELEASE(m_pD3DRenderTargetSurface) SAFE_RELEASE(m_pD3DTexture) diff --git a/Client/core/Graphics/CRenderItem.cpp b/Client/core/Graphics/CRenderItem.cpp index 9b664140cba..f8d3285df1a 100644 --- a/Client/core/Graphics/CRenderItem.cpp +++ b/Client/core/Graphics/CRenderItem.cpp @@ -32,7 +32,7 @@ void CRenderItem::PostConstruct(CRenderItemManager* pManager, bool bIncludeInMem // // //////////////////////////////////////////////////////////////// -CRenderItem::~CRenderItem(void) +CRenderItem::~CRenderItem() { assert(m_iRefCount == 0); } @@ -44,7 +44,7 @@ CRenderItem::~CRenderItem(void) // // //////////////////////////////////////////////////////////////// -void CRenderItem::PreDestruct(void) +void CRenderItem::PreDestruct() { assert(m_iRefCount == 0); m_pManager->NotifyDestructRenderItem(this); @@ -57,7 +57,7 @@ void CRenderItem::PreDestruct(void) // // //////////////////////////////////////////////////////////////// -void CRenderItem::Release(void) +void CRenderItem::Release() { assert(m_iRefCount > 0); if (--m_iRefCount > 0) @@ -74,7 +74,7 @@ void CRenderItem::Release(void) // // //////////////////////////////////////////////////////////////// -void CRenderItem::AddRef(void) +void CRenderItem::AddRef() { assert(m_iRefCount > 0); ++m_iRefCount; diff --git a/Client/core/Graphics/CRenderItemManager.cpp b/Client/core/Graphics/CRenderItemManager.cpp index 495e7ddf2df..cf27fee2c88 100644 --- a/Client/core/Graphics/CRenderItemManager.cpp +++ b/Client/core/Graphics/CRenderItemManager.cpp @@ -26,7 +26,7 @@ struct SRTVertex // // //////////////////////////////////////////////////////////////// -CRenderItemManager::CRenderItemManager(void) +CRenderItemManager::CRenderItemManager() { m_pEffectCloner = new CEffectCloner(this); } @@ -38,7 +38,7 @@ CRenderItemManager::CRenderItemManager(void) // // //////////////////////////////////////////////////////////////// -CRenderItemManager::~CRenderItemManager(void) +CRenderItemManager::~CRenderItemManager() { SAFE_DELETE(m_pEffectCloner); } @@ -91,7 +91,7 @@ void CRenderItemManager::OnDeviceCreate(IDirect3DDevice9* pDevice, float fViewpo // Release device stuff // //////////////////////////////////////////////////////////////// -void CRenderItemManager::OnLostDevice(void) +void CRenderItemManager::OnLostDevice() { for (std::set::iterator iter = m_CreatedItemList.begin(); iter != m_CreatedItemList.end(); iter++) (*iter)->OnLostDevice(); @@ -111,7 +111,7 @@ void CRenderItemManager::OnLostDevice(void) // Recreate device stuff // //////////////////////////////////////////////////////////////// -void CRenderItemManager::OnResetDevice(void) +void CRenderItemManager::OnResetDevice() { for (std::set::iterator iter = m_CreatedItemList.begin(); iter != m_CreatedItemList.end(); iter++) (*iter)->OnResetDevice(); @@ -352,7 +352,7 @@ void CRenderItemManager::NotifyDestructRenderItem(CRenderItem* pItem) // Update stuff // //////////////////////////////////////////////////////////////// -void CRenderItemManager::DoPulse(void) +void CRenderItemManager::DoPulse() { m_pRenderWare->PulseWorldTextureWatch(); @@ -371,7 +371,7 @@ void CRenderItemManager::DoPulse(void) // Save back buffer pixels in our special place // //////////////////////////////////////////////////////////////// -void CRenderItemManager::UpdateBackBufferCopy(void) +void CRenderItemManager::UpdateBackBufferCopy() { if (m_bBackBufferCopyMaybeNeedsResize) UpdateBackBufferCopySize(); @@ -446,7 +446,7 @@ void CRenderItemManager::UpdateScreenSource(CScreenSourceItem* pScreenSourceItem // Create/resize/destroy back buffer copy depending on what is required // //////////////////////////////////////////////////////////////// -void CRenderItemManager::UpdateBackBufferCopySize(void) +void CRenderItemManager::UpdateBackBufferCopySize() { m_bBackBufferCopyMaybeNeedsResize = false; @@ -501,7 +501,7 @@ bool CRenderItemManager::SetRenderTarget(CRenderTargetItem* pItem, bool bClear) // See if in enabled zones for old versions // //////////////////////////////////////////////////////////////// -bool CRenderItemManager::IsSetRenderTargetEnabledOldVer(void) +bool CRenderItemManager::IsSetRenderTargetEnabledOldVer() { return m_bSetRenderTargetEnabledOldVer; } @@ -525,7 +525,7 @@ void CRenderItemManager::EnableSetRenderTargetOldVer(bool bEnable) // Save current render target as the default one // //////////////////////////////////////////////////////////////// -bool CRenderItemManager::SaveDefaultRenderTarget(void) +bool CRenderItemManager::SaveDefaultRenderTarget() { // Make sure any special depth buffer has been removed SaveReadableDepthBuffer(); @@ -555,7 +555,7 @@ bool CRenderItemManager::SaveDefaultRenderTarget(void) // Set render target back to the default one // //////////////////////////////////////////////////////////////// -bool CRenderItemManager::RestoreDefaultRenderTarget(void) +bool CRenderItemManager::RestoreDefaultRenderTarget() { // Only need to change if we have info if (m_pDefaultD3DRenderTarget) @@ -577,7 +577,7 @@ bool CRenderItemManager::RestoreDefaultRenderTarget(void) // Check if currently drawing to the default render target // //////////////////////////////////////////////////////////////// -bool CRenderItemManager::IsUsingDefaultRenderTarget(void) +bool CRenderItemManager::IsUsingDefaultRenderTarget() { // If this is NULL, it means we haven't saved it, so aren't using another render target return m_pDefaultD3DRenderTarget == NULL; @@ -682,7 +682,7 @@ void CRenderItemManager::SetTestMode(eDxTestMode testMode) // Should be called when a render item is created/destroyed or changes // //////////////////////////////////////////////////////////////// -void CRenderItemManager::UpdateMemoryUsage(void) +void CRenderItemManager::UpdateMemoryUsage() { m_iTextureMemoryKBUsed = 0; m_iRenderTargetMemoryKBUsed = 0; @@ -1031,7 +1031,7 @@ void CRenderItemManager::NotifyShaderItemUsesMultipleRenderTargets(CShaderItem* // // //////////////////////////////////////////////////////////////// -void CRenderItemManager::PreDrawWorld(void) +void CRenderItemManager::PreDrawWorld() { // Save scene matrices g_pDeviceState->MainSceneState.TransformState = g_pDeviceState->TransformState; @@ -1133,7 +1133,7 @@ void CRenderItemManager::PreDrawWorld(void) // Ensure our readable depth buffer is no longer being used // //////////////////////////////////////////////////////////////// -void CRenderItemManager::SaveReadableDepthBuffer(void) +void CRenderItemManager::SaveReadableDepthBuffer() { if (m_bUsingReadableDepthBuffer) { @@ -1164,7 +1164,7 @@ void CRenderItemManager::SaveReadableDepthBuffer(void) // If using AA hacks, change everything back // //////////////////////////////////////////////////////////////// -void CRenderItemManager::FlushNonAARenderTarget(void) +void CRenderItemManager::FlushNonAARenderTarget() { if (m_pSavedSceneDepthSurface) { diff --git a/Client/core/Graphics/CRenderItemManager.h b/Client/core/Graphics/CRenderItemManager.h index 8da77d76337..6b37f737a90 100644 --- a/Client/core/Graphics/CRenderItemManager.h +++ b/Client/core/Graphics/CRenderItemManager.h @@ -18,11 +18,11 @@ class CRenderItemManager : public CRenderItemManagerInterface { public: ZERO_ON_NEW - CRenderItemManager(void); - ~CRenderItemManager(void); + CRenderItemManager(); + ~CRenderItemManager(); // CRenderItemManagerInterface - virtual void DoPulse(void); + virtual void DoPulse(); virtual CDxFontItem* CreateDxFont(const SString& strFullFilePath, uint uiSize, bool bBold, DWORD ulQuality = DEFAULT_QUALITY); virtual CGuiFontItem* CreateGuiFont(const SString& strFullFilePath, const SString& strFontName, uint uiSize); virtual CTextureItem* CreateTexture(const SString& strFullFilePath, const CPixels* pPixels, bool bMipMaps = true, uint uiSizeX = RDEFAULT, @@ -35,9 +35,9 @@ class CRenderItemManager : public CRenderItemManagerInterface virtual CWebBrowserItem* CreateWebBrowser(uint uiSizeX, uint uiSizeY); virtual bool SetRenderTarget(CRenderTargetItem* pItem, bool bClear); virtual void EnableSetRenderTargetOldVer(bool bEnable); - virtual bool IsSetRenderTargetEnabledOldVer(void); - virtual bool RestoreDefaultRenderTarget(void); - virtual void UpdateBackBufferCopy(void); + virtual bool IsSetRenderTargetEnabledOldVer(); + virtual bool RestoreDefaultRenderTarget(); + virtual void UpdateBackBufferCopy(); virtual void UpdateScreenSource(CScreenSourceItem* pScreenSourceItem, bool bResampleNow); virtual SShaderItemLayers* GetAppliedShaderForD3DData(CD3DDUMMY* pD3DData); virtual bool ApplyShaderItemToWorldTexture(CShaderItem* pShaderItem, const SString& strTextureNameMatch, CClientEntityBase* pClientEntity, @@ -45,15 +45,15 @@ class CRenderItemManager : public CRenderItemManagerInterface virtual bool RemoveShaderItemFromWorldTexture(CShaderItem* pShaderItem, const SString& strTextureNameMatch, CClientEntityBase* pClientEntity); virtual void RemoveClientEntityRefs(CClientEntityBase* pClientEntity); virtual void GetVisibleTextureNames(std::vector& outNameList, const SString& strTextureNameMatch, ushort usModelID); - virtual eDxTestMode GetTestMode(void) { return m_TestMode; } + virtual eDxTestMode GetTestMode() { return m_TestMode; } virtual void SetTestMode(eDxTestMode testMode); virtual void GetDxStatus(SDxStatus& outStatus); - virtual CEffectCloner* GetEffectCloner(void) { return m_pEffectCloner; } - virtual void PreDrawWorld(void); + virtual CEffectCloner* GetEffectCloner() { return m_pEffectCloner; } + virtual void PreDrawWorld(); virtual void SetDepthBufferFormat(ERenderFormat depthBufferFormat) { m_depthBufferFormat = depthBufferFormat; } - virtual ERenderFormat GetDepthBufferFormat(void) { return m_depthBufferFormat; } - virtual void SaveReadableDepthBuffer(void); - virtual void FlushNonAARenderTarget(void); + virtual ERenderFormat GetDepthBufferFormat() { return m_depthBufferFormat; } + virtual void SaveReadableDepthBuffer(); + virtual void FlushNonAARenderTarget(); virtual void HandleStretchRect(IDirect3DSurface9* pSourceSurface, CONST RECT* pSourceRect, IDirect3DSurface9* pDestSurface, CONST RECT* pDestRect, int Filter); @@ -61,14 +61,14 @@ class CRenderItemManager : public CRenderItemManagerInterface void NotifyContructRenderItem(CRenderItem* pItem); void NotifyDestructRenderItem(CRenderItem* pItem); void OnDeviceCreate(IDirect3DDevice9* pDevice, float fViewportSizeX, float fViewportSizeY); - void OnLostDevice(void); - void OnResetDevice(void); - void UpdateBackBufferCopySize(void); - bool SaveDefaultRenderTarget(void); - bool IsUsingDefaultRenderTarget(void); + void OnLostDevice(); + void OnResetDevice(); + void UpdateBackBufferCopySize(); + bool SaveDefaultRenderTarget(); + bool IsUsingDefaultRenderTarget(); void ChangeRenderTarget(uint uiSizeX, uint uiSizeY, IDirect3DSurface9* pD3DRenderTarget, IDirect3DSurface9* pD3DZStencilSurface); void RemoveShaderItemFromWatchLists(CShaderItem* pShaderItem); - void UpdateMemoryUsage(void); + void UpdateMemoryUsage(); bool CanCreateRenderItem(ClassId classId); void NotifyShaderItemUsesDepthBuffer(CShaderItem* pShaderItem, bool bUsesDepthBuffer); void NotifyShaderItemUsesMultipleRenderTargets(CShaderItem* pShaderItem, bool bUsesMultipleRenderTargets); diff --git a/Client/core/Graphics/CTileBatcher.cpp b/Client/core/Graphics/CTileBatcher.cpp index 4c54db79c88..6a01f45190e 100644 --- a/Client/core/Graphics/CTileBatcher.cpp +++ b/Client/core/Graphics/CTileBatcher.cpp @@ -20,7 +20,7 @@ // // //////////////////////////////////////////////////////////////// -CTileBatcher::CTileBatcher(void) +CTileBatcher::CTileBatcher() { } @@ -31,7 +31,7 @@ CTileBatcher::CTileBatcher(void) // // //////////////////////////////////////////////////////////////// -CTileBatcher::~CTileBatcher(void) +CTileBatcher::~CTileBatcher() { } @@ -110,7 +110,7 @@ void CTileBatcher::UpdateMatrices(float fViewportSizeX, float fViewportSizeY) // // //////////////////////////////////////////////////////////////// -void CTileBatcher::OnZBufferModified(void) +void CTileBatcher::OnZBufferModified() { m_bZBufferDirty = true; } @@ -122,7 +122,7 @@ void CTileBatcher::OnZBufferModified(void) // Send all buffered vertices to D3D // //////////////////////////////////////////////////////////////// -void CTileBatcher::Flush(void) +void CTileBatcher::Flush() { if (!m_Vertices.empty()) { diff --git a/Client/core/Graphics/CTileBatcher.h b/Client/core/Graphics/CTileBatcher.h index 4cd6102d4f8..cc03c3a104b 100644 --- a/Client/core/Graphics/CTileBatcher.h +++ b/Client/core/Graphics/CTileBatcher.h @@ -41,12 +41,12 @@ class CTileBatcher { public: ZERO_ON_NEW - CTileBatcher(void); - ~CTileBatcher(void); + CTileBatcher(); + ~CTileBatcher(); void OnDeviceCreate(IDirect3DDevice9* pDevice, float fViewportSizeX, float fViewportSizeY); - void OnZBufferModified(void); - void Flush(void); + void OnZBufferModified(); + void Flush(); void AddTile(float fX, float fY, float fWidth, float fHeight, float fU, float fV, float fSizeU, float fSizeV, CMaterialItem* pMaterial, float fRotation, float fRotCenOffX, float fRotCenOffY, unsigned long ulColor); diff --git a/Client/core/Graphics/CVideoModeManager.cpp b/Client/core/Graphics/CVideoModeManager.cpp index 8f7c318c0d9..d63aa4059af 100644 --- a/Client/core/Graphics/CVideoModeManager.cpp +++ b/Client/core/Graphics/CVideoModeManager.cpp @@ -21,8 +21,8 @@ class CVideoModeManager : public CVideoModeManagerInterface { public: ZERO_ON_NEW - CVideoModeManager(void); - ~CVideoModeManager(void); + CVideoModeManager(); + ~CVideoModeManager(); // CVideoModeManagerInterface methods virtual void PreCreateDevice(D3DPRESENT_PARAMETERS* pp); @@ -31,25 +31,25 @@ class CVideoModeManager : public CVideoModeManagerInterface virtual void PostReset(D3DPRESENT_PARAMETERS* pp); virtual void GetNextVideoMode(int& iOutNextVideoMode, bool& bOutNextWindowed, bool& bOutNextFullScreenMinimize, int& iNextFullscreenStyle); virtual bool SetVideoMode(int nextVideoMode, bool bNextWindowed, bool bNextFullScreenMinimize, int iNextFullscreenStyle); - virtual bool IsWindowed(void); - virtual bool IsMultiMonitor(void); - virtual bool IsMinimizeEnabled(void); - virtual void OnGainFocus(void); - virtual void OnLoseFocus(void); - virtual void OnPaint(void); + virtual bool IsWindowed(); + virtual bool IsMultiMonitor(); + virtual bool IsMinimizeEnabled(); + virtual void OnGainFocus(); + virtual void OnLoseFocus(); + virtual void OnPaint(); virtual bool GetRequiredDisplayResolution(int& iOutWidth, int& iOutHeight, int& iOutColorBits, int& iOutAdapterIndex); - virtual int GetFullScreenStyle(void) { return m_iCurrentFullscreenStyle; } - virtual bool IsDisplayModeWindowed(void); + virtual int GetFullScreenStyle() { return m_iCurrentFullscreenStyle; } + virtual bool IsDisplayModeWindowed(); - bool IsDisplayModeFullScreen(void); - bool IsDisplayModeFullScreenWindow(void); + bool IsDisplayModeFullScreen(); + bool IsDisplayModeFullScreenWindow(); bool GetCurrentAdapterRect(LPRECT pOutRect); - SString GetCurrentAdapterDeviceName(void); + SString GetCurrentAdapterDeviceName(); private: - void LoadCVars(void); - void SaveCVars(void); - bool GameResMatchesCurrentAdapter(void); + void LoadCVars(); + void SaveCVars(); + bool GameResMatchesCurrentAdapter(); SString MakeResolutionString(uint uiWidth, uint uiHeight, uint uiDepth, uint uiAdapter); void UpdateMonitor(); @@ -82,14 +82,14 @@ class CVideoModeManager : public CVideoModeManagerInterface // CVideoModeManager instantiation // /////////////////////////////////////////////////////////////// -CVideoModeManagerInterface* NewVideoModeManager(void) +CVideoModeManagerInterface* NewVideoModeManager() { return new CVideoModeManager(); } CVideoModeManagerInterface* g_pVideoModeManager = NULL; -CVideoModeManagerInterface* GetVideoModeManager(void) +CVideoModeManagerInterface* GetVideoModeManager() { if (!g_pVideoModeManager) g_pVideoModeManager = NewVideoModeManager(); @@ -101,7 +101,7 @@ CVideoModeManagerInterface* GetVideoModeManager(void) // CVideoModeManager implementation // /////////////////////////////////////////////////////////////// -CVideoModeManager::CVideoModeManager(void) +CVideoModeManager::CVideoModeManager() { m_pGameSettings = CCore::GetSingleton().GetGame()->GetSettings(); m_iCurrentVideoMode = 1; @@ -110,7 +110,7 @@ CVideoModeManager::CVideoModeManager(void) m_bNextWindowed = false; } -CVideoModeManager::~CVideoModeManager(void) +CVideoModeManager::~CVideoModeManager() { } @@ -245,7 +245,7 @@ void CVideoModeManager::PostReset(D3DPRESENT_PARAMETERS* pp) // Change desktop resolution if using a full screen window // /////////////////////////////////////////////////////////////// -void CVideoModeManager::OnGainFocus(void) +void CVideoModeManager::OnGainFocus() { if (m_ulForceBackBufferWidth == 0) { @@ -289,7 +289,7 @@ void CVideoModeManager::OnGainFocus(void) // Revert desktop resolution if using a full screen window // /////////////////////////////////////////////////////////////// -void CVideoModeManager::OnLoseFocus(void) +void CVideoModeManager::OnLoseFocus() { m_bPendingGainFocus = false; @@ -336,7 +336,7 @@ void CVideoModeManager::OnLoseFocus(void) // Ensure window is in the correct position for fullscreen windowed modes // /////////////////////////////////////////////////////////////// -void CVideoModeManager::OnPaint(void) +void CVideoModeManager::OnPaint() { if (IsDisplayModeFullScreenWindow()) { @@ -427,7 +427,7 @@ bool CVideoModeManager::SetVideoMode(int iNextVideoMode, bool bNextWindowed, boo // Loads to current // /////////////////////////////////////////////////////////////// -void CVideoModeManager::LoadCVars(void) +void CVideoModeManager::LoadCVars() { // Apply override if (GetApplicationSettingInt("nvhacks", "optimus-force-windowed")) @@ -459,7 +459,7 @@ void CVideoModeManager::LoadCVars(void) // Saves from next // /////////////////////////////////////////////////////////////// -void CVideoModeManager::SaveCVars(void) +void CVideoModeManager::SaveCVars() { m_pGameSettings->SetCurrentVideoMode(m_iNextVideoMode, true); CVARS_SET("display_windowed", m_bNextWindowed); @@ -480,7 +480,7 @@ void CVideoModeManager::SaveCVars(void) // // /////////////////////////////////////////////////////////////// -bool CVideoModeManager::IsWindowed(void) +bool CVideoModeManager::IsWindowed() { return (IsDisplayModeWindowed() || IsDisplayModeFullScreenWindow()); } @@ -492,7 +492,7 @@ bool CVideoModeManager::IsWindowed(void) // // /////////////////////////////////////////////////////////////// -bool CVideoModeManager::IsMultiMonitor(void) +bool CVideoModeManager::IsMultiMonitor() { if (m_ulMonitorCount == 0) { @@ -529,7 +529,7 @@ bool CVideoModeManager::IsMultiMonitor(void) // Multi-monitor, full screen, minimize // /////////////////////////////////////////////////////////////// -bool CVideoModeManager::IsMinimizeEnabled(void) +bool CVideoModeManager::IsMinimizeEnabled() { return m_bCurrentFullScreenMinimize; } @@ -541,7 +541,7 @@ bool CVideoModeManager::IsMinimizeEnabled(void) // // /////////////////////////////////////////////////////////////// -bool CVideoModeManager::IsDisplayModeWindowed(void) +bool CVideoModeManager::IsDisplayModeWindowed() { return m_bCurrentWindowed; } @@ -553,7 +553,7 @@ bool CVideoModeManager::IsDisplayModeWindowed(void) // // /////////////////////////////////////////////////////////////// -bool CVideoModeManager::IsDisplayModeFullScreen(void) +bool CVideoModeManager::IsDisplayModeFullScreen() { return !m_bCurrentWindowed && (m_iCurrentFullscreenStyle == FULLSCREEN_STANDARD); } @@ -565,7 +565,7 @@ bool CVideoModeManager::IsDisplayModeFullScreen(void) // // /////////////////////////////////////////////////////////////// -bool CVideoModeManager::IsDisplayModeFullScreenWindow(void) +bool CVideoModeManager::IsDisplayModeFullScreenWindow() { return !m_bCurrentWindowed && (m_iCurrentFullscreenStyle != FULLSCREEN_STANDARD); } @@ -577,7 +577,7 @@ bool CVideoModeManager::IsDisplayModeFullScreenWindow(void) // Returns true if desktop matches the game requirement // /////////////////////////////////////////////////////////////// -bool CVideoModeManager::GameResMatchesCurrentAdapter(void) +bool CVideoModeManager::GameResMatchesCurrentAdapter() { RECT rc; GetCurrentAdapterRect(&rc); @@ -687,7 +687,7 @@ bool CVideoModeManager::GetCurrentAdapterRect(LPRECT pOutRect) // // /////////////////////////////////////////////////////////////// -SString CVideoModeManager::GetCurrentAdapterDeviceName(void) +SString CVideoModeManager::GetCurrentAdapterDeviceName() { MONITORINFOEX monitorInfo; monitorInfo.cbSize = sizeof(MONITORINFOEX); diff --git a/Client/core/Graphics/CVideoModeManager.h b/Client/core/Graphics/CVideoModeManager.h index 05787061533..28ba1314dc4 100644 --- a/Client/core/Graphics/CVideoModeManager.h +++ b/Client/core/Graphics/CVideoModeManager.h @@ -20,7 +20,7 @@ enum class CVideoModeManagerInterface { public: - virtual ~CVideoModeManagerInterface(void) {} + virtual ~CVideoModeManagerInterface() {} virtual void PreCreateDevice(D3DPRESENT_PARAMETERS* pp) = 0; virtual void PostCreateDevice(IDirect3DDevice9* pD3DDevice, D3DPRESENT_PARAMETERS* pp) = 0; @@ -28,15 +28,15 @@ class CVideoModeManagerInterface virtual void PostReset(D3DPRESENT_PARAMETERS* pp) = 0; virtual void GetNextVideoMode(int& iOutNextVideoMode, bool& bOutNextWindowed, bool& bOutNextFullScreenMinimize, int& iNextFullscreenStyle) = 0; virtual bool SetVideoMode(int nextVideoMode, bool bNextWindowed, bool bNextFullScreenMinimize, int iNextFullscreenStyle) = 0; - virtual bool IsWindowed(void) = 0; - virtual bool IsMultiMonitor(void) = 0; - virtual bool IsMinimizeEnabled(void) = 0; - virtual void OnGainFocus(void) = 0; - virtual void OnLoseFocus(void) = 0; - virtual void OnPaint(void) = 0; + virtual bool IsWindowed() = 0; + virtual bool IsMultiMonitor() = 0; + virtual bool IsMinimizeEnabled() = 0; + virtual void OnGainFocus() = 0; + virtual void OnLoseFocus() = 0; + virtual void OnPaint() = 0; virtual bool GetRequiredDisplayResolution(int& iOutWidth, int& iOutHeight, int& iOutColorBits, int& iOutAdapterIndex) = 0; - virtual int GetFullScreenStyle(void) = 0; - virtual bool IsDisplayModeWindowed(void) = 0; + virtual int GetFullScreenStyle() = 0; + virtual bool IsDisplayModeWindowed() = 0; }; -CVideoModeManagerInterface* GetVideoModeManager(void); +CVideoModeManagerInterface* GetVideoModeManager(); diff --git a/Client/core/ServerBrowser/CServerBrowser.MasterServerManager.cpp b/Client/core/ServerBrowser/CServerBrowser.MasterServerManager.cpp index 6a45cb52612..a52723dd992 100644 --- a/Client/core/ServerBrowser/CServerBrowser.MasterServerManager.cpp +++ b/Client/core/ServerBrowser/CServerBrowser.MasterServerManager.cpp @@ -17,12 +17,12 @@ class CMasterServerManager : public CMasterServerManagerInterface { public: ZERO_ON_NEW - CMasterServerManager(void); - ~CMasterServerManager(void); + CMasterServerManager(); + ~CMasterServerManager(); // CMasterServerManagerInterface - virtual void Refresh(void); - virtual bool HasData(void); + virtual void Refresh(); + virtual bool HasData(); virtual bool ParseList(CServerListItemList& itemList); // CMasterServerManager @@ -39,7 +39,7 @@ class CMasterServerManager : public CMasterServerManagerInterface // // /////////////////////////////////////////////////////////////// -CMasterServerManagerInterface* NewMasterServerManager(void) +CMasterServerManagerInterface* NewMasterServerManager() { return new CMasterServerManager(); } @@ -51,7 +51,7 @@ CMasterServerManagerInterface* NewMasterServerManager(void) // // /////////////////////////////////////////////////////////////// -CMasterServerManager::CMasterServerManager(void) +CMasterServerManager::CMasterServerManager() { m_ElapsedTime.SetMaxIncrement(500); } @@ -63,7 +63,7 @@ CMasterServerManager::CMasterServerManager(void) // // /////////////////////////////////////////////////////////////// -CMasterServerManager::~CMasterServerManager(void) +CMasterServerManager::~CMasterServerManager() { for (uint i = 0; i < m_MasterServerList.size(); i++) SAFE_RELEASE(m_MasterServerList[i]); @@ -78,7 +78,7 @@ CMasterServerManager::~CMasterServerManager(void) // // /////////////////////////////////////////////////////////////// -void CMasterServerManager::Refresh(void) +void CMasterServerManager::Refresh() { // Create master server list if required if (m_MasterServerList.empty()) @@ -105,7 +105,7 @@ void CMasterServerManager::Refresh(void) // // /////////////////////////////////////////////////////////////// -bool CMasterServerManager::HasData(void) +bool CMasterServerManager::HasData() { // Count how many server have responded uint uiHasDataCount = 0; diff --git a/Client/core/ServerBrowser/CServerBrowser.MasterServerManager.h b/Client/core/ServerBrowser/CServerBrowser.MasterServerManager.h index 0a7addc0536..c086edcbeef 100644 --- a/Client/core/ServerBrowser/CServerBrowser.MasterServerManager.h +++ b/Client/core/ServerBrowser/CServerBrowser.MasterServerManager.h @@ -5,12 +5,12 @@ class CMasterServerManagerInterface { public: - virtual ~CMasterServerManagerInterface(void) {} + virtual ~CMasterServerManagerInterface() {} // CMasterServerManagerInterface - virtual void Refresh(void) = 0; - virtual bool HasData(void) = 0; + virtual void Refresh() = 0; + virtual bool HasData() = 0; virtual bool ParseList(CServerListItemList& itemList) = 0; }; -CMasterServerManagerInterface* NewMasterServerManager(void); +CMasterServerManagerInterface* NewMasterServerManager(); diff --git a/Client/core/ServerBrowser/CServerBrowser.RemoteMasterServer.cpp b/Client/core/ServerBrowser/CServerBrowser.RemoteMasterServer.cpp index 32281579991..a09cccce354 100644 --- a/Client/core/ServerBrowser/CServerBrowser.RemoteMasterServer.cpp +++ b/Client/core/ServerBrowser/CServerBrowser.RemoteMasterServer.cpp @@ -16,25 +16,25 @@ class CRemoteMasterServer : public CRemoteMasterServerInterface { public: ZERO_ON_NEW - CRemoteMasterServer(void); - ~CRemoteMasterServer(void); + CRemoteMasterServer(); + ~CRemoteMasterServer(); // CRemoteMasterServerInterface - virtual void Refresh(void); - virtual bool HasData(void); + virtual void Refresh(); + virtual bool HasData(); virtual bool ParseList(CServerListItemList& itemList); // CRemoteMasterServer void Init(const SString& strURL); protected: - bool CheckParsable(void); - bool CheckParsableVer0(void); - bool CheckParsableVer2(void); + bool CheckParsable(); + bool CheckParsableVer0(); + bool CheckParsableVer2(); bool ParseListVer0(CServerListItemList& itemList); bool ParseListVer2(CServerListItemList& itemList); CServerListItem* GetServerListItem(CServerListItemList& itemList, in_addr Address, ushort usGamePort); - CNetHTTPDownloadManagerInterface* GetHTTP(void); + CNetHTTPDownloadManagerInterface* GetHTTP(); static void StaticDownloadFinished(const SHttpDownloadResult& result); void DownloadFinished(const SHttpDownloadResult& result); @@ -65,7 +65,7 @@ CRemoteMasterServerInterface* NewRemoteMasterServer(const SString& strURL) // // /////////////////////////////////////////////////////////////// -CRemoteMasterServer::CRemoteMasterServer(void) +CRemoteMasterServer::CRemoteMasterServer() { } @@ -76,7 +76,7 @@ CRemoteMasterServer::CRemoteMasterServer(void) // // /////////////////////////////////////////////////////////////// -CRemoteMasterServer::~CRemoteMasterServer(void) +CRemoteMasterServer::~CRemoteMasterServer() { } @@ -100,7 +100,7 @@ void CRemoteMasterServer::Init(const SString& strURL) // // /////////////////////////////////////////////////////////////// -CNetHTTPDownloadManagerInterface* CRemoteMasterServer::GetHTTP(void) +CNetHTTPDownloadManagerInterface* CRemoteMasterServer::GetHTTP() { return g_pCore->GetNetwork()->GetHTTPDownloadManager(EDownloadMode::CORE_ASE_LIST); } @@ -112,7 +112,7 @@ CNetHTTPDownloadManagerInterface* CRemoteMasterServer::GetHTTP(void) // // /////////////////////////////////////////////////////////////// -void CRemoteMasterServer::Refresh(void) +void CRemoteMasterServer::Refresh() { // If it's been less than a minute and we has data, don't send a new request if (GetTickCount64_() - m_llLastRefreshTime < 60000 && m_strStage == "hasdata") @@ -169,7 +169,7 @@ void CRemoteMasterServer::DownloadFinished(const SHttpDownloadResult& result) // // /////////////////////////////////////////////////////////////// -bool CRemoteMasterServer::HasData(void) +bool CRemoteMasterServer::HasData() { GetHTTP()->ProcessQueuedFiles(); return m_strStage == "hasdata"; @@ -182,7 +182,7 @@ bool CRemoteMasterServer::HasData(void) // Return true if data looks usable // /////////////////////////////////////////////////////////////// -bool CRemoteMasterServer::CheckParsable(void) +bool CRemoteMasterServer::CheckParsable() { CBufferReadStream stream(m_Data, true); @@ -209,7 +209,7 @@ bool CRemoteMasterServer::CheckParsable(void) // Return true if data looks usable // /////////////////////////////////////////////////////////////// -bool CRemoteMasterServer::CheckParsableVer0(void) +bool CRemoteMasterServer::CheckParsableVer0() { CBufferReadStream stream(m_Data, true); @@ -236,7 +236,7 @@ bool CRemoteMasterServer::CheckParsableVer0(void) // Return true if data looks usable // /////////////////////////////////////////////////////////////// -bool CRemoteMasterServer::CheckParsableVer2(void) +bool CRemoteMasterServer::CheckParsableVer2() { CBufferReadStream stream(m_Data, true); diff --git a/Client/core/ServerBrowser/CServerBrowser.RemoteMasterServer.h b/Client/core/ServerBrowser/CServerBrowser.RemoteMasterServer.h index 23193aff213..c75b28c5f0b 100644 --- a/Client/core/ServerBrowser/CServerBrowser.RemoteMasterServer.h +++ b/Client/core/ServerBrowser/CServerBrowser.RemoteMasterServer.h @@ -9,12 +9,12 @@ class CRemoteMasterServerInterface : public CRefCountable { protected: - virtual ~CRemoteMasterServerInterface(void) {} + virtual ~CRemoteMasterServerInterface() {} public: // CRemoteMasterServerInterface - virtual void Refresh(void) = 0; - virtual bool HasData(void) = 0; + virtual void Refresh() = 0; + virtual bool HasData() = 0; virtual bool ParseList(CServerListItemList& itemList) = 0; }; diff --git a/Client/core/ServerBrowser/CServerBrowser.cpp b/Client/core/ServerBrowser/CServerBrowser.cpp index 1b19dd9b33a..6c3f49579c6 100644 --- a/Client/core/ServerBrowser/CServerBrowser.cpp +++ b/Client/core/ServerBrowser/CServerBrowser.cpp @@ -45,7 +45,7 @@ static CVector2D CalcScreenPosition(CGUIElement* pElement) return pos; } -CServerBrowser::CServerBrowser(void) +CServerBrowser::CServerBrowser() { CGUI* pManager = g_pCore->GetGUI(); @@ -310,7 +310,7 @@ CServerBrowser::CServerBrowser(void) } } -CServerBrowser::~CServerBrowser(void) +CServerBrowser::~CServerBrowser() { // Save options now and disable selection handler SaveOptions(); @@ -658,7 +658,7 @@ void CServerBrowser::DeleteTab(ServerBrowserType type) delete m_pTab[type]; } -ServerBrowserType CServerBrowser::GetCurrentServerBrowserTypeForSave(void) +ServerBrowserType CServerBrowser::GetCurrentServerBrowserTypeForSave() { // If current tab is temporary, then save the one used befor it if (m_uiIsUsingTempTab) @@ -667,7 +667,7 @@ ServerBrowserType CServerBrowser::GetCurrentServerBrowserTypeForSave(void) return GetCurrentServerBrowserType(); } -ServerBrowserType CServerBrowser::GetCurrentServerBrowserType(void) +ServerBrowserType CServerBrowser::GetCurrentServerBrowserType() { ServerBrowserType currentServerBrowserType; @@ -691,7 +691,7 @@ ServerBrowserType CServerBrowser::GetCurrentServerBrowserType(void) return currentServerBrowserType; } -void CServerBrowser::Update(void) +void CServerBrowser::Update() { ServerBrowserType Type = GetCurrentServerBrowserType(); CServerList* pList = GetServerList(Type); @@ -806,7 +806,7 @@ void CServerBrowser::SetVisible(bool bVisible) } } -bool CServerBrowser::IsVisible(void) +bool CServerBrowser::IsVisible() { return m_pTopWindow && m_pTopWindow->IsVisible(); } @@ -909,7 +909,7 @@ void CServerBrowser::UpdateServerList(ServerBrowserType Type, bool bClearServerL pList->SetUpdated(false); } -void CServerBrowser::CreateHistoryList(void) +void CServerBrowser::CreateHistoryList() { // Clear our combo boxes first for (unsigned int i = 0; i < SERVER_BROWSER_TYPE_COUNT; i++) @@ -960,7 +960,7 @@ void CServerBrowser::CreateHistoryList(void) m_ServersHistory.Refresh(); } -void CServerBrowser::UpdateHistoryList(void) +void CServerBrowser::UpdateHistoryList() { // Assume our type is 0, then update all fields when appropriate unsigned int Type = 0; @@ -1295,13 +1295,13 @@ void CServerBrowser::NotifyServerExists(in_addr Address, ushort usPort) SaveRecentlyPlayedList(); } -void CServerBrowser::CompleteConnect(void) +void CServerBrowser::CompleteConnect() { CServerBrowser* pBrowser = CServerBrowser::GetSingletonPtr(); pBrowser->ConnectToSelectedServer(); } -bool CServerBrowser::ConnectToSelectedServer(void) +bool CServerBrowser::ConnectToSelectedServer() { ServerBrowserType Type = GetCurrentServerBrowserType(); m_pServerPlayerList[Type]->Clear(); @@ -2200,7 +2200,7 @@ void CServerBrowser::SetAddressBarText(std::string strText) } } -bool CServerBrowser::IsAddressBarAwaitingInput(void) +bool CServerBrowser::IsAddressBarAwaitingInput() { ServerBrowserType Type = GetCurrentServerBrowserType(); return m_pEditAddress[Type]->IsActive(); @@ -2236,7 +2236,7 @@ void CServerBrowser::SetNextHistoryText(bool bDown) } } -void CServerBrowser::OnQuickConnectButtonClick(void) +void CServerBrowser::OnQuickConnectButtonClick() { // Show help text if (m_uiShownQuickConnectHelpCount < 1) @@ -2323,7 +2323,7 @@ void CServerBrowser::TabSkip(bool bBackwards) } } -bool CServerBrowser::IsActive(void) +bool CServerBrowser::IsActive() { return (m_pFrame && m_pFrame->IsActive()) || (m_pPanel && m_pPanel->IsActive()); } diff --git a/Client/core/ServerBrowser/CServerBrowser.h b/Client/core/ServerBrowser/CServerBrowser.h index 7e84c323990..1fed9ab9ec1 100644 --- a/Client/core/ServerBrowser/CServerBrowser.h +++ b/Client/core/ServerBrowser/CServerBrowser.h @@ -58,22 +58,22 @@ class CServerBrowser : public CSingleton friend class CCore; public: - explicit CServerBrowser(void); - ~CServerBrowser(void); + explicit CServerBrowser(); + ~CServerBrowser(); - void Update(void); + void Update(); void SetVisible(bool bVisible); - bool IsVisible(void); + bool IsVisible(); - bool ConnectToSelectedServer(void); + bool ConnectToSelectedServer(); - static void CompleteConnect(void); + static void CompleteConnect(); - CServerList* GetInternetList(void) { return &m_ServersInternet; }; - CServerList* GetFavouritesList(void) { return &m_ServersFavourites; }; - CServerList* GetRecentList(void) { return &m_ServersRecent; }; - CServerList* GetHistoryList(void) { return &m_ServersHistory; }; + CServerList* GetInternetList() { return &m_ServersInternet; }; + CServerList* GetFavouritesList() { return &m_ServersFavourites; }; + CServerList* GetRecentList() { return &m_ServersRecent; }; + CServerList* GetHistoryList() { return &m_ServersHistory; }; void SaveRecentlyPlayedList(); void SaveFavouritesList(); @@ -86,7 +86,7 @@ class CServerBrowser : public CSingleton void SetServerPassword(const std::string& strHost, const std::string& strPassword); std::string GetServerPassword(const std::string& strHost); - void ClearServerPasswords(void); + void ClearServerPasswords(); void SetStatusText(std::string strStatus); void SetAddressBarText(std::string strText); @@ -99,15 +99,15 @@ class CServerBrowser : public CSingleton void UpdateSelectedServerPlayerList(ServerBrowserType Type); void GetVisibleEndPointList(std::vector& outEndpointList); - bool IsAddressBarAwaitingInput(void); + bool IsAddressBarAwaitingInput(); void SetNextHistoryText(bool bDown); - void OnQuickConnectButtonClick(void); + void OnQuickConnectButtonClick(); void NotifyServerExists(in_addr Address, ushort usPort); void TabSkip(bool bBackwards); - bool IsActive(void); + bool IsActive(); void SetSelectedIndex(unsigned int uiIndex); @@ -115,7 +115,7 @@ class CServerBrowser : public CSingleton bool OnMouseClick(CGUIMouseEventArgs Args); bool OnMouseDoubleClick(CGUIMouseEventArgs Args); - void CreateHistoryList(void); + void CreateHistoryList(); bool CanBrowseVersion(const SString& strVersion); int m_iSelectedServer[SERVER_BROWSER_TYPE_COUNT]; @@ -205,7 +205,7 @@ class CServerBrowser : public CSingleton void DeleteTab(ServerBrowserType type); void UpdateServerList(ServerBrowserType Type, bool bClearServerList = false); - void UpdateHistoryList(void); + void UpdateHistoryList(); CServerList* GetServerList(ServerBrowserType Type); void AddServerToList(const CServerListItem* pServer, const ServerBrowserType Type); @@ -233,8 +233,8 @@ class CServerBrowser : public CSingleton bool OnServerListChangeRow(CGUIKeyEventArgs Args); - ServerBrowserType GetCurrentServerBrowserType(void); - ServerBrowserType GetCurrentServerBrowserTypeForSave(void); + ServerBrowserType GetCurrentServerBrowserType(); + ServerBrowserType GetCurrentServerBrowserTypeForSave(); CServerListInternet m_ServersInternet; CServerListLAN m_ServersLAN; diff --git a/Client/core/ServerBrowser/CServerCache.cpp b/Client/core/ServerBrowser/CServerCache.cpp index efddb5facce..d98bdcb0817 100644 --- a/Client/core/ServerBrowser/CServerCache.cpp +++ b/Client/core/ServerBrowser/CServerCache.cpp @@ -61,13 +61,13 @@ class CServerCache : public CServerCacheInterface virtual void GetServerListCachedInfo(CServerList* pList); virtual bool GenerateServerList(CServerList* pList); - CServerCache(void); - ~CServerCache(void); + CServerCache(); + ~CServerCache(); protected: - bool LoadServerCache(void); + bool LoadServerCache(); static DWORD StaticThreadProc(LPVOID lpdwThreadParam); - static void StaticSaveServerCache(void); + static void StaticSaveServerCache(); bool m_bListChanged; std::map m_ServerCachedMap; @@ -96,7 +96,7 @@ CServerCacheInterface* GetServerCache() // // /////////////////////////////////////////////////////////////// -CServerCache::CServerCache(void) +CServerCache::CServerCache() { LoadServerCache(); } @@ -108,7 +108,7 @@ CServerCache::CServerCache(void) // // /////////////////////////////////////////////////////////////// -CServerCache::~CServerCache(void) +CServerCache::~CServerCache() { } @@ -119,7 +119,7 @@ CServerCache::~CServerCache(void) // Load cache data from config // /////////////////////////////////////////////////////////////// -bool CServerCache::LoadServerCache(void) +bool CServerCache::LoadServerCache() { // Load config XML file CXMLFile* m_pConfigFile = CCore::GetSingleton().GetXML()->CreateXML(CalcMTASAPath(MTA_SERVER_CACHE_PATH)); @@ -248,7 +248,7 @@ DWORD CServerCache::StaticThreadProc(LPVOID lpdwThreadParam) // // /////////////////////////////////////////////////////////////// -void CServerCache::StaticSaveServerCache(void) +void CServerCache::StaticSaveServerCache() { CXMLFile* m_pConfigFile = CCore::GetSingleton().GetXML()->CreateXML(CalcMTASAPath(MTA_SERVER_CACHE_PATH)); if (!m_pConfigFile) diff --git a/Client/core/ServerBrowser/CServerCache.h b/Client/core/ServerBrowser/CServerCache.h index af6e576e238..99a659867c0 100644 --- a/Client/core/ServerBrowser/CServerCache.h +++ b/Client/core/ServerBrowser/CServerCache.h @@ -13,7 +13,7 @@ class CServerCacheInterface { public: - virtual ~CServerCacheInterface(void) {} + virtual ~CServerCacheInterface() {} virtual void SaveServerCache(bool bWaitUntilFinished) = 0; virtual void GetServerCachedInfo(CServerListItem* pItem) = 0; virtual void SetServerCachedInfo(const CServerListItem* pItem) = 0; diff --git a/Client/core/ServerBrowser/CServerInfo.cpp b/Client/core/ServerBrowser/CServerInfo.cpp index 36bef7fbdb5..77ebfbb0732 100644 --- a/Client/core/ServerBrowser/CServerInfo.cpp +++ b/Client/core/ServerBrowser/CServerInfo.cpp @@ -18,7 +18,7 @@ extern CCore* g_pCore; template <> CServerInfo* CSingleton::m_pSingleton = NULL; -CServerInfo::CServerInfo(void) +CServerInfo::CServerInfo() { CGUI* pManager = g_pCore->GetGUI(); @@ -181,7 +181,7 @@ CServerInfo::CServerInfo(void) false); // Horizontally center align } -CServerInfo::~CServerInfo(void) +CServerInfo::~CServerInfo() { // Delete our GUI elements delete m_pWindow; @@ -262,12 +262,12 @@ bool CServerInfo::OnJoinGameClicked(CGUIElement* pElement) return true; } -bool CServerInfo::IsVisible(void) +bool CServerInfo::IsVisible() { return m_pWindow->IsVisible(); } -void CServerInfo::Hide(void) +void CServerInfo::Hide() { m_pWindow->SetVisible(false); } @@ -357,7 +357,7 @@ void CServerInfo::SetServerInformation(const char* szHost, unsigned short usPort Refresh(); } -void CServerInfo::DoPulse(void) +void CServerInfo::DoPulse() { // Are we visible? if (IsVisible()) @@ -413,7 +413,7 @@ void CServerInfo::DoPulse(void) } } -void CServerInfo::Refresh(void) +void CServerInfo::Refresh() { // Reset the query variables m_Server.Init(); @@ -425,7 +425,7 @@ void CServerInfo::Refresh(void) m_Server.Query(); } -void CServerInfo::Reset(void) +void CServerInfo::Reset() { // Set every GUI elements text to blank m_pServerNameLabel->SetText(_("Querying...")); @@ -439,7 +439,7 @@ void CServerInfo::Reset(void) m_Server.Init(); } -void CServerInfo::Connect(void) +void CServerInfo::Connect() { // Get the nick from the cfg std::string strNick; diff --git a/Client/core/ServerBrowser/CServerInfo.h b/Client/core/ServerBrowser/CServerInfo.h index 1f3345bcb01..08168fd99c5 100644 --- a/Client/core/ServerBrowser/CServerInfo.h +++ b/Client/core/ServerBrowser/CServerInfo.h @@ -46,17 +46,17 @@ class CServerInfo : public CSingleton friend class CCore; public: - explicit CServerInfo(void); - ~CServerInfo(void); + explicit CServerInfo(); + ~CServerInfo(); - bool IsVisible(void); - void Hide(void); + bool IsVisible(); + void Hide(); void Show(eWindowType WindowType); void Show(eWindowType WindowType, const char* szHost, unsigned short usPort, const char* szPassword, CServerListItem* pInitialServerListItem = NULL); void SetServerInformation(const char* szHost, unsigned short usPort, const char* szPassword, CServerListItem* pInitialServerListItem = NULL); - void DoPulse(void); + void DoPulse(); protected: CGUIWindow* m_pWindow; @@ -97,9 +97,9 @@ class CServerInfo : public CSingleton unsigned short m_usPort; SString m_strPassword; - void Refresh(void); - void Connect(void); - void Reset(void); + void Refresh(); + void Connect(); + void Reset(); void ResetServerGUI(CServerListItem* pServer); bool OnCloseClicked(CGUIElement* pElement); diff --git a/Client/core/ServerBrowser/CServerList.cpp b/Client/core/ServerBrowser/CServerList.cpp index d97f2044804..a9529b2af5f 100644 --- a/Client/core/ServerBrowser/CServerList.cpp +++ b/Client/core/ServerBrowser/CServerList.cpp @@ -18,7 +18,7 @@ using namespace std; extern CCore* g_pCore; std::set CServerListItem::ms_ValidServerListItemMap; -CServerList::CServerList(void) +CServerList::CServerList() { m_bUpdated = false; m_iPass = 0; @@ -28,12 +28,12 @@ CServerList::CServerList(void) m_iRevision = 1; } -CServerList::~CServerList(void) +CServerList::~CServerList() { Clear(); } -void CServerList::Clear(void) +void CServerList::Clear() { #if 1 // Clear all entries @@ -48,7 +48,7 @@ void CServerList::Clear(void) m_llLastTickCount = 0; } -void CServerList::Pulse(void) +void CServerList::Pulse() { // Get QueriesPerSecond setting int iQueriesPerSecond = 50; @@ -177,7 +177,7 @@ bool CServerList::Remove(in_addr Address, ushort usGamePort) return m_Servers.Remove(Address, usGamePort); } -void CServerList::Refresh(void) +void CServerList::Refresh() { // Assumes we already have a (saved) list of servers, so we just need to refresh // Reinitialize each server list item @@ -194,19 +194,19 @@ void CServerList::Refresh(void) m_iRevision++; } -CServerListInternet::CServerListInternet(void) +CServerListInternet::CServerListInternet() { m_ElapsedTime.SetMaxIncrement(500); m_pMasterServerManager = NewMasterServerManager(); } -CServerListInternet::~CServerListInternet(void) +CServerListInternet::~CServerListInternet() { delete m_pMasterServerManager; m_pMasterServerManager = NULL; } -void CServerListInternet::Refresh(void) +void CServerListInternet::Refresh() { // Gets the server list from the master server and refreshes m_ElapsedTime.Reset(); m_pMasterServerManager->Refresh(); @@ -225,12 +225,12 @@ static bool SortByASEVersionCallback(const CServerListItem* const d1, const CSer // // Ensure serverlist is sorted by MTA ASE version // -void CServerList::SortByASEVersion(void) +void CServerList::SortByASEVersion() { m_Servers.GetList().sort(SortByASEVersionCallback); } -void CServerListInternet::Pulse(void) +void CServerListInternet::Pulse() { // We also need to take care of the master server list here unsigned long ulTime = m_ElapsedTime.Get(); @@ -284,7 +284,7 @@ void CServerListInternet::Pulse(void) } } -void CServerListLAN::Pulse(void) +void CServerListLAN::Pulse() { char szBuffer[32]; @@ -313,7 +313,7 @@ void CServerListLAN::Pulse(void) CServerList::Pulse(); } -void CServerListLAN::Refresh(void) +void CServerListLAN::Refresh() { // Gets the server list from LAN-broadcasting servers m_iPass = 1; m_bUpdated = true; @@ -342,7 +342,7 @@ void CServerListLAN::Refresh(void) Discover(); } -void CServerListLAN::Discover(void) +void CServerListLAN::Discover() { m_strStatus = _("Attempting to discover LAN servers"); @@ -468,12 +468,12 @@ std::string CServerListItem::Pulse(bool bCanSendQuery, bool bRemoveNonResponding } } -unsigned short CServerListItem::GetQueryPort(void) +unsigned short CServerListItem::GetQueryPort() { return usGamePort + SERVER_LIST_QUERY_PORT_OFFSET; } -void CServerListItem::Query(void) +void CServerListItem::Query() { // Performs a query according to ASE protocol sockaddr_in addr; memset(&addr, 0, sizeof(addr)); @@ -666,7 +666,7 @@ bool CServerListItem::ParseQuery(const char* szBuffer, unsigned int nLength) // // ////////////////////////////////////////////////////////////////////////////// -CServerListItemList::~CServerListItemList(void) +CServerListItemList::~CServerListItemList() { dassert(m_List.size() == m_AddressMap.size()); while (m_List.size()) @@ -814,7 +814,7 @@ CServerListItem::CServerListItem(in_addr _Address, unsigned short _usGamePort, C } // Auto removes from associated list -CServerListItem::~CServerListItem(void) +CServerListItem::~CServerListItem() { if (m_pItemList) { @@ -826,7 +826,7 @@ CServerListItem::~CServerListItem(void) CloseSocket(); } -void CServerListItem::ResetForRefresh(void) +void CServerListItem::ResetForRefresh() { CloseSocket(); bScanned = false; diff --git a/Client/core/ServerBrowser/CServerList.h b/Client/core/ServerBrowser/CServerList.h index 295ed255ea6..2bbae142dfe 100644 --- a/Client/core/ServerBrowser/CServerList.h +++ b/Client/core/ServerBrowser/CServerList.h @@ -97,7 +97,7 @@ class CServerListItem friend class CServerList; public: - CServerListItem(void) + CServerListItem() { Address.S_un.S_addr = 0; usGamePort = 0; @@ -109,7 +109,7 @@ class CServerListItem Init(); } CServerListItem(in_addr _Address, unsigned short _usGamePort, CServerListItemList* pItemList = NULL, bool bAtFront = false); - ~CServerListItem(void); + ~CServerListItem(); void ChangeAddress(in_addr _Address, unsigned short _usGamePort); static bool Parse(const char* szAddress, in_addr& Address) @@ -132,7 +132,7 @@ class CServerListItem bool operator==(const CServerListItem& other) const { return (Address.S_un.S_addr == other.Address.S_un.S_addr && usGamePort == other.usGamePort); } - void Init(void) + void Init() { MapInsert(ms_ValidServerListItemMap, this); // Initialize variables @@ -172,7 +172,7 @@ class CServerListItem m_iBuildNumber = 0; } - void CloseSocket(void) + void CloseSocket() { if (m_Socket != INVALID_SOCKET) { @@ -182,10 +182,10 @@ class CServerListItem } bool ParseQuery(const char* szBuffer, unsigned int nLength); - void Query(void); + void Query(); std::string Pulse(bool bCanSendQuery, bool bRemoveNonResponding = false); - void ResetForRefresh(void); - unsigned short GetQueryPort(void); + void ResetForRefresh(); + unsigned short GetQueryPort(); in_addr AddressCopy; // Copy to ensure it doesn't get changed without us knowing unsigned short usGamePortCopy; @@ -230,13 +230,13 @@ class CServerListItem std::vector vecPlayers; - bool WaitingToSendQuery(void) const { return !bScanned && !bSkipped && m_Socket == INVALID_SOCKET; } + bool WaitingToSendQuery() const { return !bScanned && !bSkipped && m_Socket == INVALID_SOCKET; } - const SString& GetEndpoint(void) const { return strEndpoint; } + const SString& GetEndpoint() const { return strEndpoint; } - const SString& GetEndpointSortKey(void) const { return strEndpointSortKey; } + const SString& GetEndpointSortKey() const { return strEndpointSortKey; } - void PostChange(void) + void PostChange() { // Update tie break sort key strTieBreakSortKey = SString("%04d", uiTieBreakPosition); @@ -278,9 +278,9 @@ class CServerListItem strSearchableName = strName; } - const SString& GetVersionSortKey(void) const { return strVersionSortKey; } + const SString& GetVersionSortKey() const { return strVersionSortKey; } - bool MaybeWontRespond(void) const + bool MaybeWontRespond() const { if (bMasterServerSaysNoResponse || uiCacheNoReplyCount > 0) if (GetDataQuality() < SERVER_INFO_QUERY) @@ -294,9 +294,9 @@ class CServerListItem m_iDataQuality = iDataQuality; uiRevision++; } - int GetDataQuality(void) const { return m_iDataQuality; } + int GetDataQuality() const { return m_iDataQuality; } - uint GetMaxRetries(void) const { return GetDataQuality() <= SERVER_INFO_ASE_0 || MaybeWontRespond() ? 0 : 1; } + uint GetMaxRetries() const { return GetDataQuality() <= SERVER_INFO_ASE_0 || MaybeWontRespond() ? 0 : 1; } static bool StaticIsValid(CServerListItem* pServer) { return MapContains(ms_ValidServerListItemMap, pServer); } @@ -338,7 +338,7 @@ class CServerListItemList std::map m_AddressMap; public: - std::list& GetList(void) { return m_List; } + std::list& GetList() { return m_List; } std::list::iterator begin() { return m_List.begin(); } @@ -350,8 +350,8 @@ class CServerListItemList size_t size() const { return m_List.size(); } - ~CServerListItemList(void); - void DeleteAll(void); + ~CServerListItemList(); + void DeleteAll(); CServerListItem* Find(in_addr Address, ushort usGamePort); CServerListItem* AddUnique(in_addr Address, ushort usGamePort, bool bAtFront = false); void AddNewItem(CServerListItem* pItem, bool bAtFront); @@ -363,29 +363,29 @@ class CServerListItemList class CServerList { public: - CServerList(void); - virtual ~CServerList(void); + CServerList(); + virtual ~CServerList(); // Base implementation scans all listed servers - virtual void Pulse(void); - virtual void Refresh(void); - virtual bool RemoveNonResponding(void) { return true; } + virtual void Pulse(); + virtual void Refresh(); + virtual bool RemoveNonResponding() { return true; } - CServerListIterator IteratorBegin(void) { return m_Servers.begin(); }; - CServerListIterator IteratorEnd(void) { return m_Servers.end(); }; - CServerListReverseIterator ReverseIteratorBegin(void) { return m_Servers.rbegin(); }; - CServerListReverseIterator ReverseIteratorEnd(void) { return m_Servers.rend(); }; - unsigned int GetServerCount(void) { return m_Servers.size(); }; + CServerListIterator IteratorBegin() { return m_Servers.begin(); }; + CServerListIterator IteratorEnd() { return m_Servers.end(); }; + CServerListReverseIterator ReverseIteratorBegin() { return m_Servers.rbegin(); }; + CServerListReverseIterator ReverseIteratorEnd() { return m_Servers.rend(); }; + unsigned int GetServerCount() { return m_Servers.size(); }; bool AddUnique(in_addr Address, ushort usGamePort, bool addAtFront = false); - void Clear(void); + void Clear(); bool Remove(in_addr Address, ushort usGamePort); - std::string& GetStatus(void) { return m_strStatus; }; - bool IsUpdated(void) { return m_bUpdated; }; + std::string& GetStatus() { return m_strStatus; }; + bool IsUpdated() { return m_bUpdated; }; void SetUpdated(bool bUpdated) { m_bUpdated = bUpdated; }; - int GetRevision(void) { return m_iRevision; } - void SortByASEVersion(void); + int GetRevision() { return m_iRevision; } + void SortByASEVersion(); protected: bool m_bUpdated; @@ -403,11 +403,11 @@ class CServerList class CServerListInternet : public CServerList { public: - CServerListInternet(void); - ~CServerListInternet(void); - void Pulse(void); - void Refresh(void); - bool RemoveNonResponding(void) { return m_nScanned > 10; } // Don't remove until net access is confirmed + CServerListInternet(); + ~CServerListInternet(); + void Pulse(); + void Refresh(); + bool RemoveNonResponding() { return m_nScanned > 10; } // Don't remove until net access is confirmed private: CMasterServerManagerInterface* m_pMasterServerManager; @@ -418,11 +418,11 @@ class CServerListInternet : public CServerList class CServerListLAN : public CServerList { public: - void Pulse(void); - void Refresh(void); + void Pulse(); + void Refresh(); private: - void Discover(void); + void Discover(); int m_Socket; sockaddr_in m_Remote; diff --git a/Client/game_sa/C3DMarkersSA.h b/Client/game_sa/C3DMarkersSA.h index 37f2e3ae840..fffc07fd216 100644 --- a/Client/game_sa/C3DMarkersSA.h +++ b/Client/game_sa/C3DMarkersSA.h @@ -38,7 +38,7 @@ class C3DMarkersSA : public C3DMarkers public: // constructor C3DMarkersSA(); - ~C3DMarkersSA(void); + ~C3DMarkersSA(); C3DMarker* CreateMarker(DWORD Identifier, e3DMarkerType dwType, CVector* vecPosition, FLOAT fSize, FLOAT fPulseFraction, BYTE r, BYTE g, BYTE b, BYTE a); C3DMarker* FindFreeMarker(); diff --git a/Client/game_sa/CAEVehicleAudioEntitySA.cpp b/Client/game_sa/CAEVehicleAudioEntitySA.cpp index afbd03b91e3..06e6e8c7578 100644 --- a/Client/game_sa/CAEVehicleAudioEntitySA.cpp +++ b/Client/game_sa/CAEVehicleAudioEntitySA.cpp @@ -16,7 +16,7 @@ CAEVehicleAudioEntitySA::CAEVehicleAudioEntitySA(CAEVehicleAudioEntitySAInterfac m_pInterface = pInterface; } -void CAEVehicleAudioEntitySA::JustGotInVehicleAsDriver(void) +void CAEVehicleAudioEntitySA::JustGotInVehicleAsDriver() { m_pInterface->m_bPlayerDriver = true; DWORD dwFunc = FUNC_CAEVehicleAudioEntity__JustGotInVehicleAsDriver; @@ -28,7 +28,7 @@ void CAEVehicleAudioEntitySA::JustGotInVehicleAsDriver(void) } } -void CAEVehicleAudioEntitySA::JustGotOutOfVehicleAsDriver(void) +void CAEVehicleAudioEntitySA::JustGotOutOfVehicleAsDriver() { m_pInterface->m_bPlayerDriver = false; DWORD dwFunc = FUNC_CAEVehicleAudioEntity__JustGotOutOfVehicleAsDriver; @@ -40,7 +40,7 @@ void CAEVehicleAudioEntitySA::JustGotOutOfVehicleAsDriver(void) } } -void CAEVehicleAudioEntitySA::TurnOnRadioForVehicle(void) +void CAEVehicleAudioEntitySA::TurnOnRadioForVehicle() { DWORD dwFunc = FUNC_CAEVehicleAudioEntity__TurnOnRadioForVehicle; DWORD dwThis = (DWORD)m_pInterface; diff --git a/Client/game_sa/CAEVehicleAudioEntitySA.h b/Client/game_sa/CAEVehicleAudioEntitySA.h index 73b08867187..cd2312ffa40 100644 --- a/Client/game_sa/CAEVehicleAudioEntitySA.h +++ b/Client/game_sa/CAEVehicleAudioEntitySA.h @@ -251,9 +251,9 @@ class CAEVehicleAudioEntitySA : public CAEVehicleAudioEntity { public: CAEVehicleAudioEntitySA(CAEVehicleAudioEntitySAInterface* pInterface); - void JustGotInVehicleAsDriver(void); - void JustGotOutOfVehicleAsDriver(void); - void TurnOnRadioForVehicle(void); + void JustGotInVehicleAsDriver(); + void JustGotOutOfVehicleAsDriver(); + void TurnOnRadioForVehicle(); void StopVehicleEngineSound(unsigned char ucSlot); private: diff --git a/Client/game_sa/CAnimBlendAssocGroupSA.cpp b/Client/game_sa/CAnimBlendAssocGroupSA.cpp index d4cc990e439..d4977929455 100644 --- a/Client/game_sa/CAnimBlendAssocGroupSA.cpp +++ b/Client/game_sa/CAnimBlendAssocGroupSA.cpp @@ -46,7 +46,7 @@ void CAnimBlendAssocGroupSA::InitEmptyAssociations(RpClump* pClump) } } -bool CAnimBlendAssocGroupSA::IsCreated(void) +bool CAnimBlendAssocGroupSA::IsCreated() { bool bReturn; DWORD dwThis = (DWORD)m_pInterface; @@ -60,7 +60,7 @@ bool CAnimBlendAssocGroupSA::IsCreated(void) return bReturn; } -int CAnimBlendAssocGroupSA::GetNumAnimations(void) +int CAnimBlendAssocGroupSA::GetNumAnimations() { int iReturn; DWORD dwThis = (DWORD)m_pInterface; @@ -74,7 +74,7 @@ int CAnimBlendAssocGroupSA::GetNumAnimations(void) return iReturn; } -CAnimBlock* CAnimBlendAssocGroupSA::GetAnimBlock(void) +CAnimBlock* CAnimBlendAssocGroupSA::GetAnimBlock() { SetupAnimBlock(); @@ -97,7 +97,7 @@ CAnimBlendStaticAssociation* CAnimBlendAssocGroupSA::GetAnimation(unsigned int I return pReturn; } -bool CAnimBlendAssocGroupSA::IsLoaded(void) +bool CAnimBlendAssocGroupSA::IsLoaded() { if (m_pInterface->pAnimBlock) { @@ -118,7 +118,7 @@ void CAnimBlendAssocGroupSA::CreateAssociations(const char* szBlockName) } } -void CAnimBlendAssocGroupSA::SetupAnimBlock(void) +void CAnimBlendAssocGroupSA::SetupAnimBlock() { // Make sure our AnimBlock matches up with our interface's CAnimBlockSAInterface* pCurrent = (m_pAnimBlock) ? m_pAnimBlock->m_pInterface : NULL; diff --git a/Client/game_sa/CAnimBlendAssocGroupSA.h b/Client/game_sa/CAnimBlendAssocGroupSA.h index bf5d443c3cb..26912f0394c 100644 --- a/Client/game_sa/CAnimBlendAssocGroupSA.h +++ b/Client/game_sa/CAnimBlendAssocGroupSA.h @@ -190,18 +190,18 @@ class CAnimBlendAssocGroupSA : public CAnimBlendAssocGroup CAnimBlendAssociationSAInterface* CopyAnimation(unsigned int AnimID); void InitEmptyAssociations(RpClump* pClump); - bool IsCreated(void); - int GetNumAnimations(void); - CAnimBlock* GetAnimBlock(void); + bool IsCreated(); + int GetNumAnimations(); + CAnimBlock* GetAnimBlock(); CAnimBlendStaticAssociation* GetAnimation(unsigned int ID); - AssocGroupId GetGroupID(void) { return m_pInterface->groupID; }; + AssocGroupId GetGroupID() { return m_pInterface->groupID; }; void CreateAssociations(const char* szBlockName); - bool IsLoaded(void); + bool IsLoaded(); void SetIDOffset(int iOffset) { m_pInterface->iIDOffset = iOffset; } protected: - void SetupAnimBlock(void); + void SetupAnimBlock(); CAnimBlendAssocGroupSAInterface* m_pInterface; CAnimBlockSA* m_pAnimBlock; diff --git a/Client/game_sa/CAnimBlendAssociationSA.cpp b/Client/game_sa/CAnimBlendAssociationSA.cpp index badfaa4b966..b90b93db0df 100644 --- a/Client/game_sa/CAnimBlendAssociationSA.cpp +++ b/Client/game_sa/CAnimBlendAssociationSA.cpp @@ -93,7 +93,7 @@ void CAnimBlendAssociationSA::FreeAnimBlendNodeArray() }; } -std::unique_ptr CAnimBlendAssociationSA::GetAnimHierarchy(void) +std::unique_ptr CAnimBlendAssociationSA::GetAnimHierarchy() { return pGame->GetAnimManager()->GetAnimBlendHierarchy(m_pInterface->pAnimHierarchy); } diff --git a/Client/game_sa/CAnimBlendHierarchySA.cpp b/Client/game_sa/CAnimBlendHierarchySA.cpp index aed103d946b..5f5ee2d11dd 100644 --- a/Client/game_sa/CAnimBlendHierarchySA.cpp +++ b/Client/game_sa/CAnimBlendHierarchySA.cpp @@ -12,12 +12,12 @@ #include "StdInc.h" // Careful, GetIndex will not work for custom animations -int CAnimBlendHierarchySAInterface::GetIndex(void) +int CAnimBlendHierarchySAInterface::GetIndex() { return (((DWORD)this - ARRAY_CAnimManager_Animations) / 24); } -void CAnimBlendHierarchySA::Initialize(void) +void CAnimBlendHierarchySA::Initialize() { m_pInterface->pSequences = 0; m_pInterface->usNumSequences = 0; @@ -40,7 +40,7 @@ void CAnimBlendHierarchySA::SetName(const char* szName) } } -void CAnimBlendHierarchySA::RemoveAnimSequences(void) +void CAnimBlendHierarchySA::RemoveAnimSequences() { DWORD dwThis = (DWORD)m_pInterface; DWORD dwFunc = FUNC_CAnimBlendHierarchy_RemoveAnimSequences; @@ -51,7 +51,7 @@ void CAnimBlendHierarchySA::RemoveAnimSequences(void) } } -void CAnimBlendHierarchySA::RemoveFromUncompressedCache(void) +void CAnimBlendHierarchySA::RemoveFromUncompressedCache() { DWORD dwThis = (DWORD)m_pInterface; DWORD dwFunc = FUNC_CAnimBlendHierarchy_RemoveFromUncompressedCache; @@ -62,7 +62,7 @@ void CAnimBlendHierarchySA::RemoveFromUncompressedCache(void) } } -void CAnimBlendHierarchySA::RemoveQuaternionFlips(void) +void CAnimBlendHierarchySA::RemoveQuaternionFlips() { DWORD dwThis = (DWORD)m_pInterface; DWORD dwFunc = FUNC_CAnimBlendHierarchy_RemoveQuaternionFlips; @@ -73,7 +73,7 @@ void CAnimBlendHierarchySA::RemoveQuaternionFlips(void) } } -void CAnimBlendHierarchySA::CalculateTotalTime(void) +void CAnimBlendHierarchySA::CalculateTotalTime() { DWORD dwThis = (DWORD)m_pInterface; DWORD dwFunc = FUNC_CAnimBlendHierarchy_CalculateTotalTime; diff --git a/Client/game_sa/CAnimBlendHierarchySA.h b/Client/game_sa/CAnimBlendHierarchySA.h index 86f3288a764..aadbfe89f58 100644 --- a/Client/game_sa/CAnimBlendHierarchySA.h +++ b/Client/game_sa/CAnimBlendHierarchySA.h @@ -29,7 +29,7 @@ class CAnimBlendHierarchySAInterface { public: // Careful, GetIndex will not work for custom animations - int GetIndex(void); + int GetIndex(); unsigned int uiHashKey; CAnimBlendSequenceSAInterface* pSequences; diff --git a/Client/game_sa/CAnimBlendSequenceSA.cpp b/Client/game_sa/CAnimBlendSequenceSA.cpp index 232ae88a3e3..65a5a561f4d 100644 --- a/Client/game_sa/CAnimBlendSequenceSA.cpp +++ b/Client/game_sa/CAnimBlendSequenceSA.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CAnimBlendSequenceSA::Initialize(void) +void CAnimBlendSequenceSA::Initialize() { m_pInterface->m_boneId = -1; m_pInterface->sFlags = 0; diff --git a/Client/game_sa/CAnimBlendSequenceSA.h b/Client/game_sa/CAnimBlendSequenceSA.h index 1de2a037cc9..649f9017d06 100644 --- a/Client/game_sa/CAnimBlendSequenceSA.h +++ b/Client/game_sa/CAnimBlendSequenceSA.h @@ -33,18 +33,18 @@ class CAnimBlendSequenceSA : public CAnimBlendSequence { public: CAnimBlendSequenceSA(CAnimBlendSequenceSAInterface* pInterface) { m_pInterface = pInterface; } - void Initialize(void); + void Initialize(); void SetName(const char* szName); void SetBoneTag(int32_t i32BoneID); void SetKeyFrames(size_t cKeyFrames, bool bRoot, bool bCompressed, void* pKeyFrames); void* GetKeyFrame(size_t iFrame, uint32_t u32FrameSizeInBytes); - uint32_t GetHash(void) { return m_pInterface->m_hash; } - uint16_t GetBoneTag(void) { return m_pInterface->m_boneId; } - BYTE* GetKeyFrames(void) { return m_pInterface->pKeyFrames; } - unsigned short GetKeyFramesCount(void) { return m_pInterface->sNumKeyFrames; } - bool IsBigChunkForAllSequences(void) { return ((m_pInterface->sFlags >> 3) & 1); } + uint32_t GetHash() { return m_pInterface->m_hash; } + uint16_t GetBoneTag() { return m_pInterface->m_boneId; } + BYTE* GetKeyFrames() { return m_pInterface->pKeyFrames; } + unsigned short GetKeyFramesCount() { return m_pInterface->sNumKeyFrames; } + bool IsBigChunkForAllSequences() { return ((m_pInterface->sFlags >> 3) & 1); } void CopySequenceProperties(CAnimBlendSequenceSAInterface* pAnimSequenceInterface); - CAnimBlendSequenceSAInterface* GetInterface(void) { return m_pInterface; } + CAnimBlendSequenceSAInterface* GetInterface() { return m_pInterface; } protected: CAnimBlendSequenceSAInterface* m_pInterface; diff --git a/Client/game_sa/CAnimBlockSA.cpp b/Client/game_sa/CAnimBlockSA.cpp index 784bef1122d..5477f3c1772 100644 --- a/Client/game_sa/CAnimBlockSA.cpp +++ b/Client/game_sa/CAnimBlockSA.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -int CAnimBlockSAInterface::GetIndex(void) +int CAnimBlockSAInterface::GetIndex() { return (((DWORD)this - ARRAY_CAnimManager_AnimBlocks) / 32); } diff --git a/Client/game_sa/CAnimBlockSA.h b/Client/game_sa/CAnimBlockSA.h index 5b998c30d7d..a74ec3ad698 100644 --- a/Client/game_sa/CAnimBlockSA.h +++ b/Client/game_sa/CAnimBlockSA.h @@ -19,7 +19,7 @@ class CAnimBlendAssocGroupSA; class CAnimBlockSAInterface // 32 bytes { public: - int GetIndex(void); // hacky, i know + int GetIndex(); // hacky, i know char szName[16]; bool bLoaded; // ? @@ -37,14 +37,14 @@ class CAnimBlockSA : public CAnimBlock public: CAnimBlockSA(CAnimBlockSAInterface* pInterface) { m_pInterface = pInterface; } - CAnimBlockSAInterface* GetInterface(void) { return m_pInterface; } - char* GetName(void) { return m_pInterface->szName; } - int GetIndex(void) { return m_pInterface->GetIndex(); } - void AddRef(void) { m_pInterface->usRefs++; } - unsigned short GetRefs(void) { return m_pInterface->usRefs; } - bool IsLoaded(void) { return m_pInterface->bLoaded; } - int GetIDOffset(void) { return m_pInterface->idOffset; } - size_t GetAnimationCount(void) { return m_pInterface->nAnimations; } + CAnimBlockSAInterface* GetInterface() { return m_pInterface; } + char* GetName() { return m_pInterface->szName; } + int GetIndex() { return m_pInterface->GetIndex(); } + void AddRef() { m_pInterface->usRefs++; } + unsigned short GetRefs() { return m_pInterface->usRefs; } + bool IsLoaded() { return m_pInterface->bLoaded; } + int GetIDOffset() { return m_pInterface->idOffset; } + size_t GetAnimationCount() { return m_pInterface->nAnimations; } void Request(EModelRequestType requestType, bool bAllowBlockingFail = false); CAnimBlendHierarchySAInterface* GetAnimationHierarchyInterface(size_t iAnimation); diff --git a/Client/game_sa/CAnimManagerSA.cpp b/Client/game_sa/CAnimManagerSA.cpp index d48ced2d13c..9727aafb185 100644 --- a/Client/game_sa/CAnimManagerSA.cpp +++ b/Client/game_sa/CAnimManagerSA.cpp @@ -13,13 +13,13 @@ using std::list; -CAnimManagerSA::CAnimManagerSA(void) +CAnimManagerSA::CAnimManagerSA() { MemSetFast(m_pAnimAssocGroups, 0, sizeof(m_pAnimAssocGroups)); MemSetFast(m_pAnimBlocks, 0, sizeof(m_pAnimBlocks)); } -CAnimManagerSA::~CAnimManagerSA(void) +CAnimManagerSA::~CAnimManagerSA() { for (unsigned int i = 0; i < MAX_ANIM_GROUPS; i++) if (m_pAnimAssocGroups[i]) @@ -29,7 +29,7 @@ CAnimManagerSA::~CAnimManagerSA(void) delete m_pAnimBlocks[i]; } -void CAnimManagerSA::Initialize(void) +void CAnimManagerSA::Initialize() { DWORD dwFunc = FUNC_CAnimManager_Initialize; _asm @@ -38,7 +38,7 @@ void CAnimManagerSA::Initialize(void) } } -void CAnimManagerSA::Shutdown(void) +void CAnimManagerSA::Shutdown() { DWORD dwFunc = FUNC_CAnimManager_Shutdown; _asm @@ -47,17 +47,17 @@ void CAnimManagerSA::Shutdown(void) } } -int CAnimManagerSA::GetNumAnimations(void) +int CAnimManagerSA::GetNumAnimations() { return *(int*)(VAR_CAnimManager_NumAnimations); } -int CAnimManagerSA::GetNumAnimBlocks(void) +int CAnimManagerSA::GetNumAnimBlocks() { return *(int*)(VAR_CAnimManager_NumAnimBlocks); } -int CAnimManagerSA::GetNumAnimAssocDefinitions(void) +int CAnimManagerSA::GetNumAnimAssocDefinitions() { return *(int*)(VAR_CAnimManager_NumAnimAssocDefinitions); } @@ -489,7 +489,7 @@ AnimAssocDefinition* CAnimManagerSA::AddAnimAssocDefinition(const char* szBlockN return NULL; } -void CAnimManagerSA::ReadAnimAssociationDefinitions(void) +void CAnimManagerSA::ReadAnimAssociationDefinitions() { DWORD dwFunc = FUNC_CAnimManager_ReadAnimAssociationDefinitions; _asm @@ -498,7 +498,7 @@ void CAnimManagerSA::ReadAnimAssociationDefinitions(void) } } -void CAnimManagerSA::CreateAnimAssocGroups(void) +void CAnimManagerSA::CreateAnimAssocGroups() { DWORD dwFunc = FUNC_CAnimManager_CreateAnimAssocGroups; _asm @@ -566,7 +566,7 @@ void CAnimManagerSA::LoadAnimFile(RwStream* pStream, bool b1, const char* sz1) } } -void CAnimManagerSA::LoadAnimFiles(void) +void CAnimManagerSA::LoadAnimFiles() { DWORD dwFunc = FUNC_CAnimManager_LoadAnimFiles; _asm @@ -575,7 +575,7 @@ void CAnimManagerSA::LoadAnimFiles(void) } } -void CAnimManagerSA::RemoveLastAnimFile(void) +void CAnimManagerSA::RemoveLastAnimFile() { DWORD dwFunc = FUNC_CAnimManager_RemoveLastAnimFile; _asm @@ -840,13 +840,13 @@ std::unique_ptr CAnimManagerSA::GetCustomAnimBlendSequence(C return nullptr; } -std::unique_ptr CAnimManagerSA::GetCustomAnimBlendHierarchy(void) +std::unique_ptr CAnimManagerSA::GetCustomAnimBlendHierarchy() { auto pInterface = new CAnimBlendHierarchySAInterface; return std::make_unique(pInterface); } -std::unique_ptr CAnimManagerSA::GetCustomAnimBlendSequence(void) +std::unique_ptr CAnimManagerSA::GetCustomAnimBlendSequence() { auto pInterface = new CAnimBlendSequenceSAInterface; return std::make_unique(pInterface); diff --git a/Client/game_sa/CAnimManagerSA.h b/Client/game_sa/CAnimManagerSA.h index 37e768b9974..8c3a8507681 100644 --- a/Client/game_sa/CAnimManagerSA.h +++ b/Client/game_sa/CAnimManagerSA.h @@ -82,15 +82,15 @@ class CAnimManagerSA : public CAnimManager typedef std::unique_ptr StaticAssocIntface_type; public: - CAnimManagerSA(void); - ~CAnimManagerSA(void); + CAnimManagerSA(); + ~CAnimManagerSA(); - void Initialize(void); - void Shutdown(void); + void Initialize(); + void Shutdown(); - int GetNumAnimations(void); - int GetNumAnimBlocks(void); - int GetNumAnimAssocDefinitions(void); + int GetNumAnimations(); + int GetNumAnimBlocks(); + int GetNumAnimAssocDefinitions(); std::unique_ptr GetAnimation(int ID); std::unique_ptr GetAnimation(const char* szName, CAnimBlock* pBlock); @@ -125,16 +125,16 @@ class CAnimManagerSA : public CAnimManager AnimAssocDefinition* AddAnimAssocDefinition(const char* szBlockName, const char* szAnimName, AssocGroupId animGroup, AnimationId animID, AnimDescriptor* pDescriptor); - void ReadAnimAssociationDefinitions(void); - void CreateAnimAssocGroups(void); + void ReadAnimAssociationDefinitions(); + void CreateAnimAssocGroups(); void UncompressAnimation(CAnimBlendHierarchy* pHierarchy); void RemoveFromUncompressedCache(CAnimBlendHierarchy* pHierarchy); void RemoveFromUncompressedCache(CAnimBlendHierarchySAInterface* pInterface); void LoadAnimFile(const char* szFile); void LoadAnimFile(RwStream* pStream, bool b1, const char* sz1); - void LoadAnimFiles(void); - void RemoveLastAnimFile(void); + void LoadAnimFiles(); + void RemoveLastAnimFile(); BYTE* AllocateKeyFramesMemory(uint32_t u32BytesToAllocate); void FreeKeyFramesMemory(void* pKeyFrames); @@ -161,15 +161,15 @@ class CAnimManagerSA : public CAnimManager std::unique_ptr GetCustomAnimBlendSequence(CAnimBlendSequenceSAInterface* pInterface); // Warning! These two functions will create a new interface ( dynamic memory memory allocation ) - std::unique_ptr GetCustomAnimBlendHierarchy(void); - std::unique_ptr GetCustomAnimBlendSequence(void); + std::unique_ptr GetCustomAnimBlendHierarchy(); + std::unique_ptr GetCustomAnimBlendSequence(); void DeleteCustomAnimHierarchyInterface(CAnimBlendHierarchySAInterface* pInterface); void DeleteCustomAnimSequenceInterface(CAnimBlendSequenceSAInterface* pInterface); bool isGateWayAnimationHierarchy(CAnimBlendHierarchySAInterface* pInterface); - const SString& GetGateWayBlockName(void) { return m_kGateWayBlockName; }; - const SString& GetGateWayAnimationName(void) { return m_kGateWayAnimationName; }; + const SString& GetGateWayBlockName() { return m_kGateWayBlockName; }; + const SString& GetGateWayAnimationName() { return m_kGateWayAnimationName; }; private: CAnimBlendAssocGroup* m_pAnimAssocGroups[MAX_ANIM_GROUPS]; diff --git a/Client/game_sa/CAudioContainerLookupTableSA.cpp b/Client/game_sa/CAudioContainerLookupTableSA.cpp index d562cad76b7..5202938a564 100644 --- a/Client/game_sa/CAudioContainerLookupTableSA.cpp +++ b/Client/game_sa/CAudioContainerLookupTableSA.cpp @@ -35,7 +35,7 @@ CAudioContainerLookupTableSA::CAudioContainerLookupTableSA(const SString& strPat fileHandle.close(); } -CAudioContainerLookupTableSA::~CAudioContainerLookupTableSA(void) +CAudioContainerLookupTableSA::~CAudioContainerLookupTableSA() { for (int i = 0; i < 9; i++) { diff --git a/Client/game_sa/CAudioContainerLookupTableSA.h b/Client/game_sa/CAudioContainerLookupTableSA.h index fa35da3242e..09128ec3a1d 100644 --- a/Client/game_sa/CAudioContainerLookupTableSA.h +++ b/Client/game_sa/CAudioContainerLookupTableSA.h @@ -22,7 +22,7 @@ class CAudioContainerLookupTableSA { public: CAudioContainerLookupTableSA(const SString& strPath); - ~CAudioContainerLookupTableSA(void); + ~CAudioContainerLookupTableSA(); int CountIndex(eAudioLookupIndex index); SAudioLookupEntrySA* GetEntry(eAudioLookupIndex lookupIndex, uint8 bankIndex); diff --git a/Client/game_sa/CAudioContainerSA.cpp b/Client/game_sa/CAudioContainerSA.cpp index b59519dbdb5..946c39ef5f8 100644 --- a/Client/game_sa/CAudioContainerSA.cpp +++ b/Client/game_sa/CAudioContainerSA.cpp @@ -23,12 +23,12 @@ unsigned long EndianSwap32(unsigned long x) return y; } -CAudioContainerSA::CAudioContainerSA(void) +CAudioContainerSA::CAudioContainerSA() { m_pLookupTable = new CAudioContainerLookupTableSA("AUDIO\\CONFIG\\BankLkup.dat"); } -CAudioContainerSA::~CAudioContainerSA(void) +CAudioContainerSA::~CAudioContainerSA() { if (m_pLookupTable != NULL) { diff --git a/Client/game_sa/CAudioContainerSA.h b/Client/game_sa/CAudioContainerSA.h index a58ec1a8782..304b4d4ede6 100644 --- a/Client/game_sa/CAudioContainerSA.h +++ b/Client/game_sa/CAudioContainerSA.h @@ -84,8 +84,8 @@ static_assert(sizeof(SRadioTrackHeader) == 8068, "Invalid size for SRadioTrackHe class CAudioContainerSA : public CAudioContainer { public: - CAudioContainerSA(void); - ~CAudioContainerSA(void); + CAudioContainerSA(); + ~CAudioContainerSA(); bool GetAudioData(eAudioLookupIndex lookupIndex, int bankIndex, int audioIndex, void*& pMemory, unsigned int& length); bool ValidateContainer(eAudioLookupIndex lookupIndex); diff --git a/Client/game_sa/CAudioEngine.h b/Client/game_sa/CAudioEngine.h index da8274abfaf..837ef918bd1 100644 --- a/Client/game_sa/CAudioEngine.h +++ b/Client/game_sa/CAudioEngine.h @@ -42,7 +42,7 @@ class CAudioEngine virtual void SetMissionAudioPosition(CVector* position, int slot = 1) = 0; virtual bool PlayLoadedMissionAudio(int slot = 1) = 0; virtual void PauseAllSound(bool bPaused) = 0; - virtual void StopRadio(void) = 0; + virtual void StopRadio() = 0; virtual void StartRadio(unsigned int station) = 0; virtual void ReportBulletHit(CEntity* pEntity, unsigned char ucSurfaceType, CVector* pvecPosition, float f_2) = 0; diff --git a/Client/game_sa/CAudioEngineSA.cpp b/Client/game_sa/CAudioEngineSA.cpp index 2dae935a7dd..e482dc0ca42 100644 --- a/Client/game_sa/CAudioEngineSA.cpp +++ b/Client/game_sa/CAudioEngineSA.cpp @@ -393,13 +393,13 @@ bool CAudioEngineSA::IsAmbientSoundEnabled(eAmbientSoundType eType) return false; } -VOID CAudioEngineSA::ResetAmbientSounds(void) +VOID CAudioEngineSA::ResetAmbientSounds() { SetAmbientSoundEnabled(AMBIENT_SOUND_GENERAL, true); SetAmbientSoundEnabled(AMBIENT_SOUND_GUNFIRE, true); } -VOID CAudioEngineSA::UpdateAmbientSoundSettings(void) +VOID CAudioEngineSA::UpdateAmbientSoundSettings() { // Update gunfire setting if (IsAmbientSoundEnabled(AMBIENT_SOUND_GUNFIRE)) @@ -408,7 +408,7 @@ VOID CAudioEngineSA::UpdateAmbientSoundSettings(void) MemPut(0x507814, 0x33); // No gunfire } -__declspec(noinline) bool _cdecl IsAmbientSoundGeneralEnabled(void) +__declspec(noinline) bool _cdecl IsAmbientSoundGeneralEnabled() { if (pGame) { @@ -464,7 +464,7 @@ bool CAudioEngineSA::IsWorldSoundEnabled(uint uiGroup, uint uiIndex) return !m_DisabledWorldSounds.IsRangeSet(uiFirst, uiLast - uiFirst + 1); } -void CAudioEngineSA::ResetWorldSounds(void) +void CAudioEngineSA::ResetWorldSounds() { m_DisabledWorldSounds = CRanges(); } diff --git a/Client/game_sa/CAudioEngineSA.h b/Client/game_sa/CAudioEngineSA.h index 29be59fc661..eaefa965152 100644 --- a/Client/game_sa/CAudioEngineSA.h +++ b/Client/game_sa/CAudioEngineSA.h @@ -129,20 +129,20 @@ class CAudioEngineSA : public CAudioEngine VOID SetMissionAudioPosition(CVector* position, int slot = 1); bool PlayLoadedMissionAudio(int slot = 1); VOID PauseAllSound(bool bPaused); - VOID StopRadio(void); + VOID StopRadio(); VOID StartRadio(unsigned int station); void PauseAmbientSounds(bool bPaused); VOID SetAmbientSoundEnabled(eAmbientSoundType eType, bool bEnabled); bool IsAmbientSoundEnabled(eAmbientSoundType eType); - void ResetAmbientSounds(void); + void ResetAmbientSounds(); VOID SetWorldSoundEnabled(uint uiGroup, uint uiIndex, bool bEnabled, bool bImmediate); bool IsWorldSoundEnabled(uint uiGroup, uint uiIndex); - void ResetWorldSounds(void); + void ResetWorldSounds(); void SetWorldSoundHandler(WorldSoundHandler* pHandler); void ReportBulletHit(CEntity* pEntity, unsigned char ucSurfaceType, CVector* pvecPosition, float f_2); void ReportWeaponEvent(int iEvent, eWeaponType weaponType, CPhysical* pPhysical); - void UpdateAmbientSoundSettings(void); + void UpdateAmbientSoundSettings(); bool OnWorldSound(CAESound* pAESound); private: diff --git a/Client/game_sa/CAutomobileSA.cpp b/Client/game_sa/CAutomobileSA.cpp index 453a5756c7c..0942b65707a 100644 --- a/Client/game_sa/CAutomobileSA.cpp +++ b/Client/game_sa/CAutomobileSA.cpp @@ -47,7 +47,7 @@ CAutomobileSA::CAutomobileSA(CAutomobileSAInterface* automobile) // just so it can be passed on to CVehicle } -CAutomobileSA::~CAutomobileSA(void) +CAutomobileSA::~CAutomobileSA() { for (int i = 0; i < MAX_DOORS; i++) { @@ -74,7 +74,7 @@ bool CAutomobileSA::BurstTyre(DWORD dwTyreID) return bReturn; } -bool CAutomobileSA::BreakTowLink(void) +bool CAutomobileSA::BreakTowLink() { DEBUG_TRACE("bool CAutomobileSA::BreakTowLink ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -105,7 +105,7 @@ void CAutomobileSA::BlowUpCar(CEntity* pEntity) } } -void CAutomobileSA::BlowUpCarsInPath(void) +void CAutomobileSA::BlowUpCarsInPath() { DEBUG_TRACE("void CAutomobileSA::BlowUpCarsInPath ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -118,7 +118,7 @@ void CAutomobileSA::BlowUpCarsInPath(void) } } -void CAutomobileSA::CloseAllDoors(void) +void CAutomobileSA::CloseAllDoors() { DEBUG_TRACE("void CAutomobileSA::CloseAllDoors ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -131,7 +131,7 @@ void CAutomobileSA::CloseAllDoors(void) } } -void CAutomobileSA::CloseBoot(void) +void CAutomobileSA::CloseBoot() { DEBUG_TRACE("void CAutomobileSA::CloseBoot ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -211,7 +211,7 @@ int CAutomobileSA::FixPanel(int iCarNodeIndex, ePanelsSA Panel) return iReturn; } -bool CAutomobileSA::GetAllWheelsOffGround(void) +bool CAutomobileSA::GetAllWheelsOffGround() { DEBUG_TRACE("bool CAutomobileSA::GetAllWheelsOffGround ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -228,7 +228,7 @@ bool CAutomobileSA::GetAllWheelsOffGround(void) return bReturn; } -float CAutomobileSA::GetCarPitch(void) +float CAutomobileSA::GetCarPitch() { DEBUG_TRACE("float CAutomobileSA::GetCarPitch ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -245,7 +245,7 @@ float CAutomobileSA::GetCarPitch(void) return fReturn; } -float CAutomobileSA::GetCarRoll(void) +float CAutomobileSA::GetCarRoll() { DEBUG_TRACE("float CAutomobileSA::GetCarRoll ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -282,7 +282,7 @@ void CAutomobileSA::GetComponentWorldPosition(int iComponentID, CVector* pVector }*/ -DWORD CAutomobileSA::GetNumContactWheels(void) +DWORD CAutomobileSA::GetNumContactWheels() { DEBUG_TRACE("DWORD CAutomobileSA::GetNumContactWheels ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -299,7 +299,7 @@ DWORD CAutomobileSA::GetNumContactWheels(void) return dwReturn; } -float CAutomobileSA::GetRearHeightAboveRoad(void) +float CAutomobileSA::GetRearHeightAboveRoad() { DEBUG_TRACE("float CAutomobileSA::GetRearHeightAboveRoad ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -406,7 +406,7 @@ bool CAutomobileSA::IsDoorReady(eDoorsSA Door) return bReturn; } -bool CAutomobileSA::IsInAir(void) +bool CAutomobileSA::IsInAir() { DEBUG_TRACE("bool CAutomobileSA::IsInAir ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -423,7 +423,7 @@ bool CAutomobileSA::IsInAir(void) return bReturn; } -bool CAutomobileSA::IsOpenTopCar(void) +bool CAutomobileSA::IsOpenTopCar() { DEBUG_TRACE("bool CAutomobileSA::IsOpenTopCar ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -440,7 +440,7 @@ bool CAutomobileSA::IsOpenTopCar(void) return bReturn; } -void CAutomobileSA::PlayCarHorn(void) +void CAutomobileSA::PlayCarHorn() { DEBUG_TRACE("void CAutomobileSA::PlayCarHorn ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -453,7 +453,7 @@ void CAutomobileSA::PlayCarHorn(void) } } -void CAutomobileSA::PopBoot(void) +void CAutomobileSA::PopBoot() { DEBUG_TRACE("void CAutomobileSA::PopBoot ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -466,7 +466,7 @@ void CAutomobileSA::PopBoot(void) } } -void CAutomobileSA::PopBootUsingPhysics(void) +void CAutomobileSA::PopBootUsingPhysics() { DEBUG_TRACE("void CAutomobileSA::PopBootUsingPhysics ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -513,7 +513,7 @@ void CAutomobileSA::PopPanel(int iCarNodeIndex, ePanelsSA Panel, bool bFallOffFa } } -void CAutomobileSA::ResetSuspension(void) +void CAutomobileSA::ResetSuspension() { DEBUG_TRACE("void CAutomobileSA::ResetSuspension ( void )"); DWORD dwThis = (DWORD)GetInterface(); diff --git a/Client/game_sa/CAutomobileSA.h b/Client/game_sa/CAutomobileSA.h index 753af9e8b82..e7603832811 100644 --- a/Client/game_sa/CAutomobileSA.h +++ b/Client/game_sa/CAutomobileSA.h @@ -178,39 +178,39 @@ class CAutomobileSA : public virtual CAutomobile, public virtual CVehicleSA public: CAutomobileSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2); CAutomobileSA(CAutomobileSAInterface* automobile); - ~CAutomobileSA(void); + ~CAutomobileSA(); bool BurstTyre(DWORD dwTyreID); - bool BreakTowLink(void); + bool BreakTowLink(); void BlowUpCar(CEntity* pEntity); - void BlowUpCarsInPath(void); - void CloseAllDoors(void); - void CloseBoot(void); + void BlowUpCarsInPath(); + void CloseAllDoors(); + void CloseBoot(); float FindWheelWidth(bool bUnknown); // void Fix ( void ); void FixDoor(int iCarNodeIndex, eDoorsSA Door); int FixPanel(int iCarNodeIndex, ePanelsSA Panel); - bool GetAllWheelsOffGround(void); - float GetCarPitch(void); - float GetCarRoll(void); + bool GetAllWheelsOffGround(); + float GetCarPitch(); + float GetCarRoll(); void GetComponentWorldPosition(int iComponentID, CVector* pVector); // float GetHeightAboveRoad ( void ); /* TODO */ - DWORD GetNumContactWheels(void); - float GetRearHeightAboveRoad(void); + DWORD GetNumContactWheels(); + float GetRearHeightAboveRoad(); bool IsComponentPresent(int iComponentID); bool IsDoorClosed(eDoorsSA Door); bool IsDoorFullyOpen(eDoorsSA Door); bool IsDoorMissing(eDoorsSA Door); bool IsDoorReady(eDoorsSA Door); - bool IsInAir(void); - bool IsOpenTopCar(void); - void PlaceOnRoadProperly(void); - void PlayCarHorn(void); - void PopBoot(void); - void PopBootUsingPhysics(void); + bool IsInAir(); + bool IsOpenTopCar(); + void PlaceOnRoadProperly(); + void PlayCarHorn(); + void PopBoot(); + void PopBootUsingPhysics(); void PopDoor(int iCarNodeIndex, eDoorsSA Door, bool bUnknown); void PopPanel(int iCarNodeIndex, ePanelsSA Panel, bool bFallOffFast); - void ResetSuspension(void); + void ResetSuspension(); void SetRandomDamage(bool bUnknown); void SetTaxiLight(bool bState); void SetTotalDamage(bool bUnknown); diff --git a/Client/game_sa/CBmxSA.h b/Client/game_sa/CBmxSA.h index d8d3e7c5257..ec49573656c 100644 --- a/Client/game_sa/CBmxSA.h +++ b/Client/game_sa/CBmxSA.h @@ -26,5 +26,5 @@ class CBmxSA : public virtual CBmx, public virtual CBikeSA CBmxSA(CBmxSAInterface* bmx); CBmxSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2); - virtual ~CBmxSA(void){}; + virtual ~CBmxSA(){}; }; diff --git a/Client/game_sa/CBoatSA.h b/Client/game_sa/CBoatSA.h index 82c71ef67c8..08eff35221e 100644 --- a/Client/game_sa/CBoatSA.h +++ b/Client/game_sa/CBoatSA.h @@ -43,5 +43,5 @@ class CBoatSA : public virtual CBoat, public virtual CVehicleSA CBoatSA(CBoatSAInterface* boat); CBoatSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2); - virtual ~CBoatSA(void){}; + virtual ~CBoatSA(){}; }; diff --git a/Client/game_sa/CCamSA.cpp b/Client/game_sa/CCamSA.cpp index fce693246fe..a50b2a17a73 100644 --- a/Client/game_sa/CCamSA.cpp +++ b/Client/game_sa/CCamSA.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CEntity* CCamSA::GetTargetEntity(void) const +CEntity* CCamSA::GetTargetEntity() const { CEntitySAInterface* pInterface = m_pInterface->CamTargetEntity; if (pInterface) diff --git a/Client/game_sa/CCameraSA.cpp b/Client/game_sa/CCameraSA.cpp index 661ba9faf43..9b94a5336e5 100644 --- a/Client/game_sa/CCameraSA.cpp +++ b/Client/game_sa/CCameraSA.cpp @@ -37,7 +37,7 @@ CCameraSA::CCameraSA(CCameraSAInterface* cameraInterface) HookInstall(HOOKPOS_Camera_CollisionDetection, (DWORD)HOOK_Camera_CollisionDetection, 5); } -CCameraSA::~CCameraSA(void) +CCameraSA::~CCameraSA() { for (int i = 0; i < MAX_CAMS; i++) { @@ -194,7 +194,7 @@ VOID CCameraSA::TakeControlAttachToEntity(CEntity* TargetEntity, CEntity* Attach } // LSOD recovery -void CCameraSA::RestoreLastGoodState(void) +void CCameraSA::RestoreLastGoodState() { CMatrix defmat; SetMatrix(&defmat); @@ -314,7 +314,7 @@ VOID CCameraSA::Find3rdPersonCamTargetVector(FLOAT fDistance, CVector* vecGunMuz } } -float CCameraSA::Find3rdPersonQuickAimPitch(void) +float CCameraSA::Find3rdPersonQuickAimPitch() { DEBUG_TRACE("float CCameraSA::Find3rdPersonQuickAimPitch ( void )"); float fReturn; @@ -453,7 +453,7 @@ void CCameraSA::VectorTrackLinear(CVector* pTo, CVector* pFrom, float time, bool } } -bool CCameraSA::IsFading(void) +bool CCameraSA::IsFading() { DWORD dwFunc = FUNC_GetFading; CCameraSAInterface* cameraInterface = this->GetInterface(); @@ -467,7 +467,7 @@ bool CCameraSA::IsFading(void) return bRet; } -int CCameraSA::GetFadingDirection(void) +int CCameraSA::GetFadingDirection() { DWORD dwFunc = FUNC_GetFadingDirection; CCameraSAInterface* cameraInterface = this->GetInterface(); @@ -511,12 +511,12 @@ void CCameraSA::SetFadeColor(unsigned char ucRed, unsigned char ucGreen, unsigne } } -float CCameraSA::GetCameraRotation(void) +float CCameraSA::GetCameraRotation() { return *(float*)VAR_CameraRotation; } -RwMatrix* CCameraSA::GetLTM(void) +RwMatrix* CCameraSA::GetLTM() { DWORD frame = *(DWORD*)(((DWORD)this->GetInterface()->m_pRwCamera) + 4); DWORD dwReturn; @@ -530,7 +530,7 @@ RwMatrix* CCameraSA::GetLTM(void) return (RwMatrix*)dwReturn; } -CEntity* CCameraSA::GetTargetEntity(void) +CEntity* CCameraSA::GetTargetEntity() { CEntitySAInterface* pInterface = this->GetInterface()->pTargetEntity; if (pInterface) @@ -581,7 +581,7 @@ void _declspec(naked) HOOK_Camera_CollisionDetection() } } -BYTE CCameraSA::GetCameraViewMode(void) +BYTE CCameraSA::GetCameraViewMode() { // TODO: Add support for ped camera view, this will only work on vehicles for now. return *(BYTE*)VAR_VehicleCameraView; @@ -598,7 +598,7 @@ void CCameraSA::SetShakeForce(float fShakeForce) pCameraInterface->m_fCamShakeForce = fShakeForce; } -float CCameraSA::GetShakeForce(void) +float CCameraSA::GetShakeForce() { CCameraSAInterface* pCameraInterface = GetInterface(); return pCameraInterface->m_fCamShakeForce; diff --git a/Client/game_sa/CCameraSA.h b/Client/game_sa/CCameraSA.h index ae9f750cc87..375c98f45a6 100644 --- a/Client/game_sa/CCameraSA.h +++ b/Client/game_sa/CCameraSA.h @@ -399,7 +399,7 @@ class CCameraSA : public CCamera public: CCameraSA(CCameraSAInterface* cameraInterface); - ~CCameraSA(void); + ~CCameraSA(); CCameraSAInterface* GetInterface() { return internalInterface; }; VOID TakeControl(CEntity* entity, eCamMode CamMode, int CamSwitchStyle); @@ -411,7 +411,7 @@ class CCameraSA : public CCamera VOID SetMatrix(CMatrix* matrix); VOID SetCamPositionForFixedMode(CVector* vecPosition, CVector* vecUpOffset); VOID Find3rdPersonCamTargetVector(FLOAT fDistance, CVector* vecGunMuzzle, CVector* vecSource, CVector* vecTarget); - float Find3rdPersonQuickAimPitch(void); + float Find3rdPersonQuickAimPitch(); BYTE GetActiveCam(); CCam* GetCam(BYTE bCameraID); @@ -424,20 +424,20 @@ class CCameraSA : public CCamera bool TryToStartNewCamMode(DWORD dwCamMode); bool ConeCastCollisionResolve(CVector* pPos, CVector* pLookAt, CVector* pDest, float rad, float minDist, float* pDist); void VectorTrackLinear(CVector* pTo, CVector* pFrom, float time, bool bSmoothEnds); - bool IsFading(void); - int GetFadingDirection(void); + bool IsFading(); + int GetFadingDirection(); void Fade(float fFadeOutTime, int iOutOrIn); void SetFadeColor(unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue); - float GetCameraRotation(void); - RwMatrix* GetLTM(void); - CEntity* GetTargetEntity(void); + float GetCameraRotation(); + RwMatrix* GetLTM(); + CEntity* GetTargetEntity(); void SetCameraClip(bool bObjects, bool bVehicles); void GetCameraClip(bool& bObjects, bool& bVehicles); - BYTE GetCameraViewMode(void); + BYTE GetCameraViewMode(); VOID SetCameraViewMode(BYTE dwCamMode); - void RestoreLastGoodState(void); + void RestoreLastGoodState(); void SetShakeForce(float fShakeForce); - float GetShakeForce(void); + float GetShakeForce(); private: static unsigned long FUNC_RwFrameGetLTM; diff --git a/Client/game_sa/CCheckpointsSA.cpp b/Client/game_sa/CCheckpointsSA.cpp index 1a7e39f1c74..e0cf2d110e9 100644 --- a/Client/game_sa/CCheckpointsSA.cpp +++ b/Client/game_sa/CCheckpointsSA.cpp @@ -19,7 +19,7 @@ CCheckpointsSA::CCheckpointsSA() this->Checkpoints[i] = new CCheckpointSA((CCheckpointSAInterface*)(ARRAY_CHECKPOINTS + i * sizeof(CCheckpointSAInterface))); } -CCheckpointsSA::~CCheckpointsSA(void) +CCheckpointsSA::~CCheckpointsSA() { for (int i = 0; i < MAX_CHECKPOINTS; i++) { diff --git a/Client/game_sa/CCheckpointsSA.h b/Client/game_sa/CCheckpointsSA.h index faa4439fc89..b3a9ed49816 100644 --- a/Client/game_sa/CCheckpointsSA.h +++ b/Client/game_sa/CCheckpointsSA.h @@ -32,7 +32,7 @@ class CCheckpointsSA : public CCheckpoints public: // constructor CCheckpointsSA(); - ~CCheckpointsSA(void); + ~CCheckpointsSA(); CCheckpoint* CreateCheckpoint(DWORD Identifier, WORD wType, CVector* vecPosition, CVector* vecPointDir, FLOAT fSize, FLOAT fPulseFraction, const SColor color); diff --git a/Client/game_sa/CColModelSA.cpp b/Client/game_sa/CColModelSA.cpp index 4b9e046cf6f..88fd0e92d28 100644 --- a/Client/game_sa/CColModelSA.cpp +++ b/Client/game_sa/CColModelSA.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CColModelSA::CColModelSA(void) +CColModelSA::CColModelSA() { m_pInterface = new CColModelSAInterface; DWORD dwThis = (DWORD)m_pInterface; @@ -30,7 +30,7 @@ CColModelSA::CColModelSA(CColModelSAInterface* pInterface) m_bDestroyInterface = false; } -CColModelSA::~CColModelSA(void) +CColModelSA::~CColModelSA() { if (m_bDestroyInterface) { diff --git a/Client/game_sa/CColModelSA.h b/Client/game_sa/CColModelSA.h index e03232bef48..0f0ffab18ee 100644 --- a/Client/game_sa/CColModelSA.h +++ b/Client/game_sa/CColModelSA.h @@ -86,12 +86,12 @@ class CColModelSAInterface class CColModelSA : public CColModel { public: - CColModelSA(void); + CColModelSA(); CColModelSA(CColModelSAInterface* pInterface); - ~CColModelSA(void); + ~CColModelSA(); - CColModelSAInterface* GetInterface(void) { return m_pInterface; } - void Destroy(void) { delete this; } + CColModelSAInterface* GetInterface() { return m_pInterface; } + void Destroy() { delete this; } private: CColModelSAInterface* m_pInterface; diff --git a/Client/game_sa/CColPointSA.cpp b/Client/game_sa/CColPointSA.cpp index 3106d3f6ce6..d0b7961d3c3 100644 --- a/Client/game_sa/CColPointSA.cpp +++ b/Client/game_sa/CColPointSA.cpp @@ -11,14 +11,14 @@ #include "StdInc.h" -CColPointSA::CColPointSA(void) +CColPointSA::CColPointSA() { m_pInternalInterface = new CColPointSAInterface(); }; // Get lighting taking into account time of day // Returns between 0 and 1 -float CColPointSA::GetLightingForTimeOfDay(void) +float CColPointSA::GetLightingForTimeOfDay() { CColLighting lighting = GetLightingB(); diff --git a/Client/game_sa/CColPointSA.h b/Client/game_sa/CColPointSA.h index 5cdd953bfa8..2ce2c0b0ec7 100644 --- a/Client/game_sa/CColPointSA.h +++ b/Client/game_sa/CColPointSA.h @@ -39,42 +39,42 @@ class CColPointSA : public CColPoint CColPointSAInterface* m_pInternalInterface; public: - CColPointSA(void); + CColPointSA(); CColPointSA(CColPointSAInterface* pInterface) { m_pInternalInterface = pInterface; }; - virtual CColPointSAInterface* GetInterface(void) { return m_pInternalInterface; } - virtual const CVector& GetPosition(void) { return GetInterface()->Position; } + virtual CColPointSAInterface* GetInterface() { return m_pInternalInterface; } + virtual const CVector& GetPosition() { return GetInterface()->Position; } virtual void SetPosition(const CVector& vecPosition) { GetInterface()->Position = vecPosition; } - virtual const CVector& GetNormal(void) { return GetInterface()->Normal; } + virtual const CVector& GetNormal() { return GetInterface()->Normal; } virtual void SetNormal(const CVector& vecNormal) { GetInterface()->Normal = vecNormal; } - virtual EColSurface GetSurfaceTypeA(void) { return GetInterface()->ucSurfaceTypeA; } - virtual EColSurface GetSurfaceTypeB(void) { return GetInterface()->ucSurfaceTypeB; } + virtual EColSurface GetSurfaceTypeA() { return GetInterface()->ucSurfaceTypeA; } + virtual EColSurface GetSurfaceTypeB() { return GetInterface()->ucSurfaceTypeB; } virtual void SetSurfaceTypeA(EColSurface surfaceType) { GetInterface()->ucSurfaceTypeA = surfaceType; } virtual void SetSurfaceTypeB(EColSurface surfaceType) { GetInterface()->ucSurfaceTypeB = surfaceType; } - virtual BYTE GetPieceTypeA(void) { return GetInterface()->ucPieceTypeA; } - virtual BYTE GetPieceTypeB(void) { return GetInterface()->ucPieceTypeB; } + virtual BYTE GetPieceTypeA() { return GetInterface()->ucPieceTypeA; } + virtual BYTE GetPieceTypeB() { return GetInterface()->ucPieceTypeB; } virtual void SetPieceTypeA(BYTE ucPieceType) { GetInterface()->ucPieceTypeA = ucPieceType; } virtual void SetPieceTypeB(BYTE ucPieceType) { GetInterface()->ucPieceTypeB = ucPieceType; } - virtual CColLighting GetLightingA(void) { return GetInterface()->lightingA; } - virtual CColLighting GetLightingB(void) { return GetInterface()->lightingB; } + virtual CColLighting GetLightingA() { return GetInterface()->lightingA; } + virtual CColLighting GetLightingB() { return GetInterface()->lightingB; } virtual void SetLightingA(CColLighting lighting) { GetInterface()->lightingA = lighting; } virtual void SetLightingB(CColLighting lighting) { GetInterface()->lightingB = lighting; } - virtual float GetDepth(void) { return GetInterface()->fDepth; } + virtual float GetDepth() { return GetInterface()->fDepth; } virtual void SetDepth(float fDepth) { GetInterface()->fDepth = fDepth; } - virtual void Destroy(void) + virtual void Destroy() { if (m_pInternalInterface) delete m_pInternalInterface; delete this; } - virtual float GetLightingForTimeOfDay(void); + virtual float GetLightingForTimeOfDay(); }; diff --git a/Client/game_sa/CControllerConfigManagerSA.cpp b/Client/game_sa/CControllerConfigManagerSA.cpp index bf866ea994a..75b45342515 100644 --- a/Client/game_sa/CControllerConfigManagerSA.cpp +++ b/Client/game_sa/CControllerConfigManagerSA.cpp @@ -112,7 +112,7 @@ void CControllerConfigManagerSA::SuspendSteerAndFlyWithMouse(bool bSuspend) ApplySteerAndFlyWithMouseSettings(); } -void CControllerConfigManagerSA::ApplySteerAndFlyWithMouseSettings(void) +void CControllerConfigManagerSA::ApplySteerAndFlyWithMouseSettings() { if (m_bSuspendSteerAndFlyWithMouse) { diff --git a/Client/game_sa/CControllerConfigManagerSA.h b/Client/game_sa/CControllerConfigManagerSA.h index 23335dcb8dd..da5d92b8274 100644 --- a/Client/game_sa/CControllerConfigManagerSA.h +++ b/Client/game_sa/CControllerConfigManagerSA.h @@ -34,13 +34,13 @@ class CControllerConfigManagerSA : public CControllerConfigManager void SetFlyWithMouse(bool bFlyWithMouse); void SetSteerWithMouse(bool bSteerWithMouse); void SuspendSteerAndFlyWithMouse(bool bSuspend); - float GetVerticalAimSensitivity(void); + float GetVerticalAimSensitivity(); void SetVerticalAimSensitivity(float fSensitivity); - float GetVerticalAimSensitivityRawValue(void); + float GetVerticalAimSensitivityRawValue(); void SetVerticalAimSensitivityRawValue(float fRawValue); // CControllerConfigManagerSA - void ApplySteerAndFlyWithMouseSettings(void); + void ApplySteerAndFlyWithMouseSettings(); protected: bool m_bSteerWithMouse; diff --git a/Client/game_sa/CDamageManagerSA.cpp b/Client/game_sa/CDamageManagerSA.cpp index 98cd595d3c9..bdd5d465748 100644 --- a/Client/game_sa/CDamageManagerSA.cpp +++ b/Client/game_sa/CDamageManagerSA.cpp @@ -197,7 +197,7 @@ BYTE CDamageManagerSA::GetPanelStatus(BYTE bPanel) return 0; } -unsigned long CDamageManagerSA::GetPanelStatus(void) +unsigned long CDamageManagerSA::GetPanelStatus() { return internalInterface->Panels; } @@ -240,7 +240,7 @@ BYTE CDamageManagerSA::GetLightStatus(BYTE bLight) return bReturn; } -unsigned char CDamageManagerSA::GetLightStatus(void) +unsigned char CDamageManagerSA::GetLightStatus() { return static_cast(internalInterface->Lights); } diff --git a/Client/game_sa/CDamageManagerSA.h b/Client/game_sa/CDamageManagerSA.h index 0303281fc2c..5e85ceb5b1d 100644 --- a/Client/game_sa/CDamageManagerSA.h +++ b/Client/game_sa/CDamageManagerSA.h @@ -58,11 +58,11 @@ class CDamageManagerSA : public CDamageManager BYTE GetWheelStatus(eWheelPosition bWheel); VOID SetWheelStatus(eWheelPosition bWheel, BYTE bTireStatus); BYTE GetPanelStatus(BYTE bPanel); - unsigned long GetPanelStatus(void); + unsigned long GetPanelStatus(); VOID SetPanelStatus(BYTE bPanel, BYTE bPanelStatus); void SetPanelStatus(unsigned long ulStatus); BYTE GetLightStatus(BYTE bLight); - unsigned char GetLightStatus(void); + unsigned char GetLightStatus(); VOID SetLightStatus(BYTE bLight, BYTE bLightStatus); void SetLightStatus(unsigned char ucStatus); BYTE GetAeroplaneCompStatus(BYTE CompID); diff --git a/Client/game_sa/CDoorSA.h b/Client/game_sa/CDoorSA.h index 6bce58bcc5e..f317bff114f 100644 --- a/Client/game_sa/CDoorSA.h +++ b/Client/game_sa/CDoorSA.h @@ -17,11 +17,11 @@ #define WIN32_LEAN_AND_MEAN #include -// 006f47e0 public: FLOAT __thiscall CDoor::GetAngleOpenRatio(void)const +// 006f47e0 public: FLOAT __thiscall CDoor::GetAngleOpenRatio()const #define FUNC_GetAngleOpenRatio 0x6f47e0 -// 006f4800 public: bool __thiscall CDoor::IsClosed(void)const +// 006f4800 public: bool __thiscall CDoor::IsClosed()const #define FUNC_IsClosed 0x6f4800 -// 006f4820 public: bool __thiscall CDoor::IsFullyOpen(void)const +// 006f4820 public: bool __thiscall CDoor::IsFullyOpen()const #define FUNC_IsFullyOpen 0x6f4820 // 006f4790 public: void __thiscall CDoor::Open(FLOAT) #define FUNC_Open 0x6f4790 diff --git a/Client/game_sa/CEntitySA.cpp b/Client/game_sa/CEntitySA.cpp index 1cba0bc8412..4f8611a3bd4 100644 --- a/Client/game_sa/CEntitySA.cpp +++ b/Client/game_sa/CEntitySA.cpp @@ -16,7 +16,7 @@ extern CGameSA* pGame; unsigned long CEntitySA::FUNC_CClumpModelInfo__GetFrameFromId; unsigned long CEntitySA::FUNC_RwFrameGetLTM; -CEntitySA::CEntitySA(void) +CEntitySA::CEntitySA() { // Set these variables to a constant state m_pInterface = NULL; @@ -97,7 +97,7 @@ VOID CEntitySA::Teleport(float fX, float fY, float fZ) } } -VOID CEntitySA::ProcessControl(void) +VOID CEntitySA::ProcessControl() { DEBUG_TRACE("VOID CEntitySA::ProcessControl ( void )"); DWORD dwFunc = m_pInterface->vtbl->ProcessControl; @@ -189,7 +189,7 @@ VOID CEntitySA::SetOrientation(float fX, float fY, float fZ) pGame->GetWorld()->Add(this, CEntity_SetOrientation); } -VOID CEntitySA::FixBoatOrientation(void) +VOID CEntitySA::FixBoatOrientation() { DEBUG_TRACE("VOID CEntitySA::FixBoatOrientation ( void )"); pGame->GetWorld()->Remove(this, CEntity_FixBoatOrientation); @@ -233,7 +233,7 @@ VOID CEntitySA::SetPosition(CVector* vecPosition) SetPosition(vecPosition->fX, vecPosition->fY, vecPosition->fZ); } -void CEntitySA::RestoreLastGoodPhysicsState(void) +void CEntitySA::RestoreLastGoodPhysicsState() { // Validate m_LastGoodPosition if (!IsValidPosition(m_LastGoodPosition)) @@ -248,7 +248,7 @@ void CEntitySA::RestoreLastGoodPhysicsState(void) // // Get entity position. Fixes bad numbers // -CVector* CEntitySA::GetPosition(void) +CVector* CEntitySA::GetPosition() { CVector* pPosition = GetPositionInternal(); if (!IsValidPosition(*pPosition)) @@ -470,7 +470,7 @@ bool CEntitySA::IsOnScreen() return bReturn; } -bool CEntitySA::IsFullyVisible(void) +bool CEntitySA::IsFullyVisible() { if (m_pInterface->bDistanceFade) return false; @@ -481,7 +481,7 @@ bool CEntitySA::IsFullyVisible(void) return true; } -bool CEntitySA::IsVisible(void) +bool CEntitySA::IsVisible() { return m_pInterface->bIsVisible; } @@ -545,7 +545,7 @@ bool CEntitySA::IsPlayingAnimation(char* szAnimName) else return false; } -BYTE CEntitySA::GetAreaCode(void) +BYTE CEntitySA::GetAreaCode() { return m_pInterface->m_areaCode; } @@ -560,7 +560,7 @@ void CEntitySA::SetUnderwater(bool bUnderwater) m_pInterface->bUnderwater = bUnderwater; } -bool CEntitySA::GetUnderwater(void) +bool CEntitySA::GetUnderwater() { return m_pInterface->bUnderwater; } diff --git a/Client/game_sa/CEntitySA.h b/Client/game_sa/CEntitySA.h index cb51180dd75..a9566ce62e4 100644 --- a/Client/game_sa/CEntitySA.h +++ b/Client/game_sa/CEntitySA.h @@ -198,9 +198,9 @@ class CEntitySAInterface // // Sets - void SetIsLowLodEntity(void) { numLodChildrenRendered = 0x40; } + void SetIsLowLodEntity() { numLodChildrenRendered = 0x40; } - void SetIsHighLodEntity(void) { numLodChildrenRendered = 0x60; } + void SetIsHighLodEntity() { numLodChildrenRendered = 0x60; } void SetEntityVisibilityResult(int result) { @@ -209,11 +209,11 @@ class CEntitySAInterface } // Gets - bool IsLowLodEntity(void) const { return (numLodChildrenRendered & 0x60) == 0x40; } + bool IsLowLodEntity() const { return (numLodChildrenRendered & 0x60) == 0x40; } - bool IsHighLodEntity(void) const { return (numLodChildrenRendered & 0x60) == 0x60; } + bool IsHighLodEntity() const { return (numLodChildrenRendered & 0x60) == 0x60; } - int GetEntityVisibilityResult(void) const + int GetEntityVisibilityResult() const { if (numLodChildrenRendered & 0x60) return numLodChildrenRendered & 0x1f; @@ -227,7 +227,7 @@ class CEntitySA : public virtual CEntity friend class COffsets; public: - CEntitySA(void); + CEntitySA(); CEntitySAInterface* m_pInterface; @@ -239,19 +239,19 @@ class CEntitySA : public virtual CEntity VOID SetPosition(float fX, float fY, float fZ); VOID Teleport(float fX, float fY, float fZ); - VOID ProcessControl(void); + VOID ProcessControl(); VOID SetupLighting(); VOID Render(); VOID SetOrientation(float fX, float fY, float fZ); - VOID FixBoatOrientation(void); // eAi you might want to rename this + VOID FixBoatOrientation(); // eAi you might want to rename this VOID SetPosition(CVector* vecPosition); void SetUnderwater(bool bUnderwater); - bool GetUnderwater(void); + bool GetUnderwater(); - virtual void RestoreLastGoodPhysicsState(void); - CVector* GetPosition(void); - CVector* GetPositionInternal(void); + virtual void RestoreLastGoodPhysicsState(); + CVector* GetPosition(); + CVector* GetPositionInternal(); CMatrix* GetMatrix(CMatrix* matrix); CMatrix* GetMatrixInternal(CMatrix* matrix); VOID SetMatrix(CMatrix* matrix); @@ -260,10 +260,10 @@ class CEntitySA : public virtual CEntity bool IsOnScreen(); bool IsFullyVisible(); - bool IsVisible(void); + bool IsVisible(); void SetVisible(bool bVisible); - BYTE GetAreaCode(void); + BYTE GetAreaCode(); void SetAreaCode(BYTE areaCode); FLOAT GetDistanceFromCentreOfMassToBaseOfModel(); @@ -280,10 +280,10 @@ class CEntitySA : public virtual CEntity BOOL DoNotRemoveFromGame; // when deleted, if this is true, it won't be removed from the game VOID SetDoNotRemoveFromGameWhenDeleted(bool bDoNotRemoveFromGame) { DoNotRemoveFromGame = bDoNotRemoveFromGame; }; - BOOL IsStatic(VOID) { return m_pInterface->bIsStatic; } + BOOL IsStatic() { return m_pInterface->bIsStatic; } VOID SetStatic(BOOL bStatic) { m_pInterface->bIsStatic = bStatic; }; VOID SetUsesCollision(BOOL bUsesCollision) { m_pInterface->bUsesCollision = bUsesCollision; }; - BOOL IsBackfaceCulled(VOID) { return m_pInterface->bBackfaceCulled; }; + BOOL IsBackfaceCulled() { return m_pInterface->bBackfaceCulled; }; VOID SetBackfaceCulled(BOOL bBackfaceCulled) { m_pInterface->bBackfaceCulled = bBackfaceCulled; }; VOID SetAlpha(DWORD dwAlpha); @@ -292,13 +292,13 @@ class CEntitySA : public virtual CEntity bool IsPlayingAnimation(char* szAnimName); - void* GetStoredPointer(void) { return m_pStoredPointer; }; + void* GetStoredPointer() { return m_pStoredPointer; }; void SetStoredPointer(void* pPointer) { m_pStoredPointer = pPointer; }; - bool IsStaticWaitingForCollision(void) { return m_pInterface->bIsStaticWaitingForCollision; } + bool IsStaticWaitingForCollision() { return m_pInterface->bIsStaticWaitingForCollision; } void SetStaticWaitingForCollision(bool bStatic) { m_pInterface->bIsStaticWaitingForCollision = bStatic; } - unsigned long GetArrayID(void) { return m_ulArrayID; } + unsigned long GetArrayID() { return m_ulArrayID; } void SetArrayID(unsigned long ulID) { m_ulArrayID = ulID; } // CEntitySA interface diff --git a/Client/game_sa/CEventDamageSA.cpp b/Client/game_sa/CEventDamageSA.cpp index 052263f39e2..1f8fd1dabec 100644 --- a/Client/game_sa/CEventDamageSA.cpp +++ b/Client/game_sa/CEventDamageSA.cpp @@ -43,7 +43,7 @@ CEventDamageSA::CEventDamageSA(CEventDamageSAInterface* pInterface) m_DamageReason = EDamageReason::OTHER; } -CEventDamageSA::~CEventDamageSA(void) +CEventDamageSA::~CEventDamageSA() { delete m_pDamageResponse; @@ -60,7 +60,7 @@ CEventDamageSA::~CEventDamageSA(void) } } -CEntity* CEventDamageSA::GetInflictingEntity(void) +CEntity* CEventDamageSA::GetInflictingEntity() { CEntity* pReturn = NULL; CEntitySAInterface* pInterface = m_pInterface->pInflictor; @@ -72,7 +72,7 @@ CEntity* CEventDamageSA::GetInflictingEntity(void) return pReturn; } -bool CEventDamageSA::HasKilledPed(void) +bool CEventDamageSA::HasKilledPed() { DWORD dwThis = (DWORD)m_pInterface; DWORD dwFunc = FUNC_CEventDamage_HasKilledPed; @@ -86,7 +86,7 @@ bool CEventDamageSA::HasKilledPed(void) return bReturn; } -float CEventDamageSA::GetDamageApplied(void) +float CEventDamageSA::GetDamageApplied() { DWORD dwThis = (DWORD)m_pInterface; DWORD dwFunc = FUNC_CEventDamage_GetDamageApplied; @@ -100,7 +100,7 @@ float CEventDamageSA::GetDamageApplied(void) return fReturn; } -AssocGroupId CEventDamageSA::GetAnimGroup(void) +AssocGroupId CEventDamageSA::GetAnimGroup() { DWORD dwThis = (DWORD)m_pInterface; DWORD dwFunc = FUNC_CEventDamage_GetAnimGroup; @@ -114,7 +114,7 @@ AssocGroupId CEventDamageSA::GetAnimGroup(void) return animGroup; } -AnimationId CEventDamageSA::GetAnimId(void) +AnimationId CEventDamageSA::GetAnimId() { DWORD dwThis = (DWORD)m_pInterface; DWORD dwFunc = FUNC_CEventDamage_GetAnimId; @@ -128,7 +128,7 @@ AnimationId CEventDamageSA::GetAnimId(void) return animID; } -bool CEventDamageSA::GetAnimAdded(void) +bool CEventDamageSA::GetAnimAdded() { bool bReturn; DWORD dwThis = (DWORD)m_pInterface; diff --git a/Client/game_sa/CEventDamageSA.h b/Client/game_sa/CEventDamageSA.h index 5bf0f5adadd..7a662709bc3 100644 --- a/Client/game_sa/CEventDamageSA.h +++ b/Client/game_sa/CEventDamageSA.h @@ -71,34 +71,34 @@ class CEventDamageSA : public CEventDamage public: CEventDamageSA(CEntity* pEntity, unsigned int i_1, eWeaponType weaponType, ePedPieceTypes hitZone, unsigned char uc_2, bool b_3, bool b_4); CEventDamageSA(CEventDamageSAInterface* pInterface); - ~CEventDamageSA(void); + ~CEventDamageSA(); - CEventDamageSAInterface* GetInterface(void) { return m_pInterface; } + CEventDamageSAInterface* GetInterface() { return m_pInterface; } - void Destroy(void) { delete this; } + void Destroy() { delete this; } // Flag accessors - bool DidPedFallDown(void) { return (m_pInterface->ucFlags & 2) != 0; } - bool WasStealthAttack(void) { return (m_pInterface->ucFlags & 16) != 0; } + bool DidPedFallDown() { return (m_pInterface->ucFlags & 2) != 0; } + bool WasStealthAttack() { return (m_pInterface->ucFlags & 16) != 0; } - void MakePedFallDown(void) { m_pInterface->ucFlags |= 2; } + void MakePedFallDown() { m_pInterface->ucFlags |= 2; } - DWORD GetDamageTime(void) { return m_pInterface->damageTime; } - eWeaponType GetWeaponUsed(void) { return m_pInterface->weaponUsed; } - ePedPieceTypes GetPedPieceType(void) { return m_pInterface->pedPieceType; } - char GetDirection(void) { return m_pInterface->ucDirection; } + DWORD GetDamageTime() { return m_pInterface->damageTime; } + eWeaponType GetWeaponUsed() { return m_pInterface->weaponUsed; } + ePedPieceTypes GetPedPieceType() { return m_pInterface->pedPieceType; } + char GetDirection() { return m_pInterface->ucDirection; } - CEntity* GetInflictingEntity(void); - CPedDamageResponse* GetDamageResponse(void) { return m_pDamageResponse; } + CEntity* GetInflictingEntity(); + CPedDamageResponse* GetDamageResponse() { return m_pDamageResponse; } - bool HasKilledPed(void); - float GetDamageApplied(void); - AssocGroupId GetAnimGroup(void); - AnimationId GetAnimId(void); - bool GetAnimAdded(void); + bool HasKilledPed(); + float GetDamageApplied(); + AssocGroupId GetAnimGroup(); + AnimationId GetAnimId(); + bool GetAnimAdded(); void ComputeDeathAnim(CPed* pPed, bool bUnk); void ComputeDamageAnim(CPed* pPed, bool bUnk); bool AffectsPed(CPed* pPed); void SetDamageReason(EDamageReasonType damageReason) { m_DamageReason = damageReason; } - EDamageReasonType GetDamageReason(void) { return m_DamageReason; } + EDamageReasonType GetDamageReason() { return m_DamageReason; } }; diff --git a/Client/game_sa/CEventGunShotSA.h b/Client/game_sa/CEventGunShotSA.h index 541c75812f9..7c7732d5d64 100644 --- a/Client/game_sa/CEventGunShotSA.h +++ b/Client/game_sa/CEventGunShotSA.h @@ -28,7 +28,7 @@ class CEventGunShotSA : public CEventGunShot CEventGunShotSA(CEntity* pEntity, CVector& vecOrigin, CVector& vecTarget, bool b_1); CEventGunShotSA(CEventGunShotSAInterface* pInterface) { m_pInterface = pInterface; } - CEventGunShotSAInterface* GetInterface(void) { return m_pInterface; } + CEventGunShotSAInterface* GetInterface() { return m_pInterface; } void Destroy(bool bDestroyInterface); diff --git a/Client/game_sa/CEventSA.h b/Client/game_sa/CEventSA.h index 91a6779acdb..ac5e7db8d31 100644 --- a/Client/game_sa/CEventSA.h +++ b/Client/game_sa/CEventSA.h @@ -31,13 +31,13 @@ class CEventSA : public CEvent public: CEventSA(CEventSAInterface* pInterface) { m_pInterface = pInterface; } - CEventSAInterface* GetInterface(void) { return m_pInterface; } + CEventSAInterface* GetInterface() { return m_pInterface; } - eEventEntityType GetType(void); - CEntity* GetEntity(void); - eEventEntity GetEntityType(void); - CEntity* GetCommittedBy(void); - CVector* GetPosition(void); + eEventEntityType GetType(); + CEntity* GetEntity(); + eEventEntity GetEntityType(); + CEntity* GetCommittedBy(); + CVector* GetPosition(); protected: CEventSAInterface* m_pInterface; diff --git a/Client/game_sa/CExplosionManagerSA.h b/Client/game_sa/CExplosionManagerSA.h index 8ce793c593f..94823b7fc80 100644 --- a/Client/game_sa/CExplosionManagerSA.h +++ b/Client/game_sa/CExplosionManagerSA.h @@ -23,15 +23,15 @@ class CExplosionManagerSA : public CExplosionManager { public: - CExplosionManagerSA(void); - ~CExplosionManagerSA(void); + CExplosionManagerSA(); + ~CExplosionManagerSA(); CExplosion* AddExplosion(CEntity* pExplodingEntity, CEntity* pOwner, eExplosionType explosionType, CVector& vecPosition, unsigned int uiActivationDelay = 0, bool bMakeSound = true, float fCamShake = -1.0f, bool bNoDamage = false); VOID RemoveAllExplosionsInArea(CVector* vecPosition, FLOAT fRadius); - VOID RemoveAllExplosions(void); + VOID RemoveAllExplosions(); CExplosion* GetExplosion(DWORD ID); - CExplosion* FindFreeExplosion(void); + CExplosion* FindFreeExplosion(); private: CExplosionSA* Explosions[MAX_EXPLOSIONS]; diff --git a/Client/game_sa/CExplosionSA.cpp b/Client/game_sa/CExplosionSA.cpp index 11aee84c6f0..fdc28938351 100644 --- a/Client/game_sa/CExplosionSA.cpp +++ b/Client/game_sa/CExplosionSA.cpp @@ -11,13 +11,13 @@ #include "StdInc.h" -eExplosionType CExplosionSA::GetExplosionType(void) +eExplosionType CExplosionSA::GetExplosionType() { DEBUG_TRACE("eExplosionType CExplosionSA::GetExplosionType ( )"); return internalInterface->m_ExplosionType; } -CVector* CExplosionSA::GetExplosionPosition(void) +CVector* CExplosionSA::GetExplosionPosition() { DEBUG_TRACE("CVector * CExplosionSA::GetExplosionPosition ( )"); return &internalInterface->m_vecPosition; @@ -31,7 +31,7 @@ void CExplosionSA::SetExplosionPosition(const CVector* vecPosition) /** * \todo Handle objects creating explosions */ -CEntity* CExplosionSA::GetExplosionCreator(void) +CEntity* CExplosionSA::GetExplosionCreator() { DEBUG_TRACE("CEntity * CExplosionSA::GetExplosionCreator ( )"); // we create a temporary entity to take care of finding the type of entity it is @@ -69,24 +69,24 @@ CEntity* CExplosionSA::GetExplosionCreator(void) return NULL; } -CEntity* CExplosionSA::GetExplodingEntity(void) +CEntity* CExplosionSA::GetExplodingEntity() { return NULL; } -BOOL CExplosionSA::IsActive(void) +BOOL CExplosionSA::IsActive() { DEBUG_TRACE("BOOL CExplosionSA::IsActive ( )"); return internalInterface->m_cExplosionActive; } -VOID CExplosionSA::Remove(void) +VOID CExplosionSA::Remove() { DEBUG_TRACE("VOID CExplosionSA::Remove ( )"); internalInterface->m_cExplosionActive = 0; } -float CExplosionSA::GetExplosionForce(void) +float CExplosionSA::GetExplosionForce() { DEBUG_TRACE("FLOAT CExplosionSA::GetExplosionForce()"); return this->GetInterface()->m_fExplosionForce; @@ -116,7 +116,7 @@ void CExplosionSA::SetActivationTimer(unsigned long ulActivationTime) this->GetInterface()->m_ActivationTime = ulActivationTime; } -DWORD CExplosionSA::GetExpiryTime(void) +DWORD CExplosionSA::GetExpiryTime() { DEBUG_TRACE("DWORD CExplosionSA::GetExpiryTime()"); return this->GetInterface()->m_TimeExpires; @@ -128,7 +128,7 @@ void CExplosionSA::SetExpiryTime(DWORD dwExpiryTime) this->GetInterface()->m_TimeExpires = dwExpiryTime; } -float CExplosionSA::GetExplosionRadius(void) +float CExplosionSA::GetExplosionRadius() { DEBUG_TRACE("FLOAT CExplosionSA::GetExplosionRadius()"); return this->GetInterface()->m_fExplosionRadius; diff --git a/Client/game_sa/CExplosionSA.h b/Client/game_sa/CExplosionSA.h index a7c1d6aee8c..b9b8b595700 100644 --- a/Client/game_sa/CExplosionSA.h +++ b/Client/game_sa/CExplosionSA.h @@ -48,20 +48,20 @@ class CExplosionSA : public CExplosion CExplosionSAInterface* GetInterface() { return this->internalInterface; }; - eExplosionType GetExplosionType(void); - CVector* GetExplosionPosition(void); + eExplosionType GetExplosionType(); + CVector* GetExplosionPosition(); void SetExplosionPosition(const CVector* vecPosition); - CEntity* GetExplosionCreator(void); - CEntity* GetExplodingEntity(void); - BOOL IsActive(void); - VOID Remove(void); - float GetExplosionForce(void); + CEntity* GetExplosionCreator(); + CEntity* GetExplodingEntity(); + BOOL IsActive(); + VOID Remove(); + float GetExplosionForce(); void SetExplosionForce(float fForce); void SetSilent(bool bSilent); - unsigned long GetActivationTimer(void); + unsigned long GetActivationTimer(); void SetActivationTimer(unsigned long ulActivationTime); - DWORD GetExpiryTime(void); + DWORD GetExpiryTime(); void SetExpiryTime(DWORD dwExpiryTime); - float GetExplosionRadius(void); + float GetExplosionRadius(); void SetExplosionRadius(float fRadius); }; diff --git a/Client/game_sa/CFireManagerSA.cpp b/Client/game_sa/CFireManagerSA.cpp index 41bb3f18b6f..8600f4874d7 100644 --- a/Client/game_sa/CFireManagerSA.cpp +++ b/Client/game_sa/CFireManagerSA.cpp @@ -21,7 +21,7 @@ CFireManagerSA::CFireManagerSA() (CFireSAInterface*)(CLASS_CFireManager + 40 * i)); // + 4 because thats the position of CFire array in CFireManager (see source) } -CFireManagerSA::~CFireManagerSA(void) +CFireManagerSA::~CFireManagerSA() { for (int i = 0; i < MAX_FIRES; i++) { diff --git a/Client/game_sa/CFireManagerSA.h b/Client/game_sa/CFireManagerSA.h index 5dead5e0ad6..16eda471341 100644 --- a/Client/game_sa/CFireManagerSA.h +++ b/Client/game_sa/CFireManagerSA.h @@ -36,7 +36,7 @@ class CFireManagerSA : public CFireManager public: // constructor CFireManagerSA(); - ~CFireManagerSA(void); + ~CFireManagerSA(); VOID ExtinguishPoint(CVector& vecPosition, float fRadius); CFire* StartFire(CEntity* entityTarget, CEntity* entityCreator, float fSize); diff --git a/Client/game_sa/CFxSystemSA.cpp b/Client/game_sa/CFxSystemSA.cpp index ecfacdcfd01..5ed9933b11b 100644 --- a/Client/game_sa/CFxSystemSA.cpp +++ b/Client/game_sa/CFxSystemSA.cpp @@ -103,7 +103,7 @@ void CFxSystemSA::SetDrawDistance(float fDrawDistance) m_fDrawDistance = Clamp(0.f, fDrawDistance, 8191.f); } -float CFxSystemSA::GetDrawDistance(void) +float CFxSystemSA::GetDrawDistance() { if (HasCustomDrawDistance()) return m_fDrawDistance; @@ -111,7 +111,7 @@ float CFxSystemSA::GetDrawDistance(void) return m_pInterface->pBlueprint->usCullDistance / 256.f; } -bool CFxSystemSA::HasCustomDrawDistance(void) +bool CFxSystemSA::HasCustomDrawDistance() { return m_fDrawDistance != 0; } @@ -138,7 +138,7 @@ __declspec(noinline) void OnMY_FxSystem_c_Update_MidA_Pre(CFxSystemSAInterface* ms_fUsingDrawDistance = 0; } -__declspec(noinline) void OnMY_FxSystem_c_Update_MidA_Post(void) +__declspec(noinline) void OnMY_FxSystem_c_Update_MidA_Post() { if (ms_pUsingFxSystemSAInterface) { @@ -206,7 +206,7 @@ __declspec(noinline) void OnMY_FxSystem_c_Update_MidB_Pre(CFxEmitterSAInterface* } } -__declspec(noinline) void OnMY_FxSystem_c_Update_MidB_Post(void) +__declspec(noinline) void OnMY_FxSystem_c_Update_MidB_Post() { if (ms_pUsingFxEmitterSAInterface) { @@ -252,7 +252,7 @@ void _declspec(naked) HOOK_FxSystem_c_Update_MidB() // Setup hooks // ////////////////////////////////////////////////////////////////////////////////////////// -void CFxSystemSA::StaticSetHooks(void) +void CFxSystemSA::StaticSetHooks() { EZHookInstall(FxSystem_c_Update_MidA); EZHookInstall(FxSystem_c_Update_MidB); diff --git a/Client/game_sa/CFxSystemSA.h b/Client/game_sa/CFxSystemSA.h index 7f2ff10ec4e..0ff1f7c0bf6 100644 --- a/Client/game_sa/CFxSystemSA.h +++ b/Client/game_sa/CFxSystemSA.h @@ -87,13 +87,13 @@ class CFxSystemSA : public CFxSystem CFxSystemSA(CFxSystemSAInterface* pInterface); ~CFxSystemSA(); - void PlayAndKill(void); + void PlayAndKill(); void SetEffectSpeed(float fSpeed); - float GetEffectSpeed(void); + float GetEffectSpeed(); void SetEffectDensity(float fDensity); - float GetEffectDensity(void); + float GetEffectDensity(); void GetPosition(CVector& vecPos); void SetPosition(const CVector& vecPos); @@ -102,12 +102,12 @@ class CFxSystemSA : public CFxSystem void SetMatrix(const CMatrix& matrix); void SetDrawDistance(float fDrawDistance); - float GetDrawDistance(void); - bool HasCustomDrawDistance(void); + float GetDrawDistance(); + bool HasCustomDrawDistance(); - void* GetInterface(void) { return (void*)m_pInterface; } + void* GetInterface() { return (void*)m_pInterface; } - static void StaticSetHooks(void); + static void StaticSetHooks(); protected: CFxSystemSAInterface* m_pInterface; diff --git a/Client/game_sa/CGameSA.cpp b/Client/game_sa/CGameSA.cpp index 8137b5a9512..5b8c4e833fd 100644 --- a/Client/game_sa/CGameSA.cpp +++ b/Client/game_sa/CGameSA.cpp @@ -202,7 +202,7 @@ CGameSA::CGameSA() CFxSystemSA::StaticSetHooks(); } -CGameSA::~CGameSA(void) +CGameSA::~CGameSA() { delete reinterpret_cast(m_pPlayerInfo); @@ -370,7 +370,7 @@ BOOL CGameSA::InitLocalPlayer(CClientPed* pClientPed) return FALSE; } -float CGameSA::GetGravity(void) +float CGameSA::GetGravity() { return *(float*)(0x863984); } @@ -380,7 +380,7 @@ void CGameSA::SetGravity(float fGravity) MemPut(0x863984, fGravity); } -float CGameSA::GetGameSpeed(void) +float CGameSA::GetGameSpeed() { return *(float*)(0xB7CB64); } @@ -440,7 +440,7 @@ DWORD* CGameSA::GetMemoryValue(DWORD dwOffset) return NULL; } -void CGameSA::Reset(void) +void CGameSA::Reset() { // Things to do if the game was loaded if (GetSystemState() == GS_PLAYING_GAME) @@ -467,7 +467,7 @@ void CGameSA::Reset(void) } } -void CGameSA::Terminate(void) +void CGameSA::Terminate() { // Initiate the destruction delete this; @@ -478,7 +478,7 @@ void CGameSA::Terminate(void) #endif } -void CGameSA::Initialize(void) +void CGameSA::Initialize() { // Initialize garages m_pGarages->Initialize(); @@ -489,12 +489,12 @@ void CGameSA::Initialize(void) MemPutFast(CLASS_CMenuManager + 0x5C, 0); } -eGameVersion CGameSA::GetGameVersion(void) +eGameVersion CGameSA::GetGameVersion() { return m_eGameVersion; } -eGameVersion CGameSA::FindGameVersion(void) +eGameVersion CGameSA::FindGameVersion() { unsigned char ucA = *reinterpret_cast(0x748ADD); unsigned char ucB = *reinterpret_cast(0x748ADE); @@ -518,22 +518,22 @@ eGameVersion CGameSA::FindGameVersion(void) return m_eGameVersion; } -float CGameSA::GetFPS(void) +float CGameSA::GetFPS() { return *VAR_FPS; } -float CGameSA::GetTimeStep(void) +float CGameSA::GetTimeStep() { return *VAR_TimeStep; } -float CGameSA::GetOldTimeStep(void) +float CGameSA::GetOldTimeStep() { return *VAR_OldTimeStep; } -float CGameSA::GetTimeScale(void) +float CGameSA::GetTimeScale() { return *VAR_TimeScale; } @@ -543,7 +543,7 @@ void CGameSA::SetTimeScale(float fTimeScale) *VAR_TimeScale = fTimeScale; } -unsigned char CGameSA::GetBlurLevel(void) +unsigned char CGameSA::GetBlurLevel() { return *(unsigned char*)0x8D5104; } @@ -553,7 +553,7 @@ void CGameSA::SetBlurLevel(unsigned char ucLevel) MemPutFast(0x8D5104, ucLevel); } -unsigned long CGameSA::GetMinuteDuration(void) +unsigned long CGameSA::GetMinuteDuration() { return *(unsigned long*)0xB7015C; } @@ -698,7 +698,7 @@ void CGameSA::SetJetpackWeaponEnabled(eWeaponType weaponType, bool bEnabled) } } -bool CGameSA::PerformChecks(void) +bool CGameSA::PerformChecks() { std::map::iterator it; for (it = m_Cheats.begin(); it != m_Cheats.end(); it++) @@ -753,7 +753,7 @@ bool CGameSA::IsASyncLoadingEnabled(bool bIgnoreSuspend) return true; } -void CGameSA::SetupSpecialCharacters(void) +void CGameSA::SetupSpecialCharacters() { ModelInfo[1].MakePedModel("TRUTH"); ModelInfo[2].MakePedModel("MACCER"); @@ -804,7 +804,7 @@ void CGameSA::SetupSpecialCharacters(void) } // Well, has it? -bool CGameSA::HasCreditScreenFadedOut(void) +bool CGameSA::HasCreditScreenFadedOut() { BYTE ucAlpha = *(BYTE*)0xBAB320; bool bCreditScreenFadedOut = (GetSystemState() >= 7) && (ucAlpha < 6); @@ -812,7 +812,7 @@ bool CGameSA::HasCreditScreenFadedOut(void) } // Ensure replaced/restored textures for models in the GTA map are correct -void CGameSA::FlushPendingRestreamIPL(void) +void CGameSA::FlushPendingRestreamIPL() { CModelInfoSA::StaticFlushPendingRestreamIPL(); m_pRenderWare->ResetStats(); @@ -824,12 +824,12 @@ void CGameSA::GetShaderReplacementStats(SShaderReplacementStats& outStats) } // Ensure models have the default lod distances -void CGameSA::ResetModelLodDistances(void) +void CGameSA::ResetModelLodDistances() { CModelInfoSA::StaticResetLodDistances(); } -void CGameSA::ResetAlphaTransparencies(void) +void CGameSA::ResetAlphaTransparencies() { CModelInfoSA::StaticResetAlphaTransparencies(); } @@ -837,11 +837,11 @@ void CGameSA::ResetAlphaTransparencies(void) // Disable VSync by forcing what normally happends at the end of the loading screens // Note #1: This causes the D3D device to be reset after the next frame // Note #2: Some players do not need this to disable VSync. (Possibly because their video card driver settings override it somewhere) -void CGameSA::DisableVSync(void) +void CGameSA::DisableVSync() { MemPutFast(0xBAB318, 0); } -CWeapon* CGameSA::CreateWeapon(void) +CWeapon* CGameSA::CreateWeapon() { return new CWeaponSA(new CWeaponSAInterface, NULL, WEAPONSLOT_MAX); } @@ -856,7 +856,7 @@ void CGameSA::OnPedContextChange(CPed* pPedContext) m_pPedContext = pPedContext; } -CPed* CGameSA::GetPedContext(void) +CPed* CGameSA::GetPedContext() { if (!m_pPedContext) m_pPedContext = pGame->GetPools()->GetPedFromRef((DWORD)1); diff --git a/Client/game_sa/CGameSA.h b/Client/game_sa/CGameSA.h index 6a57b3b2ac2..06e1ce65d86 100644 --- a/Client/game_sa/CGameSA.h +++ b/Client/game_sa/CGameSA.h @@ -351,34 +351,34 @@ class CGameSA : public CGame VOID SetRenderHook(InRenderer* pInRenderer); - void Initialize(void); - void Reset(void); - void Terminate(void); + void Initialize(); + void Reset(); + void Terminate(); - eGameVersion GetGameVersion(void); - eGameVersion FindGameVersion(void); + eGameVersion GetGameVersion(); + eGameVersion FindGameVersion(); - float GetFPS(void); - float GetTimeStep(void); - float GetOldTimeStep(void); - float GetTimeScale(void); + float GetFPS(); + float GetTimeStep(); + float GetOldTimeStep(); + float GetTimeScale(); void SetTimeScale(float fTimeScale); BOOL InitLocalPlayer(class CClientPed* pClientPed); - float GetGravity(void); + float GetGravity(); void SetGravity(float fGravity); - float GetGameSpeed(void); + float GetGameSpeed(); void SetGameSpeed(float fSpeed); - unsigned char GetBlurLevel(void); + unsigned char GetBlurLevel(); void SetBlurLevel(unsigned char ucLevel); void SetJetpackWeaponEnabled(eWeaponType weaponType, bool bEnabled); bool GetJetpackWeaponEnabled(eWeaponType weaponType); - unsigned long GetMinuteDuration(void); + unsigned long GetMinuteDuration(); void SetMinuteDuration(unsigned long ulTime); bool IsCheatEnabled(const char* szCheatName); @@ -399,24 +399,24 @@ class CGameSA : public CGame bool VerifySADataFileNames(); bool PerformChecks(); - int& GetCheckStatus(void) { return m_iCheckStatus; } + int& GetCheckStatus() { return m_iCheckStatus; } void SetAsyncLoadingFromScript(bool bScriptEnabled, bool bScriptForced); void SuspendASyncLoading(bool bSuspend, uint uiAutoUnsuspendDelay = 0); bool IsASyncLoadingEnabled(bool bIgnoreSuspend = false); - bool HasCreditScreenFadedOut(void); + bool HasCreditScreenFadedOut(); - void SetupSpecialCharacters(void); - CWeapon* CreateWeapon(void); + void SetupSpecialCharacters(); + CWeapon* CreateWeapon(); CWeaponStat* CreateWeaponStat(eWeaponType weaponType, eWeaponSkill weaponSkill); - void FlushPendingRestreamIPL(void); - void ResetModelLodDistances(void); - void ResetAlphaTransparencies(void); - void DisableVSync(void); + void FlushPendingRestreamIPL(); + void ResetModelLodDistances(); + void ResetAlphaTransparencies(); + void DisableVSync(); void OnPedContextChange(CPed* pPedContext); - CPed* GetPedContext(void); + CPed* GetPedContext(); void GetShaderReplacementStats(SShaderReplacementStats& outStats); diff --git a/Client/game_sa/CHandlingEntrySA.cpp b/Client/game_sa/CHandlingEntrySA.cpp index 8298a8997c6..1a73e9681a4 100644 --- a/Client/game_sa/CHandlingEntrySA.cpp +++ b/Client/game_sa/CHandlingEntrySA.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CHandlingEntrySA::CHandlingEntrySA(void) +CHandlingEntrySA::CHandlingEntrySA() { // Create a new interface and zero it m_pHandlingSA = new tHandlingDataSA; @@ -33,7 +33,7 @@ CHandlingEntrySA::CHandlingEntrySA(tHandlingDataSA* pOriginal) m_bChanged = true; } -CHandlingEntrySA::~CHandlingEntrySA(void) +CHandlingEntrySA::~CHandlingEntrySA() { if (m_bChanged) { diff --git a/Client/game_sa/CHandlingEntrySA.h b/Client/game_sa/CHandlingEntrySA.h index e1ca9618e1d..b7f72645b5b 100644 --- a/Client/game_sa/CHandlingEntrySA.h +++ b/Client/game_sa/CHandlingEntrySA.h @@ -88,62 +88,62 @@ class CHandlingEntrySA : public CHandlingEntry { public: // Constructor for creatable dummy entries - CHandlingEntrySA(void); + CHandlingEntrySA(); // Constructor for original entries CHandlingEntrySA(tHandlingDataSA* pOriginal); - virtual ~CHandlingEntrySA(void); + virtual ~CHandlingEntrySA(); // Use this to copy data from an another handling class to this void Assign(const CHandlingEntry* pData); // Get functions - float GetMass(void) const { return m_Handling.fMass; }; - float GetTurnMass(void) const { return m_Handling.fTurnMass; }; - float GetDragCoeff(void) const { return m_Handling.fDragCoeff; }; - const CVector& GetCenterOfMass(void) const { return m_Handling.vecCenterOfMass; }; + float GetMass() const { return m_Handling.fMass; }; + float GetTurnMass() const { return m_Handling.fTurnMass; }; + float GetDragCoeff() const { return m_Handling.fDragCoeff; }; + const CVector& GetCenterOfMass() const { return m_Handling.vecCenterOfMass; }; - unsigned int GetPercentSubmerged(void) const { return m_Handling.uiPercentSubmerged; }; - float GetTractionMultiplier(void) const { return m_Handling.fTractionMultiplier; }; + unsigned int GetPercentSubmerged() const { return m_Handling.uiPercentSubmerged; }; + float GetTractionMultiplier() const { return m_Handling.fTractionMultiplier; }; - eDriveType GetCarDriveType(void) const { return static_cast(m_Handling.Transmission.ucDriveType); }; - eEngineType GetCarEngineType(void) const { return static_cast(m_Handling.Transmission.ucEngineType); }; - unsigned char GetNumberOfGears(void) const { return m_Handling.Transmission.ucNumberOfGears; }; + eDriveType GetCarDriveType() const { return static_cast(m_Handling.Transmission.ucDriveType); }; + eEngineType GetCarEngineType() const { return static_cast(m_Handling.Transmission.ucEngineType); }; + unsigned char GetNumberOfGears() const { return m_Handling.Transmission.ucNumberOfGears; }; - float GetEngineAcceleration(void) const { return m_Handling.Transmission.fEngineAcceleration; }; - float GetEngineInertia(void) const { return m_Handling.Transmission.fEngineInertia; }; - float GetMaxVelocity(void) const { return m_Handling.Transmission.fMaxVelocity; }; + float GetEngineAcceleration() const { return m_Handling.Transmission.fEngineAcceleration; }; + float GetEngineInertia() const { return m_Handling.Transmission.fEngineInertia; }; + float GetMaxVelocity() const { return m_Handling.Transmission.fMaxVelocity; }; - float GetBrakeDeceleration(void) const { return m_Handling.fBrakeDeceleration; }; - float GetBrakeBias(void) const { return m_Handling.fBrakeBias; }; - bool GetABS(void) const { return m_Handling.bABS; }; + float GetBrakeDeceleration() const { return m_Handling.fBrakeDeceleration; }; + float GetBrakeBias() const { return m_Handling.fBrakeBias; }; + bool GetABS() const { return m_Handling.bABS; }; - float GetSteeringLock(void) const { return m_Handling.fSteeringLock; }; - float GetTractionLoss(void) const { return m_Handling.fTractionLoss; }; - float GetTractionBias(void) const { return m_Handling.fTractionBias; }; + float GetSteeringLock() const { return m_Handling.fSteeringLock; }; + float GetTractionLoss() const { return m_Handling.fTractionLoss; }; + float GetTractionBias() const { return m_Handling.fTractionBias; }; - float GetSuspensionForceLevel(void) const { return m_Handling.fSuspensionForceLevel; }; - float GetSuspensionDamping(void) const { return m_Handling.fSuspensionDamping; }; - float GetSuspensionHighSpeedDamping(void) const { return m_Handling.fSuspensionHighSpdDamping; }; - float GetSuspensionUpperLimit(void) const { return m_Handling.fSuspensionUpperLimit; }; - float GetSuspensionLowerLimit(void) const { return m_Handling.fSuspensionLowerLimit; }; - float GetSuspensionFrontRearBias(void) const { return m_Handling.fSuspensionFrontRearBias; }; - float GetSuspensionAntiDiveMultiplier(void) const { return m_Handling.fSuspensionAntiDiveMultiplier; }; + float GetSuspensionForceLevel() const { return m_Handling.fSuspensionForceLevel; }; + float GetSuspensionDamping() const { return m_Handling.fSuspensionDamping; }; + float GetSuspensionHighSpeedDamping() const { return m_Handling.fSuspensionHighSpdDamping; }; + float GetSuspensionUpperLimit() const { return m_Handling.fSuspensionUpperLimit; }; + float GetSuspensionLowerLimit() const { return m_Handling.fSuspensionLowerLimit; }; + float GetSuspensionFrontRearBias() const { return m_Handling.fSuspensionFrontRearBias; }; + float GetSuspensionAntiDiveMultiplier() const { return m_Handling.fSuspensionAntiDiveMultiplier; }; - float GetCollisionDamageMultiplier(void) const { return m_Handling.fCollisionDamageMultiplier; }; + float GetCollisionDamageMultiplier() const { return m_Handling.fCollisionDamageMultiplier; }; - unsigned int GetHandlingFlags(void) const { return m_Handling.uiHandlingFlags; }; - unsigned int GetModelFlags(void) const { return m_Handling.uiModelFlags; }; - float GetSeatOffsetDistance(void) const { return m_Handling.fSeatOffsetDistance; }; - unsigned int GetMonetary(void) const { return m_Handling.uiMonetary; }; + unsigned int GetHandlingFlags() const { return m_Handling.uiHandlingFlags; }; + unsigned int GetModelFlags() const { return m_Handling.uiModelFlags; }; + float GetSeatOffsetDistance() const { return m_Handling.fSeatOffsetDistance; }; + unsigned int GetMonetary() const { return m_Handling.uiMonetary; }; - eLightType GetHeadLight(void) const { return static_cast(m_Handling.ucHeadLight); }; - eLightType GetTailLight(void) const { return static_cast(m_Handling.ucTailLight); }; - unsigned char GetAnimGroup(void) const { return m_Handling.ucAnimGroup; }; + eLightType GetHeadLight() const { return static_cast(m_Handling.ucHeadLight); }; + eLightType GetTailLight() const { return static_cast(m_Handling.ucTailLight); }; + unsigned char GetAnimGroup() const { return m_Handling.ucAnimGroup; }; - eVehicleTypes GetModel(void) const { return static_cast(m_Handling.iVehicleID); }; - bool HasSuspensionChanged(void) const { return true; }; + eVehicleTypes GetModel() const { return static_cast(m_Handling.iVehicleID); }; + bool HasSuspensionChanged() const { return true; }; // Set functions void SetMass(float fMass) { m_Handling.fMass = fMass; }; @@ -191,7 +191,7 @@ class CHandlingEntrySA : public CHandlingEntry void Recalculate(unsigned short usModel); - tHandlingDataSA* GetInterface(void) { return m_pHandlingSA; }; + tHandlingDataSA* GetInterface() { return m_pHandlingSA; }; void SetSuspensionChanged(bool bChanged) { m_bChanged = bChanged; }; diff --git a/Client/game_sa/CHandlingManagerSA.cpp b/Client/game_sa/CHandlingManagerSA.cpp index d6951c5be4c..c95645d903e 100644 --- a/Client/game_sa/CHandlingManagerSA.cpp +++ b/Client/game_sa/CHandlingManagerSA.cpp @@ -82,7 +82,7 @@ __declspec(noinline) void DumpHandlingData(tHandlingDataSA* pData) fclose(pFile); } -__declspec(naked) void Hook_Calculate(void) +__declspec(naked) void Hook_Calculate() { tHandlingDataSA* pData; DWORD dwHandlingData; @@ -101,7 +101,7 @@ __declspec(naked) void Hook_Calculate(void) } } -CHandlingManagerSA::CHandlingManagerSA(void) +CHandlingManagerSA::CHandlingManagerSA() { // Initialize all default handlings InitializeDefaultHandlings(); @@ -151,7 +151,7 @@ CHandlingManagerSA::CHandlingManagerSA(void) iChangedVehicles = 0; } -CHandlingManagerSA::~CHandlingManagerSA(void) +CHandlingManagerSA::~CHandlingManagerSA() { // Destroy all original handling entries for (int i = 0; i < HT_MAX; i++) @@ -172,7 +172,7 @@ eHandlingProperty CHandlingManagerSA::GetPropertyEnumFromName(std::string strNam return HANDLING_MAX; } -CHandlingEntry* CHandlingManagerSA::CreateHandlingData(void) +CHandlingEntry* CHandlingManagerSA::CreateHandlingData() { CHandlingEntrySA* pHandlingEntry = new CHandlingEntrySA(); return pHandlingEntry; @@ -625,7 +625,7 @@ eHandlingTypes CHandlingManagerSA::GetHandlingID(eVehicleTypes eModel) return HT_LANDSTAL; } -void CHandlingManagerSA::InitializeDefaultHandlings(void) +void CHandlingManagerSA::InitializeDefaultHandlings() { // Reset MemSetFast(m_OriginalHandlingData, 0, sizeof(m_OriginalHandlingData)); diff --git a/Client/game_sa/CHandlingManagerSA.h b/Client/game_sa/CHandlingManagerSA.h index de53672a28d..9f568c12f13 100644 --- a/Client/game_sa/CHandlingManagerSA.h +++ b/Client/game_sa/CHandlingManagerSA.h @@ -17,10 +17,10 @@ class CHandlingManagerSA : public CHandlingManager { public: - CHandlingManagerSA(void); - ~CHandlingManagerSA(void); + CHandlingManagerSA(); + ~CHandlingManagerSA(); - CHandlingEntry* CreateHandlingData(void); + CHandlingEntry* CreateHandlingData(); const CHandlingEntry* GetOriginalHandlingData(eVehicleTypes eModel); @@ -29,10 +29,10 @@ class CHandlingManagerSA : public CHandlingManager eHandlingProperty GetPropertyEnumFromName(std::string strName); void CheckSuspensionChanges(CHandlingEntry* pEntry); - void RemoveChangedVehicle(void); + void RemoveChangedVehicle(); private: - void InitializeDefaultHandlings(void); + void InitializeDefaultHandlings(); static DWORD m_dwStore_LoadHandlingCfg; diff --git a/Client/game_sa/CHudSA.cpp b/Client/game_sa/CHudSA.cpp index a3ab572cc69..c4e51dbeef3 100644 --- a/Client/game_sa/CHudSA.cpp +++ b/Client/game_sa/CHudSA.cpp @@ -14,7 +14,7 @@ char szVehicleName[50] = {'\0'}; char szZoneName[50] = {'\0'}; -CHudSA::CHudSA(void) +CHudSA::CHudSA() { InitComponentList(); @@ -132,7 +132,7 @@ VOID CHudSA::Disable(bool bDisabled) MemPut(FUNC_DrawRadarPlanB, 0x83); } -bool CHudSA::IsDisabled(void) +bool CHudSA::IsDisabled() { return *(BYTE*)FUNC_Draw == 0xC3; } @@ -200,7 +200,7 @@ void CHudSA::Draw2DPolygon(float fX1, float fY1, float fX2, float fY2, float fX3 // // CHudSA::InitComponentList // -void CHudSA::InitComponentList(void) +void CHudSA::InitComponentList() { SHudComponent componentList[] = { {1, HUD_AMMO, 1, FUNC_DrawAmmo, 1, 0xCC, 0xC3}, @@ -306,7 +306,7 @@ void CHudSA::AdjustComponents(float fAspectRatio) // // CHudSA::ResetComponentAdjustment // -void CHudSA::ResetComponentAdjustment(void) +void CHudSA::ResetComponentAdjustment() { // Restore default values (4:3 aspect ratio) MemPut(m_pfAspectRatioMultiplicator, 0.002232143f); diff --git a/Client/game_sa/CHudSA.h b/Client/game_sa/CHudSA.h index 3afdc0d2ee1..8f25a7d649b 100644 --- a/Client/game_sa/CHudSA.h +++ b/Client/game_sa/CHudSA.h @@ -66,23 +66,23 @@ struct SHudComponent class CHudSA : public CHud { public: - CHudSA(void); + CHudSA(); VOID SetHelpMessage(char* szMessage); VOID SetBigMessage(char* szBigMessage); VOID SetVehicleName(char* szName); VOID SetZoneName(char* szName); VOID Disable(bool bDisabled); - bool IsDisabled(void); + bool IsDisabled(); VOID DrawBarChart(float fX, float fY, DWORD dwWidth, DWORD dwHeight, float fPercentage, DWORD dwForeColor, DWORD dwBorderColor); bool CalcScreenCoors(CVector* vecPosition1, CVector* vecPosition2, float* fX, float* fY, bool bSetting1, bool bSetting2); void Draw2DPolygon(float fX1, float fY1, float fX2, float fY2, float fX3, float fY3, float fX4, float fY4, DWORD dwColor); void SetComponentVisible(eHudComponent component, bool bVisible); bool IsComponentVisible(eHudComponent component); void AdjustComponents(float fAspectRatio); - void ResetComponentAdjustment(void); + void ResetComponentAdjustment(); protected: - void InitComponentList(void); + void InitComponentList(); std::map m_HudComponentMap; diff --git a/Client/game_sa/CMarkerSA.cpp b/Client/game_sa/CMarkerSA.cpp index 5d769c51d11..d375cfc01b2 100644 --- a/Client/game_sa/CMarkerSA.cpp +++ b/Client/game_sa/CMarkerSA.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CMarkerSA::Init(void) +void CMarkerSA::Init() { internalInterface->position = CVector(0, 0, 0); internalInterface->BlipType = (BYTE)MARKER_TYPE_COORDS; diff --git a/Client/game_sa/CMarkerSA.h b/Client/game_sa/CMarkerSA.h index 8a331b21343..be102ddf105 100644 --- a/Client/game_sa/CMarkerSA.h +++ b/Client/game_sa/CMarkerSA.h @@ -55,7 +55,7 @@ class CMarkerSA : public CMarker /* Our Functions */ CMarkerSA(CMarkerSAInterface* markerInterface) { internalInterface = markerInterface; }; - void Init(void); + void Init(); VOID SetSprite(eMarkerSprite Sprite); VOID SetDisplay(eMarkerDisplay wDisplay); diff --git a/Client/game_sa/CModelInfoSA.cpp b/Client/game_sa/CModelInfoSA.cpp index d1aac7a35d2..d821a9b49af 100644 --- a/Client/game_sa/CModelInfoSA.cpp +++ b/Client/game_sa/CModelInfoSA.cpp @@ -21,7 +21,7 @@ std::map std::map CModelInfoSA::ms_ModelDefaultAlphaTransparencyMap; std::unordered_map> CModelInfoSA::ms_ModelDefaultDummiesPosition; -CModelInfoSA::CModelInfoSA(void) +CModelInfoSA::CModelInfoSA() { m_pInterface = NULL; this->m_dwModelID = 0xFFFFFFFF; @@ -45,7 +45,7 @@ CModelInfoSA::CModelInfoSA(DWORD dwModelID) m_bAddedRefForCollision = false; } -CBaseModelInfoSAInterface* CModelInfoSA::GetInterface(void) +CBaseModelInfoSAInterface* CModelInfoSA::GetInterface() { return m_pInterface = ppModelInfo[m_dwModelID]; } @@ -255,7 +255,7 @@ bool CModelInfoSA::IsPlayerModel() (m_dwModelID >= 274 && m_dwModelID <= 288) || (m_dwModelID >= 290 && m_dwModelID <= 312)); } -BOOL CModelInfoSA::IsUpgrade(void) +BOOL CModelInfoSA::IsUpgrade() { return m_dwModelID >= 1000 && m_dwModelID <= 1193; } @@ -297,7 +297,7 @@ char* CModelInfoSA::GetNameIfVehicle() // return NULL; } -uint CModelInfoSA::GetAnimFileIndex(void) +uint CModelInfoSA::GetAnimFileIndex() { DWORD dwFunc = m_pInterface->VFTBL->GetAnimFileIndex; DWORD dwThis = (DWORD)m_pInterface; @@ -624,7 +624,7 @@ void CModelInfoSA::RestreamIPL() MapSet(ms_RestreamTxdIDMap, GetTextureDictionaryID(), 0); } -void CModelInfoSA::StaticFlushPendingRestreamIPL(void) +void CModelInfoSA::StaticFlushPendingRestreamIPL() { if (ms_RestreamTxdIDMap.empty()) return; @@ -889,7 +889,7 @@ void CModelInfoSA::SetCustomCarPlateText(const char* szText) else szStoredText[0] = 0; } -unsigned int CModelInfoSA::GetNumRemaps(void) +unsigned int CModelInfoSA::GetNumRemaps() { DWORD dwFunc = FUNC_CVehicleModelInfo__GetNumRemaps; DWORD ModelID = m_dwModelID; @@ -904,7 +904,7 @@ unsigned int CModelInfoSA::GetNumRemaps(void) return uiReturn; } -void* CModelInfoSA::GetVehicleSuspensionData(void) +void* CModelInfoSA::GetVehicleSuspensionData() { return GetInterface()->pColModel->pColData->pSuspensionLines; } @@ -1008,7 +1008,7 @@ void CModelInfoSA::SetCustomModel(RpClump* pClump) } } -void CModelInfoSA::RestoreOriginalModel(void) +void CModelInfoSA::RestoreOriginalModel() { // Are we loaded? if (IsLoaded()) @@ -1095,7 +1095,7 @@ void CModelInfoSA::SetColModel(CColModel* pColModel) } } -void CModelInfoSA::RestoreColModel(void) +void CModelInfoSA::RestoreColModel() { // Are we loaded? m_pInterface = ppModelInfo[m_dwModelID]; @@ -1141,7 +1141,7 @@ void CModelInfoSA::RestoreColModel(void) } } -void CModelInfoSA::MakeCustomModel(void) +void CModelInfoSA::MakeCustomModel() { // We have a custom model? if (m_pCustomClump) @@ -1251,7 +1251,7 @@ void _declspec(naked) HOOK_NodeNameStreamRead() // Setup hooks // ////////////////////////////////////////////////////////////////////////////////////////// -void CModelInfoSA::StaticSetHooks(void) +void CModelInfoSA::StaticSetHooks() { EZHookInstall(NodeNameStreamRead); } @@ -1362,14 +1362,14 @@ void CModelInfoSA::InitialiseSupportedUpgrades(RpClump* pClump) m_ModelSupportedUpgrades.m_bInitialised = true; } -void CModelInfoSA::ResetSupportedUpgrades(void) +void CModelInfoSA::ResetSupportedUpgrades() { m_ModelSupportedUpgrades.Reset(); } -eModelInfoType CModelInfoSA::GetModelType(void) +eModelInfoType CModelInfoSA::GetModelType() { - return ((eModelInfoType(*)(void))m_pInterface->VFTBL->GetModelType)(); + return ((eModelInfoType(*)())m_pInterface->VFTBL->GetModelType)(); } ////////////////////////////////////////////////////////////////////////////////////////// @@ -1389,7 +1389,7 @@ eModelInfoType CModelInfoSA::GetModelType(void) // Returns true if model was unloaded // ////////////////////////////////////////////////////////////////////////////////////////// -bool CModelInfoSA::ForceUnload(void) +bool CModelInfoSA::ForceUnload() { CBaseModelInfoSAInterface* pModelInfoSAInterface = GetInterface(); diff --git a/Client/game_sa/CModelInfoSA.h b/Client/game_sa/CModelInfoSA.h index 32b9ff39bc7..41dcd27e855 100644 --- a/Client/game_sa/CModelInfoSA.h +++ b/Client/game_sa/CModelInfoSA.h @@ -72,20 +72,20 @@ class CBaseModelInfo_SA_VTBL { public: DWORD Destructor; - DWORD AsAtomicModelInfoPtr; // (void) - DWORD AsDamageAtomicModelInfoPtr; // (void) - DWORD AsLodAtomicModelInfoPtr; // (void) - DWORD GetModelType; // (void) - Not defined in the base - DWORD GetTimeInfo; // (void) - DWORD Init; // (void) - DWORD Shutdown; // (void) - DWORD DeleteRwObject; // (void) - Not defined in the base - DWORD GetRwModelType; // (void) - Not defined in the base + DWORD AsAtomicModelInfoPtr; // () + DWORD AsDamageAtomicModelInfoPtr; // () + DWORD AsLodAtomicModelInfoPtr; // () + DWORD GetModelType; // () - Not defined in the base + DWORD GetTimeInfo; // () + DWORD Init; // () + DWORD Shutdown; // () + DWORD DeleteRwObject; // () - Not defined in the base + DWORD GetRwModelType; // () - Not defined in the base DWORD CreateInstance_; // (RwMatrixTag*) - Not defined in the base - DWORD CreateInstance; // (void) - Not defined in the base + DWORD CreateInstance; // () - Not defined in the base DWORD SetAnimFile; // (char const*) - DWORD ConvertAnimFileIndex; // (void) - DWORD GetAnimFileIndex; // (void) + DWORD ConvertAnimFileIndex; // () + DWORD GetAnimFileIndex; // () }; class CAtomicModelInfo_SA_VTBL : public CBaseModelInfo_SA_VTBL @@ -281,68 +281,68 @@ class CModelInfoSA : public CModelInfo SVehicleSupportedUpgrades m_ModelSupportedUpgrades; public: - CModelInfoSA(void); + CModelInfoSA(); CModelInfoSA(DWORD dwModelID); - CBaseModelInfoSAInterface* GetInterface(void); - CPedModelInfoSAInterface* GetPedModelInfoInterface(void) { return reinterpret_cast(GetInterface()); } + CBaseModelInfoSAInterface* GetInterface(); + CPedModelInfoSAInterface* GetPedModelInfoInterface() { return reinterpret_cast(GetInterface()); } - DWORD GetModel(void) { return m_dwModelID; } - eModelInfoType GetModelType(void); - uint GetAnimFileIndex(void); + DWORD GetModel() { return m_dwModelID; } + eModelInfoType GetModelType(); + uint GetAnimFileIndex(); - bool IsPlayerModel(void); + bool IsPlayerModel(); - BOOL IsBoat(void); - BOOL IsCar(void); - BOOL IsTrain(void); - BOOL IsHeli(void); - BOOL IsPlane(void); - BOOL IsBike(void); - BOOL IsFakePlane(void); - BOOL IsMonsterTruck(void); - BOOL IsQuadBike(void); - BOOL IsBmx(void); - BOOL IsTrailer(void); - BOOL IsVehicle(void); - BOOL IsUpgrade(void); + BOOL IsBoat(); + BOOL IsCar(); + BOOL IsTrain(); + BOOL IsHeli(); + BOOL IsPlane(); + BOOL IsBike(); + BOOL IsFakePlane(); + BOOL IsMonsterTruck(); + BOOL IsQuadBike(); + BOOL IsBmx(); + BOOL IsTrailer(); + BOOL IsVehicle(); + BOOL IsUpgrade(); - char* GetNameIfVehicle(void); + char* GetNameIfVehicle(); VOID Request(EModelRequestType requestType, const char* szTag); - VOID Remove(void); + VOID Remove(); BYTE GetLevelFromPosition(CVector* vecPosition); - BOOL IsLoaded(void); - BOOL DoIsLoaded(void); - BYTE GetFlags(void); - CBoundingBox* GetBoundingBox(void); - bool IsValid(void); - float GetDistanceFromCentreOfMassToBaseOfModel(void); - unsigned short GetTextureDictionaryID(void); + BOOL IsLoaded(); + BOOL DoIsLoaded(); + BYTE GetFlags(); + CBoundingBox* GetBoundingBox(); + bool IsValid(); + float GetDistanceFromCentreOfMassToBaseOfModel(); + unsigned short GetTextureDictionaryID(); void SetTextureDictionaryID(unsigned short usID); - float GetLODDistance(void); + float GetLODDistance(); void SetLODDistance(float fDistance); - static void StaticResetLodDistances(void); - void RestreamIPL(void); - static void StaticFlushPendingRestreamIPL(void); - static void StaticSetHooks(void); + static void StaticResetLodDistances(); + void RestreamIPL(); + static void StaticFlushPendingRestreamIPL(); + static void StaticSetHooks(); void SetAlphaTransparencyEnabled(BOOL bEnabled); bool IsAlphaTransparencyEnabled(); - void ResetAlphaTransparency(void); - static void StaticResetAlphaTransparencies(void); + void ResetAlphaTransparency(); + static void StaticResetAlphaTransparencies(); void ModelAddRef(EModelRequestType requestType, const char* szTag); - int GetRefCount(void); + int GetRefCount(); void RemoveRef(bool bRemoveExtraGTARef = false); - bool ForceUnload(void); + bool ForceUnload(); // CVehicleModelInfo specific short GetAvailableVehicleMod(unsigned short usSlot); bool IsUpgradeAvailable(eVehicleUpgradePosn posn); void SetCustomCarPlateText(const char* szText); - unsigned int GetNumRemaps(void); - void* GetVehicleSuspensionData(void); + unsigned int GetNumRemaps(); + void* GetVehicleSuspensionData(); void* SetVehicleSuspensionData(void* pSuspensionLines); CVector GetVehicleExhaustFumesPosition() override; void SetVehicleExhaustFumesPosition(const CVector& vecPosition) override; @@ -358,22 +358,22 @@ class CModelInfoSA : public CModelInfo // Custom collision related functions void SetCustomModel(RpClump* pClump); - void RestoreOriginalModel(void); + void RestoreOriginalModel(); void SetColModel(CColModel* pColModel); - void RestoreColModel(void); - void MakeCustomModel(void); + void RestoreColModel(); + void MakeCustomModel(); void SetModelID(DWORD dwModelID) { m_dwModelID = dwModelID; } - RwObject* GetRwObject(void) { return m_pInterface ? m_pInterface->pRwObject : NULL; } + RwObject* GetRwObject() { return m_pInterface ? m_pInterface->pRwObject : NULL; } // CModelInfoSA methods void MakePedModel(char* szTexture); - SVehicleSupportedUpgrades GetVehicleSupportedUpgrades(void) { return m_ModelSupportedUpgrades; } + SVehicleSupportedUpgrades GetVehicleSupportedUpgrades() { return m_ModelSupportedUpgrades; } void InitialiseSupportedUpgrades(RpClump* pClump); - void ResetSupportedUpgrades(void); + void ResetSupportedUpgrades(); private: void RwSetSupportedUpgrades(RwFrame* parent, DWORD dwModel); diff --git a/Client/game_sa/CObjectSA.cpp b/Client/game_sa/CObjectSA.cpp index 9c7c70955fa..7363413528f 100644 --- a/Client/game_sa/CObjectSA.cpp +++ b/Client/game_sa/CObjectSA.cpp @@ -284,7 +284,7 @@ void CObjectSA::SetHealth(float fHealth) static_cast(this->GetInterface())->fHealth = fHealth; } -float CObjectSA::GetHealth(void) +float CObjectSA::GetHealth() { return static_cast(this->GetInterface())->fHealth; } diff --git a/Client/game_sa/CObjectSA.h b/Client/game_sa/CObjectSA.h index bee31c6a068..e3990224dc8 100644 --- a/Client/game_sa/CObjectSA.h +++ b/Client/game_sa/CObjectSA.h @@ -130,14 +130,14 @@ class CObjectSA : public virtual CObject, public virtual CPhysicalSA public: CObjectSA(CObjectSAInterface* objectInterface); CObjectSA(DWORD dwModel, bool bBreakingDisabled); - ~CObjectSA(void); + ~CObjectSA(); - CObjectSAInterface* GetObjectInterface(void) { return (CObjectSAInterface*)GetInterface(); } + CObjectSAInterface* GetObjectInterface() { return (CObjectSAInterface*)GetInterface(); } - void Explode(void); - void Break(void); + void Explode(); + void Break(); void SetHealth(float fHealth); - float GetHealth(void); + float GetHealth(); void SetModelIndex(unsigned long ulModel); void SetAlpha(unsigned char ucAlpha) { m_ucAlpha = ucAlpha; } diff --git a/Client/game_sa/COffsets.cpp b/Client/game_sa/COffsets.cpp index 779d1e9a6c9..47cb4368312 100644 --- a/Client/game_sa/COffsets.cpp +++ b/Client/game_sa/COffsets.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void COffsets::Initialize10EU(void) +void COffsets::Initialize10EU() { InitializeCommon10(); @@ -27,7 +27,7 @@ void COffsets::Initialize10EU(void) CCameraSA::FUNC_RwFrameGetLTM = 0x7F09D0; } -void COffsets::Initialize10US(void) +void COffsets::Initialize10US() { InitializeCommon10(); @@ -43,7 +43,7 @@ void COffsets::Initialize10US(void) CCameraSA::FUNC_RwFrameGetLTM = 0x7F0990; } -void COffsets::Initialize11(void) +void COffsets::Initialize11() { CGameSA::VAR_SystemTime = (unsigned long*)0xB7CB84; CGameSA::VAR_IsAtMenu = (unsigned long*)0xBA677B; @@ -66,12 +66,12 @@ void COffsets::Initialize11(void) CWeatherSA::FUNC_IsRaining = 0x4ABF50; } -void COffsets::Initialize20(void) +void COffsets::Initialize20() { // TODO } -void COffsets::InitializeCommon10(void) +void COffsets::InitializeCommon10() { CGameSA::VAR_SystemTime = (unsigned long*)0xB7CB84; CGameSA::VAR_IsAtMenu = (unsigned long*)0xBA677B; diff --git a/Client/game_sa/COffsets.h b/Client/game_sa/COffsets.h index 1cf719e6acf..49ce7e62c60 100644 --- a/Client/game_sa/COffsets.h +++ b/Client/game_sa/COffsets.h @@ -14,11 +14,11 @@ class COffsets { public: - static void Initialize10EU(void); - static void Initialize10US(void); - static void Initialize11(void); - static void Initialize20(void); + static void Initialize10EU(); + static void Initialize10US(); + static void Initialize11(); + static void Initialize20(); private: - static void InitializeCommon10(void); + static void InitializeCommon10(); }; diff --git a/Client/game_sa/CPadSA.cpp b/Client/game_sa/CPadSA.cpp index 44706ecbf02..bf4be5f9075 100644 --- a/Client/game_sa/CPadSA.cpp +++ b/Client/game_sa/CPadSA.cpp @@ -49,7 +49,7 @@ VOID CPadSA::Restore() MemCpyFast(this->internalInterface, &this->StoredPad, sizeof(CPadSAInterface)); } -bool CPadSA::IsEnabled(void) +bool CPadSA::IsEnabled() { bool bEnabled = *(BYTE*)FUNC_CPad_UpdatePads == 0x56; return bEnabled; @@ -65,7 +65,7 @@ VOID CPadSA::Disable(bool bDisable) // this->internalInterface->DisablePlayerControls = bDisable; } -VOID CPadSA::Clear(void) +VOID CPadSA::Clear() { CControllerState cs; // create a null controller (class is inited to null) SetCurrentControllerState(&cs); @@ -80,7 +80,7 @@ VOID CPadSA::SetHornHistoryValue(bool value) internalInterface->bHornHistory[internalInterface->iCurrHornHistory] = value; } -long CPadSA::GetAverageWeapon(void) +long CPadSA::GetAverageWeapon() { return internalInterface->AverageWeapon; } diff --git a/Client/game_sa/CPadSA.h b/Client/game_sa/CPadSA.h index fb79d94834b..7f67ab5869d 100644 --- a/Client/game_sa/CPadSA.h +++ b/Client/game_sa/CPadSA.h @@ -77,12 +77,12 @@ class CPadSA : public CPad VOID SetLastControllerState(CControllerState* ControllerState); VOID Store(); VOID Restore(); - bool IsEnabled(void); + bool IsEnabled(); VOID Disable(bool bDisable); - VOID Clear(void); + VOID Clear(); CPadSAInterface* GetInterface() { return this->internalInterface; }; VOID SetHornHistoryValue(bool value); - long GetAverageWeapon(void); + long GetAverageWeapon(); void SetLastTimeTouched(DWORD dwTime); uint GetDrunkInputDelay() { return internalInterface->DrunkDrivingBufferUsed; }; diff --git a/Client/game_sa/CPedDamageResponseCalculatorSA.cpp b/Client/game_sa/CPedDamageResponseCalculatorSA.cpp index aaeda9ba1ba..a815d416c7c 100644 --- a/Client/game_sa/CPedDamageResponseCalculatorSA.cpp +++ b/Client/game_sa/CPedDamageResponseCalculatorSA.cpp @@ -37,7 +37,7 @@ CPedDamageResponseCalculatorSA::CPedDamageResponseCalculatorSA(CPedDamageRespons m_bDestroyInterface = false; } -CPedDamageResponseCalculatorSA::~CPedDamageResponseCalculatorSA(void) +CPedDamageResponseCalculatorSA::~CPedDamageResponseCalculatorSA() { if (m_bDestroyInterface) { diff --git a/Client/game_sa/CPedDamageResponseCalculatorSA.h b/Client/game_sa/CPedDamageResponseCalculatorSA.h index eb3f8c5e45e..bc7b33371bd 100644 --- a/Client/game_sa/CPedDamageResponseCalculatorSA.h +++ b/Client/game_sa/CPedDamageResponseCalculatorSA.h @@ -32,7 +32,7 @@ class CPedDamageResponseCalculatorSA : public CPedDamageResponseCalculator public: CPedDamageResponseCalculatorSA(CEntity* pEntity, float fDamage, eWeaponType weaponType, ePedPieceTypes bodyPart, bool b_1); CPedDamageResponseCalculatorSA(CPedDamageResponseCalculatorSAInterface* pInterface); - ~CPedDamageResponseCalculatorSA(void); + ~CPedDamageResponseCalculatorSA(); void ComputeDamageResponse(CPed* pPed, CPedDamageResponse* pDamageResponse, bool bSpeak); diff --git a/Client/game_sa/CPedDamageResponseSA.h b/Client/game_sa/CPedDamageResponseSA.h index 826f66039b7..55cdd2bffef 100644 --- a/Client/game_sa/CPedDamageResponseSA.h +++ b/Client/game_sa/CPedDamageResponseSA.h @@ -29,7 +29,7 @@ class CPedDamageResponseSA : public CPedDamageResponse public: CPedDamageResponseSA(CPedDamageResponseSAInterface* pInterface) { m_pInterface = pInterface; } - CPedDamageResponseSAInterface* GetInterface(void) { return m_pInterface; } + CPedDamageResponseSAInterface* GetInterface() { return m_pInterface; } void Calculate(CEntity* pEntity, float fDamage, eWeaponType weaponType, ePedPieceTypes bodyPart, bool b_1, bool bSpeak); diff --git a/Client/game_sa/CPedIntelligenceSA.cpp b/Client/game_sa/CPedIntelligenceSA.cpp index 2b04902367c..b9adc5d44e0 100644 --- a/Client/game_sa/CPedIntelligenceSA.cpp +++ b/Client/game_sa/CPedIntelligenceSA.cpp @@ -26,25 +26,25 @@ CPedIntelligenceSA::~CPedIntelligenceSA() delete this->TaskManager; } -CTaskManager* CPedIntelligenceSA::GetTaskManager(void) +CTaskManager* CPedIntelligenceSA::GetTaskManager() { DEBUG_TRACE("CTaskManager * CPedSA::GetTaskManager( void )"); return this->TaskManager; } -CVehicleScanner* CPedIntelligenceSA::GetVehicleScanner(void) +CVehicleScanner* CPedIntelligenceSA::GetVehicleScanner() { return this->VehicleScanner; } -bool CPedIntelligenceSA::IsRespondingToEvent(void) +bool CPedIntelligenceSA::IsRespondingToEvent() { DWORD dwFunc = FUNC_IsRespondingToEvent; return false; } -int CPedIntelligenceSA::GetCurrentEventType(void) +int CPedIntelligenceSA::GetCurrentEventType() { DWORD dwFunc = FUNC_GetCurrentEventType; DWORD dwRet = 0; @@ -58,7 +58,7 @@ int CPedIntelligenceSA::GetCurrentEventType(void) return dwRet; } -CEvent* CPedIntelligenceSA::GetCurrentEvent(void) +CEvent* CPedIntelligenceSA::GetCurrentEvent() { return NULL; } @@ -80,7 +80,7 @@ bool CPedIntelligenceSA::TestForStealthKill(CPed* pPed, bool bUnk) return bReturn; } -CTaskSimpleUseGunSAInterface* CPedIntelligenceSA::GetTaskUseGun(void) +CTaskSimpleUseGunSAInterface* CPedIntelligenceSA::GetTaskUseGun() { CTaskSimpleUseGunSAInterface* pTaskUseGun; DWORD dwThis = (DWORD)internalInterface; diff --git a/Client/game_sa/CPedIntelligenceSA.h b/Client/game_sa/CPedIntelligenceSA.h index 8ec56cbf910..facd9cba395 100644 --- a/Client/game_sa/CPedIntelligenceSA.h +++ b/Client/game_sa/CPedIntelligenceSA.h @@ -60,13 +60,13 @@ class CPedIntelligenceSA : public CPedIntelligence public: CPedIntelligenceSA(CPedIntelligenceSAInterface* pedIntelligenceSAInterface, CPed* ped); - ~CPedIntelligenceSA(void); - CPedIntelligenceSAInterface* GetInterface(void) { return this->internalInterface; } - bool IsRespondingToEvent(void); - int GetCurrentEventType(void); - CEvent* GetCurrentEvent(void); - CTaskManager* GetTaskManager(void); - CVehicleScanner* GetVehicleScanner(void); + ~CPedIntelligenceSA(); + CPedIntelligenceSAInterface* GetInterface() { return this->internalInterface; } + bool IsRespondingToEvent(); + int GetCurrentEventType(); + CEvent* GetCurrentEvent(); + CTaskManager* GetTaskManager(); + CVehicleScanner* GetVehicleScanner(); bool TestForStealthKill(CPed* pPed, bool bUnk); - CTaskSimpleUseGunSAInterface* GetTaskUseGun(void); + CTaskSimpleUseGunSAInterface* GetTaskUseGun(); }; diff --git a/Client/game_sa/CPedModelInfoSA.cpp b/Client/game_sa/CPedModelInfoSA.cpp index 2f2b9885947..e9e3b05f110 100644 --- a/Client/game_sa/CPedModelInfoSA.cpp +++ b/Client/game_sa/CPedModelInfoSA.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CPedModelInfoSAInterface::CPedModelInfoSAInterface(void) +CPedModelInfoSAInterface::CPedModelInfoSAInterface() { MemSetFast(this, 0, sizeof(CPedModelInfoSAInterface)); VFTBL = (CBaseModelInfo_SA_VTBL*)VAR_CPedModelInfo_VTBL; @@ -19,7 +19,7 @@ CPedModelInfoSAInterface::CPedModelInfoSAInterface(void) MemPutFast(&pad, 0xFFFFFFFF); } -CPedModelInfoSA::CPedModelInfoSA(void) : CModelInfoSA() +CPedModelInfoSA::CPedModelInfoSA() : CModelInfoSA() { m_pPedModelInterface = new CPedModelInfoSAInterface; } diff --git a/Client/game_sa/CPedModelInfoSA.h b/Client/game_sa/CPedModelInfoSA.h index ecc540dfcc9..0d0efd294a2 100644 --- a/Client/game_sa/CPedModelInfoSA.h +++ b/Client/game_sa/CPedModelInfoSA.h @@ -39,7 +39,7 @@ typedef long AssocGroupID; class CPedModelInfoSAInterface : public CBaseModelInfoSAInterface { public: - CPedModelInfoSAInterface(void); + CPedModelInfoSAInterface(); BYTE pad[4]; // 32 AssocGroupID motionAnimGroup; // 36 Motion anim group (AssocGroupID, long) @@ -62,8 +62,8 @@ class CPedModelInfoSAInterface : public CBaseModelInfoSAInterface class CPedModelInfoSA : public CModelInfoSA, public CPedModelInfo { public: - CPedModelInfoSA(void); - CPedModelInfoSAInterface* GetPedModelInfoInterface(void) { return m_pPedModelInterface; } + CPedModelInfoSA(); + CPedModelInfoSAInterface* GetPedModelInfoInterface() { return m_pPedModelInterface; } void SetMotionAnimGroup(AssocGroupId animGroup); private: diff --git a/Client/game_sa/CPedSA.cpp b/Client/game_sa/CPedSA.cpp index dfca6dcfdf4..c03a555bd3e 100644 --- a/Client/game_sa/CPedSA.cpp +++ b/Client/game_sa/CPedSA.cpp @@ -33,7 +33,7 @@ VOID CPedSA::SetInterface(CEntitySAInterface* intInterface) m_pInterface = intInterface; } -CPedSA::~CPedSA(void) +CPedSA::~CPedSA() { if (m_pPedIntelligence) delete m_pPedIntelligence; @@ -111,7 +111,7 @@ void CPedSA::SetModelIndex(DWORD dwModelIndex) } // Hacky thing done for the local player when changing model -void CPedSA::RemoveGeometryRef(void) +void CPedSA::RemoveGeometryRef() { RpClump* pClump = (RpClump*)GetInterface()->m_pRwObject; RpAtomic* pAtomic = (RpAtomic*)((pClump->atomics.root.next) - 0x8); @@ -120,7 +120,7 @@ void CPedSA::RemoveGeometryRef(void) pGeometry->refs--; } -bool CPedSA::IsInWater(void) +bool CPedSA::IsInWater() { DEBUG_TRACE("bool CPedSA::IsInWater ()"); CTask* pTask = this->m_pPedIntelligence->GetTaskManager()->GetTask(TASK_PRIORITY_EVENT_RESPONSE_NONTEMP); @@ -161,7 +161,7 @@ bool CPedSA::AddProjectile(eWeaponType eWeapon, CVector vecOrigin, float fForce, return ((CProjectileInfoSA*)pGame->GetProjectileInfo())->AddProjectile((CEntitySA*)this, eWeapon, vecOrigin, fForce, target, targetEntity); } -void CPedSA::DetachPedFromEntity(void) +void CPedSA::DetachPedFromEntity() { DWORD dwFunc = FUNC_DetachPedFromEntity; DWORD dwThis = (DWORD)this->GetInterface(); @@ -315,7 +315,7 @@ void CPedSA::SetHealth(float fHealth) GetPedInterface()->fHealth = fHealth; } -float CPedSA::GetArmor(void) +float CPedSA::GetArmor() { return GetPedInterface()->fArmor; } @@ -325,7 +325,7 @@ void CPedSA::SetArmor(float fArmor) GetPedInterface()->fArmor = fArmor; } -float CPedSA::GetOxygenLevel(void) +float CPedSA::GetOxygenLevel() { return GetPedInterface()->pPlayerData->m_fBreath; } @@ -347,7 +347,7 @@ void CPedSA::SetIsStanding(bool bStanding) } } -DWORD CPedSA::GetType(void) +DWORD CPedSA::GetType() { return m_dwType; } @@ -464,7 +464,7 @@ CWeapon* CPedSA::GetWeapon(eWeaponSlot weaponSlot) return NULL; } -void CPedSA::ClearWeapons(void) +void CPedSA::ClearWeapons() { // Remove all the weapons for (unsigned int i = 0; i < WEAPONSLOT_MAX; i++) @@ -478,7 +478,7 @@ void CPedSA::ClearWeapons(void) } } -void CPedSA::RestoreLastGoodPhysicsState(void) +void CPedSA::RestoreLastGoodPhysicsState() { CPhysicalSA::RestoreLastGoodPhysicsState(); SetCurrentRotation(0); @@ -608,7 +608,7 @@ CVector* CPedSA::GetTransformedBonePosition(eBone bone, CVector* vecPosition) // Apply the extra ped rotations for slope pitch and swimming. // Achieved by calling the code at the start of CPed::PreRenderAfterTest // -void CPedSA::ApplySwimAndSlopeRotations(void) +void CPedSA::ApplySwimAndSlopeRotations() { CPedSAInterface* pPedInterface = GetPedInterface(); if (pPedInterface->pedFlags.bCalledPreRender) @@ -626,7 +626,7 @@ void CPedSA::ApplySwimAndSlopeRotations(void) g_bOnlyUpdateRotations = false; } -bool CPedSA::IsDucking(void) +bool CPedSA::IsDucking() { return ((CPedSAInterface*)this->GetInterface())->pedFlags.bIsDucking; } @@ -636,7 +636,7 @@ void CPedSA::SetDucking(bool bDuck) ((CPedSAInterface*)this->GetInterface())->pedFlags.bIsDucking = bDuck; } -int CPedSA::GetCantBeKnockedOffBike(void) +int CPedSA::GetCantBeKnockedOffBike() { return ((CPedSAInterface*)this->GetInterface())->pedFlags.CantBeKnockedOffBike; } @@ -666,7 +666,7 @@ void CPedSA::QuitEnteringCar(CVehicle* vehicle, int iSeat, bool bUnknown) } } -bool CPedSA::IsWearingGoggles(void) +bool CPedSA::IsWearingGoggles() { DWORD dwFunc = FUNC_IsWearingGoggles; DWORD dwThis = (DWORD)this->GetInterface(); @@ -709,7 +709,7 @@ void CPedSA::SetClothesTextureAndModel(const char* szTexture, const char* szMode } } -void CPedSA::RebuildPlayer(void) +void CPedSA::RebuildPlayer() { DWORD dwFunc = FUNC_CClothes__RebuildPlayer; DWORD dwThis = (DWORD)this->GetInterface(); @@ -722,7 +722,7 @@ void CPedSA::RebuildPlayer(void) } } -eFightingStyle CPedSA::GetFightingStyle(void) +eFightingStyle CPedSA::GetFightingStyle() { return (eFightingStyle)((CPedSAInterface*)this->GetInterface())->bFightingStyle; } @@ -764,7 +764,7 @@ void CPedSA::SetFightingStyle(eFightingStyle style, BYTE bStyleExtra) } } -CEntity* CPedSA::GetContactEntity(void) +CEntity* CPedSA::GetContactEntity() { CEntitySAInterface* pInterface = ((CPedSAInterface*)this->GetInterface())->pContactEntity; if (pInterface) @@ -799,12 +799,12 @@ CEntity* CPedSA::GetContactEntity(void) return nullptr; } -unsigned char CPedSA::GetRunState(void) +unsigned char CPedSA::GetRunState() { return *(unsigned char*)(((DWORD)(this->GetInterface()) + 1332)); } -CEntity* CPedSA::GetTargetedEntity(void) +CEntity* CPedSA::GetTargetedEntity() { CEntitySAInterface* pInterface = ((CPedSAInterface*)this->GetInterface())->pTargetedEntity; if (pInterface) @@ -828,12 +828,12 @@ void CPedSA::SetTargetedEntity(CEntity* pEntity) ((CPedSAInterface*)this->GetInterface())->pTargetedEntity = pInterface; } -bool CPedSA::GetCanBeShotInVehicle(void) +bool CPedSA::GetCanBeShotInVehicle() { return GetPedInterface()->pedFlags.bCanBeShotInVehicle; } -bool CPedSA::GetTestForShotInVehicle(void) +bool CPedSA::GetTestForShotInVehicle() { return GetPedInterface()->pedFlags.bTestForShotInVehicle; } @@ -879,7 +879,7 @@ void CPedSA::SetFootBlood(unsigned int uiFootBlood) MemPutFast(dwThis + 0x750, uiFootBlood); } -unsigned int CPedSA::GetFootBlood(void) +unsigned int CPedSA::GetFootBlood() { DWORD dwThis = (DWORD)this->GetInterface(); // Check if the ped has the foot blood flag @@ -892,7 +892,7 @@ unsigned int CPedSA::GetFootBlood(void) return 0; } -bool CPedSA::IsOnFire(void) +bool CPedSA::IsOnFire() { if (GetPedInterface()->pFireOnPed != NULL) return true; @@ -981,7 +981,7 @@ void CPedSA::SetVoice(const char* szVoiceType, const char* szVoice) } // GetCurrentWeaponStat will only work if the game ped context is currently set to this ped -CWeaponStat* CPedSA::GetCurrentWeaponStat(void) +CWeaponStat* CPedSA::GetCurrentWeaponStat() { if (pGame->GetPedContext() != this) { @@ -1001,7 +1001,7 @@ CWeaponStat* CPedSA::GetCurrentWeaponStat(void) return pWeaponStat; } -float CPedSA::GetCurrentWeaponRange(void) +float CPedSA::GetCurrentWeaponRange() { CWeaponStat* pWeaponStat = GetCurrentWeaponStat(); if (!pWeaponStat) @@ -1022,7 +1022,7 @@ void CPedSA::AddWeaponAudioEvent(EPedWeaponAudioEventType audioEventType) } } -int CPedSA::GetCustomMoveAnim(void) +int CPedSA::GetCustomMoveAnim() { return m_iCustomMoveAnim; } @@ -1831,7 +1831,7 @@ void _declspec(naked) HOOK_CPed_PreRenderAfterTest_Mid() // Setup hooks // ////////////////////////////////////////////////////////////////////////////////////////// -void CPedSA::StaticSetHooks(void) +void CPedSA::StaticSetHooks() { EZHookInstall(CPed_PreRenderAfterTest); EZHookInstall(CPed_PreRenderAfterTest_Mid); diff --git a/Client/game_sa/CPedSA.h b/Client/game_sa/CPedSA.h index b50b0963d1d..ab486631057 100644 --- a/Client/game_sa/CPedSA.h +++ b/Client/game_sa/CPedSA.h @@ -339,44 +339,44 @@ class CPedSA : public virtual CPed, public virtual CPhysicalSA ~CPedSA(); VOID SetInterface(CEntitySAInterface* intInterface); - CPedSAInterface* GetPedInterface(void) { return (CPedSAInterface*)GetInterface(); } + CPedSAInterface* GetPedInterface() { return (CPedSAInterface*)GetInterface(); } void Init(); void SetModelIndex(DWORD dwModelIndex); - void RemoveGeometryRef(void); + void RemoveGeometryRef(); void AttachPedToBike(CEntity* entity, CVector* vector, unsigned short sUnk, FLOAT fUnk, FLOAT fUnk2, eWeaponType weaponType); void AttachPedToEntity(DWORD dwEntityInterface, CVector* vector, unsigned short sDirection, FLOAT fRotationLimit, eWeaponType weaponType, bool bChangeCamera); - void DetachPedFromEntity(void); + void DetachPedFromEntity(); bool CanSeeEntity(CEntity* entity, FLOAT fDistance); CVehicle* GetVehicle(); void Respawn(CVector* position, bool bCameraCut); bool AddProjectile(eWeaponType eWeapon, CVector vecOrigin, float fForce, CVector* target, CEntity* targetEntity); - FLOAT GetHealth(void); + FLOAT GetHealth(); void SetHealth(float fHealth); - float GetArmor(void); + float GetArmor(); void SetArmor(float fArmor); - float GetOxygenLevel(void); + float GetOxygenLevel(); void SetOxygenLevel(float fOxygen); CWeapon* GiveWeapon(eWeaponType weaponType, unsigned int uiAmmo, eWeaponSkill skill); CWeapon* GetWeapon(eWeaponSlot weaponSlot); CWeapon* GetWeapon(eWeaponType weaponType); - void ClearWeapons(void); + void ClearWeapons(); void RemoveWeaponModel(int iModel); void ClearWeapon(eWeaponType weaponType); void SetIsStanding(bool bStanding); - CPedIntelligence* GetPedIntelligence(void) { return m_pPedIntelligence; } - CPedSound* GetPedSound(void) { return m_pPedSound; } - DWORD GetType(void); + CPedIntelligence* GetPedIntelligence() { return m_pPedIntelligence; } + CPedSound* GetPedSound() { return m_pPedSound; } + DWORD GetType(); void SetType(DWORD dwType); DWORD* GetMemoryValue(DWORD dwOffset); - virtual void RestoreLastGoodPhysicsState(void); + virtual void RestoreLastGoodPhysicsState(); FLOAT GetCurrentRotation(); FLOAT GetTargetRotation(); void SetCurrentRotation(FLOAT fRotation); @@ -387,53 +387,53 @@ class CPedSA : public virtual CPed, public virtual CPhysicalSA CVector* GetBonePosition(eBone bone, CVector* vecPosition); CVector* GetTransformedBonePosition(eBone bone, CVector* vecPosition); - void ApplySwimAndSlopeRotations(void); + void ApplySwimAndSlopeRotations(); - bool IsDucking(void); + bool IsDucking(); void SetDucking(bool bDuck); - bool IsInWater(void); + bool IsInWater(); - int GetCantBeKnockedOffBike(void); + int GetCantBeKnockedOffBike(); void SetCantBeKnockedOffBike(int iCantBeKnockedOffBike); void QuitEnteringCar(CVehicle* vehicle, int iSeat, bool bUnknown); - bool IsWearingGoggles(void); + bool IsWearingGoggles(); void SetGogglesState(bool bIsWearingThem); void SetClothesTextureAndModel(const char* szTexture, const char* szModel, int textureType); - void RebuildPlayer(void); + void RebuildPlayer(); - eFightingStyle GetFightingStyle(void); + eFightingStyle GetFightingStyle(); void SetFightingStyle(eFightingStyle style, BYTE bStyleExtra = 6); - CEntity* GetContactEntity(void); + CEntity* GetContactEntity(); - unsigned char GetRunState(void); + unsigned char GetRunState(); - CEntity* GetTargetedEntity(void); + CEntity* GetTargetedEntity(); void SetTargetedEntity(CEntity* pEntity); - bool GetCanBeShotInVehicle(void); - bool GetTestForShotInVehicle(void); + bool GetCanBeShotInVehicle(); + bool GetTestForShotInVehicle(); void SetCanBeShotInVehicle(bool bShot); void SetTestForShotInVehicle(bool bTest); bool InternalAttachEntityToEntity(DWORD dwEntityInterface, const CVector* vecPosition, const CVector* vecRotation); - BYTE GetOccupiedSeat(void) { return m_ucOccupiedSeat; } + BYTE GetOccupiedSeat() { return m_ucOccupiedSeat; } void SetOccupiedSeat(BYTE seat) { m_ucOccupiedSeat = seat; } void RemoveBodyPart(int i, char c); void SetFootBlood(unsigned int uiFootBlood); - unsigned int GetFootBlood(void); + unsigned int GetFootBlood(); - bool IsOnFire(void); + bool IsOnFire(); void SetOnFire(bool bOnFire); - bool GetStayInSamePlace(void) { return GetPedInterface()->pedFlags.bStayInSamePlace; } + bool GetStayInSamePlace() { return GetPedInterface()->pedFlags.bStayInSamePlace; } void SetStayInSamePlace(bool bStay); void GetVoice(short* psVoiceType, short* psVoiceID); @@ -441,11 +441,11 @@ class CPedSA : public virtual CPed, public virtual CPhysicalSA void SetVoice(short sVoiceType, short sVoiceID); void SetVoice(const char* szVoiceType, const char* szVoice); - CWeaponStat* GetCurrentWeaponStat(void); - float GetCurrentWeaponRange(void); + CWeaponStat* GetCurrentWeaponStat(); + float GetCurrentWeaponRange(); void AddWeaponAudioEvent(EPedWeaponAudioEventType audioEventType); - virtual int GetCustomMoveAnim(void); + virtual int GetCustomMoveAnim(); - static void StaticSetHooks(void); + static void StaticSetHooks(); }; diff --git a/Client/game_sa/CPedSoundSA.cpp b/Client/game_sa/CPedSoundSA.cpp index 2514177d41e..0d0e8e29b83 100644 --- a/Client/game_sa/CPedSoundSA.cpp +++ b/Client/game_sa/CPedSoundSA.cpp @@ -26,7 +26,7 @@ void CPedSoundSA::SetVoiceID(short sVoiceID) m_pInterface->m_sVoiceID = sVoiceID; } -bool CPedSoundSA::IsSpeechDisabled(void) +bool CPedSoundSA::IsSpeechDisabled() { bool bReturn; DWORD dwThis = (DWORD)m_pInterface; @@ -40,7 +40,7 @@ bool CPedSoundSA::IsSpeechDisabled(void) return bReturn; } -void CPedSoundSA::EnablePedSpeech(void) +void CPedSoundSA::EnablePedSpeech() { DWORD dwThis = (DWORD)m_pInterface; DWORD dwFunc = FUNC_CAEPedSound__EnablePedSpeech; diff --git a/Client/game_sa/CPedSoundSA.h b/Client/game_sa/CPedSoundSA.h index 384ff310d0e..c2b7ab5eac5 100644 --- a/Client/game_sa/CPedSoundSA.h +++ b/Client/game_sa/CPedSoundSA.h @@ -71,15 +71,15 @@ class CPedSoundSA : public CPedSound public: CPedSoundSA(CPedSoundSAInterface* pInterface) { m_pInterface = pInterface; } - CPedSoundSAInterface* GetInterface(void) { return m_pInterface; } + CPedSoundSAInterface* GetInterface() { return m_pInterface; } - short GetVoiceTypeID(void); - short GetVoiceID(void); + short GetVoiceTypeID(); + short GetVoiceID(); void SetVoiceTypeID(short sVoiceType); void SetVoiceID(short sVoiceID); - bool IsSpeechDisabled(void); - void EnablePedSpeech(void); + bool IsSpeechDisabled(); + void EnablePedSpeech(); void DisablePedSpeech(bool bStopCurrent); static short GetVoiceTypeIDFromName(const char* szVoiceTypeName); diff --git a/Client/game_sa/CPhysicalSA.cpp b/Client/game_sa/CPhysicalSA.cpp index 6cba6d9b930..b554f998dd7 100644 --- a/Client/game_sa/CPhysicalSA.cpp +++ b/Client/game_sa/CPhysicalSA.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CPhysicalSA::RestoreLastGoodPhysicsState(void) +void CPhysicalSA::RestoreLastGoodPhysicsState() { CEntitySA::RestoreLastGoodPhysicsState(); @@ -115,7 +115,7 @@ VOID CPhysicalSA::SetTurnSpeed(CVector* vecTurnSpeed) } } -float CPhysicalSA::GetMass(void) +float CPhysicalSA::GetMass() { return ((CPhysicalSAInterface*)this->GetInterface())->m_fMass; } @@ -125,7 +125,7 @@ void CPhysicalSA::SetMass(float fMass) ((CPhysicalSAInterface*)this->GetInterface())->m_fMass = fMass; } -float CPhysicalSA::GetTurnMass(void) +float CPhysicalSA::GetTurnMass() { return ((CPhysicalSAInterface*)this->GetInterface())->m_fTurnMass; } @@ -135,7 +135,7 @@ void CPhysicalSA::SetTurnMass(float fTurnMass) ((CPhysicalSAInterface*)this->GetInterface())->m_fTurnMass = fTurnMass; } -float CPhysicalSA::GetAirResistance(void) +float CPhysicalSA::GetAirResistance() { return ((CPhysicalSAInterface*)this->GetInterface())->m_fAirResistance; } @@ -145,7 +145,7 @@ void CPhysicalSA::SetAirResistance(float fAirResistance) ((CPhysicalSAInterface*)this->GetInterface())->m_fAirResistance = fAirResistance; } -float CPhysicalSA::GetElasticity(void) +float CPhysicalSA::GetElasticity() { return ((CPhysicalSAInterface*)this->GetInterface())->m_fElasticity; } @@ -155,7 +155,7 @@ void CPhysicalSA::SetElasticity(float fElasticity) ((CPhysicalSAInterface*)this->GetInterface())->m_fElasticity = fElasticity; } -float CPhysicalSA::GetBuoyancyConstant(void) +float CPhysicalSA::GetBuoyancyConstant() { return ((CPhysicalSAInterface*)this->GetInterface())->m_fBuoyancyConstant; } @@ -189,7 +189,7 @@ VOID CPhysicalSA::ProcessCollision() } } -void CPhysicalSA::AddToMovingList(void) +void CPhysicalSA::AddToMovingList() { DWORD dwFunc = FUNC_CPhysical_AddToMovingList; DWORD dwThis = (DWORD)GetInterface(); @@ -201,7 +201,7 @@ void CPhysicalSA::AddToMovingList(void) } } -float CPhysicalSA::GetDamageImpulseMagnitude(void) +float CPhysicalSA::GetDamageImpulseMagnitude() { return ((CPhysicalSAInterface*)this->GetInterface())->m_fDamageImpulseMagnitude; } @@ -211,7 +211,7 @@ void CPhysicalSA::SetDamageImpulseMagnitude(float fMagnitude) ((CPhysicalSAInterface*)this->GetInterface())->m_fDamageImpulseMagnitude = fMagnitude; } -CEntity* CPhysicalSA::GetDamageEntity(void) +CEntity* CPhysicalSA::GetDamageEntity() { CEntitySAInterface* pInterface = ((CPhysicalSAInterface*)this->GetInterface())->m_pCollidedEntity; if (pInterface) @@ -229,13 +229,13 @@ void CPhysicalSA::SetDamageEntity(CEntity* pEntity) ((CPhysicalSAInterface*)this->GetInterface())->m_pCollidedEntity = pEntitySA->GetInterface(); } -void CPhysicalSA::ResetLastDamage(void) +void CPhysicalSA::ResetLastDamage() { ((CPhysicalSAInterface*)this->GetInterface())->m_fDamageImpulseMagnitude = 0.0f; ((CPhysicalSAInterface*)this->GetInterface())->m_pCollidedEntity = NULL; } -CEntity* CPhysicalSA::GetAttachedEntity(void) +CEntity* CPhysicalSA::GetAttachedEntity() { CEntitySAInterface* pInterface = ((CPhysicalSAInterface*)this->GetInterface())->m_pAttachedEntity; if (pInterface) @@ -329,7 +329,7 @@ void CPhysicalSA::SetAttachedOffsets(CVector& vecPosition, CVector& vecRotation) } } -float CPhysicalSA::GetLighting(void) +float CPhysicalSA::GetLighting() { CPhysicalSAInterface* pInterface = (CPhysicalSAInterface*)this->GetInterface(); return pInterface->m_fLighting; diff --git a/Client/game_sa/CPhysicalSA.h b/Client/game_sa/CPhysicalSA.h index 2f4fd0ece6e..bead040f42c 100644 --- a/Client/game_sa/CPhysicalSA.h +++ b/Client/game_sa/CPhysicalSA.h @@ -112,7 +112,7 @@ static_assert(sizeof(CPhysicalSAInterface) == 0x138, "Invalid size for CPhysical class CPhysicalSA : public virtual CPhysical, public virtual CEntitySA { public: - virtual void RestoreLastGoodPhysicsState(void); + virtual void RestoreLastGoodPhysicsState(); CVector* GetMoveSpeed(CVector* vecMoveSpeed); CVector* GetTurnSpeed(CVector* vecTurnSpeed); CVector* GetMoveSpeedInternal(CVector* vecMoveSpeed); @@ -120,29 +120,29 @@ class CPhysicalSA : public virtual CPhysical, public virtual CEntitySA void SetMoveSpeed(CVector* vecMoveSpeed); void SetTurnSpeed(CVector* vecTurnSpeed); - float GetMass(void); + float GetMass(); void SetMass(float fMass); - float GetTurnMass(void); + float GetTurnMass(); void SetTurnMass(float fTurnMass); - float GetAirResistance(void); + float GetAirResistance(); void SetAirResistance(float fAirResistance); - float GetElasticity(void); + float GetElasticity(); void SetElasticity(float fElasticity); - float GetBuoyancyConstant(void); + float GetBuoyancyConstant(); void SetBuoyancyConstant(float fBuoyancyConstant); void GetCenterOfMass(CVector& vecCenterOfMass); void SetCenterOfMass(CVector& vecCenterOfMass); - void ProcessCollision(void); - void AddToMovingList(void); + void ProcessCollision(); + void AddToMovingList(); - float GetDamageImpulseMagnitude(void); + float GetDamageImpulseMagnitude(); void SetDamageImpulseMagnitude(float fMagnitude); - CEntity* GetDamageEntity(void); + CEntity* GetDamageEntity(); void SetDamageEntity(CEntity* pEntity); - void ResetLastDamage(void); + void ResetLastDamage(); - CEntity* GetAttachedEntity(void); + CEntity* GetAttachedEntity(); void AttachEntityToEntity(CPhysical& Entity, const CVector& vecPosition, const CVector& vecRotation); void DetachEntityFromEntity(float fUnkX, float fUnkY, float fUnkZ, bool bUnk); void GetAttachedOffsets(CVector& vecPosition, CVector& vecRotation); @@ -150,7 +150,7 @@ class CPhysicalSA : public virtual CPhysical, public virtual CEntitySA virtual bool InternalAttachEntityToEntity(DWORD dwEntityInterface, const CVector* vecPosition, const CVector* vecRotation); - float GetLighting(void); + float GetLighting(); void SetLighting(float fLighting); void SetFrozen(bool bFrozen); diff --git a/Client/game_sa/CPickupsSA.cpp b/Client/game_sa/CPickupsSA.cpp index ec0f98abfed..ef33886f189 100644 --- a/Client/game_sa/CPickupsSA.cpp +++ b/Client/game_sa/CPickupsSA.cpp @@ -18,7 +18,7 @@ CPickupsSA::CPickupsSA() Pickups[i] = new CPickupSA((CPickupSAInterface*)(ARRAY_PICKUPS + i * sizeof(CPickupSAInterface))); } -CPickupsSA::~CPickupsSA(void) +CPickupsSA::~CPickupsSA() { for (int i = 0; i < MAX_PICKUPS; i++) { diff --git a/Client/game_sa/CPickupsSA.h b/Client/game_sa/CPickupsSA.h index 48cac10509c..31754444738 100644 --- a/Client/game_sa/CPickupsSA.h +++ b/Client/game_sa/CPickupsSA.h @@ -29,8 +29,8 @@ class CPickupsSA : public CPickups CPickupSA* Pickups[MAX_PICKUPS]; public: - CPickupsSA(void); - ~CPickupsSA(void); + CPickupsSA(); + ~CPickupsSA(); CPickup* GetPickup(DWORD ID); CPickup* CreatePickup(CVector* position, DWORD ModelIndex, ePickupType Type, DWORD dwMonetaryValue, DWORD dwMoneyPerDay, BYTE bPingOutOfPlayer); diff --git a/Client/game_sa/CPlayerInfoSA.cpp b/Client/game_sa/CPlayerInfoSA.cpp index 11adef64ed2..92c576dda34 100644 --- a/Client/game_sa/CPlayerInfoSA.cpp +++ b/Client/game_sa/CPlayerInfoSA.cpp @@ -66,7 +66,7 @@ void CPlayerInfoSA::SetPlayerMoney(long lMoney, bool bInstant) /** * */ -VOID CPlayerInfoSA::GivePlayerParachute(VOID) +VOID CPlayerInfoSA::GivePlayerParachute() { DEBUG_TRACE("VOID CPlayerInfoSA::GivePlayerParachute ( VOID )"); DWORD dwFunction = FUNC_GivePlayerParachute; @@ -207,12 +207,12 @@ CVehicle* CPlayerInfoSA::GetPlayerRemoteControlledCar() return (CVehicle*)VAR_PlayerRCCar; } -float CPlayerInfoSA::GetFPSMoveHeading(void) +float CPlayerInfoSA::GetFPSMoveHeading() { return this->GetInterface()->PlayerPedData.m_fFPSMoveHeading; } -bool CPlayerInfoSA::GetDoesNotGetTired(void) +bool CPlayerInfoSA::GetDoesNotGetTired() { return internalInterface->DoesNotGetTired; } @@ -222,7 +222,7 @@ void CPlayerInfoSA::SetDoesNotGetTired(bool bDoesNotGetTired) internalInterface->DoesNotGetTired = bDoesNotGetTired; } -short CPlayerInfoSA::GetLastTimeEaten(void) +short CPlayerInfoSA::GetLastTimeEaten() { return internalInterface->TimeLastEaten; } @@ -232,7 +232,7 @@ void CPlayerInfoSA::SetLastTimeEaten(short sTime) internalInterface->TimeLastEaten = sTime; } -DWORD CPlayerInfoSA::GetLastTimeBigGunFired(void) +DWORD CPlayerInfoSA::GetLastTimeBigGunFired() { return internalInterface->LastTimeBigGunFired; } diff --git a/Client/game_sa/CPlayerInfoSA.h b/Client/game_sa/CPlayerInfoSA.h index 2cc8173e828..761d0a3b53f 100644 --- a/Client/game_sa/CPlayerInfoSA.h +++ b/Client/game_sa/CPlayerInfoSA.h @@ -261,7 +261,7 @@ class CPlayerInfoSA : public CPlayerInfo this->wanted = NULL; // we can't init it yet, as our interface hasn't been inited yet } - ~CPlayerInfoSA(void) + ~CPlayerInfoSA() { if (wanted) { @@ -269,19 +269,19 @@ class CPlayerInfoSA : public CPlayerInfo } } - CPlayerInfoSAInterface* GetInterface(void) { return internalInterface; } + CPlayerInfoSAInterface* GetInterface() { return internalInterface; } CPlayerPed* GetPlayerPed(); CWanted* GetWanted(); - long GetPlayerMoney(void); + long GetPlayerMoney(); void SetPlayerMoney(long lMoney, bool bInstant); void GetCrossHair(bool& bActivated, float& fTargetX, float& fTargetY); - VOID GivePlayerParachute(VOID); + VOID GivePlayerParachute(); VOID StreamParachuteWeapon(bool bAllowParachute); - short GetLastTimeEaten(void); + short GetLastTimeEaten(); void SetLastTimeEaten(short sTime); VOID MakePlayerSafe(BOOL boolSafe); @@ -293,22 +293,22 @@ class CPlayerInfoSA : public CPlayerInfo VOID TakeRemoteControlledCarFromPlayer(); CVehicle* GetPlayerRemoteControlledCar(); - float GetFPSMoveHeading(void); + float GetFPSMoveHeading(); - bool GetDoesNotGetTired(void); + bool GetDoesNotGetTired(); void SetDoesNotGetTired(bool bDoesNotGetTired); - DWORD GetLastTimeBigGunFired(void); + DWORD GetLastTimeBigGunFired(); void SetLastTimeBigGunFired(DWORD dwTime); byte GetCamDrunkLevel(); void SetCamDrunkLevel(byte level); - DWORD GetCarTwoWheelCounter(void) { return internalInterface->nCarTwoWheelCounter; } - float GetCarTwoWheelDist(void) { return internalInterface->fCarTwoWheelDist; } - DWORD GetCarLess3WheelCounter(void) { return internalInterface->nCarLess3WheelCounter; } - DWORD GetBikeRearWheelCounter(void) { return internalInterface->nBikeRearWheelCounter; } - float GetBikeRearWheelDist(void) { return internalInterface->fBikeRearWheelDist; } - DWORD GetBikeFrontWheelCounter(void) { return internalInterface->nBikeFrontWheelCounter; } - float GetBikeFrontWheelDist(void) { return internalInterface->fBikeFrontWheelDist; } + DWORD GetCarTwoWheelCounter() { return internalInterface->nCarTwoWheelCounter; } + float GetCarTwoWheelDist() { return internalInterface->fCarTwoWheelDist; } + DWORD GetCarLess3WheelCounter() { return internalInterface->nCarLess3WheelCounter; } + DWORD GetBikeRearWheelCounter() { return internalInterface->nBikeRearWheelCounter; } + float GetBikeRearWheelDist() { return internalInterface->fBikeRearWheelDist; } + DWORD GetBikeFrontWheelCounter() { return internalInterface->nBikeFrontWheelCounter; } + float GetBikeFrontWheelDist() { return internalInterface->fBikeFrontWheelDist; } }; diff --git a/Client/game_sa/CPlayerPedSA.cpp b/Client/game_sa/CPlayerPedSA.cpp index f3522b2a473..9ecd5a494e3 100644 --- a/Client/game_sa/CPlayerPedSA.cpp +++ b/Client/game_sa/CPlayerPedSA.cpp @@ -123,7 +123,7 @@ CPlayerPedSA::CPlayerPedSA(CPlayerPedSAInterface* pPlayer) GetPlayerPedInterface()->pedFlags.bNeverEverTargetThisPed = true; } -CPlayerPedSA::~CPlayerPedSA(void) +CPlayerPedSA::~CPlayerPedSA() { DEBUG_TRACE("CPlayerPedSA::~CPlayerPedSA( )"); if (!this->BeingDeleted && DoNotRemoveFromGame == false) @@ -155,12 +155,12 @@ CPlayerPedSA::~CPlayerPedSA(void) } } -CWanted* CPlayerPedSA::GetWanted(void) +CWanted* CPlayerPedSA::GetWanted() { return m_pWanted; } -float CPlayerPedSA::GetSprintEnergy(void) +float CPlayerPedSA::GetSprintEnergy() { /* OutputDebugString("GetSprintEnergy HACK\n"); @@ -185,7 +185,7 @@ void CPlayerPedSA::SetSprintEnergy(float fSprintEnergy) m_pData->m_fSprintEnergy = fSprintEnergy; } -void CPlayerPedSA::SetInitialState(void) +void CPlayerPedSA::SetInitialState() { DWORD dwUnknown = 1; DWORD dwFunction = FUNC_SetInitialState; @@ -205,7 +205,7 @@ void CPlayerPedSA::SetInitialState(void) GetPlayerPedInterface()->pedFlags.bStayInSamePlace = false; } -eMoveAnim CPlayerPedSA::GetMoveAnim(void) +eMoveAnim CPlayerPedSA::GetMoveAnim() { CPedSAInterface* pedInterface = (CPedSAInterface*)this->GetInterface(); return (eMoveAnim)pedInterface->iMoveAnimGroup; @@ -603,7 +603,7 @@ void _declspec(naked) HOOK_CClothes_GetDefaultPlayerMotionGroup() // Setup hooks // ////////////////////////////////////////////////////////////////////////////////////////// -void CPlayerPedSA::StaticSetHooks(void) +void CPlayerPedSA::StaticSetHooks() { EZHookInstall(CPlayerPed_ProcessAnimGroups_Mid); EZHookInstall(CClothes_GetDefaultPlayerMotionGroup); diff --git a/Client/game_sa/CPlayerPedSA.h b/Client/game_sa/CPlayerPedSA.h index af141454012..9fe8bac711e 100644 --- a/Client/game_sa/CPlayerPedSA.h +++ b/Client/game_sa/CPlayerPedSA.h @@ -43,16 +43,16 @@ class CPlayerPedSA : public virtual CPlayerPed, public virtual CPedSA public: CPlayerPedSA(ePedModel pedType); CPlayerPedSA(CPlayerPedSAInterface* ped); - ~CPlayerPedSA(void); + ~CPlayerPedSA(); - CWanted* GetWanted(void); + CWanted* GetWanted(); - float GetSprintEnergy(void); + float GetSprintEnergy(); void SetSprintEnergy(float fSprintEnergy); - void SetInitialState(void); + void SetInitialState(); - eMoveAnim GetMoveAnim(void); + eMoveAnim GetMoveAnim(); void SetMoveAnim(eMoveAnim iAnimGroup); /* DWORD GetCurrentWeaponType ( void ); @@ -61,7 +61,7 @@ class CPlayerPedSA : public virtual CPlayerPed, public virtual CPedSA VOID ResetToInitialState ( void ); VOID ClearWeaponTarget ( void );*/ - CPlayerPedSAInterface* GetPlayerPedInterface(void) { return static_cast(m_pInterface); }; + CPlayerPedSAInterface* GetPlayerPedInterface() { return static_cast(m_pInterface); }; - static void StaticSetHooks(void); + static void StaticSetHooks(); }; diff --git a/Client/game_sa/CPoolsSA.cpp b/Client/game_sa/CPoolsSA.cpp index 8f09e01b2bf..c54c4e8c10c 100644 --- a/Client/game_sa/CPoolsSA.cpp +++ b/Client/game_sa/CPoolsSA.cpp @@ -30,7 +30,7 @@ CPoolsSA::CPoolsSA() PointerNodeSingleLinkPool = new CPointerNodeSingleLinkPoolSA(); } -CPoolsSA::~CPoolsSA(void) +CPoolsSA::~CPoolsSA() { // Make sure we've deleted all vehicles, objects, peds and buildings DeleteAllVehicles(); @@ -48,7 +48,7 @@ CPoolsSA::~CPoolsSA(void) delete PointerNodeSingleLinkPool; } -void CPoolsSA::DeleteAllBuildings(void) +void CPoolsSA::DeleteAllBuildings() { /* for ( int i = 0; i < MAX_BUILDINGS; i++ ) @@ -1327,12 +1327,12 @@ int CPoolsSA::GetNumberOfUsedSpaces(ePools pool) return iOut; } -CEntryInfoNodePool* CPoolsSA::GetEntryInfoNodePool(void) +CEntryInfoNodePool* CPoolsSA::GetEntryInfoNodePool() { return EntryInfoNodePool; } -int CEntryInfoNodePoolSA::GetNumberOfUsedSpaces(void) +int CEntryInfoNodePoolSA::GetNumberOfUsedSpaces() { DWORD dwFunc = FUNC_CEntryInfoNodePool_GetNoOfUsedSpaces; int iOut = 0; @@ -1347,12 +1347,12 @@ int CEntryInfoNodePoolSA::GetNumberOfUsedSpaces(void) return iOut; } -CPointerNodeDoubleLinkPool* CPoolsSA::GetPointerNodeDoubleLinkPool(void) +CPointerNodeDoubleLinkPool* CPoolsSA::GetPointerNodeDoubleLinkPool() { return PointerNodeDoubleLinkPool; } -int CPointerNodeDoubleLinkPoolSA::GetNumberOfUsedSpaces(void) +int CPointerNodeDoubleLinkPoolSA::GetNumberOfUsedSpaces() { DWORD dwFunc = FUNC_CPtrNodeDoubleLinkPool_GetNoOfUsedSpaces; int iOut = 0; @@ -1367,7 +1367,7 @@ int CPointerNodeDoubleLinkPoolSA::GetNumberOfUsedSpaces(void) return iOut; } -CPointerNodeSingleLinkPool* CPoolsSA::GetPointerNodeSingleLinkPool(void) +CPointerNodeSingleLinkPool* CPoolsSA::GetPointerNodeSingleLinkPool() { return PointerNodeSingleLinkPool; } @@ -1377,7 +1377,7 @@ void CPoolsSA::InvalidateLocalPlayerClientEntity() m_pedPool.arrayOfClientEntities[0] = {m_pedPool.arrayOfClientEntities[0].pEntity, nullptr}; } -int CPointerNodeSingleLinkPoolSA::GetNumberOfUsedSpaces(void) +int CPointerNodeSingleLinkPoolSA::GetNumberOfUsedSpaces() { DWORD dwFunc = FUNC_CPtrNodeSingleLinkPool_GetNoOfUsedSpaces; int iOut = 0; diff --git a/Client/game_sa/CProjectileInfoSA.cpp b/Client/game_sa/CProjectileInfoSA.cpp index ddb27fbf038..3f3dbf18494 100644 --- a/Client/game_sa/CProjectileInfoSA.cpp +++ b/Client/game_sa/CProjectileInfoSA.cpp @@ -169,7 +169,7 @@ bool CProjectileInfoSA::AddProjectile(CEntity* creator, eWeaponType eWeapon, CVe return dwReturn != 0; } -CEntity* CProjectileInfoSA::GetTarget(void) +CEntity* CProjectileInfoSA::GetTarget() { CEntitySAInterface* pTargetInterface = internalInterface->pEntProjectileTarget; CEntity* pTarget = NULL; @@ -201,7 +201,7 @@ void CProjectileInfoSA::SetTarget(CEntity* pEntity) internalInterface->pEntProjectileTarget = pEntitySA->GetInterface(); } -bool CProjectileInfoSA::IsActive(void) +bool CProjectileInfoSA::IsActive() { return (internalInterface->bProjectileActive == 1 && internalInterface->dwProjectileType != 0); } \ No newline at end of file diff --git a/Client/game_sa/CProjectileInfoSA.h b/Client/game_sa/CProjectileInfoSA.h index d7c4ebbf959..0d81c2dc559 100644 --- a/Client/game_sa/CProjectileInfoSA.h +++ b/Client/game_sa/CProjectileInfoSA.h @@ -71,11 +71,11 @@ class CProjectileInfoSA : public CProjectileInfo bool AddProjectile(CEntity* creator, eWeaponType eWeapon, CVector vecOrigin, float fForce, CVector* target, CEntity* targetEntity); CProjectile* GetProjectile(void* projectilePointer); - CEntity* GetTarget(void); + CEntity* GetTarget(); void SetTarget(CEntity* pEntity); - bool IsActive(void); + bool IsActive(); void SetCounter(DWORD dwCounter) { internalInterface->dwCounter = dwCounter + pGame->GetSystemTime(); } - DWORD GetCounter(void) { return internalInterface->dwCounter - pGame->GetSystemTime(); } + DWORD GetCounter() { return internalInterface->dwCounter - pGame->GetSystemTime(); } }; diff --git a/Client/game_sa/CProjectileSA.cpp b/Client/game_sa/CProjectileSA.cpp index 3530f714d56..1e597bc04d6 100644 --- a/Client/game_sa/CProjectileSA.cpp +++ b/Client/game_sa/CProjectileSA.cpp @@ -73,7 +73,7 @@ void CProjectileSA::Destroy(bool bBlow) // Corrects errors in the physics engine that cause projectiles to be far away from the objects they attached to // issue #8122 -bool CProjectileSA::CorrectPhysics(void) +bool CProjectileSA::CorrectPhysics() { // make sure we have an interface for our bomb/satchel CPhysicalSAInterface* pInterface = static_cast(m_pInterface); diff --git a/Client/game_sa/CProjectileSA.h b/Client/game_sa/CProjectileSA.h index 8d4920a87a4..3a677f53468 100644 --- a/Client/game_sa/CProjectileSA.h +++ b/Client/game_sa/CProjectileSA.h @@ -32,5 +32,5 @@ class CProjectileSA : public virtual CProjectile, public virtual CObjectSA bool CalculateImpactPosition(CEntitySAInterface* pCollidedWith, CVector vecInputStart, CVector& vecInputEnd); void SetProjectileInfo(CProjectileInfo* pProjectileInfo) { projectileInfo = pProjectileInfo; } - bool CorrectPhysics(void); + bool CorrectPhysics(); }; diff --git a/Client/game_sa/CQuadBikeSA.h b/Client/game_sa/CQuadBikeSA.h index d8185cdebab..c82ead95323 100644 --- a/Client/game_sa/CQuadBikeSA.h +++ b/Client/game_sa/CQuadBikeSA.h @@ -26,5 +26,5 @@ class CQuadBikeSA : public virtual CQuadBike, public virtual CAutomobileSA CQuadBikeSA(CQuadBikeSAInterface* quadbike); CQuadBikeSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2); - virtual ~CQuadBikeSA(void) {} + virtual ~CQuadBikeSA() {} }; diff --git a/Client/game_sa/CRenderWareSA.ClothesReplacing.cpp b/Client/game_sa/CRenderWareSA.ClothesReplacing.cpp index f8f79c732b1..782639f25ac 100644 --- a/Client/game_sa/CRenderWareSA.ClothesReplacing.cpp +++ b/Client/game_sa/CRenderWareSA.ClothesReplacing.cpp @@ -95,7 +95,7 @@ void CRenderWareSA::ClothesRemoveReplacementTxd(char* pFileData) // Returns true (once) if clothes textures need regenerating // //////////////////////////////////////////////////////////////// -bool CRenderWareSA::HasClothesReplacementChanged(void) +bool CRenderWareSA::HasClothesReplacementChanged() { bool bResult = bClothesReplacementChanged; bClothesReplacementChanged = false; @@ -220,7 +220,7 @@ void _declspec(naked) HOOK_CStreaming_RequestModel_Mid() // Setup hooks // ////////////////////////////////////////////////////////////////////////////////////////// -void CRenderWareSA::StaticSetClothesReplacingHooks(void) +void CRenderWareSA::StaticSetClothesReplacingHooks() { EZHookInstall(CStreaming_RequestModel_Mid); } diff --git a/Client/game_sa/CRenderWareSA.ShaderMatching.cpp b/Client/game_sa/CRenderWareSA.ShaderMatching.cpp index 48f65bfae44..c30a3bb499e 100644 --- a/Client/game_sa/CRenderWareSA.ShaderMatching.cpp +++ b/Client/game_sa/CRenderWareSA.ShaderMatching.cpp @@ -512,7 +512,7 @@ void CMatchChannelManager::AddToRematchQueue(CMatchChannel* pChannel) // // ////////////////////////////////////////////////////////////////// -void CMatchChannelManager::FlushChanges(void) +void CMatchChannelManager::FlushChanges() { if (!m_OptimizeQueue.empty()) ProcessOptimizeChannelsQueue(); @@ -534,7 +534,7 @@ void CMatchChannelManager::FlushChanges(void) // Reset replacement info for all changed channels // ////////////////////////////////////////////////////////////////// -void CMatchChannelManager::RecalcEverything(void) +void CMatchChannelManager::RecalcEverything() { OutputDebug(SString("RecalcEverything - %d channels", m_CreatedChannelList.size())); @@ -590,7 +590,7 @@ void CMatchChannelManager::RecalcEverything(void) // Recheck all textures against the required channels // ////////////////////////////////////////////////////////////////// -void CMatchChannelManager::ProcessRematchTexturesQueue(void) +void CMatchChannelManager::ProcessRematchTexturesQueue() { OutputDebug(SString("ProcessRematchTexturesQueue - %d items (%d textures)", m_RematchQueue.size(), m_AllTextureList.size())); @@ -635,7 +635,7 @@ void CMatchChannelManager::ProcessRematchTexturesQueue(void) // Merge channels which have the same match chain // ////////////////////////////////////////////////////////////////// -void CMatchChannelManager::ProcessOptimizeChannelsQueue(void) +void CMatchChannelManager::ProcessOptimizeChannelsQueue() { OutputDebug(SString("ProcessOptimizeChannelsQueue - %d items", m_OptimizeQueue.size())); @@ -793,7 +793,7 @@ CMatchChannel* CMatchChannelManager::GetChannel(const CShaderAndEntityPair& key) // Create a channel // ////////////////////////////////////////////////////////////////// -CMatchChannel* CMatchChannelManager::NewChannel(void) +CMatchChannel* CMatchChannelManager::NewChannel() { CMatchChannel* pChannel = new CMatchChannel(); MapInsert(m_CreatedChannelList, pChannel); diff --git a/Client/game_sa/CRenderWareSA.ShaderMatching.h b/Client/game_sa/CRenderWareSA.ShaderMatching.h index c4c4d9df62a..1785155ac53 100644 --- a/Client/game_sa/CRenderWareSA.ShaderMatching.h +++ b/Client/game_sa/CRenderWareSA.ShaderMatching.h @@ -130,7 +130,7 @@ class CShaderAndEntityPair class CMatchChannel { public: - CMatchChannel(void) + CMatchChannel() { m_bResetReplacements = false; m_uiId = ms_uiIdCounter++; @@ -172,7 +172,7 @@ class CMatchChannel MapRemove(m_ShaderAndEntityList, key); } - uint GetShaderAndEntityCount(void) const { return m_ShaderAndEntityList.size(); } + uint GetShaderAndEntityCount() const { return m_ShaderAndEntityList.size(); } void GetBestShaderForEntity(CClientEntityBase* pClientEntity, int iEntityType, SShaderInfoLayers& outShaderLayers) const { @@ -235,7 +235,7 @@ class CMatchChannel m_MatchChain = matchChain; } - const SWildcardMatchChain& GetMatchChain(void) const { return m_MatchChain; } + const SWildcardMatchChain& GetMatchChain() const { return m_MatchChain; } SWildcardMatchChain m_MatchChain; // String matches this channel represents CFastHashSet m_MatchedTextureList; // All textures whose name matches the match chain @@ -268,17 +268,17 @@ class CMatchChannelManager bool bSilent); void AddToOptimizeQueue(CMatchChannel* pChannel); void AddToRematchQueue(CMatchChannel* pChannel); - void FlushChanges(void); - void RecalcEverything(void); - void ProcessRematchTexturesQueue(void); - void ProcessOptimizeChannelsQueue(void); + void FlushChanges(); + void RecalcEverything(); + void ProcessRematchTexturesQueue(); + void ProcessOptimizeChannelsQueue(); void MergeChannelTo(CMatchChannel* pSource, CMatchChannel* pTarget); CMatchChannel* FindChannelWithMatchChain(const SWildcardMatchChain& matchChain, CMatchChannel* pExcluding); CMatchChannel* GetChannelOnlyUsedBy(SShaderInfo* pShaderInfo, CClientEntityBase* pClientEntity, bool bAppendLayers); void AddUsage(const CShaderAndEntityPair& key, CMatchChannel* pChannel); void RemoveUsage(const CShaderAndEntityPair& key, CMatchChannel* pChannel); CMatchChannel* GetChannel(const CShaderAndEntityPair& key); - CMatchChannel* NewChannel(void); + CMatchChannel* NewChannel(); void DeleteChannel(CMatchChannel* pChannel); SShaderInfo* GetShaderInfo(CSHADERDUMMY* pShaderData, bool bAddIfRequired, float fPriority, bool bLayered, int iTypeMask, uint uiShaderCreateTime, bool bUsesVertexShader); diff --git a/Client/game_sa/CRenderWareSA.ShaderSupport.cpp b/Client/game_sa/CRenderWareSA.ShaderSupport.cpp index 0ec902d174e..7dd01506e80 100644 --- a/Client/game_sa/CRenderWareSA.ShaderSupport.cpp +++ b/Client/game_sa/CRenderWareSA.ShaderSupport.cpp @@ -137,7 +137,7 @@ void _declspec(naked) HOOK_CTxdStore_RemoveTxd() // // //////////////////////////////////////////////////////////////// -void CRenderWareSA::InitTextureWatchHooks(void) +void CRenderWareSA::InitTextureWatchHooks() { HookInstall(HOOKPOS_CTxdStore_SetupTxdParent, (DWORD)HOOK_CTxdStore_SetupTxdParent, 6); HookInstall(HOOKPOS_CTxdStore_RemoveTxd, (DWORD)HOOK_CTxdStore_RemoveTxd, 6); @@ -158,7 +158,7 @@ void CRenderWareSA::InitTextureWatchHooks(void) // Process ms_txdStreamEventList // //////////////////////////////////////////////////////////////// -void CRenderWareSA::PulseWorldTextureWatch(void) +void CRenderWareSA::PulseWorldTextureWatch() { UpdateModuleTickCount64(); UpdateDisableGTAVertexShadersTimer(); @@ -552,7 +552,7 @@ void CRenderWareSA::RemoveShaderRefs(CSHADERDUMMY* pShaderItem) // Save/reset counters // //////////////////////////////////////////////////////////////// -void CRenderWareSA::ResetStats(void) +void CRenderWareSA::ResetStats() { m_uiNumReplacementRequests = m_uiReplacementRequestCounter; m_uiNumReplacementMatches = m_uiReplacementMatchCounter; @@ -580,7 +580,7 @@ void CRenderWareSA::GetShaderReplacementStats(SShaderReplacementStats& outStats) // // //////////////////////////////////////////////////////////////// -void CRenderWareSA::Initialize(void) +void CRenderWareSA::Initialize() { if (!MapContains(m_D3DDataTexInfoMap, FAKE_D3DTEXTURE_NO_TEXTURE)) { @@ -597,7 +597,7 @@ void CRenderWareSA::Initialize(void) // Disable GTA vertex shaders for the next 10 seconds // //////////////////////////////////////////////////////////////// -void CRenderWareSA::DisableGTAVertexShadersForAWhile(void) +void CRenderWareSA::DisableGTAVertexShadersForAWhile() { m_GTAVertexShadersDisabledTimer.Reset(); SetGTAVertexShadersEnabled(false); @@ -610,7 +610,7 @@ void CRenderWareSA::DisableGTAVertexShadersForAWhile(void) // Update countdown before automatically re enabling GTA vertex shaders // //////////////////////////////////////////////////////////////// -void CRenderWareSA::UpdateDisableGTAVertexShadersTimer(void) +void CRenderWareSA::UpdateDisableGTAVertexShadersTimer() { #if MTA_DEBUG if (m_GTAVertexShadersDisabledTimer.Get() > 1 * 1000) @@ -967,7 +967,7 @@ void _declspec(naked) HOOK_RwIm2DRenderPrimitive() // Setup hooks // ////////////////////////////////////////////////////////////////////////////////////////// -void CRenderWareSA::StaticSetHooks(void) +void CRenderWareSA::StaticSetHooks() { EZHookInstall(RwTextureSetName); EZHookInstall(RwTextureDestroy_Mid); diff --git a/Client/game_sa/CRenderWareSA.ShaderSupport.h b/Client/game_sa/CRenderWareSA.ShaderSupport.h index dd9850dc1a8..8c2b9b0451c 100644 --- a/Client/game_sa/CRenderWareSA.ShaderSupport.h +++ b/Client/game_sa/CRenderWareSA.ShaderSupport.h @@ -96,7 +96,7 @@ struct STexInfo struct SShaderInfoInstance { - SShaderInfoInstance(void) : pShaderInfo(NULL), bMixEntityAndNonEntity(false) {} + SShaderInfoInstance() : pShaderInfo(NULL), bMixEntityAndNonEntity(false) {} SShaderInfoInstance(SShaderInfo* pShaderInfo, bool bMixEntityAndNonEntity) : pShaderInfo(pShaderInfo), bMixEntityAndNonEntity(bMixEntityAndNonEntity) {} @@ -133,7 +133,7 @@ struct SShaderInfoLayers // struct STexShaderReplacement { - STexShaderReplacement(void) : bSet(false) /*, pShaderInfo ( NULL )*/ {} + STexShaderReplacement() : bSet(false) /*, pShaderInfo ( NULL )*/ {} bool bSet; SShaderInfoLayers shaderLayers; }; @@ -151,7 +151,7 @@ struct STexNameInfo #endif } - void ResetReplacementResults(void) + void ResetReplacementResults() { for (uint i = 0; i < NUMELMS(texNoEntityShaders); i++) texNoEntityShaders[i] = STexShaderReplacement(); diff --git a/Client/game_sa/CRenderWareSA.cpp b/Client/game_sa/CRenderWareSA.cpp index bcf9fc3e214..e5c6b86d204 100644 --- a/Client/game_sa/CRenderWareSA.cpp +++ b/Client/game_sa/CRenderWareSA.cpp @@ -193,7 +193,7 @@ CRenderWareSA::CRenderWareSA(eGameVersion version) m_bGTAVertexShadersEnabled = true; } -CRenderWareSA::~CRenderWareSA(void) +CRenderWareSA::~CRenderWareSA() { SAFE_DELETE(m_pMatchChannelManager); } diff --git a/Client/game_sa/CRenderWareSA.h b/Client/game_sa/CRenderWareSA.h index 0c571f3a734..3d92080d945 100644 --- a/Client/game_sa/CRenderWareSA.h +++ b/Client/game_sa/CRenderWareSA.h @@ -29,14 +29,14 @@ class CRenderWareSA : public CRenderWare public: ZERO_ON_NEW CRenderWareSA(enum eGameVersion version); - ~CRenderWareSA(void); - void Initialize(void); + ~CRenderWareSA(); + void Initialize(); bool ModelInfoTXDLoadTextures(SReplacementTextures* pReplacementTextures, const SString& strFilename, const CBuffer& fileData, bool bFilteringEnabled); bool ModelInfoTXDAddTextures(SReplacementTextures* pReplacementTextures, ushort usModelId); void ModelInfoTXDRemoveTextures(SReplacementTextures* pReplacementTextures); void ClothesAddReplacementTxd(char* pFileData, ushort usFileId); void ClothesRemoveReplacementTxd(char* pFileData); - bool HasClothesReplacementChanged(void); + bool HasClothesReplacementChanged(); // Reads and parses a TXD file specified by a path (szTXD) RwTexDictionary* ReadTXD(const SString& strFilename, const CBuffer& fileData); @@ -92,7 +92,7 @@ class CRenderWareSA : public CRenderWare bool ReplacePartModels(RpClump* pClump, RpAtomicContainer* pAtomics, unsigned int uiAtomics, const char* szName); ushort GetTXDIDForModelID(ushort usModelID); - void PulseWorldTextureWatch(void); + void PulseWorldTextureWatch(); void GetModelTextureNames(std::vector& outNameList, ushort usModelID); void GetTxdTextures(std::vector& outTextureList, ushort usTxdId); static void GetTxdTextures(std::vector& outTextureList, RwTexDictionary* pTXD); @@ -109,20 +109,20 @@ class CRenderWareSA : public CRenderWare // CRenderWareSA methods RwTexture* RightSizeTexture(RwTexture* pTexture, uint uiSizeLimit, SString& strError); - void ResetStats(void); + void ResetStats(); void GetShaderReplacementStats(SShaderReplacementStats& outStats); CModelTexturesInfo* GetModelTexturesInfo(ushort usModelId); RwFrame* GetFrameFromName(RpClump* pRoot, SString strName); - static void StaticSetHooks(void); - static void StaticSetClothesReplacingHooks(void); + static void StaticSetHooks(); + static void StaticSetClothesReplacingHooks(); static void RwTexDictionaryRemoveTexture(RwTexDictionary* pTXD, RwTexture* pTex); static bool RwTexDictionaryContainsTexture(RwTexDictionary* pTXD, RwTexture* pTex); static short CTxdStore_GetTxdRefcount(unsigned short usTxdID); static bool StaticGetTextureCB(RwTexture* texture, std::vector* pTextureList); - void InitTextureWatchHooks(void); + void InitTextureWatchHooks(); void StreamingAddedTexture(ushort usTxdId, const SString& strTextureName, CD3DDUMMY* pD3DData); void StreamingRemovedTxd(ushort usTxdId); void ScriptAddedTxd(RwTexDictionary* pTxd); @@ -137,8 +137,8 @@ class CRenderWareSA : public CRenderWare void OnTextureStreamIn(STexInfo* pTexInfo); void OnTextureStreamOut(STexInfo* pTexInfo); - void DisableGTAVertexShadersForAWhile(void); - void UpdateDisableGTAVertexShadersTimer(void); + void DisableGTAVertexShadersForAWhile(); + void UpdateDisableGTAVertexShadersTimer(); void SetGTAVertexShadersEnabled(bool bEnable); // Watched world textures diff --git a/Client/game_sa/CSettingsSA.cpp b/Client/game_sa/CSettingsSA.cpp index 0db231a0625..62eb2da07ec 100644 --- a/Client/game_sa/CSettingsSA.cpp +++ b/Client/game_sa/CSettingsSA.cpp @@ -37,7 +37,7 @@ void HOOK_StoreShadowForVehicle(); float ms_fVehicleLODDistance, ms_fTrainPlaneLODDistance, ms_fPedsLODDistance; -CSettingsSA::CSettingsSA(void) +CSettingsSA::CSettingsSA() { m_pInterface = (CSettingsSAInterface*)CLASS_CMenuManager; m_pInterface->bFrameLimiter = false; @@ -58,7 +58,7 @@ CSettingsSA::CSettingsSA(void) SetRadarMode(RADAR_MODE_ALL); } -bool CSettingsSA::IsWideScreenEnabled(void) +bool CSettingsSA::IsWideScreenEnabled() { return m_pInterface->bUseWideScreen; } @@ -68,7 +68,7 @@ void CSettingsSA::SetWideScreenEnabled(bool bEnabled) m_pInterface->bUseWideScreen = bEnabled; } -unsigned int CSettingsSA::GetNumVideoModes(void) +unsigned int CSettingsSA::GetNumVideoModes() { unsigned int uiReturn = 0; _asm @@ -93,7 +93,7 @@ VideoMode* CSettingsSA::GetVideoModeInfo(VideoMode* modeInfo, unsigned int modeI return pReturn; } -unsigned int CSettingsSA::GetCurrentVideoMode(void) +unsigned int CSettingsSA::GetCurrentVideoMode() { unsigned int uiReturn = 0; _asm @@ -120,7 +120,7 @@ void CSettingsSA::SetCurrentVideoMode(unsigned int modeIndex, bool bOnRestart) m_pInterface->dwVideoMode = modeIndex; } -uint CSettingsSA::GetNumAdapters(void) +uint CSettingsSA::GetNumAdapters() { unsigned int uiReturn = 0; _asm @@ -141,7 +141,7 @@ void CSettingsSA::SetAdapter(unsigned int uiAdapterIndex) } } -unsigned int CSettingsSA::GetCurrentAdapter(void) +unsigned int CSettingsSA::GetCurrentAdapter() { unsigned int uiReturn = 0; _asm @@ -152,7 +152,7 @@ unsigned int CSettingsSA::GetCurrentAdapter(void) return uiReturn; } -unsigned char CSettingsSA::GetRadioVolume(void) +unsigned char CSettingsSA::GetRadioVolume() { return m_pInterface->ucRadioVolume; } @@ -163,7 +163,7 @@ void CSettingsSA::SetRadioVolume(unsigned char ucVolume) pGame->GetAudioEngine()->SetMusicMasterVolume(ucVolume); } -unsigned char CSettingsSA::GetSFXVolume(void) +unsigned char CSettingsSA::GetSFXVolume() { return m_pInterface->ucSfxVolume; } @@ -174,7 +174,7 @@ void CSettingsSA::SetSFXVolume(unsigned char ucVolume) pGame->GetAudioEngine()->SetEffectsMasterVolume(ucVolume); } -unsigned int CSettingsSA::GetUsertrackMode(void) +unsigned int CSettingsSA::GetUsertrackMode() { // 0 = radio, 1 = random, 2 = sequential return m_pInterface->ucUsertrackMode; @@ -185,7 +185,7 @@ void CSettingsSA::SetUsertrackMode(unsigned int uiMode) m_pInterface->ucUsertrackMode = uiMode; } -bool CSettingsSA::IsUsertrackAutoScan(void) +bool CSettingsSA::IsUsertrackAutoScan() { // 1 = yes, 0 = no return m_pInterface->bUsertrackAutoScan; @@ -196,7 +196,7 @@ void CSettingsSA::SetUsertrackAutoScan(bool bEnable) m_pInterface->bUsertrackAutoScan = bEnable; } -bool CSettingsSA::IsRadioEqualizerEnabled(void) +bool CSettingsSA::IsRadioEqualizerEnabled() { // 1 = on, 0 = off return m_pInterface->bRadioEqualizer; @@ -207,7 +207,7 @@ void CSettingsSA::SetRadioEqualizerEnabled(bool bEnable) m_pInterface->bRadioEqualizer = bEnable; } -bool CSettingsSA::IsRadioAutotuneEnabled(void) +bool CSettingsSA::IsRadioAutotuneEnabled() { // 1 = on, 0 = off return m_pInterface->bRadioAutotune; @@ -219,7 +219,7 @@ void CSettingsSA::SetRadioAutotuneEnabled(bool bEnable) } // Minimum is 0.925 and maximum is 1.8 -float CSettingsSA::GetDrawDistance(void) +float CSettingsSA::GetDrawDistance() { return m_pInterface->fDrawDistance; } @@ -292,7 +292,7 @@ void CSettingsSA::SetAntiAliasing(unsigned int uiAntiAliasing, bool bOnRestart) m_pInterface->dwAntiAliasing = uiAntiAliasing; } -bool CSettingsSA::IsMipMappingEnabled(void) +bool CSettingsSA::IsMipMappingEnabled() { return m_pInterface->bMipMapping; } @@ -312,7 +312,7 @@ void CSettingsSA::Save() } } -bool CSettingsSA::IsVolumetricShadowsEnabled(void) +bool CSettingsSA::IsVolumetricShadowsEnabled() { return m_bVolumetricShadowsEnabled && !m_bVolumetricShadowsSuspended; } @@ -405,12 +405,12 @@ void _declspec(naked) HOOK_StoreShadowForVehicle() // AspectRatio // //////////////////////////////////////////////// -eAspectRatio CSettingsSA::GetAspectRatio(void) +eAspectRatio CSettingsSA::GetAspectRatio() { return m_AspectRatio; } -float CSettingsSA::GetAspectRatioValue(void) +float CSettingsSA::GetAspectRatioValue() { return *(float*)0xC3EFA4; } @@ -454,7 +454,7 @@ void CSettingsSA::SetAspectRatio(eAspectRatio aspectRatio, bool bAdjustmentEnabl // Grass // //////////////////////////////////////////////// -bool CSettingsSA::IsGrassEnabled(void) +bool CSettingsSA::IsGrassEnabled() { return *(BYTE*)0x05DBAED == 0x85; } @@ -469,7 +469,7 @@ void CSettingsSA::SetGrassEnabled(bool bEnable) // HUD mode (radar map + blips, blips only, nothing) // //////////////////////////////////////////////// -eRadarMode CSettingsSA::GetRadarMode(void) +eRadarMode CSettingsSA::GetRadarMode() { return *(eRadarMode*)VAR_RadarMode; } @@ -491,22 +491,22 @@ bool ms_bFOVPlayerFromScript = false; bool ms_bFOVVehicleFromScript = false; // consider moving this to the camera class - qaisjp -float CSettingsSA::GetFieldOfViewPlayer(void) +float CSettingsSA::GetFieldOfViewPlayer() { return ms_fFOV; } -float CSettingsSA::GetFieldOfViewVehicle(void) +float CSettingsSA::GetFieldOfViewVehicle() { return ms_fFOVCar; } -float CSettingsSA::GetFieldOfViewVehicleMax(void) +float CSettingsSA::GetFieldOfViewVehicleMax() { return ms_fFOVCarMax; } -void CSettingsSA::UpdateFieldOfViewFromSettings(void) +void CSettingsSA::UpdateFieldOfViewFromSettings() { float fFieldOfView; g_pCore->GetCVars()->Get("fov", fFieldOfView); @@ -516,7 +516,7 @@ void CSettingsSA::UpdateFieldOfViewFromSettings(void) SetFieldOfViewVehicleMax(100, false); } -void CSettingsSA::ResetFieldOfViewFromScript(void) +void CSettingsSA::ResetFieldOfViewFromScript() { ms_bFOVPlayerFromScript = false; ms_bFOVVehicleFromScript = false; @@ -568,7 +568,7 @@ void CSettingsSA::SetVehiclesLODDistance(float fVehiclesLODDistance, float fTrai ms_fTrainPlaneLODDistance = fTrainsPlanesLODDistance; } -void CSettingsSA::ResetVehiclesLODDistance(void) +void CSettingsSA::ResetVehiclesLODDistance() { bool bHighDetailVehicles; g_pCore->GetCVars()->Get("high_detail_vehicles", bHighDetailVehicles); @@ -628,7 +628,7 @@ void CSettingsSA::ResetPedsLODDistance() // Return true if DirectX says we have resolutions available that are higher that the desktop // //////////////////////////////////////////////// -bool CSettingsSA::HasUnsafeResolutions(void) +bool CSettingsSA::HasUnsafeResolutions() { uint numVidModes = GetNumVideoModes(); for (uint vidMode = 0; vidMode < numVidModes; vidMode++) @@ -731,7 +731,7 @@ uint CSettingsSA::FindVideoMode(int iResX, int iResY, int iColorBits) // Set/validate the required video mode // ////////////////////////////////////////////////////////////////////////////////////////// -void CSettingsSA::SetValidVideoMode(void) +void CSettingsSA::SetValidVideoMode() { bool bValid = false; int iWidth, iHeight, iColorBits, iAdapterIndex; @@ -832,7 +832,7 @@ void CSettingsSA::SetValidVideoMode(void) // return 2 for multi adapter show dialog // ////////////////////////////////////////////////////////////////////////////////////////// -int CSettingsSA::OnSelectDevice(void) +int CSettingsSA::OnSelectDevice() { if (GetNumAdapters() > 1 && g_pCore->GetDeviceSelectionEnabled()) { @@ -860,7 +860,7 @@ int CSettingsSA::OnSelectDevice(void) // * Choose whether to show the device selection dialog box // ////////////////////////////////////////////////////////////////////////////////////////// -__declspec(noinline) int OnMY_SelectDevice(void) +__declspec(noinline) int OnMY_SelectDevice() { CSettingsSA* gameSettings = (CSettingsSA*)pGame->GetSettings(); return gameSettings->OnSelectDevice(); @@ -901,7 +901,7 @@ void _declspec(naked) HOOK_SelectDevice() // Setup hooks // //////////////////////////////////////////////// -void CSettingsSA::StaticSetHooks(void) +void CSettingsSA::StaticSetHooks() { EZHookInstall(SelectDevice); } diff --git a/Client/game_sa/CSettingsSA.h b/Client/game_sa/CSettingsSA.h index f8996e5c42b..35db8b73fbf 100644 --- a/Client/game_sa/CSettingsSA.h +++ b/Client/game_sa/CSettingsSA.h @@ -91,88 +91,88 @@ class CSettingsSA : public CGameSettings int m_iDesktopHeight; public: - CSettingsSA(void); + CSettingsSA(); - bool IsWideScreenEnabled(void); + bool IsWideScreenEnabled(); void SetWideScreenEnabled(bool bEnabled); - unsigned int GetNumVideoModes(void); + unsigned int GetNumVideoModes(); VideoMode* GetVideoModeInfo(VideoMode* modeInfo, unsigned int modeIndex); - unsigned int GetCurrentVideoMode(void); + unsigned int GetCurrentVideoMode(); void SetCurrentVideoMode(unsigned int modeIndex, bool bOnRestart); - unsigned int GetNumAdapters(void); - unsigned int GetCurrentAdapter(void); + unsigned int GetNumAdapters(); + unsigned int GetCurrentAdapter(); void SetAdapter(unsigned int uiAdapterIndex); - bool HasUnsafeResolutions(void); + bool HasUnsafeResolutions(); bool IsUnsafeResolution(int iWidth, int iHeight); - unsigned char GetRadioVolume(void); + unsigned char GetRadioVolume(); void SetRadioVolume(unsigned char ucVolume); - unsigned char GetSFXVolume(void); + unsigned char GetSFXVolume(); void SetSFXVolume(unsigned char ucVolume); - unsigned int GetUsertrackMode(void); + unsigned int GetUsertrackMode(); void SetUsertrackMode(unsigned int uiMode); - bool IsUsertrackAutoScan(void); + bool IsUsertrackAutoScan(); void SetUsertrackAutoScan(bool bEnable); - bool IsRadioEqualizerEnabled(void); + bool IsRadioEqualizerEnabled(); void SetRadioEqualizerEnabled(bool bEnable); - bool IsRadioAutotuneEnabled(void); + bool IsRadioAutotuneEnabled(); void SetRadioAutotuneEnabled(bool bEnable); - float GetDrawDistance(void); + float GetDrawDistance(); void SetDrawDistance(float fDrawDistance); - unsigned int GetBrightness(void); + unsigned int GetBrightness(); void SetBrightness(unsigned int uiBrightness); - unsigned int GetFXQuality(void); + unsigned int GetFXQuality(); void SetFXQuality(unsigned int fxQualityId); - float GetMouseSensitivity(void); + float GetMouseSensitivity(); void SetMouseSensitivity(float fSensitivity); - unsigned int GetAntiAliasing(void); + unsigned int GetAntiAliasing(); void SetAntiAliasing(unsigned int uiAntiAliasing, bool bOnRestart); - bool IsMipMappingEnabled(void); + bool IsMipMappingEnabled(); void SetMipMappingEnabled(bool bEnable); - bool IsVolumetricShadowsEnabled(void); + bool IsVolumetricShadowsEnabled(); void SetVolumetricShadowsEnabled(bool bEnable); void SetVolumetricShadowsSuspended(bool bSuspended); - float GetAspectRatioValue(void); - eAspectRatio GetAspectRatio(void); + float GetAspectRatioValue(); + eAspectRatio GetAspectRatio(); void SetAspectRatio(eAspectRatio aspectRatio, bool bAdjustmentEnabled = true); - bool IsGrassEnabled(void); + bool IsGrassEnabled(); void SetGrassEnabled(bool bEnable); - eRadarMode GetRadarMode(void); + eRadarMode GetRadarMode(); void SetRadarMode(eRadarMode hudMode); - void UpdateFieldOfViewFromSettings(void); - void ResetFieldOfViewFromScript(void); + void UpdateFieldOfViewFromSettings(); + void ResetFieldOfViewFromScript(); void SetFieldOfViewPlayer(float fAngle, bool bFromScript); void SetFieldOfViewVehicle(float fAngle, bool bFromScript); void SetFieldOfViewVehicleMax(float fAngle, bool bFromScript); - float GetFieldOfViewPlayer(void); - float GetFieldOfViewVehicle(void); - float GetFieldOfViewVehicleMax(void); + float GetFieldOfViewPlayer(); + float GetFieldOfViewVehicle(); + float GetFieldOfViewVehicleMax(); void SetVehiclesLODDistance(float fVehiclesLODDistance, float fTrainsPlanesLODDistance); - void ResetVehiclesLODDistance(void); + void ResetVehiclesLODDistance(); void GetVehiclesLODDistance(float& fVehiclesLODDistance, float& fTrainsPlanesLODDistance); - void Save(void); + void Save(); void SetPedsLODDistance(float fPedsLODDistance); - void ResetPedsLODDistance(void); - float GetPedsLODDistance(void); + void ResetPedsLODDistance(); + float GetPedsLODDistance(); - static void StaticSetHooks(void); + static void StaticSetHooks(); uint FindVideoMode(int iResX, int iResY, int iColorBits); - void SetValidVideoMode(void); - int OnSelectDevice(void); + void SetValidVideoMode(); + int OnSelectDevice(); private: static unsigned long FUNC_GetNumVideoModes; diff --git a/Client/game_sa/CStreamingSA.cpp b/Client/game_sa/CStreamingSA.cpp index d2b9b7e9505..063eb8d7f45 100644 --- a/Client/game_sa/CStreamingSA.cpp +++ b/Client/game_sa/CStreamingSA.cpp @@ -23,7 +23,7 @@ namespace DWORD numModelsRequested; DWORD memoryUsed; - void Record(void) + void Record() { #define VAR_CStreaming_bLoadingBigModel 0x08E4A58 #define VAR_CStreaming_numPriorityRequests 0x08E4BA0 diff --git a/Client/game_sa/CTaskManagementSystemSA.cpp b/Client/game_sa/CTaskManagementSystemSA.cpp index c5c4420f6fb..b8ba98ef828 100644 --- a/Client/game_sa/CTaskManagementSystemSA.cpp +++ b/Client/game_sa/CTaskManagementSystemSA.cpp @@ -17,13 +17,13 @@ VOID HOOK_CTask_Operator_Delete(); CTaskSAInterface* pTempTaskInterface = 0; -CTaskManagementSystemSA::CTaskManagementSystemSA(void) +CTaskManagementSystemSA::CTaskManagementSystemSA() { // Install our hook used to delete our tasks when GTA does HookInstall(FUNC_CTask_Operator_Delete, (DWORD)HOOK_CTask_Operator_Delete, 6); } -CTaskManagementSystemSA::~CTaskManagementSystemSA(void) +CTaskManagementSystemSA::~CTaskManagementSystemSA() { // Delete all the entries list::const_iterator iter = m_TaskList.begin(); diff --git a/Client/game_sa/CTaskManagementSystemSA.h b/Client/game_sa/CTaskManagementSystemSA.h index 8d48c0637e4..63a5b7bd49f 100644 --- a/Client/game_sa/CTaskManagementSystemSA.h +++ b/Client/game_sa/CTaskManagementSystemSA.h @@ -24,8 +24,8 @@ class CTaskManagementSystemSA; class CTaskManagementSystemSA : public CTaskManagementSystem { public: - CTaskManagementSystemSA(void); - ~CTaskManagementSystemSA(void); + CTaskManagementSystemSA(); + ~CTaskManagementSystemSA(); CTask* AddTask(CTaskSA* pTask); void RemoveTask(CTaskSAInterface* pTaskInterface); diff --git a/Client/game_sa/CTasksSA.cpp b/Client/game_sa/CTasksSA.cpp index a915307354c..e6309ed7b87 100644 --- a/Client/game_sa/CTasksSA.cpp +++ b/Client/game_sa/CTasksSA.cpp @@ -17,7 +17,7 @@ CTasksSA::CTasksSA(CTaskManagementSystemSA* pTaskManagementSystem) m_pTaskManagementSystem = pTaskManagementSystem; } -CTaskSimplePlayerOnFoot* CTasksSA::CreateTaskSimplePlayerOnFoot(void) +CTaskSimplePlayerOnFoot* CTasksSA::CreateTaskSimplePlayerOnFoot() { DEBUG_TRACE("CTaskSimplePlayerOnFoot* CTasksSA::CreateTaskSimplePlayerOnFoot ( void )"); @@ -26,7 +26,7 @@ CTaskSimplePlayerOnFoot* CTasksSA::CreateTaskSimplePlayerOnFoot(void) return pTask; } -CTaskComplexFacial* CTasksSA::CreateTaskComplexFacial(void) +CTaskComplexFacial* CTasksSA::CreateTaskComplexFacial() { DEBUG_TRACE("CTaskComplexFacial* CTasksSA::CreateTaskComplexFacial ( void )"); @@ -345,7 +345,7 @@ void _declspec(naked) HOOK_CEventHandler_ComputeDamageResponse_Mid() // Setup hooks // ////////////////////////////////////////////////////////////////////////////////////////// -void CTasksSA::StaticSetHooks(void) +void CTasksSA::StaticSetHooks() { EZHookInstall(CEventHandler_ComputeDamageResponse_Mid); } diff --git a/Client/game_sa/CTasksSA.h b/Client/game_sa/CTasksSA.h index 5c16566457d..00795dc3a46 100644 --- a/Client/game_sa/CTasksSA.h +++ b/Client/game_sa/CTasksSA.h @@ -36,8 +36,8 @@ class CTasksSA : public CTasks public: CTasksSA(CTaskManagementSystemSA* pTaskManagementSystem); - CTaskSimplePlayerOnFoot* CreateTaskSimplePlayerOnFoot(void); - CTaskComplexFacial* CreateTaskComplexFacial(void); + CTaskSimplePlayerOnFoot* CreateTaskSimplePlayerOnFoot(); + CTaskComplexFacial* CreateTaskComplexFacial(); CTaskSimpleCarSetPedInAsDriver* CreateTaskSimpleCarSetPedInAsDriver(CVehicle* pVehicle); CTaskSimpleCarSetPedInAsPassenger* CreateTaskSimpleCarSetPedInAsPassenger(CVehicle* pVehicle, int iTargetDoor); @@ -90,5 +90,5 @@ class CTasksSA : public CTasks unsigned char bAimImmediate = false); CTaskSimpleFight* CreateTaskSimpleFight(CEntity* pTargetEntity, int nCommand, unsigned int nIdlePeriod = 10000); - static void StaticSetHooks(void); + static void StaticSetHooks(); }; diff --git a/Client/game_sa/CTheCarGeneratorsSA.cpp b/Client/game_sa/CTheCarGeneratorsSA.cpp index 0aa803bae77..3eef45056ee 100644 --- a/Client/game_sa/CTheCarGeneratorsSA.cpp +++ b/Client/game_sa/CTheCarGeneratorsSA.cpp @@ -18,7 +18,7 @@ CTheCarGeneratorsSA::CTheCarGeneratorsSA() CarGenerators[i] = new CCarGeneratorSA((CCarGeneratorSAInterface*)(ARRAY_CarGenerators + i * sizeof(CCarGeneratorSAInterface))); } -CTheCarGeneratorsSA::~CTheCarGeneratorsSA(void) +CTheCarGeneratorsSA::~CTheCarGeneratorsSA() { for (int i = 0; i < MAX_CAR_GENERATORS; i++) { diff --git a/Client/game_sa/CTrailerSA.h b/Client/game_sa/CTrailerSA.h index 16cc507c533..c0a7bb4de3f 100644 --- a/Client/game_sa/CTrailerSA.h +++ b/Client/game_sa/CTrailerSA.h @@ -26,5 +26,5 @@ class CTrailerSA : public virtual CTrailer, public virtual CAutomobileSA CTrailerSA(CTrailerSAInterface* trailer); CTrailerSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2); - virtual ~CTrailerSA(void) {} + virtual ~CTrailerSA() {} }; diff --git a/Client/game_sa/CVehicleSA.cpp b/Client/game_sa/CVehicleSA.cpp index 753e75a5d0a..c195df184e6 100644 --- a/Client/game_sa/CVehicleSA.cpp +++ b/Client/game_sa/CVehicleSA.cpp @@ -246,7 +246,7 @@ CVehicleSA::CVehicleSA(CVehicleSAInterface* pVehicleInterface) #endif } -void CVehicleSA::Init(void) +void CVehicleSA::Init() { m_pInterface->bStreamingDontDelete = true; m_pInterface->bDontStream = true; @@ -431,12 +431,12 @@ VOID CVehicleSA::SetMoveSpeed(CVector* vecMoveSpeed) #endif } -CVehicleSAInterface* CVehicleSA::GetNextCarriageInTrain(void) +CVehicleSAInterface* CVehicleSA::GetNextCarriageInTrain() { return (CVehicleSAInterface*)*(DWORD*)((DWORD)this->GetInterface() + 1492); } -CVehicle* CVehicleSA::GetNextTrainCarriage(void) +CVehicle* CVehicleSA::GetNextTrainCarriage() { CVehicleSAInterface* pVehicle = GetNextCarriageInTrain(); if (pVehicle) @@ -470,7 +470,7 @@ void CVehicleSA::SetNextTrainCarriage(CVehicle* pNext) } } -CVehicleSAInterface* CVehicleSA::GetPreviousCarriageInTrain(void) +CVehicleSAInterface* CVehicleSA::GetPreviousCarriageInTrain() { return (CVehicleSAInterface*)*(DWORD*)((DWORD)this->GetInterface() + 1488); } @@ -493,7 +493,7 @@ void CVehicleSA::SetPreviousTrainCarriage(CVehicle* pPrevious) } } -CVehicle* CVehicleSA::GetPreviousTrainCarriage(void) +CVehicle* CVehicleSA::GetPreviousTrainCarriage() { CVehicleSAInterface* pVehicle = GetPreviousCarriageInTrain(); if (pVehicle) @@ -559,7 +559,7 @@ void CVehicleSA::DetachTrainCarriage(CVehicle* pCarriage) } } -bool CVehicleSA::IsChainEngine(void) +bool CVehicleSA::IsChainEngine() { return GetVehicleInterface()->trainFlags.bIsTheChainEngine; } @@ -569,7 +569,7 @@ void CVehicleSA::SetIsChainEngine(bool bChainEngine) GetVehicleInterface()->trainFlags.bIsTheChainEngine = bChainEngine; } -bool CVehicleSA::IsDerailed(void) +bool CVehicleSA::IsDerailed() { CVehicleSAInterface* pInterface = GetVehicleInterface(); return pInterface->trainFlags.bIsDerailed; @@ -685,7 +685,7 @@ void CVehicleSA::SetTrainPosition(float fPosition, bool bRecalcOnRailDistance) } } -bool CVehicleSA::CanPedEnterCar(void) +bool CVehicleSA::CanPedEnterCar() { DEBUG_TRACE("bool CVehicleSA::CanPedEnterCar ( void )"); DWORD dwThis = (DWORD)m_pInterface; @@ -768,7 +768,7 @@ bool CVehicleSA::AreSwingingDoorsAllowed() const return m_bSwingingDoorsAllowed; } -bool CVehicleSA::AreDoorsLocked(void) +bool CVehicleSA::AreDoorsLocked() { return (GetVehicleInterface()->ul_doorstate == 2 || GetVehicleInterface()->ul_doorstate == 5 || GetVehicleInterface()->ul_doorstate == 4 || GetVehicleInterface()->ul_doorstate == 7 || GetVehicleInterface()->ul_doorstate == 3); @@ -795,7 +795,7 @@ void CVehicleSA::LockDoors(bool bLocked) } } -bool CVehicleSA::AreDoorsUndamageable(void) +bool CVehicleSA::AreDoorsUndamageable() { return (GetVehicleInterface()->ul_doorstate == 1 || GetVehicleInterface()->ul_doorstate == 7); } @@ -909,7 +909,7 @@ bool CVehicleSA::CanPedStepOutCar(bool bUnknown) return bReturn; } -bool CVehicleSA::CarHasRoof(void) +bool CVehicleSA::CarHasRoof() { DEBUG_TRACE("bool CVehicleSA::CarHasRoof ( void )"); DWORD dwThis = (DWORD)m_pInterface; @@ -926,7 +926,7 @@ bool CVehicleSA::CarHasRoof(void) return bReturn; } -void CVehicleSA::ExtinguishCarFire(void) +void CVehicleSA::ExtinguishCarFire() { DEBUG_TRACE("void CVehicleSA::ExtinguishCarFire ( void )"); DWORD dwThis = (DWORD)m_pInterface; @@ -939,7 +939,7 @@ void CVehicleSA::ExtinguishCarFire(void) } } -DWORD CVehicleSA::GetBaseVehicleType(void) +DWORD CVehicleSA::GetBaseVehicleType() { DEBUG_TRACE("DWORD CVehicleSA::GetBaseVehicleType ( void )"); DWORD dwThis = (DWORD)m_pInterface; @@ -963,25 +963,25 @@ void CVehicleSA::SetBodyDirtLevel(float fDirtLevel) GetVehicleInterface()->nBodyDirtLevel = fDirtLevel; } -float CVehicleSA::GetBodyDirtLevel(void) +float CVehicleSA::GetBodyDirtLevel() { DEBUG_TRACE("float CVehicleSA::GetBodyDirtLevel ( void )"); return GetVehicleInterface()->nBodyDirtLevel; } -unsigned char CVehicleSA::GetCurrentGear(void) +unsigned char CVehicleSA::GetCurrentGear() { DEBUG_TRACE("unsigned char CVehicleSA::GetCurrentGear ( void )"); return GetVehicleInterface()->m_nCurrentGear; } -float CVehicleSA::GetGasPedal(void) +float CVehicleSA::GetGasPedal() { DEBUG_TRACE("float CVehicleSA::GetGasPedal ( void )"); return GetVehicleInterface()->m_fGasPedal; } -float CVehicleSA::GetHeightAboveRoad(void) +float CVehicleSA::GetHeightAboveRoad() { DEBUG_TRACE("float CVehicleSA::GetHeightAboveRoad ( void )"); DWORD dwThis = (DWORD)GetVehicleInterface(); @@ -998,7 +998,7 @@ float CVehicleSA::GetHeightAboveRoad(void) return fReturn; } -float CVehicleSA::GetSteerAngle(void) +float CVehicleSA::GetSteerAngle() { DEBUG_TRACE("float CVehicleSA::GetSteerAngle ( void )"); return GetVehicleInterface()->m_fSteerAngle; @@ -1051,7 +1051,7 @@ bool CVehicleSA::GetTowHitchPos(CVector* pVector) return bReturn; } -bool CVehicleSA::IsOnItsSide(void) +bool CVehicleSA::IsOnItsSide() { DEBUG_TRACE("bool CVehicleSA::IsOnItsSide ( void )"); DWORD dwThis = (DWORD)m_pInterface; @@ -1067,7 +1067,7 @@ bool CVehicleSA::IsOnItsSide(void) return bReturn; } -bool CVehicleSA::IsLawEnforcementVehicle(void) +bool CVehicleSA::IsLawEnforcementVehicle() { DEBUG_TRACE("bool CVehicleSA::IsLawEnforcementVehicle ( void )"); DWORD dwThis = (DWORD)m_pInterface; @@ -1123,7 +1123,7 @@ bool CVehicleSA::IsSphereTouchingVehicle(CVector* vecOrigin, float fRadius) return bReturn; } -bool CVehicleSA::IsUpsideDown(void) +bool CVehicleSA::IsUpsideDown() { DEBUG_TRACE("bool CVehicleSA::IsUpsideDown ( void )"); DWORD dwThis = (DWORD)m_pInterface; @@ -1169,7 +1169,7 @@ void CVehicleSA::SetEngineOn(bool bEngineOn) } } -CPed* CVehicleSA::GetDriver(void) +CPed* CVehicleSA::GetDriver() { DEBUG_TRACE("CPed* CVehicleSA::GetDriver ( void )"); CPoolsSA* pPools = (CPoolsSA*)pGame->GetPools(); @@ -1609,7 +1609,7 @@ bool CVehicleSA::IsLandingGearDown() return false; } -void CVehicleSA::Fix(void) +void CVehicleSA::Fix() { DEBUG_TRACE("void CVehicleSA::Fix ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -1685,23 +1685,23 @@ void CVehicleSA::FadeOut(bool bFadeOut) vehicle->m_nVehicleFlags.bFadeOut = bFadeOut; } -bool CVehicleSA::IsFadingOut(void) +bool CVehicleSA::IsFadingOut() { CVehicleSAInterface* vehicle = (CVehicleSAInterface*)this->GetInterface(); return vehicle->m_nVehicleFlags.bFadeOut; } -unsigned char CVehicleSA::GetNumberGettingIn(void) +unsigned char CVehicleSA::GetNumberGettingIn() { return GetVehicleInterface()->m_nNumGettingIn; } -unsigned char CVehicleSA::GetPassengerCount(void) +unsigned char CVehicleSA::GetPassengerCount() { return GetVehicleInterface()->m_nNumPassengers; } -unsigned char CVehicleSA::GetMaxPassengerCount(void) +unsigned char CVehicleSA::GetMaxPassengerCount() { return GetVehicleInterface()->m_nMaxPassengers; } @@ -1726,7 +1726,7 @@ void CVehicleSA::SetTowLink(CVehicle* pVehicle) } } -bool CVehicleSA::BreakTowLink(void) +bool CVehicleSA::BreakTowLink() { DEBUG_TRACE("bool CVehicleSA::BreakTowLink ( void )"); DWORD dwThis = (DWORD)GetInterface(); @@ -1744,7 +1744,7 @@ bool CVehicleSA::BreakTowLink(void) return bReturn; } -CVehicle* CVehicleSA::GetTowedVehicle(void) +CVehicle* CVehicleSA::GetTowedVehicle() { DEBUG_TRACE("CVehicle * CVehicleSA::GetTowedVehicle ( void )"); CVehicleSAInterface* pTowedVehicle = (CVehicleSAInterface*)*(DWORD*)((DWORD)this->GetInterface() + 1224); @@ -1756,7 +1756,7 @@ CVehicle* CVehicleSA::GetTowedVehicle(void) return NULL; } -CVehicle* CVehicleSA::GetTowedByVehicle(void) +CVehicle* CVehicleSA::GetTowedByVehicle() { DEBUG_TRACE("CVehicle * CVehicleSA::GetTowedVehicle ( void )"); CVehicleSAInterface* pTowedVehicle = (CVehicleSAInterface*)*(DWORD*)((DWORD)this->GetInterface() + 1220); @@ -1795,7 +1795,7 @@ void CVehicleSA::PickupEntityWithWinch(CEntity* pEntity) } } -void CVehicleSA::ReleasePickedUpEntityWithWinch(void) +void CVehicleSA::ReleasePickedUpEntityWithWinch() { DWORD dwFunc = FUNC_CVehicle_ReleasePickedUpEntityWithWinch; DWORD dwThis = (DWORD)GetInterface(); @@ -1853,7 +1853,7 @@ void CVehicleSA::SetRemap(int iRemap) } } -int CVehicleSA::GetRemapIndex(void) +int CVehicleSA::GetRemapIndex() { DWORD dwFunc = FUNC_CVehicle__GetRemapIndex; DWORD dwThis = (DWORD)GetInterface(); @@ -1879,7 +1879,7 @@ void CVehicleSA::SetRemapTexDictionary(int iRemapTextureDictionary) } } -bool CVehicleSA::IsSmokeTrailEnabled(void) +bool CVehicleSA::IsSmokeTrailEnabled() { return (*(unsigned char*)((DWORD)this->GetInterface() + 2560) == 1); } @@ -1889,7 +1889,7 @@ void CVehicleSA::SetSmokeTrailEnabled(bool bEnabled) MemPutFast((DWORD)this->GetInterface() + 2560, (bEnabled) ? 1 : 0); } -CHandlingEntry* CVehicleSA::GetHandlingData(void) +CHandlingEntry* CVehicleSA::GetHandlingData() { return m_pHandlingData; } @@ -1902,7 +1902,7 @@ void CVehicleSA::SetHandlingData(CHandlingEntry* pHandling) RecalculateHandling(); } -void CVehicleSA::RecalculateHandling(void) +void CVehicleSA::RecalculateHandling() { if (!m_pHandlingData) return; @@ -2169,7 +2169,7 @@ CVector CVehicleSA::GetWheelPosition(eWheelPosition wheel) return CVector(); } -bool CVehicleSA::IsHeliSearchLightVisible(void) +bool CVehicleSA::IsHeliSearchLightVisible() { // See CHeli::PreRender DWORD dwThis = (DWORD)GetInterface(); @@ -2183,7 +2183,7 @@ void CVehicleSA::SetHeliSearchLightVisible(bool bVisible) MemPutFast(dwThis + 2577, bVisible); } -CColModel* CVehicleSA::GetSpecialColModel(void) +CColModel* CVehicleSA::GetSpecialColModel() { CVehicleSAInterface* vehicle = (CVehicleSAInterface*)this->GetInterface(); if (vehicle->m_nSpecialColModel != 0xFF) @@ -2229,7 +2229,7 @@ bool CVehicleSA::UpdateMovingCollision(float fAngle) return bReturn; } -void* CVehicleSA::GetPrivateSuspensionLines(void) +void* CVehicleSA::GetPrivateSuspensionLines() { if (m_pSuspensionLines == NULL) { @@ -2255,7 +2255,7 @@ void* CVehicleSA::GetPrivateSuspensionLines(void) return m_pSuspensionLines; } -void CVehicleSA::CopyGlobalSuspensionLinesToPrivate(void) +void CVehicleSA::CopyGlobalSuspensionLinesToPrivate() { CModelInfo* pModelInfo = pGame->GetModelInfo(GetModelIndex()); CColDataSA* pColData = pModelInfo->GetInterface()->pColModel->pColData; @@ -2279,7 +2279,7 @@ void CVehicleSA::CopyGlobalSuspensionLinesToPrivate(void) } } -void CVehicleSA::RecalculateSuspensionLines(void) +void CVehicleSA::RecalculateSuspensionLines() { CHandlingEntry* pHandlingEntry = GetHandlingData(); // if suspension is master disabled or suspension hasn't changed return. @@ -2549,7 +2549,7 @@ void CVehicleSA::AddComponent(RwFrame* pFrame, bool bReadOnly) m_ExtraFrames.insert(std::pair(strName, frame)); } -void CVehicleSA::FinalizeFramesList(void) +void CVehicleSA::FinalizeFramesList() { // For each frame, make list of parent frames std::map::iterator iter = m_ExtraFrames.begin(); diff --git a/Client/game_sa/CVehicleSA.h b/Client/game_sa/CVehicleSA.h index 80b9c54c51c..4c5d34c3a7e 100644 --- a/Client/game_sa/CVehicleSA.h +++ b/Client/game_sa/CVehicleSA.h @@ -51,28 +51,28 @@ class CVehicleSA; // 006DF930 ; public: void __thiscall CVehicle::RemoveVehicleUpgrade(int) #define FUNC_CVehicle_RemoveVehicleUpgrade 0x6DF930 -// 006D1E80 public: bool __thiscall CVehicle::CanPedEnterCar(void) +// 006D1E80 public: bool __thiscall CVehicle::CanPedEnterCar() #define FUNC_CVehicle_CanPedEnterCar 0x6D1E80 -// 006D2030 public: bool __thiscall CVehicle::CanPedJumpOutCar(void) +// 006D2030 public: bool __thiscall CVehicle::CanPedJumpOutCar() #define FUNC_CVehicle_CanPedJumpOutCar 0x6D2030 // 006D5CF0 public: bool __thiscall CVehicle::CanPedLeanOut(CPed*) #define FUNC_CVehicle_CanPedLeanOut 0x6D5CF0 -// 006D1F30 public: bool __thiscall CVehicle::CanPedStepOutCar(void) +// 006D1F30 public: bool __thiscall CVehicle::CanPedStepOutCar() #define FUNC_CVehicle_CanPedStepOutCar 0x6D1F30 -// 006D25D0 public: bool __thiscall CVehicle::CarHasRoof(void) +// 006D25D0 public: bool __thiscall CVehicle::CarHasRoof() #define FUNC_CVehicle_CarHasRoof 0x6D25D0 -// 006D2460 public: void __thiscall CVehicle::ExtinguishCarFire(void) +// 006D2460 public: void __thiscall CVehicle::ExtinguishCarFire() #define FUNC_CVehicle_ExtinguishCarFire 0x6D2460 -// 006D2460 public: DWORD __thiscall CVehicle::GetBaseVehicleType(void) +// 006D2460 public: DWORD __thiscall CVehicle::GetBaseVehicleType() #define FUNC_CVehicle_GetBaseVehicleType 0x411D50 -// 006D63F0 public: DWORD __thiscall CVehicle::GetHeightAboveRoad(void) +// 006D63F0 public: DWORD __thiscall CVehicle::GetHeightAboveRoad() #define FUNC_CVehicle_GetHeightAboveRoad 0x6D63F0 // 006DFBE0 public: DWORD __thiscall CVehicle::GetTowBarPos(CVector*, 1, 0) @@ -81,10 +81,10 @@ class CVehicleSA; // 006DFB70 public: void __thiscall CVehicle::GetTowHitchPos(CVector*, 1, 0) #define FUNC_CVehicle_GetTowHitchPos 0x6DFB70 -// 006D1DD0 public: bool __thiscall CVehicle::IsOnItsSide(void) +// 006D1DD0 public: bool __thiscall CVehicle::IsOnItsSide() #define FUNC_CVehicle_IsOnItsSide 0x6D1DD0 -// 006D2370 public: bool __thiscall CVehicle::IsLawEnforcementVehicle(void) +// 006D2370 public: bool __thiscall CVehicle::IsLawEnforcementVehicle() #define FUNC_CVehicle_IsLawEnforcementVehicle 0x6D2370 // 006D1BD0 public: bool __thiscall CVehicle::IsPassenger(CPed*) @@ -93,7 +93,7 @@ class CVehicleSA; // 006D84D0 public: bool __thiscall CVehicle.:IsSphereTouchingVehicle(float, float, float, float) #define FUNC_CVehicle_IsSphereTouchingVehicle 0x6D84D0 -// 006D1D90 public: bool __thiscall CVehicle::IsUpsideDown(void) +// 006D1D90 public: bool __thiscall CVehicle::IsUpsideDown() #define FUNC_CVehicle_IsUpsideDown 0x6D1D90 // 006D2BF0 public: void __thiscall CVehicle::MakeDirty(CColPoint*) @@ -102,7 +102,7 @@ class CVehicleSA; // 0041BDD0 public: void __thiscall CVehicle::SetEngineOn(bool) #define FUNC_CVehicle_SetEngineOn 0x41BDD0 -// 006F6CC0 public: void __thiscall CTrain::FindPositionOnTrackFromCoors(void) +// 006F6CC0 public: void __thiscall CTrain::FindPositionOnTrackFromCoors() #define FUNC_CTrain_FindPositionOnTrackFromCoors 0x6F6CC0 // 006F6BD0 int GetTrainNodeNearPoint(float x, float y, float z, int* pTrackID) places track ID in *pTrackID and returns node ID @@ -532,7 +532,7 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA CVehicleSA(CVehicleSAInterface* vehicleInterface); CVehicleSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2); ~CVehicleSA(); - void Init(void); + void Init(); // CEntitySA interface virtual void OnChangingPosition(const CVector& vecNewPosition); @@ -551,7 +551,7 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA float GetDistanceToCarriage(CVehicle* pCarriage); void AttachTrainCarriage(CVehicle* pCarriage); void DetachTrainCarriage(CVehicle* pCarriage); - bool IsChainEngine(void); + bool IsChainEngine(); void SetIsChainEngine(bool bChainEngine = true); bool IsDerailed(); @@ -564,7 +564,7 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA void SetTrainDirection(bool bDirection); BYTE GetRailTrack(); void SetRailTrack(BYTE ucTrackID); - float GetTrainPosition(void); + float GetTrainPosition(); void SetTrainPosition(float fPosition, bool bRecalcOnRailDistance = true); bool CanPedEnterCar(); @@ -731,37 +731,37 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA void GetGravity(CVector* pvecGravity) const { *pvecGravity = m_vecGravity; } void SetGravity(const CVector* pvecGravity); - SColor GetHeadLightColor(void) { return m_HeadLightColor; } + SColor GetHeadLightColor() { return m_HeadLightColor; } void SetHeadLightColor(const SColor color) { m_HeadLightColor = color; } CObject* SpawnFlyingComponent(int i_1, unsigned int ui_2); void SetWheelVisibility(eWheelPosition wheel, bool bVisible); CVector GetWheelPosition(eWheelPosition wheel); - bool IsHeliSearchLightVisible(void); + bool IsHeliSearchLightVisible(); void SetHeliSearchLightVisible(bool bVisible); - CColModel* GetSpecialColModel(void); + CColModel* GetSpecialColModel(); bool UpdateMovingCollision(float fAngle); - void RecalculateHandling(void); + void RecalculateHandling(); - void* GetPrivateSuspensionLines(void); + void* GetPrivateSuspensionLines(); CVehicleSAInterface* GetVehicleInterface() { return (CVehicleSAInterface*)m_pInterface; } - bool DoesVehicleHaveSirens(void) { return m_tSirenInfo.m_bOverrideSirens; } + bool DoesVehicleHaveSirens() { return m_tSirenInfo.m_bOverrideSirens; } void GiveVehicleSirens(unsigned char ucSirenType, unsigned char ucSirenCount); - void RemoveVehicleSirens(void) { m_tSirenInfo.m_bOverrideSirens = false; } + void RemoveVehicleSirens() { m_tSirenInfo.m_bOverrideSirens = false; } void SetVehicleSirenMinimumAlpha(unsigned char ucSirenCount, DWORD dwPercentage) { m_tSirenInfo.m_tSirenInfo[ucSirenCount].m_dwMinSirenAlpha = dwPercentage; } void SetVehicleSirenPosition(unsigned char ucSirenID, CVector vecPos); void GetVehicleSirenPosition(unsigned char ucSirenID, CVector& vecPos); - unsigned char GetVehicleSirenCount(void) { return m_tSirenInfo.m_ucSirenCount; } - unsigned char GetVehicleSirenType(void) { return m_tSirenInfo.m_ucSirenType; } + unsigned char GetVehicleSirenCount() { return m_tSirenInfo.m_ucSirenCount; } + unsigned char GetVehicleSirenType() { return m_tSirenInfo.m_ucSirenType; } DWORD GetVehicleSirenMinimumAlpha(unsigned char ucSirenID) { return m_tSirenInfo.m_tSirenInfo[ucSirenID].m_dwMinSirenAlpha; } SColor GetVehicleSirenColour(unsigned char ucSirenID) { return m_tSirenInfo.m_tSirenInfo[ucSirenID].m_RGBBeaconColour; } void SetVehicleSirenColour(unsigned char ucSirenID, SColor tVehicleSirenColour) @@ -769,15 +769,15 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA m_tSirenInfo.m_tSirenInfo[ucSirenID].m_RGBBeaconColour = tVehicleSirenColour; } void SetVehicleCurrentSirenID(unsigned char ucCurrentSirenID) { m_tSirenInfo.m_ucCurrentSirenID = ucCurrentSirenID; } - unsigned char GetVehicleCurrentSirenID(void) { return m_tSirenInfo.m_ucCurrentSirenID; } - unsigned char GetSirenRandomiser(void) { return m_tSirenInfo.m_ucCurrentSirenRandomiser; } + unsigned char GetVehicleCurrentSirenID() { return m_tSirenInfo.m_ucCurrentSirenID; } + unsigned char GetSirenRandomiser() { return m_tSirenInfo.m_ucCurrentSirenRandomiser; } void SetSirenRandomiser(unsigned char ucSirenRandomiser) { m_tSirenInfo.m_ucCurrentSirenRandomiser = ucSirenRandomiser; } void SetPointLightColour(SColor tPointLightColour) { m_tSirenInfo.m_tPointLightColour = tPointLightColour; } - SColor GetPointLightColour(void) { return m_tSirenInfo.m_tPointLightColour; } - bool IsSiren360EffectEnabled(void) { return m_tSirenInfo.m_b360Flag; } - bool IsSirenLOSCheckEnabled(void) { return m_tSirenInfo.m_bDoLOSCheck; } - bool IsSirenRandomiserEnabled(void) { return m_tSirenInfo.m_bUseRandomiser; } - bool IsSirenSilentEffectEnabled(void) { return m_tSirenInfo.m_bSirenSilent; } + SColor GetPointLightColour() { return m_tSirenInfo.m_tPointLightColour; } + bool IsSiren360EffectEnabled() { return m_tSirenInfo.m_b360Flag; } + bool IsSirenLOSCheckEnabled() { return m_tSirenInfo.m_bDoLOSCheck; } + bool IsSirenRandomiserEnabled() { return m_tSirenInfo.m_bUseRandomiser; } + bool IsSirenSilentEffectEnabled() { return m_tSirenInfo.m_bSirenSilent; } void SetVehicleFlags(bool bEnable360, bool bEnableRandomiser, bool bEnableLOSCheck, bool bEnableSilent); bool SetComponentRotation(const SString& vehicleComponent, const CVector& vecRotation); bool GetComponentRotation(const SString& vehicleComponent, CVector& vecPositionModelling); @@ -792,17 +792,17 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA bool SetComponentVisible(const SString& vehicleComponent, bool bVisible); void AddComponent(RwFrame* pFrame, bool bReadOnly); bool GetComponentVisible(const SString& vehicleComponent, bool& bVisible); - std::map& GetComponentMap(void) { return m_ExtraFrames; } + std::map& GetComponentMap() { return m_ExtraFrames; } bool SetPlateText(const SString& strText); bool SetWindowOpenFlagState(unsigned char ucWindow, bool bState); void UpdateLandingGearPosition(); - CAEVehicleAudioEntitySA* GetVehicleAudioEntity(void) { return m_pVehicleAudioEntity; }; + CAEVehicleAudioEntitySA* GetVehicleAudioEntity() { return m_pVehicleAudioEntity; }; private: - void RecalculateSuspensionLines(void); - void CopyGlobalSuspensionLinesToPrivate(void); + void RecalculateSuspensionLines(); + void CopyGlobalSuspensionLinesToPrivate(); SVehicleFrame* GetVehicleComponent(const SString& vehicleComponent); - void FinalizeFramesList(void); + void FinalizeFramesList(); }; diff --git a/Client/game_sa/CWantedSA.cpp b/Client/game_sa/CWantedSA.cpp index 3f3ad50ba10..eeb33864b2b 100644 --- a/Client/game_sa/CWantedSA.cpp +++ b/Client/game_sa/CWantedSA.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CWantedSA::CWantedSA(void) +CWantedSA::CWantedSA() { // TODO: Call GTA's new operator for CWanted. Lack of proper initialization might be causing crashes. @@ -27,7 +27,7 @@ CWantedSA::CWantedSA(CWantedSAInterface* wantedInterface) m_bDontDelete = true; } -CWantedSA::~CWantedSA(void) +CWantedSA::~CWantedSA() { if (!m_bDontDelete) { diff --git a/Client/game_sa/CWantedSA.h b/Client/game_sa/CWantedSA.h index 0c497b42617..01761e52f3d 100644 --- a/Client/game_sa/CWantedSA.h +++ b/Client/game_sa/CWantedSA.h @@ -82,9 +82,9 @@ class CWantedSA : public CWanted bool m_bDontDelete; public: - CWantedSA(void); + CWantedSA(); CWantedSA(CWantedSAInterface* wantedInterface); - ~CWantedSA(void); + ~CWantedSA(); // Internal game_sa accessors CWantedSAInterface* GetInterface() { return this->internalInterface; } @@ -95,6 +95,6 @@ class CWantedSA : public CWanted void SetMaximumWantedLevel(DWORD dwWantedLevel); void SetWantedLevel(DWORD dwWantedLevel); void SetWantedLevelNoFlash(DWORD dwWantedLevel); - char GetWantedLevel(void) { return this->internalInterface->m_WantedLevel; }; + char GetWantedLevel() { return this->internalInterface->m_WantedLevel; }; void SetWantedLevelNoDrop(DWORD dwWantedLevel); }; diff --git a/Client/game_sa/CWaterManagerSA.cpp b/Client/game_sa/CWaterManagerSA.cpp index 6306065a5fa..12bf33385d9 100644 --- a/Client/game_sa/CWaterManagerSA.cpp +++ b/Client/game_sa/CWaterManagerSA.cpp @@ -828,7 +828,7 @@ void CWaterManagerSA::Reset() } // Dynamically hook/unhook water rendering when required -void CWaterManagerSA::UpdateRenderOrderRequirement(void) +void CWaterManagerSA::UpdateRenderOrderRequirement() { bool bAltRenderOrderRequired = ms_iNumNonDefaultAndNonZeroVertices != 0 || m_iActivePolyCount > 0 || m_bWaterDrawnLast; if (m_bAltRenderOrder != bAltRenderOrderRequired) @@ -847,7 +847,7 @@ void CWaterManagerSA::SetWaterDrawnLast(bool bEnable) UpdateRenderOrderRequirement(); } -bool CWaterManagerSA::IsWaterDrawnLast(void) +bool CWaterManagerSA::IsWaterDrawnLast() { return m_bWaterDrawnLast; } diff --git a/Client/game_sa/CWaterManagerSA.h b/Client/game_sa/CWaterManagerSA.h index 9d872376aaf..5d0b5dab8ef 100644 --- a/Client/game_sa/CWaterManagerSA.h +++ b/Client/game_sa/CWaterManagerSA.h @@ -155,12 +155,12 @@ class CWaterManagerSA : public CWaterManager bool SetWorldWaterLevel(float fLevel, void* pChangeSource, bool bIncludeWorldNonSeaLevel); bool SetPositionWaterLevel(const CVector& vecPosition, float fLevel, void* pChangeSource); bool SetPolyWaterLevel(CWaterPoly* pPoly, float fLevel, void* pChangeSource); - void ResetWorldWaterLevel(void); + void ResetWorldWaterLevel(); float GetWaveLevel(); void SetWaveLevel(float fWaveLevel); void SetWaterDrawnLast(bool bEnable); - bool IsWaterDrawnLast(void); + bool IsWaterDrawnLast(); bool TestLineAgainstWater(const CVector& vecStart, const CVector& vecEnd, CVector* vecCollision); @@ -168,7 +168,7 @@ class CWaterManagerSA : public CWaterManager void UndoChanges(void* pChangeSource = NULL); void RebuildIndex(); void Reset(); - void UpdateRenderOrderRequirement(void); + void UpdateRenderOrderRequirement(); private: CWaterVertexSA m_Vertices[NUM_NewWaterVertices]; diff --git a/Client/game_sa/CWaterSA.cpp b/Client/game_sa/CWaterSA.cpp index a6327ccc486..c1df2e4e2b4 100644 --- a/Client/game_sa/CWaterSA.cpp +++ b/Client/game_sa/CWaterSA.cpp @@ -17,7 +17,7 @@ int ms_iNumNonDefaultAndNonZeroVertices = 0; // ----------------------------------------------------- // Vertices -CWaterVertexSA::CWaterVertexSA(void) +CWaterVertexSA::CWaterVertexSA() { m_pInterface = NULL; m_bIsWorldWaterVertex = false; @@ -87,7 +87,7 @@ void CWaterVertexSA::Init(bool bIsWorldWaterVertex) } // Restore initial state -void CWaterVertexSA::Reset(void) +void CWaterVertexSA::Reset() { if (m_bIsWorldWaterVertex) { @@ -99,7 +99,7 @@ void CWaterVertexSA::Reset(void) } // Check if swimming pool etc. -bool CWaterVertexSA::IsWorldNonSeaLevel(void) +bool CWaterVertexSA::IsWorldNonSeaLevel() { return m_bIsWorldWaterVertex && m_fDefaultZ != 0.f; } diff --git a/Client/game_sa/CWaterSA.h b/Client/game_sa/CWaterSA.h index 5078a793a57..21743993806 100644 --- a/Client/game_sa/CWaterSA.h +++ b/Client/game_sa/CWaterSA.h @@ -70,8 +70,8 @@ class CWaterVertexSA : public CWaterVertex void OnChangeLevel(float fOldZ, float fNewZ); void Init(bool bIsWorldWaterVertex); - void Reset(void); - bool IsWorldNonSeaLevel(void); + void Reset(); + bool IsWorldNonSeaLevel(); protected: bool m_bIsWorldWaterVertex; diff --git a/Client/game_sa/CWeaponInfoSA.h b/Client/game_sa/CWeaponInfoSA.h index 7dfe61dc87d..de8ab1c3ccf 100644 --- a/Client/game_sa/CWeaponInfoSA.h +++ b/Client/game_sa/CWeaponInfoSA.h @@ -110,82 +110,82 @@ class CWeaponInfoSA : public CWeaponInfo void SetFlag(DWORD flag) { internalInterface->m_nFlags |= flag; } void ClearFlag(DWORD flag) { internalInterface->m_nFlags &= ~flag; } bool IsFlagSet(DWORD flag) { return ((internalInterface->m_nFlags & flag) > 0 ? true : false); } - short GetFlags(void) { return internalInterface->m_nFlags; } + short GetFlags() { return internalInterface->m_nFlags; } eWeaponModel GetModel() { return (eWeaponModel)internalInterface->m_modelId; } eWeaponModel GetModel2() { return (eWeaponModel)internalInterface->m_modelId2; } - CWeaponInfoSAInterface* GetInterface(void) { return internalInterface; }; + CWeaponInfoSAInterface* GetInterface() { return internalInterface; }; - float GetWeaponRange(void) { return internalInterface->m_fWeaponRange; }; + float GetWeaponRange() { return internalInterface->m_fWeaponRange; }; void SetWeaponRange(float fRange) { internalInterface->m_fWeaponRange = fRange; }; - float GetTargetRange(void) { return internalInterface->m_fTargetRange; }; + float GetTargetRange() { return internalInterface->m_fTargetRange; }; void SetTargetRange(float fRange) { internalInterface->m_fTargetRange = fRange; }; - CVector* GetFireOffset(void) { return &internalInterface->m_vecFireOffset; }; + CVector* GetFireOffset() { return &internalInterface->m_vecFireOffset; }; void SetFireOffset(CVector* vecFireOffset) { MemCpyFast(&internalInterface->m_vecFireOffset, vecFireOffset, sizeof(CVector)); }; - short GetDamagePerHit(void) { return internalInterface->m_nDamage; }; + short GetDamagePerHit() { return internalInterface->m_nDamage; }; void SetDamagePerHit(short sDamagePerHit) { internalInterface->m_nDamage = sDamagePerHit; }; - float GetAccuracy(void) { return internalInterface->m_fAccuracy; }; + float GetAccuracy() { return internalInterface->m_fAccuracy; }; void SetAccuracy(float fAccuracy) { internalInterface->m_fAccuracy = fAccuracy; }; - short GetMaximumClipAmmo(void) { return internalInterface->m_nAmmo; }; + short GetMaximumClipAmmo() { return internalInterface->m_nAmmo; }; void SetMaximumClipAmmo(short sAmmo) { internalInterface->m_nAmmo = sAmmo; }; - float GetMoveSpeed(void) { return internalInterface->m_fMoveSpeed; }; + float GetMoveSpeed() { return internalInterface->m_fMoveSpeed; }; void SetMoveSpeed(float fMoveSpeed) { internalInterface->m_fMoveSpeed = fMoveSpeed; }; // projectile/areaeffect only - float GetFiringSpeed(void) { return internalInterface->m_fSpeed; }; + float GetFiringSpeed() { return internalInterface->m_fSpeed; }; void SetFiringSpeed(float fFiringSpeed) { internalInterface->m_fSpeed = fFiringSpeed; }; // area effect only - float GetRadius(void) { return internalInterface->m_fRadius; }; + float GetRadius() { return internalInterface->m_fRadius; }; void SetRadius(float fRadius) { internalInterface->m_fRadius = fRadius; }; - float GetLifeSpan(void) { return internalInterface->m_fLifeSpan; }; + float GetLifeSpan() { return internalInterface->m_fLifeSpan; }; void SetLifeSpan(float fLifeSpan) { internalInterface->m_fLifeSpan = fLifeSpan; }; - float GetSpread(void) { return internalInterface->m_fSpread; }; + float GetSpread() { return internalInterface->m_fSpread; }; void SetSpread(float fSpread) { internalInterface->m_fSpread = fSpread; }; - float GetAnimBreakoutTime(void) { return internalInterface->m_animBreakoutTime; }; + float GetAnimBreakoutTime() { return internalInterface->m_animBreakoutTime; }; void SetAnimBreakoutTime(float fBreakoutTime) { internalInterface->m_animBreakoutTime = fBreakoutTime; }; - eWeaponSlot GetSlot(void) { return (eWeaponSlot)internalInterface->m_nWeaponSlot; }; + eWeaponSlot GetSlot() { return (eWeaponSlot)internalInterface->m_nWeaponSlot; }; void SetSlot(eWeaponSlot dwSlot) { internalInterface->m_nWeaponSlot = (eWeaponSlot)dwSlot; }; - eWeaponSkill GetSkill(void) { return internalInterface->m_SkillLevel; } + eWeaponSkill GetSkill() { return internalInterface->m_SkillLevel; } void SetSkill(eWeaponSkill weaponSkill) { internalInterface->m_SkillLevel = weaponSkill; } - float GetRequiredStatLevel(void) { return static_cast(internalInterface->m_nReqStatLevel); } + float GetRequiredStatLevel() { return static_cast(internalInterface->m_nReqStatLevel); } void SetRequiredStatLevel(float fStatLevel) { internalInterface->m_nReqStatLevel = static_cast(fStatLevel); } - DWORD GetAnimGroup(void) { return internalInterface->m_animGroup; } + DWORD GetAnimGroup() { return internalInterface->m_animGroup; } void SetAnimGroup(DWORD dwAnimGroup) { internalInterface->m_animGroup = dwAnimGroup; } - eFireType GetFireType(void) { return internalInterface->m_eFireType; } + eFireType GetFireType() { return internalInterface->m_eFireType; } // Floats - float GetWeaponAnimLoopStart(void) { return internalInterface->m_animLoopStart; } - float GetWeaponAnimLoopStop(void) { return internalInterface->m_animLoopEnd; } - float GetWeaponAnimLoopFireTime(void) { return internalInterface->m_animFireTime; } + float GetWeaponAnimLoopStart() { return internalInterface->m_animLoopStart; } + float GetWeaponAnimLoopStop() { return internalInterface->m_animLoopEnd; } + float GetWeaponAnimLoopFireTime() { return internalInterface->m_animFireTime; } void SetWeaponAnimLoopFireTime(float animFireTime) { internalInterface->m_animFireTime = animFireTime; } - float GetWeaponAnim2LoopStart(void) { return internalInterface->m_anim2LoopStart; } - float GetWeaponAnim2LoopStop(void) { return internalInterface->m_anim2LoopEnd; } - float GetWeaponAnim2LoopFireTime(void) { return internalInterface->m_anim2FireTime; } + float GetWeaponAnim2LoopStart() { return internalInterface->m_anim2LoopStart; } + float GetWeaponAnim2LoopStop() { return internalInterface->m_anim2LoopEnd; } + float GetWeaponAnim2LoopFireTime() { return internalInterface->m_anim2FireTime; } - float GetWeaponAnimBreakoutTime(void) { return internalInterface->m_animBreakoutTime; } + float GetWeaponAnimBreakoutTime() { return internalInterface->m_animBreakoutTime; } - float GetWeaponRadius(void) { return internalInterface->m_fRadius; } + float GetWeaponRadius() { return internalInterface->m_fRadius; } // Ints - short GetAimOffsetIndex(void) { return internalInterface->m_nAimOffsetIndex; } + short GetAimOffsetIndex() { return internalInterface->m_nAimOffsetIndex; } - BYTE GetDefaultCombo(void) { return internalInterface->m_defaultCombo; } - BYTE GetCombosAvailable(void) { return internalInterface->m_nCombosAvailable; } + BYTE GetDefaultCombo() { return internalInterface->m_defaultCombo; } + BYTE GetCombosAvailable() { return internalInterface->m_nCombosAvailable; } }; diff --git a/Client/game_sa/CWeaponSA.cpp b/Client/game_sa/CWeaponSA.cpp index 3ec0b047ce1..91c0a894104 100644 --- a/Client/game_sa/CWeaponSA.cpp +++ b/Client/game_sa/CWeaponSA.cpp @@ -19,7 +19,7 @@ CWeaponSA::CWeaponSA(CWeaponSAInterface* weaponInterface, CPed* ped, eWeaponSlot internalInterface = weaponInterface; } -void CWeaponSA::Destroy(void) +void CWeaponSA::Destroy() { if (!owner) { diff --git a/Client/game_sa/CWeaponSA.h b/Client/game_sa/CWeaponSA.h index b46454821eb..25853f52a47 100644 --- a/Client/game_sa/CWeaponSA.h +++ b/Client/game_sa/CWeaponSA.h @@ -69,7 +69,7 @@ class CWeaponSA : public CWeapon VOID SetAsCurrentWeapon(); CWeaponInfo* GetInfo(eWeaponSkill skill) { return pGame->GetWeaponInfo(internalInterface->m_eWeaponType, skill); }; - void Destroy(void); + void Destroy(); void Remove(); void Initialize(eWeaponType type, unsigned int uiAmmo, CPed* pPed); void Update(CPed* pPed); diff --git a/Client/game_sa/CWeaponStatManagerSA.cpp b/Client/game_sa/CWeaponStatManagerSA.cpp index fcfacbb3632..5b5a3ddf4b1 100644 --- a/Client/game_sa/CWeaponStatManagerSA.cpp +++ b/Client/game_sa/CWeaponStatManagerSA.cpp @@ -147,7 +147,7 @@ CWeaponStat* CWeaponStatManagerSA::GetOriginalWeaponStats(eWeaponType type, eWea } return NULL; } -void CWeaponStatManagerSA::Init(void) +void CWeaponStatManagerSA::Init() { // Load SA Defaults // Script to Dump: diff --git a/Client/game_sa/CWeaponStatManagerSA.h b/Client/game_sa/CWeaponStatManagerSA.h index 90b9abfbc54..b59df262ff4 100644 --- a/Client/game_sa/CWeaponStatManagerSA.h +++ b/Client/game_sa/CWeaponStatManagerSA.h @@ -75,14 +75,14 @@ struct sWeaponInfo class CWeaponStatManagerSA : public CWeaponStatManager { public: - CWeaponStatManagerSA(void); - ~CWeaponStatManagerSA(void); + CWeaponStatManagerSA(); + ~CWeaponStatManagerSA(); CWeaponStat* GetWeaponStats(eWeaponType type, eWeaponSkill skill = WEAPONSKILL_STD); CWeaponStat* GetWeaponStatsFromSkillLevel(eWeaponType type, float fSkillLevel); CWeaponStat* GetOriginalWeaponStats(eWeaponType type, eWeaponSkill skill = WEAPONSKILL_STD); - void Init(void); - void InitLists(void); - void ResetLists(void); + void Init(); + void InitLists(); + void ResetLists(); bool LoadDefault(CWeaponStat* pDest, eWeaponType weaponType, eWeaponSkill skill = WEAPONSKILL_STD); void CreateWeaponStat(CWeaponInfo* pInterface, eWeaponType weaponType, eWeaponSkill weaponSkill); CWeaponStat* CreateWeaponStatUnlisted(eWeaponType weaponType, eWeaponSkill weaponSkill); diff --git a/Client/game_sa/CWeaponStatSA.h b/Client/game_sa/CWeaponStatSA.h index ae39a7a9f07..a7d52f97d1e 100644 --- a/Client/game_sa/CWeaponStatSA.h +++ b/Client/game_sa/CWeaponStatSA.h @@ -13,13 +13,13 @@ class CWeaponStatSA : public CWeaponStat { public: - CWeaponStatSA(void){}; + CWeaponStatSA(){}; CWeaponStatSA(eWeaponType weaponType, eWeaponSkill skillLevel); CWeaponStatSA(CWeaponInfoSA* pWeaponInfo, eWeaponType weaponType, eWeaponSkill skillLevel); - ~CWeaponStatSA(void); + ~CWeaponStatSA(); - eWeaponType GetWeaponType(void); - eWeaponSkill GetWeaponSkillLevel(void); + eWeaponType GetWeaponType(); + eWeaponSkill GetWeaponSkillLevel(); void SetWeaponType(eWeaponType weaponType); void SetWeaponSkillLevel(eWeaponSkill skillLevel); @@ -34,106 +34,106 @@ class CWeaponStatSA : public CWeaponStat // For initialization only void SetFlags(int iFlags) { pWeaponStats->m_nFlags = iFlags; } bool IsFlagSet(DWORD flag) { return ((pWeaponStats->m_nFlags & flag) > 0 ? true : false); } - int GetFlags(void) { return pWeaponStats->m_nFlags; } + int GetFlags() { return pWeaponStats->m_nFlags; } - eWeaponModel GetModel(void) { return (eWeaponModel)pWeaponStats->m_modelId; } + eWeaponModel GetModel() { return (eWeaponModel)pWeaponStats->m_modelId; } void SetModel(int iModel) { pWeaponStats->m_modelId = (int)iModel; } - eWeaponModel GetModel2(void) { return (eWeaponModel)pWeaponStats->m_modelId2; } + eWeaponModel GetModel2() { return (eWeaponModel)pWeaponStats->m_modelId2; } void SetModel2(int iModel) { pWeaponStats->m_modelId2 = (int)iModel; } - CWeaponInfoSAInterface* GetInterface(void) { return pWeaponStats; }; + CWeaponInfoSAInterface* GetInterface() { return pWeaponStats; }; - float GetWeaponRange(void) { return pWeaponStats->m_fWeaponRange; }; + float GetWeaponRange() { return pWeaponStats->m_fWeaponRange; }; void SetWeaponRange(float fRange) { pWeaponStats->m_fWeaponRange = fRange; }; - float GetTargetRange(void) { return pWeaponStats->m_fTargetRange; }; + float GetTargetRange() { return pWeaponStats->m_fTargetRange; }; void SetTargetRange(float fRange) { pWeaponStats->m_fTargetRange = fRange; }; - CVector* GetFireOffset(void) { return &pWeaponStats->m_vecFireOffset; }; + CVector* GetFireOffset() { return &pWeaponStats->m_vecFireOffset; }; void SetFireOffset(CVector* vecFireOffset) { pWeaponStats->m_vecFireOffset = *vecFireOffset; }; - short GetDamagePerHit(void) { return pWeaponStats->m_nDamage; }; + short GetDamagePerHit() { return pWeaponStats->m_nDamage; }; void SetDamagePerHit(short sDamagePerHit) { pWeaponStats->m_nDamage = sDamagePerHit; }; - float GetAccuracy(void) { return pWeaponStats->m_fAccuracy; }; + float GetAccuracy() { return pWeaponStats->m_fAccuracy; }; void SetAccuracy(float fAccuracy) { pWeaponStats->m_fAccuracy = fAccuracy; }; - short GetMaximumClipAmmo(void) { return pWeaponStats->m_nAmmo; }; + short GetMaximumClipAmmo() { return pWeaponStats->m_nAmmo; }; void SetMaximumClipAmmo(short sAccuracy) { pWeaponStats->m_nAmmo = sAccuracy; }; - float GetMoveSpeed(void) { return pWeaponStats->m_fMoveSpeed; }; + float GetMoveSpeed() { return pWeaponStats->m_fMoveSpeed; }; void SetMoveSpeed(float fMoveSpeed) { pWeaponStats->m_fMoveSpeed = fMoveSpeed; }; // projectile/areaeffect only - float GetFiringSpeed(void) { return pWeaponStats->m_fSpeed; }; + float GetFiringSpeed() { return pWeaponStats->m_fSpeed; }; void SetFiringSpeed(float fFiringSpeed) { pWeaponStats->m_fSpeed = fFiringSpeed; }; // area effect only - float GetRadius(void) { return pWeaponStats->m_fRadius; }; + float GetRadius() { return pWeaponStats->m_fRadius; }; void SetRadius(float fRadius) { pWeaponStats->m_fRadius = fRadius; }; - float GetLifeSpan(void) { return pWeaponStats->m_fLifeSpan; }; + float GetLifeSpan() { return pWeaponStats->m_fLifeSpan; }; void SetLifeSpan(float fLifeSpan) { pWeaponStats->m_fLifeSpan = fLifeSpan; }; - float GetSpread(void) { return pWeaponStats->m_fSpread; }; + float GetSpread() { return pWeaponStats->m_fSpread; }; void SetSpread(float fSpread) { pWeaponStats->m_fSpread = fSpread; }; - float GetAnimBreakoutTime(void) { return pWeaponStats->m_animBreakoutTime; }; + float GetAnimBreakoutTime() { return pWeaponStats->m_animBreakoutTime; }; void SetAnimBreakoutTime(float fBreakoutTime) { pWeaponStats->m_animBreakoutTime = fBreakoutTime; }; - eWeaponSlot GetSlot(void) { return (eWeaponSlot)pWeaponStats->m_nWeaponSlot; }; + eWeaponSlot GetSlot() { return (eWeaponSlot)pWeaponStats->m_nWeaponSlot; }; void SetSlot(eWeaponSlot dwSlot) { pWeaponStats->m_nWeaponSlot = (eWeaponSlot)dwSlot; }; - eWeaponSkill GetSkill(void) { return pWeaponStats->m_SkillLevel; } + eWeaponSkill GetSkill() { return pWeaponStats->m_SkillLevel; } void SetSkill(eWeaponSkill weaponSkill) { pWeaponStats->m_SkillLevel = weaponSkill; } - float GetRequiredStatLevel(void) { return static_cast(pWeaponStats->m_nReqStatLevel); } + float GetRequiredStatLevel() { return static_cast(pWeaponStats->m_nReqStatLevel); } void SetRequiredStatLevel(float fStatLevel) { pWeaponStats->m_nReqStatLevel = static_cast(fStatLevel); } void SetRequiredStatLevel(int iStatLevel) { pWeaponStats->m_nReqStatLevel = iStatLevel; } - DWORD GetAnimGroup(void) { return pWeaponStats->m_animGroup; } + DWORD GetAnimGroup() { return pWeaponStats->m_animGroup; } void SetAnimGroup(DWORD dwAnimGroup) { pWeaponStats->m_animGroup = dwAnimGroup; } - eFireType GetFireType(void) { return pWeaponStats->m_eFireType; } + eFireType GetFireType() { return pWeaponStats->m_eFireType; } void SetFireType(eFireType type) { pWeaponStats->m_eFireType = type; } // Floats - float GetWeaponAnimLoopStart(void) { return pWeaponStats->m_animLoopStart; } + float GetWeaponAnimLoopStart() { return pWeaponStats->m_animLoopStart; } void SetWeaponAnimLoopStart(float animLoopStart) { pWeaponStats->m_animLoopStart = animLoopStart; } - float GetWeaponAnimLoopStop(void) { return pWeaponStats->m_animLoopEnd; } + float GetWeaponAnimLoopStop() { return pWeaponStats->m_animLoopEnd; } void SetWeaponAnimLoopStop(float animLoopEnd) { pWeaponStats->m_animLoopEnd = animLoopEnd; } - float GetWeaponAnimLoopFireTime(void) { return pWeaponStats->m_animFireTime; } + float GetWeaponAnimLoopFireTime() { return pWeaponStats->m_animFireTime; } void SetWeaponAnimLoopFireTime(float animFireTime) { pWeaponStats->m_animFireTime = animFireTime; } - float GetWeaponAnim2LoopStart(void) { return pWeaponStats->m_anim2LoopStart; } + float GetWeaponAnim2LoopStart() { return pWeaponStats->m_anim2LoopStart; } void SetWeaponAnim2LoopStart(float anim2LoopStart) { pWeaponStats->m_anim2LoopStart = anim2LoopStart; } - float GetWeaponAnim2LoopStop(void) { return pWeaponStats->m_anim2LoopEnd; } + float GetWeaponAnim2LoopStop() { return pWeaponStats->m_anim2LoopEnd; } void SetWeaponAnim2LoopStop(float anim2LoopEnd) { pWeaponStats->m_anim2LoopEnd = anim2LoopEnd; } - float GetWeaponAnim2LoopFireTime(void) { return pWeaponStats->m_anim2FireTime; } + float GetWeaponAnim2LoopFireTime() { return pWeaponStats->m_anim2FireTime; } void SetWeaponAnim2LoopFireTime(float anim2FireTime) { pWeaponStats->m_anim2FireTime = anim2FireTime; } - float GetWeaponAnimBreakoutTime(void) { return pWeaponStats->m_animBreakoutTime; } + float GetWeaponAnimBreakoutTime() { return pWeaponStats->m_animBreakoutTime; } void SetWeaponAnimBreakoutTime(float animBreakoutTime) { pWeaponStats->m_animBreakoutTime = animBreakoutTime; } - float GetWeaponSpeed(void) { return pWeaponStats->m_fSpeed; } + float GetWeaponSpeed() { return pWeaponStats->m_fSpeed; } void SetWeaponSpeed(float fSpeed) { pWeaponStats->m_fSpeed = fSpeed; } - float GetWeaponRadius(void) { return pWeaponStats->m_fRadius; } + float GetWeaponRadius() { return pWeaponStats->m_fRadius; } void SetWeaponRadius(float fRadius) { pWeaponStats->m_fRadius = fRadius; } // Ints - short GetAimOffsetIndex(void) { return pWeaponStats->m_nAimOffsetIndex; } + short GetAimOffsetIndex() { return pWeaponStats->m_nAimOffsetIndex; } void SetAimOffsetIndex(short sIndex) { pWeaponStats->m_nAimOffsetIndex = sIndex; } - BYTE GetDefaultCombo(void) { return pWeaponStats->m_defaultCombo; } + BYTE GetDefaultCombo() { return pWeaponStats->m_defaultCombo; } void SetDefaultCombo(BYTE defaultCombo) { pWeaponStats->m_defaultCombo = defaultCombo; } - BYTE GetCombosAvailable(void) { return pWeaponStats->m_nCombosAvailable; } + BYTE GetCombosAvailable() { return pWeaponStats->m_nCombosAvailable; } void SetCombosAvailable(BYTE nCombosAvailable) { pWeaponStats->m_nCombosAvailable = nCombosAvailable; } private: diff --git a/Client/game_sa/CWeatherSA.cpp b/Client/game_sa/CWeatherSA.cpp index 70d905bf0a4..4ebed2f023d 100644 --- a/Client/game_sa/CWeatherSA.cpp +++ b/Client/game_sa/CWeatherSA.cpp @@ -18,7 +18,7 @@ float* CWeatherSA::VAR_AmountOfRain; unsigned long CWeatherSA::FUNC_IsRaining; -unsigned char CWeatherSA::Get(void) +unsigned char CWeatherSA::Get() { DEBUG_TRACE("unsigned char CWeatherSA::Get ( void )"); return (unsigned char)*VAR_CurrentWeather; @@ -59,13 +59,13 @@ void CWeatherSA::ForceWeatherNow(unsigned char weather) *VAR_CurrentWeather_c = ucWeather; } -void CWeatherSA::Release(void) +void CWeatherSA::Release() { DEBUG_TRACE("void CWeatherSA::Release ( void )"); *VAR_CurrentWeather = 0xFF; } -bool CWeatherSA::IsRaining(void) +bool CWeatherSA::IsRaining() { DEBUG_TRACE("bool CWeatherSA::IsRaining ( void )"); DWORD dwFunc = FUNC_IsRaining; @@ -78,7 +78,7 @@ bool CWeatherSA::IsRaining(void) return bReturn; } -float CWeatherSA::GetAmountOfRain(void) +float CWeatherSA::GetAmountOfRain() { return *VAR_AmountOfRain; } @@ -102,7 +102,7 @@ void CWeatherSA::SetAmountOfRain(float fAmount) *VAR_AmountOfRain = fAmount; } -void CWeatherSA::ResetAmountOfRain(void) +void CWeatherSA::ResetAmountOfRain() { BYTE originalMov[5] = {0xA3, 0x24, 0x13, 0xC8, 0x00}; // 0x72BC72 BYTE originalFstp1[6] = {0xD9, 0x1D, 0x24, 0x13, 0xC8, 0x00}; // 0x72BC92 diff --git a/Client/game_sa/CWeatherSA.h b/Client/game_sa/CWeatherSA.h index e2924f70a55..a19dc01ffa9 100644 --- a/Client/game_sa/CWeatherSA.h +++ b/Client/game_sa/CWeatherSA.h @@ -19,19 +19,19 @@ class CWeatherSA : public CWeather friend class COffsets; public: - unsigned char Get(void); + unsigned char Get(); void Set(unsigned char primary, unsigned char secondary); void SetPrimary(unsigned char weather); void SetSecondary(unsigned char weather); void ForceWeather(unsigned char weather); void ForceWeatherNow(unsigned char weather); - void Release(void); + void Release(); - bool IsRaining(void); - float GetAmountOfRain(void); + bool IsRaining(); + float GetAmountOfRain(); void SetAmountOfRain(float fAmount); - void ResetAmountOfRain(void); + void ResetAmountOfRain(); private: static unsigned char* VAR_CurrentWeather; diff --git a/Client/game_sa/CWorldSA.cpp b/Client/game_sa/CWorldSA.cpp index 144fc73b229..9e1787e04ad 100644 --- a/Client/game_sa/CWorldSA.cpp +++ b/Client/game_sa/CWorldSA.cpp @@ -22,7 +22,7 @@ CWorldSA::CWorldSA() void HOOK_FallenPeds(); void HOOK_FallenCars(); -void CWorldSA::InstallHooks(void) +void CWorldSA::InstallHooks() { HookInstall(0x565CB0, (DWORD)HOOK_FallenPeds, 5); HookInstall(0x565E80, (DWORD)HOOK_FallenCars, 5); @@ -467,7 +467,7 @@ bool CWorldSA::HasCollisionBeenLoaded(CVector* vecPosition) return bRet; } -DWORD CWorldSA::GetCurrentArea(void) +DWORD CWorldSA::GetCurrentArea() { return *(DWORD*)VAR_currArea; } @@ -490,7 +490,7 @@ void CWorldSA::SetJetpackMaxHeight(float fHeight) MemPut(VAR_fJetpackMaxHeight, fHeight); } -float CWorldSA::GetJetpackMaxHeight(void) +float CWorldSA::GetJetpackMaxHeight() { return *(float*)(VAR_fJetpackMaxHeight); } @@ -500,7 +500,7 @@ void CWorldSA::SetAircraftMaxHeight(float fHeight) g_pCore->GetMultiplayer()->SetAircraftMaxHeight(fHeight); } -float CWorldSA::GetAircraftMaxHeight(void) +float CWorldSA::GetAircraftMaxHeight() { return g_pCore->GetMultiplayer()->GetAircraftMaxHeight(); } @@ -510,7 +510,7 @@ void CWorldSA::SetAircraftMaxVelocity(float fVelocity) g_pCore->GetMultiplayer()->SetAircraftMaxVelocity(fVelocity); } -float CWorldSA::GetAircraftMaxVelocity(void) +float CWorldSA::GetAircraftMaxVelocity() { return g_pCore->GetMultiplayer()->GetAircraftMaxVelocity(); } @@ -530,7 +530,7 @@ void CWorldSA::SetOcclusionsEnabled(bool bEnabled) } } -bool CWorldSA::GetOcclusionsEnabled(void) +bool CWorldSA::GetOcclusionsEnabled() { if (*(BYTE*)FUNC_COcclusion_ProcessBeforeRendering == 0x51) // Is standard value ? return true; diff --git a/Client/game_sa/CWorldSA.h b/Client/game_sa/CWorldSA.h index 71da4088459..a2cc6e9a39d 100644 --- a/Client/game_sa/CWorldSA.h +++ b/Client/game_sa/CWorldSA.h @@ -54,7 +54,7 @@ class CWorldSA : public CWorld { public: CWorldSA(); - void InstallHooks(void); + void InstallHooks(); void Add(CEntity* entity, eDebugCaller CallerId); void Add(CEntitySAInterface* entityInterface, eDebugCaller CallerId); void Remove(CEntity* entity, eDebugCaller CallerId); @@ -71,16 +71,16 @@ class CWorldSA : public CWorld void LoadMapAroundPoint(CVector* vecPosition, float fRadius); bool IsLineOfSightClear(const CVector* vecStart, const CVector* vecEnd, const SLineOfSightFlags flags); bool HasCollisionBeenLoaded(CVector* vecPosition); - DWORD GetCurrentArea(void); + DWORD GetCurrentArea(); void SetCurrentArea(DWORD dwArea); void SetJetpackMaxHeight(float fHeight); - float GetJetpackMaxHeight(void); + float GetJetpackMaxHeight(); void SetAircraftMaxHeight(float fHeight); - float GetAircraftMaxHeight(void); + float GetAircraftMaxHeight(); void SetAircraftMaxVelocity(float fVelocity); - float GetAircraftMaxVelocity(void); + float GetAircraftMaxVelocity(); void SetOcclusionsEnabled(bool bEnabled); - bool GetOcclusionsEnabled(void); + bool GetOcclusionsEnabled(); void FindWorldPositionForRailTrackPosition(float fRailTrackPosition, int iTrackId, CVector* pOutVecPosition); int FindClosestRailTrackNode(const CVector& vecPosition, uchar& ucOutTrackId, float& fOutRailDistance); diff --git a/Client/game_sa/HeapTrace.cpp b/Client/game_sa/HeapTrace.cpp index 59e45b214be..67ccc19f135 100644 --- a/Client/game_sa/HeapTrace.cpp +++ b/Client/game_sa/HeapTrace.cpp @@ -97,7 +97,7 @@ void RemoveTrack(void* pAddress) } } -void DumpUnfreed(void) +void DumpUnfreed() { // Make sure we got a list if (!pAllocList) @@ -159,7 +159,7 @@ void AddTrack(void* pAddress, size_t size, const char* szFile, int iLine) void RemoveTrack(void* pAddress) { } -void DumpUnfreed(void) +void DumpUnfreed() { } #endif diff --git a/Client/game_sa/HeapTrace.h b/Client/game_sa/HeapTrace.h index f703aa1484f..3c07fdb2e58 100644 --- a/Client/game_sa/HeapTrace.h +++ b/Client/game_sa/HeapTrace.h @@ -13,4 +13,4 @@ void AddTrack(void* pAddress, size_t size, const char* szFile, int iLine); void RemoveTrack(void* pAddress); -void DumpUnfreed(void); +void DumpUnfreed(); diff --git a/Client/game_sa/TaskAttackSA.cpp b/Client/game_sa/TaskAttackSA.cpp index e3fc1f110b9..41f4b1d5b90 100644 --- a/Client/game_sa/TaskAttackSA.cpp +++ b/Client/game_sa/TaskAttackSA.cpp @@ -158,7 +158,7 @@ void CTaskSimpleUseGunSA::Reset(CPed* pPed, CEntity* pTargetEntity, CVector vecT } } -int CTaskSimpleUseGunSA::GetTaskType(void) +int CTaskSimpleUseGunSA::GetTaskType() { int iReturn; DWORD dwFunc = FUNC_CTaskSimpleUseGun_GetTaskType; @@ -247,7 +247,7 @@ void CTaskSimpleUseGunSA::ClearAnim(CPed* pPed) } } -signed char CTaskSimpleUseGunSA::GetCurrentCommand(void) +signed char CTaskSimpleUseGunSA::GetCurrentCommand() { signed char bReturn; DWORD dwFunc = FUNC_CTaskSimpleUseGun_GetCurrentCommand; @@ -261,7 +261,7 @@ signed char CTaskSimpleUseGunSA::GetCurrentCommand(void) return bReturn; } -bool CTaskSimpleUseGunSA::GetDoneFiring(void) +bool CTaskSimpleUseGunSA::GetDoneFiring() { bool bReturn; DWORD dwFunc = FUNC_CTaskSimpleUseGun_GetDoneFiring; @@ -275,7 +275,7 @@ bool CTaskSimpleUseGunSA::GetDoneFiring(void) return bReturn; } -bool CTaskSimpleUseGunSA::GetIsFinished(void) +bool CTaskSimpleUseGunSA::GetIsFinished() { bool bReturn; DWORD dwFunc = FUNC_CTaskSimpleUseGun_GetIsFinished; @@ -289,7 +289,7 @@ bool CTaskSimpleUseGunSA::GetIsFinished(void) return bReturn; } -bool CTaskSimpleUseGunSA::IsLineOfSightBlocked(void) +bool CTaskSimpleUseGunSA::IsLineOfSightBlocked() { bool bReturn; DWORD dwFunc = FUNC_CTaskSimpleUseGun_IsLineOfSightBlocked; @@ -303,7 +303,7 @@ bool CTaskSimpleUseGunSA::IsLineOfSightBlocked(void) return bReturn; } -bool CTaskSimpleUseGunSA::GetIsFiring(void) +bool CTaskSimpleUseGunSA::GetIsFiring() { bool bReturn; DWORD dwFunc = FUNC_CTaskSimpleUseGun_GetIsFiring; @@ -317,7 +317,7 @@ bool CTaskSimpleUseGunSA::GetIsFiring(void) return bReturn; } -bool CTaskSimpleUseGunSA::GetIsReloading(void) +bool CTaskSimpleUseGunSA::GetIsReloading() { bool bReturn; DWORD dwFunc = FUNC_CTaskSimpleUseGun_GetIsReloading; @@ -331,7 +331,7 @@ bool CTaskSimpleUseGunSA::GetIsReloading(void) return bReturn; } -bool CTaskSimpleUseGunSA::GetSkipAim(void) +bool CTaskSimpleUseGunSA::GetSkipAim() { bool bReturn; DWORD dwFunc = FUNC_CTaskSimpleUseGun_GetSkipAim; @@ -345,7 +345,7 @@ bool CTaskSimpleUseGunSA::GetSkipAim(void) return bReturn; } -bool CTaskSimpleUseGunSA::PlayerPassiveControlGun(void) +bool CTaskSimpleUseGunSA::PlayerPassiveControlGun() { bool bReturn; DWORD dwFunc = FUNC_CTaskSimpleUseGun_PlayerPassiveControlGun; diff --git a/Client/game_sa/TaskAttackSA.h b/Client/game_sa/TaskAttackSA.h index 13f6c928fde..afcaccce389 100644 --- a/Client/game_sa/TaskAttackSA.h +++ b/Client/game_sa/TaskAttackSA.h @@ -92,7 +92,7 @@ class CTaskSimpleGangDriveBySAInterface : public CTaskSimpleSAInterface class CTaskSimpleGangDriveBySA : public virtual CTaskSimpleSA, public virtual CTaskSimpleGangDriveBy { public: - CTaskSimpleGangDriveBySA(void){}; + CTaskSimpleGangDriveBySA(){}; CTaskSimpleGangDriveBySA(CEntity* pTargetEntity, const CVector* pVecTarget, float fAbortRange, char FrequencyPercentage, char nDrivebyStyle, bool bSeatRHS); }; @@ -130,14 +130,14 @@ class CTaskSimpleUseGunSAInterface : public CTaskSimpleSAInterface class CTaskSimpleUseGunSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleUseGun { public: - CTaskSimpleUseGunSA(void){}; + CTaskSimpleUseGunSA(){}; CTaskSimpleUseGunSA(CEntity* pTargetEntity, CVector vecTarget, char nCommand, short nBurstLength = 1, unsigned char bAimImmediate = false); bool ControlGun(CPed* pPed, CEntity* pTargetEntity, char nCommand); bool ControlGunMove(CVector2D* pMoveVec); void Reset(CPed* pPed, CEntity* pTargetEntity, CVector vecTarget, char nCommand, short nBurstLength = 1); - int GetTaskType(void); + int GetTaskType(); bool MakeAbortable(CPed* pPed, const int iPriority, const CEvent* pEvent); bool ProcessPed(CPed* pPed); bool SetPedPosition(CPed* pPed); @@ -145,14 +145,14 @@ class CTaskSimpleUseGunSA : public virtual CTaskSimpleSA, public virtual CTaskSi void AbortIK(CPed* pPed); void AimGun(CPed* pPed); void ClearAnim(CPed* pPed); - signed char GetCurrentCommand(void); - bool GetDoneFiring(void); - bool GetIsFinished(void); - bool IsLineOfSightBlocked(void); - bool GetIsFiring(void); - bool GetIsReloading(void); - bool GetSkipAim(void); - bool PlayerPassiveControlGun(void); + signed char GetCurrentCommand(); + bool GetDoneFiring(); + bool GetIsFinished(); + bool IsLineOfSightBlocked(); + bool GetIsFiring(); + bool GetIsReloading(); + bool GetSkipAim(); + bool PlayerPassiveControlGun(); void RemoveStanceAnims(CPed* pPed, float); static bool RequirePistolWhip(CPed* pPed, CEntity*); void SetBurstLength(short); @@ -188,6 +188,6 @@ class CTaskSimpleFightSAInterface : public CTaskSimpleSAInterface class CTaskSimpleFightSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleFight { public: - CTaskSimpleFightSA(void){}; + CTaskSimpleFightSA(){}; CTaskSimpleFightSA(CEntity* pTargetEntity, int nCommand, unsigned int nIdlePeriod = 10000); }; diff --git a/Client/game_sa/TaskBasicSA.h b/Client/game_sa/TaskBasicSA.h index 774237f9772..af9654ca78d 100644 --- a/Client/game_sa/TaskBasicSA.h +++ b/Client/game_sa/TaskBasicSA.h @@ -45,7 +45,7 @@ class CTaskComplexUseMobilePhoneSAInterface : public CTaskComplexSAInterface class CTaskComplexUseMobilePhoneSA : public virtual CTaskComplexSA, public virtual CTaskComplexUseMobilePhone { public: - CTaskComplexUseMobilePhoneSA(void){}; + CTaskComplexUseMobilePhoneSA(){}; CTaskComplexUseMobilePhoneSA(const int iDuration); // Default is -1 }; @@ -75,13 +75,13 @@ class CTaskSimpleAnimSAInterface : public CTaskSimpleSAInterface class CTaskSimpleAnimSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleAnim { public: - CTaskSimpleAnimSA(void){}; + CTaskSimpleAnimSA(){}; }; class CTaskSimpleRunAnimSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleRunAnim { public: - CTaskSimpleRunAnimSA(void){}; + CTaskSimpleRunAnimSA(){}; CTaskSimpleRunAnimSA(const AssocGroupId animGroup, const AnimationId animID, const float fBlendDelta, const int iTaskType, const char* pTaskName, const bool bHoldLastFrame = false); }; @@ -107,7 +107,7 @@ class CTaskSimpleRunNamedAnimSAInterface : public CTaskSimpleAnimSAInterface class CTaskSimpleRunNamedAnimSA : public virtual CTaskSimpleAnimSA, public virtual CTaskSimpleRunNamedAnim { public: - CTaskSimpleRunNamedAnimSA(void){}; + CTaskSimpleRunNamedAnimSA(){}; CTaskSimpleRunNamedAnimSA(const char* pAnimName, const char* pAnimGroupName, const int flags, const float fBlendDelta, const int iTime = -1, const bool bDontInterrupt = false, const bool bRunInSequence = false, const bool bOffsetPed = false, const bool bHoldLastFrame = false); @@ -121,7 +121,7 @@ class CTaskComplexDieSAInterface : public CTaskComplexSAInterface class CTaskComplexDieSA : public virtual CTaskComplexSA, public virtual CTaskComplexDie { public: - CTaskComplexDieSA(void){}; + CTaskComplexDieSA(){}; CTaskComplexDieSA(const eWeaponType eMeansOfDeath /*=WEAPONTYPE_UNARMED*/, const AssocGroupId animGroup = 0 /*ANIM_STD_PED*/, const AnimationId anim = 0 /*ANIM_STD_KO_FRONT*/, const float fBlendDelta = 4.0f, const float fAnimSpeed = 0.0f, const bool bBeingKilledByStealth = false, const bool bFallingToDeath = false, const int iFallToDeathDir = 0, @@ -136,7 +136,7 @@ class CTaskSimpleStealthKillInterface : public CTaskSimpleSAInterface class CTaskSimpleStealthKillSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleStealthKill { public: - CTaskSimpleStealthKillSA(void){}; + CTaskSimpleStealthKillSA(){}; CTaskSimpleStealthKillSA(bool bKiller, class CPed* pPed, const AssocGroupId animGroup); }; @@ -150,7 +150,7 @@ class CTaskSimpleDeadSAInterface : public CTaskSimpleSAInterface class CTaskSimpleDeadSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleDead { public: - CTaskSimpleDeadSA(void){}; + CTaskSimpleDeadSA(){}; CTaskSimpleDeadSA(unsigned int uiDeathTimeMS, bool bUnk2); }; @@ -173,7 +173,7 @@ class CTaskSimpleBeHitSAInterface : public CTaskSimpleSAInterface class CTaskSimpleBeHitSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleBeHit { public: - CTaskSimpleBeHitSA(void){}; + CTaskSimpleBeHitSA(){}; CTaskSimpleBeHitSA(CPed* pPedAttacker, ePedPieceTypes hitBodyPart, int hitBodySide, int weaponId); }; @@ -208,7 +208,7 @@ class CTaskComplexSunbatheSAInterface : public CTaskComplexSAInterface class CTaskComplexSunbatheSA : public virtual CTaskComplexSA, public virtual CTaskComplexSunbathe { public: - CTaskComplexSunbatheSA(void){}; + CTaskComplexSunbatheSA(){}; CTaskComplexSunbatheSA(class CObject* pTowel, const bool bStartStanding); void SetEndTime(DWORD dwTime); @@ -226,7 +226,7 @@ class CTaskSimplePlayerOnFootSAInterface : public CTaskSimpleSAInterface class CTaskSimplePlayerOnFootSA : public virtual CTaskSimpleSA, public virtual CTaskSimplePlayerOnFoot { public: - CTaskSimplePlayerOnFootSA(void); + CTaskSimplePlayerOnFootSA(); }; //////////////////// @@ -241,5 +241,5 @@ class CTaskComplexFacialSAInterface : public CTaskComplexSAInterface class CTaskComplexFacialSA : public virtual CTaskComplexSA, public virtual CTaskComplexFacial { public: - CTaskComplexFacialSA(void); + CTaskComplexFacialSA(); }; diff --git a/Client/game_sa/TaskCarAccessoriesSA.h b/Client/game_sa/TaskCarAccessoriesSA.h index d6e0831a4e3..1e841c971b4 100644 --- a/Client/game_sa/TaskCarAccessoriesSA.h +++ b/Client/game_sa/TaskCarAccessoriesSA.h @@ -49,7 +49,7 @@ class CTaskSimpleCarSetPedInAsDriverSAInterface : public CTaskSimpleSAInterface class CTaskSimpleCarSetPedInAsDriverSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleCarSetPedInAsDriver { public: - CTaskSimpleCarSetPedInAsDriverSA(void){}; + CTaskSimpleCarSetPedInAsDriverSA(){}; CTaskSimpleCarSetPedInAsDriverSA(CVehicle* pTargetVehicle, CTaskUtilityLineUpPedWithCar* pUtility); void SetIsWarpingPedIntoCar(); @@ -78,7 +78,7 @@ class CTaskSimpleCarSetPedInAsPassengerSAInterface : public CTaskSimpleSAInterfa class CTaskSimpleCarSetPedInAsPassengerSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleCarSetPedInAsPassenger { public: - CTaskSimpleCarSetPedInAsPassengerSA(void){}; + CTaskSimpleCarSetPedInAsPassengerSA(){}; CTaskSimpleCarSetPedInAsPassengerSA(CVehicle* pTargetVehicle, int iTargetDoor, CTaskUtilityLineUpPedWithCar* pUtility); void SetIsWarpingPedIntoCar(); @@ -107,7 +107,7 @@ class CTaskSimpleCarSetPedOutSAInterface : public CTaskSimpleSAInterface class CTaskSimpleCarSetPedOutSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleCarSetPedOut { public: - CTaskSimpleCarSetPedOutSA(void){}; + CTaskSimpleCarSetPedOutSA(){}; CTaskSimpleCarSetPedOutSA(CVehicle* pTargetVehicle, int iTargetDoor, bool bSwitchOffEngine = false); void SetIsWarpingPedOutOfCar(); diff --git a/Client/game_sa/TaskCarSA.h b/Client/game_sa/TaskCarSA.h index fa448d5da77..5d966382fd3 100644 --- a/Client/game_sa/TaskCarSA.h +++ b/Client/game_sa/TaskCarSA.h @@ -65,7 +65,7 @@ class CTaskComplexEnterCarSAInterface : public CTaskComplexSAInterface class CTaskComplexEnterCarSA : public virtual CTaskComplexSA { public: - CTaskComplexEnterCarSA(void){}; + CTaskComplexEnterCarSA(){}; CTaskComplexEnterCarSA(CVehicle* pTargetVehicle, const bool bAsDriver, const bool bQuitAfterOpeningDoor, const bool bQuitAfterDraggingPedOut, const bool bCarryOnAfterFallingOff = false); @@ -100,7 +100,7 @@ class CTaskComplexEnterCarAsDriverSAInterface : public CTaskComplexEnterCarSAInt class CTaskComplexEnterCarAsDriverSA : public virtual CTaskComplexEnterCarSA, public virtual CTaskComplexEnterCarAsDriver { public: - CTaskComplexEnterCarAsDriverSA(void){}; + CTaskComplexEnterCarAsDriverSA(){}; CTaskComplexEnterCarAsDriverSA(CVehicle* pTargetVehicle); // from CTaskComplexEnterCarSA @@ -122,7 +122,7 @@ class CTaskComplexEnterCarAsPassengerSAInterface : public CTaskComplexEnterCarSA class CTaskComplexEnterCarAsPassengerSA : public virtual CTaskComplexEnterCarSA, public virtual CTaskComplexEnterCarAsPassenger { public: - CTaskComplexEnterCarAsPassengerSA(void){}; + CTaskComplexEnterCarAsPassengerSA(){}; CTaskComplexEnterCarAsPassengerSA(CVehicle* pTargetVehicle, const int iTargetSeat = 0, const bool bCarryOnAfterFallingOff = false); // from CTaskComplexEnterCarSA @@ -144,7 +144,7 @@ class CTaskComplexEnterBoatAsDriverSAInterface : public CTaskComplexSAInterface class CTaskComplexEnterBoatAsDriverSA : public virtual CTaskComplexSA, public virtual CTaskComplexEnterBoatAsDriver { public: - CTaskComplexEnterBoatAsDriverSA(void){}; + CTaskComplexEnterBoatAsDriverSA(){}; CTaskComplexEnterBoatAsDriverSA(CVehicle* pTargetVehicle); }; @@ -177,7 +177,7 @@ class CTaskComplexLeaveCarSAInterface : public CTaskComplexSAInterface class CTaskComplexLeaveCarSA : public virtual CTaskComplexSA, public virtual CTaskComplexLeaveCar { public: - CTaskComplexLeaveCarSA(void){}; + CTaskComplexLeaveCarSA(){}; CTaskComplexLeaveCarSA(CVehicle* pTargetVehicle, const int iTargetDoor = 0, const int iDelayTime = 0, const bool bSensibleLeaveCar = true, const bool bForceGetOut = false); diff --git a/Client/game_sa/TaskGoToSA.h b/Client/game_sa/TaskGoToSA.h index fe406cc66e7..34abf3262ed 100644 --- a/Client/game_sa/TaskGoToSA.h +++ b/Client/game_sa/TaskGoToSA.h @@ -90,6 +90,6 @@ class CTaskComplexWanderStandardSAInterface : public CTaskComplexWanderSAInterfa class CTaskComplexWanderStandardSA : public virtual CTaskComplexWanderSA, public virtual CTaskComplexWanderStandard { public: - CTaskComplexWanderStandardSA(void){}; + CTaskComplexWanderStandardSA(){}; CTaskComplexWanderStandardSA(const int iMoveState, const unsigned char iDir, const bool bWanderSensibly = true); }; diff --git a/Client/game_sa/TaskIKSA.cpp b/Client/game_sa/TaskIKSA.cpp index f1cc1d16123..32b2b09f11b 100644 --- a/Client/game_sa/TaskIKSA.cpp +++ b/Client/game_sa/TaskIKSA.cpp @@ -79,7 +79,7 @@ CTaskSimpleIKLookAtSA::CTaskSimpleIKLookAtSA(char* idString, CEntity* pEntity, i } } -CTaskSimpleIKManagerSA::CTaskSimpleIKManagerSA(void) +CTaskSimpleIKManagerSA::CTaskSimpleIKManagerSA() { this->m_pTaskManagementSystem = (CTaskManagementSystemSA*)(pGame->GetTaskManagementSystem()); } diff --git a/Client/game_sa/TaskIKSA.h b/Client/game_sa/TaskIKSA.h index cf3c8fc3bac..76f198a211d 100644 --- a/Client/game_sa/TaskIKSA.h +++ b/Client/game_sa/TaskIKSA.h @@ -58,7 +58,7 @@ class CTaskSimpleIKChainSAInterface : public CTaskSimpleSAInterface class CTaskSimpleIKChainSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleIKChain { public: - CTaskSimpleIKChainSA(void){}; + CTaskSimpleIKChainSA(){}; CTaskSimpleIKChainSA(char* idString, int effectorBoneTag, CVector effectorVec, int pivotBoneTag, CEntity* pEntity, int offsetBoneTag, CVector offsetPos, float speed, int time = 99999999, int blendTime = 1000); }; @@ -78,7 +78,7 @@ class CTaskSimpleIKLookAtSAInterface : public CTaskSimpleIKChainSAInterface class CTaskSimpleIKLookAtSA : public virtual CTaskSimpleIKChainSA, public virtual CTaskSimpleIKLookAt { public: - CTaskSimpleIKLookAtSA(void){}; + CTaskSimpleIKLookAtSA(){}; CTaskSimpleIKLookAtSA(char* idString, CEntity* pEntity, int time, int offsetBoneTag, CVector offsetPos, unsigned char useTorso = false, float speed = 0.25f, int blendTime = 1000, int m_priority = 3); }; @@ -103,7 +103,7 @@ class CTaskSimpleIKManagerSA : public virtual CTaskSimpleSA, public virtual CTas CTaskManagementSystemSA* m_pTaskManagementSystem; public: - CTaskSimpleIKManagerSA(void); + CTaskSimpleIKManagerSA(); // CTaskSimpleIKManagerSA ( /*fill me*/ ); int AddIKChainTask(CTaskSimpleIKChain* pIKChainTask, int slotID = -1); @@ -154,7 +154,7 @@ class CTaskSimpleTriggerLookAtSAInterface : public CTaskSimpleSAInterface class CTaskSimpleTriggerLookAtSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleTriggerLookAt { public: - CTaskSimpleTriggerLookAtSA(void){}; + CTaskSimpleTriggerLookAtSA(){}; CTaskSimpleTriggerLookAtSA(CEntity* pEntity, int time, int offsetBoneTag, CVector offsetPos, unsigned char useTorso = false, float speed = 0.25f, int blendTime = 1000, int priority = 3); }; diff --git a/Client/game_sa/TaskJumpFallSA.h b/Client/game_sa/TaskJumpFallSA.h index 2bab370a311..c509453446d 100644 --- a/Client/game_sa/TaskJumpFallSA.h +++ b/Client/game_sa/TaskJumpFallSA.h @@ -53,7 +53,7 @@ class CTaskSimpleClimbSAInterface : public CTaskSimpleSAInterface class CTaskSimpleClimbSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleClimb { public: - CTaskSimpleClimbSA(void){}; + CTaskSimpleClimbSA(){}; CTaskSimpleClimbSA(CEntity* pClimbEnt, const CVector& vecTarget, float fHeading, unsigned char nSurfaceType, char nHeight = CLIMB_GRAB, const bool bForceClimb = false); }; @@ -105,6 +105,6 @@ class CTaskSimpleJetPackSAInterface : public CTaskSimpleSAInterface class CTaskSimpleJetPackSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleJetPack { public: - CTaskSimpleJetPackSA(void){}; + CTaskSimpleJetPackSA(){}; CTaskSimpleJetPackSA(const CVector* pVecTargetPos, float fCruiseHeight = 10.0f, int nHoverTime = 0); }; diff --git a/Client/game_sa/TaskPhysicalResponseSA.cpp b/Client/game_sa/TaskPhysicalResponseSA.cpp index 03f9f8c221c..ae64f8912ec 100644 --- a/Client/game_sa/TaskPhysicalResponseSA.cpp +++ b/Client/game_sa/TaskPhysicalResponseSA.cpp @@ -43,32 +43,32 @@ CTaskSimpleChokingSA::CTaskSimpleChokingSA(CPed* pAttacker, bool bIsTearGas) } } -CPed* CTaskSimpleChokingSA::GetAttacker(void) +CPed* CTaskSimpleChokingSA::GetAttacker() { CTaskSimpleChokingSAInterface* internalInterface = (CTaskSimpleChokingSAInterface*)this->GetInterface(); SClientEntity* pPedClientEntity = pGame->GetPools()->GetPed((DWORD*)internalInterface->m_pAttacker); return pPedClientEntity ? pPedClientEntity->pEntity : nullptr; } -unsigned int CTaskSimpleChokingSA::GetTimeRemaining(void) +unsigned int CTaskSimpleChokingSA::GetTimeRemaining() { CTaskSimpleChokingSAInterface* internalInterface = (CTaskSimpleChokingSAInterface*)this->GetInterface(); return internalInterface->m_nTimeRemaining; } -unsigned int CTaskSimpleChokingSA::GetTimeStarted(void) +unsigned int CTaskSimpleChokingSA::GetTimeStarted() { CTaskSimpleChokingSAInterface* internalInterface = (CTaskSimpleChokingSAInterface*)this->GetInterface(); return internalInterface->m_nTimeStarted; } -bool CTaskSimpleChokingSA::IsTeargas(void) +bool CTaskSimpleChokingSA::IsTeargas() { CTaskSimpleChokingSAInterface* internalInterface = (CTaskSimpleChokingSAInterface*)this->GetInterface(); return internalInterface->m_bIsTeargas ? true : false; } -bool CTaskSimpleChokingSA::IsFinished(void) +bool CTaskSimpleChokingSA::IsFinished() { CTaskSimpleChokingSAInterface* internalInterface = (CTaskSimpleChokingSAInterface*)this->GetInterface(); return internalInterface->m_bIsFinished; diff --git a/Client/game_sa/TaskPhysicalResponseSA.h b/Client/game_sa/TaskPhysicalResponseSA.h index 7dfa21beaeb..175a47c195a 100644 --- a/Client/game_sa/TaskPhysicalResponseSA.h +++ b/Client/game_sa/TaskPhysicalResponseSA.h @@ -31,14 +31,14 @@ class CTaskSimpleChokingSAInterface : public CTaskSimpleSAInterface class CTaskSimpleChokingSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleChoking { public: - CTaskSimpleChokingSA(void){}; + CTaskSimpleChokingSA(){}; CTaskSimpleChokingSA(CPed* pAttacker, bool bIsTearGas); - CPed* GetAttacker(void); - unsigned int GetTimeRemaining(void); - unsigned int GetTimeStarted(void); - bool IsTeargas(void); - bool IsFinished(void); + CPed* GetAttacker(); + unsigned int GetTimeRemaining(); + unsigned int GetTimeStarted(); + bool IsTeargas(); + bool IsFinished(); void UpdateChoke(CPed* pPed, CPed* pAttacker, bool bIsTearGas); }; diff --git a/Client/game_sa/TaskSA.h b/Client/game_sa/TaskSA.h index fb357446006..2272a317e73 100644 --- a/Client/game_sa/TaskSA.h +++ b/Client/game_sa/TaskSA.h @@ -70,30 +70,30 @@ class CTaskSA : public virtual CTask bool m_bBeingDestroyed; public: - CTaskSA(void); - ~CTaskSA(void); + CTaskSA(); + ~CTaskSA(); - CTask* Clone(void); + CTask* Clone(); void SetParent(CTask* pParent); - CTask* GetParent(void) { return Parent; } - CTask* GetSubTask(void); - bool IsSimpleTask(void); - int GetTaskType(void); + CTask* GetParent() { return Parent; } + CTask* GetSubTask(); + bool IsSimpleTask(); + int GetTaskType(); void StopTimer(const CEvent* pEvent); bool MakeAbortable(CPed* pPed, const int iPriority, const CEvent* pEvent); - const char* GetTaskName(void); + const char* GetTaskName(); // our function(s) void SetInterface(CTaskSAInterface* pInterface) { TaskInterface = pInterface; }; - CTaskSAInterface* GetInterface(void) { return this->TaskInterface; } - bool IsValid(void) { return this->GetInterface() != NULL; } + CTaskSAInterface* GetInterface() { return this->TaskInterface; } + bool IsValid() { return this->GetInterface() != NULL; } void CreateTaskInterface(size_t nSize); void SetAsPedTask(CPed* pPed, const int iTaskPriority, const bool bForceNewTask = false); void SetAsSecondaryPedTask(CPed* pPed, const int iType); - void Destroy(void); - void DestroyJustThis(void); + void Destroy(); + void DestroyJustThis(); }; union UCTask { @@ -146,7 +146,7 @@ static T* ValidNewTask(T* pTask) } template -static T* NewTask(void) +static T* NewTask() { return ValidNewTask(new T()); } diff --git a/Client/game_sa/TaskSecondarySA.h b/Client/game_sa/TaskSecondarySA.h index 6c1398156e5..beb75eb23ae 100644 --- a/Client/game_sa/TaskSecondarySA.h +++ b/Client/game_sa/TaskSecondarySA.h @@ -48,6 +48,6 @@ class CTaskSimpleDuckSAInterface : public CTaskSimpleSAInterface class CTaskSimpleDuckSA : public virtual CTaskSimpleSA, public virtual CTaskSimpleDuck { public: - CTaskSimpleDuckSA(void){}; + CTaskSimpleDuckSA(){}; CTaskSimpleDuckSA(eDuckControlTypes nDuckControl, unsigned short nLengthOfDuck = 0, short nUseShotsWhizzingEvents = -1); }; diff --git a/Client/game_sa/gamesa_renderware.h b/Client/game_sa/gamesa_renderware.h index ae177e87b28..351d37db9b9 100644 --- a/Client/game_sa/gamesa_renderware.h +++ b/Client/game_sa/gamesa_renderware.h @@ -29,7 +29,7 @@ class CColModelSAInterface; #define RpSetFrame(__c,__f) ((((RwObject *)(__c))->parent) = (void *)(__f)) /* RenderWare function defines */ -typedef RpAtomic*(__cdecl* RpAtomicCreate_t)(void); +typedef RpAtomic*(__cdecl* RpAtomicCreate_t)(); typedef RpAtomic*(__cdecl* RpAtomicClone_t)(RpAtomic* atomic); typedef int(__cdecl* RpAtomicDestroy_t)(RpAtomic* atomic); typedef RpAtomic*(__cdecl* RpAtomicSetGeometry_t)(RpAtomic* atomic, RpGeometry* geometry, unsigned int flags); @@ -43,7 +43,7 @@ typedef RwFrame*(__cdecl* RwFrameRemoveChild_t)(RwFrame* child); typedef RwFrame*(__cdecl* RwFrameForAllObjects_t)(RwFrame* frame, void* callback, void* data); typedef RwFrame*(__cdecl* RwFrameTranslate_t)(RwFrame* frame, const RwV3d* v, RwTransformOrder order); typedef RwFrame*(__cdecl* RwFrameScale_t)(RwFrame* frame, const RwV3d* v, RwTransformOrder order); -typedef RwFrame*(__cdecl* RwFrameCreate_t)(void); +typedef RwFrame*(__cdecl* RwFrameCreate_t)(); typedef RwFrame*(__cdecl* RwFrameSetIdentity_t)(RwFrame* frame); typedef RpGeometry*(__cdecl* RpGeometryCreate_t)(int numverts, int numtriangles, unsigned int format); typedef const RpGeometry*(__cdecl* RpGeometryTriangleSetVertexIndices_t)(const RpGeometry* geo, RpTriangle* tri, unsigned short v1, unsigned short v2, @@ -55,20 +55,20 @@ typedef RpGeometry*(__cdecl* RpGeometryTriangleSetMaterial_t)(RpGeometry* geo, R typedef int(__cdecl* RpGeometryDestroy_t)(RpGeometry* geo); typedef void*(__cdecl* RwIm3DTransform_t)(RwVertex* pVerts, unsigned int numVerts, RwMatrix* ltm, unsigned int flags); typedef int(__cdecl* RwIm3DRenderIndexedPrimitive_t)(RwPrimitiveType primType, unsigned short* indices, int numIndices); -typedef int(__cdecl* RwIm3DEnd_t)(void); +typedef int(__cdecl* RwIm3DEnd_t)(); typedef RpLight*(__cdecl* RpLightCreate_t)(int type); typedef RpLight*(__cdecl* RpLightSetRadius_t)(RpLight* light, float radius); typedef RpLight*(__cdecl* RpLightSetColor_t)(RpLight* light, const RwColorFloat* color); -typedef RwMatrix*(__cdecl* RwMatrixCreate_t)(void); +typedef RwMatrix*(__cdecl* RwMatrixCreate_t)(); typedef RwMatrix*(__cdecl* RwMatrixInvert_t)(RwMatrix* dst, const RwMatrix* src); typedef RwMatrix*(__cdecl* RwMatrixTranslate_t)(RwMatrix* matrix, const RwV3d* translation, RwTransformOrder order); typedef RwMatrix*(__cdecl* RwMatrixScale_t)(RwMatrix* matrix, const RwV3d* translation, RwTransformOrder order); -typedef RpMaterial*(__cdecl* RpMaterialCreate_t)(void); +typedef RpMaterial*(__cdecl* RpMaterialCreate_t)(); typedef int(__cdecl* RpMaterialDestroy_t)(RpMaterial* mat); typedef RwTexDictionary*(__cdecl* RwTexDictionarySetCurrent_t)(RwTexDictionary* dict); typedef const RwTexDictionary*(__cdecl* RwTexDictionaryForAllTextures_t)(const RwTexDictionary* dict, void* callback, void* data); typedef RwTexture*(__cdecl* RwTexDictionaryAddTexture_t)(RwTexDictionary* dict, RwTexture* texture); -typedef RwTexDictionary*(__cdecl* RwTexDictionaryGetCurrent_t)(void); +typedef RwTexDictionary*(__cdecl* RwTexDictionaryGetCurrent_t)(); typedef RwTexture*(__cdecl* RwTexDictionaryFindNamedTexture_t)(RwTexDictionary* dict, const char* name); typedef void(__cdecl* RpPrtStdGlobalDataSetStreamEmbedded_t)(void* value); typedef RpWorld*(__cdecl* RpWorldAddAtomic_t)(RpWorld* world, RpAtomic* atomic); diff --git a/Client/gui/CGUIButton_Impl.cpp b/Client/gui/CGUIButton_Impl.cpp index 73b945144ee..ac21d0a84ed 100644 --- a/Client/gui/CGUIButton_Impl.cpp +++ b/Client/gui/CGUIButton_Impl.cpp @@ -47,7 +47,7 @@ CGUIButton_Impl::CGUIButton_Impl(CGUI_Impl* pGUI, CGUIElement* pParent, const ch } } -CGUIButton_Impl::~CGUIButton_Impl(void) +CGUIButton_Impl::~CGUIButton_Impl() { DestroyElement(); } diff --git a/Client/gui/CGUIButton_Impl.h b/Client/gui/CGUIButton_Impl.h index 111d24bf7ad..e5a0e6ee09b 100644 --- a/Client/gui/CGUIButton_Impl.h +++ b/Client/gui/CGUIButton_Impl.h @@ -18,9 +18,9 @@ class CGUIButton_Impl : public CGUIButton, public CGUIElement_Impl { public: CGUIButton_Impl(class CGUI_Impl* pGUI, CGUIElement* pParent = NULL, const char* szCaption = ""); - ~CGUIButton_Impl(void); + ~CGUIButton_Impl(); - eCGUIType GetType(void) { return CGUI_BUTTON; }; + eCGUIType GetType() { return CGUI_BUTTON; }; #include "CGUIElement_Inc.h" }; diff --git a/Client/gui/CGUICheckBox_Impl.cpp b/Client/gui/CGUICheckBox_Impl.cpp index b6421322346..e381f935418 100644 --- a/Client/gui/CGUICheckBox_Impl.cpp +++ b/Client/gui/CGUICheckBox_Impl.cpp @@ -51,7 +51,7 @@ CGUICheckBox_Impl::CGUICheckBox_Impl(CGUI_Impl* pGUI, CGUIElement* pParent, cons } } -CGUICheckBox_Impl::~CGUICheckBox_Impl(void) +CGUICheckBox_Impl::~CGUICheckBox_Impl() { DestroyElement(); } @@ -61,7 +61,7 @@ void CGUICheckBox_Impl::SetSelected(bool bChecked) reinterpret_cast(m_pWindow)->setSelected(!bChecked); } -bool CGUICheckBox_Impl::GetSelected(void) +bool CGUICheckBox_Impl::GetSelected() { return !(reinterpret_cast(m_pWindow)->isSelected()); } diff --git a/Client/gui/CGUICheckBox_Impl.h b/Client/gui/CGUICheckBox_Impl.h index cab1adccf52..25f99d9e49e 100644 --- a/Client/gui/CGUICheckBox_Impl.h +++ b/Client/gui/CGUICheckBox_Impl.h @@ -18,12 +18,12 @@ class CGUICheckBox_Impl : public CGUICheckBox, public CGUIElement_Impl { public: CGUICheckBox_Impl(class CGUI_Impl* pGUI, CGUIElement* pParent = NULL, const char* szCaption = "", bool bChecked = false); - ~CGUICheckBox_Impl(void); + ~CGUICheckBox_Impl(); void SetSelected(bool bChecked); - bool GetSelected(void); + bool GetSelected(); - eCGUIType GetType(void) { return CGUI_CHECKBOX; }; + eCGUIType GetType() { return CGUI_CHECKBOX; }; #include "CGUIElement_Inc.h" }; diff --git a/Client/gui/CGUIComboBox_Impl.cpp b/Client/gui/CGUIComboBox_Impl.cpp index c8719b55317..930e160a853 100644 --- a/Client/gui/CGUIComboBox_Impl.cpp +++ b/Client/gui/CGUIComboBox_Impl.cpp @@ -54,7 +54,7 @@ CGUIComboBox_Impl::CGUIComboBox_Impl(CGUI_Impl* pGUI, CGUIElement* pParent, cons } } -CGUIComboBox_Impl::~CGUIComboBox_Impl(void) +CGUIComboBox_Impl::~CGUIComboBox_Impl() { Clear(); DestroyElement(); @@ -97,12 +97,12 @@ bool CGUIComboBox_Impl::RemoveItem(int index) return false; } -CGUIListItem* CGUIComboBox_Impl::GetSelectedItem(void) +CGUIListItem* CGUIComboBox_Impl::GetSelectedItem() { return GetListItem(reinterpret_cast(m_pWindow)->getSelectedItem()); } -int CGUIComboBox_Impl::GetSelectedItemIndex(void) +int CGUIComboBox_Impl::GetSelectedItemIndex() { CEGUI::ListboxItem* pItem = reinterpret_cast(m_pWindow)->getSelectedItem(); CFastHashMap::iterator it; @@ -227,7 +227,7 @@ bool CGUIComboBox_Impl::SetSelectedItemByIndex(int index) return false; } -void CGUIComboBox_Impl::Clear(void) +void CGUIComboBox_Impl::Clear() { reinterpret_cast(m_pWindow)->getDropList()->resetList(); @@ -241,7 +241,7 @@ void CGUIComboBox_Impl::Clear(void) m_pWindow->setText(storedCaption); } -bool CGUIComboBox_Impl::IsOpen(void) +bool CGUIComboBox_Impl::IsOpen() { return reinterpret_cast(m_pWindow)->isDropDownListVisible(); } @@ -261,7 +261,7 @@ CGUIListItem_Impl* CGUIComboBox_Impl::GetListItem(CEGUI::ListboxItem* pItem) return it->second; } -size_t CGUIComboBox_Impl::GetItemCount(void) +size_t CGUIComboBox_Impl::GetItemCount() { return reinterpret_cast(m_pWindow)->getItemCount(); } @@ -290,13 +290,13 @@ bool CGUIComboBox_Impl::Event_OnDropListRemoved(const CEGUI::EventArgs& e) return true; } -void CGUIComboBox_Impl::ShowDropList(void) +void CGUIComboBox_Impl::ShowDropList() { reinterpret_cast(m_pWindow)->showDropList(); reinterpret_cast(m_pWindow)->setSingleClickEnabled(true); } -void CGUIComboBox_Impl::HideDropList(void) +void CGUIComboBox_Impl::HideDropList() { reinterpret_cast(m_pWindow)->hideDropList(); } diff --git a/Client/gui/CGUIComboBox_Impl.h b/Client/gui/CGUIComboBox_Impl.h index 212e82264ee..00becb458b5 100644 --- a/Client/gui/CGUIComboBox_Impl.h +++ b/Client/gui/CGUIComboBox_Impl.h @@ -18,31 +18,31 @@ class CGUIComboBox_Impl : public CGUIComboBox, public CGUIElement_Impl { public: CGUIComboBox_Impl(class CGUI_Impl* pGUI, CGUIElement* pParent = NULL, const char* szCaption = ""); - ~CGUIComboBox_Impl(void); + ~CGUIComboBox_Impl(); - eCGUIType GetType(void) { return CGUI_COMBOBOX; }; + eCGUIType GetType() { return CGUI_COMBOBOX; }; CGUIListItem* AddItem(const char* szText); CGUIListItem* AddItem(CGUIStaticImage* pImage); bool RemoveItem(int index); CGUIListItem* GetItemByIndex(int index); - CGUIListItem* GetSelectedItem(void); - int GetSelectedItemIndex(void); - size_t GetItemCount(void); + CGUIListItem* GetSelectedItem(); + int GetSelectedItemIndex(); + size_t GetItemCount(); int GetItemIndex(CGUIListItem* pItem); const char* GetItemText(int index); bool SetItemText(int index, const char* szText); bool SetSelectedItemByIndex(int index); - void Clear(void); - bool IsOpen(void); + void Clear(); + bool IsOpen(); void SetReadOnly(bool bReadonly); void SetSelectionHandler(GUI_CALLBACK Callback); void SetDropListRemoveHandler(GUI_CALLBACK Callback); - void ShowDropList(void); - void HideDropList(void); + void ShowDropList(); + void HideDropList(); #include "CGUIElement_Inc.h" diff --git a/Client/gui/CGUIEdit_Impl.cpp b/Client/gui/CGUIEdit_Impl.cpp index e425b486acf..00e0986714d 100644 --- a/Client/gui/CGUIEdit_Impl.cpp +++ b/Client/gui/CGUIEdit_Impl.cpp @@ -53,7 +53,7 @@ CGUIEdit_Impl::CGUIEdit_Impl(CGUI_Impl* pGUI, CGUIElement* pParent, const char* } } -CGUIEdit_Impl::~CGUIEdit_Impl(void) +CGUIEdit_Impl::~CGUIEdit_Impl() { if (GetParent() == NULL) { @@ -71,7 +71,7 @@ void CGUIEdit_Impl::SetReadOnly(bool bReadOnly) reinterpret_cast(m_pWindow)->setReadOnly(bReadOnly); } -bool CGUIEdit_Impl::IsReadOnly(void) +bool CGUIEdit_Impl::IsReadOnly() { return reinterpret_cast(m_pWindow)->isReadOnly(); } @@ -81,7 +81,7 @@ void CGUIEdit_Impl::SetMasked(bool bMasked) reinterpret_cast(m_pWindow)->setTextMasked(bMasked); } -bool CGUIEdit_Impl::IsMasked(void) +bool CGUIEdit_Impl::IsMasked() { return reinterpret_cast(m_pWindow)->isTextMasked(); } @@ -91,7 +91,7 @@ void CGUIEdit_Impl::SetMaxLength(unsigned int uiMaxLength) reinterpret_cast(m_pWindow)->setMaxTextLength(uiMaxLength); } -unsigned int CGUIEdit_Impl::GetMaxLength(void) +unsigned int CGUIEdit_Impl::GetMaxLength() { return static_cast(reinterpret_cast(m_pWindow)->getMaxTextLength()); } @@ -101,17 +101,17 @@ void CGUIEdit_Impl::SetSelection(unsigned int uiStart, unsigned int uiEnd) reinterpret_cast(m_pWindow)->setSelection(uiStart, uiEnd); } -unsigned int CGUIEdit_Impl::GetSelectionStart(void) +unsigned int CGUIEdit_Impl::GetSelectionStart() { return static_cast(reinterpret_cast(m_pWindow)->getSelectionStartIndex()); } -unsigned int CGUIEdit_Impl::GetSelectionEnd(void) +unsigned int CGUIEdit_Impl::GetSelectionEnd() { return static_cast(reinterpret_cast(m_pWindow)->getSelectionEndIndex()); } -unsigned int CGUIEdit_Impl::GetSelectionLength(void) +unsigned int CGUIEdit_Impl::GetSelectionLength() { return static_cast(reinterpret_cast(m_pWindow)->getSelectionLength()); } @@ -121,17 +121,17 @@ void CGUIEdit_Impl::SetCaretIndex(unsigned int uiIndex) return reinterpret_cast(m_pWindow)->setCaratIndex(uiIndex); } -void CGUIEdit_Impl::SetCaretAtStart(void) +void CGUIEdit_Impl::SetCaretAtStart() { reinterpret_cast(m_pWindow)->setCaratIndex(0); } -void CGUIEdit_Impl::SetCaretAtEnd(void) +void CGUIEdit_Impl::SetCaretAtEnd() { reinterpret_cast(m_pWindow)->setCaratIndex(GetText().length()); } -unsigned int CGUIEdit_Impl::GetCaretIndex(void) +unsigned int CGUIEdit_Impl::GetCaretIndex() { return static_cast(reinterpret_cast(m_pWindow)->getCaratIndex()); } @@ -156,7 +156,7 @@ void CGUIEdit_Impl::SetRenderingStartedHandler(GUI_CALLBACK Callback) m_OnRenderingStarted = Callback; } -bool CGUIEdit_Impl::ActivateOnTab(void) +bool CGUIEdit_Impl::ActivateOnTab() { // Only select this as active if its visible and writable if (IsVisible() && !IsReadOnly()) diff --git a/Client/gui/CGUIEdit_Impl.h b/Client/gui/CGUIEdit_Impl.h index 0517931c3f1..9d7f11bd210 100644 --- a/Client/gui/CGUIEdit_Impl.h +++ b/Client/gui/CGUIEdit_Impl.h @@ -18,34 +18,34 @@ class CGUIEdit_Impl : public CGUIEdit, public CGUIElement_Impl, public CGUITabLi { public: CGUIEdit_Impl(class CGUI_Impl* pGUI, CGUIElement* pParent = NULL, const char* szText = ""); - ~CGUIEdit_Impl(void); + ~CGUIEdit_Impl(); void SetReadOnly(bool bReadOnly); - bool IsReadOnly(void); + bool IsReadOnly(); void SetMasked(bool bMasked); - bool IsMasked(void); + bool IsMasked(); void SetMaxLength(unsigned int uiMaxLength); - unsigned int GetMaxLength(void); + unsigned int GetMaxLength(); void SetSelection(unsigned int uiStart, unsigned int uiEnd); - unsigned int GetSelectionStart(void); - unsigned int GetSelectionEnd(void); - unsigned int GetSelectionLength(void); + unsigned int GetSelectionStart(); + unsigned int GetSelectionEnd(); + unsigned int GetSelectionLength(); void SetCaretIndex(unsigned int uiIndex); - void SetCaretAtStart(void); - void SetCaretAtEnd(void); - unsigned int GetCaretIndex(void); + void SetCaretAtStart(); + void SetCaretAtEnd(); + unsigned int GetCaretIndex(); void SetTextAcceptedHandler(GUI_CALLBACK Callback); void SetTextChangedHandler(GUI_CALLBACK Callback); void SetRenderingEndedHandler(GUI_CALLBACK Callback); void SetRenderingStartedHandler(GUI_CALLBACK Callback); - bool ActivateOnTab(void); + bool ActivateOnTab(); - eCGUIType GetType(void) { return CGUI_EDIT; }; + eCGUIType GetType() { return CGUI_EDIT; }; #include "CGUIElement_Inc.h" diff --git a/Client/gui/CGUIElement_Impl.cpp b/Client/gui/CGUIElement_Impl.cpp index 734cdb889a2..e39e3fae9bd 100644 --- a/Client/gui/CGUIElement_Impl.cpp +++ b/Client/gui/CGUIElement_Impl.cpp @@ -18,7 +18,7 @@ #define CGUI_NODRAW_TOP 9.0f #define CGUI_NODRAW_BOTTOM 9.0f -CGUIElement_Impl::CGUIElement_Impl(void) +CGUIElement_Impl::CGUIElement_Impl() { m_pData = NULL; m_pWindow = NULL; @@ -26,7 +26,7 @@ CGUIElement_Impl::CGUIElement_Impl(void) m_pManager = NULL; } -void CGUIElement_Impl::DestroyElement(void) +void CGUIElement_Impl::DestroyElement() { m_pManager->RemoveFromRedrawQueue(reinterpret_cast((m_pWindow)->getUserData())); @@ -45,7 +45,7 @@ void CGUIElement_Impl::SetVisible(bool bVisible) m_pWindow->setVisible(bVisible); } -bool CGUIElement_Impl::IsVisible(void) +bool CGUIElement_Impl::IsVisible() { return m_pWindow->isVisible(); } @@ -56,7 +56,7 @@ void CGUIElement_Impl::SetEnabled(bool bEnabled) // m_pWindow->setZOrderingEnabled ( bEnabled ); } -bool CGUIElement_Impl::IsEnabled(void) +bool CGUIElement_Impl::IsEnabled() { return !m_pWindow->isDisabled(); } @@ -66,17 +66,17 @@ void CGUIElement_Impl::SetZOrderingEnabled(bool bZOrderingEnabled) m_pWindow->setZOrderingEnabled(bZOrderingEnabled); } -bool CGUIElement_Impl::IsZOrderingEnabled(void) +bool CGUIElement_Impl::IsZOrderingEnabled() { return m_pWindow->isZOrderingEnabled(); } -void CGUIElement_Impl::BringToFront(void) +void CGUIElement_Impl::BringToFront() { m_pWindow->moveToFront(); } -void CGUIElement_Impl::MoveToBack(void) +void CGUIElement_Impl::MoveToBack() { m_pWindow->moveToBack(); } @@ -183,7 +183,7 @@ void CGUIElement_Impl::SetMinimumSize(const CVector2D& vecSize) m_pWindow->setMinimumSize(CEGUI::Size(vecSize.fX, vecSize.fY)); } -CVector2D CGUIElement_Impl::GetMinimumSize(void) +CVector2D CGUIElement_Impl::GetMinimumSize() { const CEGUI::Size& TempSize = m_pWindow->getMinimumSize(); return CVector2D(TempSize.d_width, TempSize.d_height); @@ -201,7 +201,7 @@ void CGUIElement_Impl::SetMaximumSize(const CVector2D& vecSize) m_pWindow->setMaximumSize(CEGUI::Size(vecSize.fX, vecSize.fY)); } -CVector2D CGUIElement_Impl::GetMaximumSize(void) +CVector2D CGUIElement_Impl::GetMaximumSize() { const CEGUI::Size& TempSize = m_pWindow->getMaximumSize(); return CVector2D(TempSize.d_width, TempSize.d_height); @@ -219,7 +219,7 @@ void CGUIElement_Impl::SetText(const char* szText) m_pWindow->setText(CGUI_Impl::GetUTFString(szText)); } -std::string CGUIElement_Impl::GetText(void) +std::string CGUIElement_Impl::GetText() { return CGUI_Impl::GetUTFString(m_pWindow->getText().c_str()).c_str(); } @@ -229,12 +229,12 @@ void CGUIElement_Impl::SetAlpha(float fAlpha) m_pWindow->setAlpha(fAlpha); } -float CGUIElement_Impl::GetAlpha(void) +float CGUIElement_Impl::GetAlpha() { return m_pWindow->getAlpha(); } -float CGUIElement_Impl::GetEffectiveAlpha(void) +float CGUIElement_Impl::GetEffectiveAlpha() { return m_pWindow->getEffectiveAlpha(); } @@ -244,22 +244,22 @@ void CGUIElement_Impl::SetInheritsAlpha(bool bInheritsAlpha) m_pWindow->setInheritsAlpha(bInheritsAlpha); } -bool CGUIElement_Impl::GetInheritsAlpha(void) +bool CGUIElement_Impl::GetInheritsAlpha() { return m_pWindow->inheritsAlpha(); } -void CGUIElement_Impl::Activate(void) +void CGUIElement_Impl::Activate() { m_pWindow->activate(); } -void CGUIElement_Impl::Deactivate(void) +void CGUIElement_Impl::Deactivate() { m_pWindow->deactivate(); } -bool CGUIElement_Impl::IsActive(void) +bool CGUIElement_Impl::IsActive() { return m_pWindow->isActive(); } @@ -269,7 +269,7 @@ void CGUIElement_Impl::SetAlwaysOnTop(bool bAlwaysOnTop) m_pWindow->setAlwaysOnTop(bAlwaysOnTop); } -bool CGUIElement_Impl::IsAlwaysOnTop(void) +bool CGUIElement_Impl::IsAlwaysOnTop() { return m_pWindow->isAlwaysOnTop(); } @@ -317,7 +317,7 @@ void CGUIElement_Impl::SetParent(CGUIElement* pParent) m_pParent = pParent; } -CGUIElement* CGUIElement_Impl::GetParent(void) +CGUIElement* CGUIElement_Impl::GetParent() { // Validate if (m_pParent && m_pWindow && !m_pWindow->getParent()) @@ -326,12 +326,12 @@ CGUIElement* CGUIElement_Impl::GetParent(void) return m_pParent; } -CEGUI::Window* CGUIElement_Impl::GetWindow(void) +CEGUI::Window* CGUIElement_Impl::GetWindow() { return m_pWindow; } -void CGUIElement_Impl::CorrectEdges(void) +void CGUIElement_Impl::CorrectEdges() { CEGUI::Point currentPoint = m_pWindow->getPosition(CEGUI::Absolute); CEGUI::Size currentSize = m_pWindow->getSize(CEGUI::Absolute); @@ -368,7 +368,7 @@ bool CGUIElement_Impl::SetFont(const char* szFontName) } } -std::string CGUIElement_Impl::GetFont(void) +std::string CGUIElement_Impl::GetFont() { try { @@ -413,7 +413,7 @@ std::string CGUIElement_Impl::GetProperty(const char* szProperty) return strValue.c_str(); } -void CGUIElement_Impl::FillProperties(void) +void CGUIElement_Impl::FillProperties() { CEGUI::Window::PropertyIterator itPropertySet = ((CEGUI::PropertySet*)m_pWindow)->getIterator(); while (!itPropertySet.isAtEnd()) @@ -430,7 +430,7 @@ void CGUIElement_Impl::FillProperties(void) } } -void CGUIElement_Impl::EmptyProperties(void) +void CGUIElement_Impl::EmptyProperties() { if (!m_Properties.empty()) { @@ -446,7 +446,7 @@ void CGUIElement_Impl::EmptyProperties(void) } } -CGUIPropertyIter CGUIElement_Impl::GetPropertiesBegin(void) +CGUIPropertyIter CGUIElement_Impl::GetPropertiesBegin() { try { @@ -463,7 +463,7 @@ CGUIPropertyIter CGUIElement_Impl::GetPropertiesBegin(void) } } -CGUIPropertyIter CGUIElement_Impl::GetPropertiesEnd(void) +CGUIPropertyIter CGUIElement_Impl::GetPropertiesEnd() { try { @@ -540,7 +540,7 @@ void CGUIElement_Impl::SetKeyDownHandler(const GUI_CALLBACK_KEY& Callback) m_OnKeyDownWithArgs = Callback; } -void CGUIElement_Impl::AddEvents(void) +void CGUIElement_Impl::AddEvents() { // Note: Mouse Click, Double Click, Enter, Leave and ButtonDown are handled by global events in CGUI_Impl // Register our events @@ -565,35 +565,35 @@ bool CGUIElement_Impl::Event_OnSized(const CEGUI::EventArgs& e) return true; } -bool CGUIElement_Impl::Event_OnClick(void) +bool CGUIElement_Impl::Event_OnClick() { if (m_OnClick) m_OnClick(reinterpret_cast(this)); return true; } -bool CGUIElement_Impl::Event_OnDoubleClick(void) +bool CGUIElement_Impl::Event_OnDoubleClick() { if (m_OnDoubleClick) m_OnDoubleClick(reinterpret_cast(this)); return true; } -bool CGUIElement_Impl::Event_OnMouseEnter(void) +bool CGUIElement_Impl::Event_OnMouseEnter() { if (m_OnMouseEnter) m_OnMouseEnter(reinterpret_cast(this)); return true; } -bool CGUIElement_Impl::Event_OnMouseLeave(void) +bool CGUIElement_Impl::Event_OnMouseLeave() { if (m_OnMouseLeave) m_OnMouseLeave(reinterpret_cast(this)); return true; } -bool CGUIElement_Impl::Event_OnMouseButtonDown(void) +bool CGUIElement_Impl::Event_OnMouseButtonDown() { if (m_OnMouseDown) m_OnMouseDown(reinterpret_cast(this)); @@ -658,7 +658,7 @@ bool CGUIElement_Impl::Event_OnKeyDown(const CEGUI::EventArgs& e) return true; } -inline void CGUIElement_Impl::ForceRedraw(void) +inline void CGUIElement_Impl::ForceRedraw() { m_pWindow->forceRedraw(); } \ No newline at end of file diff --git a/Client/gui/CGUIElement_Impl.h b/Client/gui/CGUIElement_Impl.h index 8ad74851ac8..3d317a2ca06 100644 --- a/Client/gui/CGUIElement_Impl.h +++ b/Client/gui/CGUIElement_Impl.h @@ -25,18 +25,18 @@ class CGUI_Impl; class CGUIElement_Impl : public CGUIElement { public: - CGUIElement_Impl(void); + CGUIElement_Impl(); void SetVisible(bool bVisible); - bool IsVisible(void); + bool IsVisible(); void SetEnabled(bool bEnabled); - bool IsEnabled(void); + bool IsEnabled(); void SetZOrderingEnabled(bool bZOrderingEnabled); - bool IsZOrderingEnabled(void); + bool IsZOrderingEnabled(); - void BringToFront(void); - void MoveToBack(void); + void BringToFront(); + void MoveToBack(); void SetPosition(const CVector2D& vecPosition, bool bRelative = false); CVector2D GetPosition(bool bRelative = false); @@ -52,34 +52,34 @@ class CGUIElement_Impl : public CGUIElement void AutoSize(const char* Text = NULL, float fPaddingX = 0.0f, float fPaddingY = 2.0f); bool SetFont(const char* szFontName); - std::string GetFont(void); + std::string GetFont(); void SetProperty(const char* szProperty, const char* szValue); std::string GetProperty(const char* szProperty); void SetMinimumSize(const CVector2D& vecSize); - CVector2D GetMinimumSize(void); + CVector2D GetMinimumSize(); void GetMinimumSize(CVector2D& vecSize); void SetMaximumSize(const CVector2D& vecSize); - CVector2D GetMaximumSize(void); + CVector2D GetMaximumSize(); void GetMaximumSize(CVector2D& vecSize); void SetText(const char* Text); - std::string GetText(void); + std::string GetText(); void SetAlpha(float fAlpha); - float GetAlpha(void); - float GetEffectiveAlpha(void); + float GetAlpha(); + float GetEffectiveAlpha(); void SetInheritsAlpha(bool bInheritsAlpha); - bool GetInheritsAlpha(void); + bool GetInheritsAlpha(); - void Activate(void); - void Deactivate(void); - bool IsActive(void); + void Activate(); + void Deactivate(); + bool IsActive(); void SetAlwaysOnTop(bool bAlwaysOnTop); - bool IsAlwaysOnTop(void); + bool IsAlwaysOnTop(); CRect2D AbsoluteToRelative(const CRect2D& Rect); CVector2D AbsoluteToRelative(const CVector2D& Vector); @@ -88,17 +88,17 @@ class CGUIElement_Impl : public CGUIElement CVector2D RelativeToAbsolute(const CVector2D& Vector); void SetParent(CGUIElement* pParent); - CGUIElement* GetParent(void); + CGUIElement* GetParent(); - CEGUI::Window* GetWindow(void); + CEGUI::Window* GetWindow(); - void ForceRedraw(void); + void ForceRedraw(); void SetUserData(void* pData) { m_pData = pData; } - void* GetUserData(void) { return m_pData; } + void* GetUserData() { return m_pData; } - CGUIPropertyIter GetPropertiesBegin(void); - CGUIPropertyIter GetPropertiesEnd(void); + CGUIPropertyIter GetPropertiesBegin(); + CGUIPropertyIter GetPropertiesEnd(); void SetMovedHandler(GUI_CALLBACK Callback); void SetSizedHandler(GUI_CALLBACK Callback); @@ -113,20 +113,20 @@ class CGUIElement_Impl : public CGUIElement void SetKeyDownHandler(const GUI_CALLBACK_KEY& Callback); void SetEnterKeyHandler(GUI_CALLBACK Callback); - bool Event_OnClick(void); - bool Event_OnDoubleClick(void); - bool Event_OnMouseEnter(void); - bool Event_OnMouseLeave(void); - bool Event_OnMouseButtonDown(void); + bool Event_OnClick(); + bool Event_OnDoubleClick(); + bool Event_OnMouseEnter(); + bool Event_OnMouseLeave(); + bool Event_OnMouseButtonDown(); protected: - void DestroyElement(void); + void DestroyElement(); - void CorrectEdges(void); - void FillProperties(void); - void EmptyProperties(void); + void CorrectEdges(); + void FillProperties(); + void EmptyProperties(); - void AddEvents(void); + void AddEvents(); bool Event_OnMoved(const CEGUI::EventArgs& e); bool Event_OnSized(const CEGUI::EventArgs& e); diff --git a/Client/gui/CGUIElement_Inc.h b/Client/gui/CGUIElement_Inc.h index 3bf62b64594..ac9a91f6a6c 100644 --- a/Client/gui/CGUIElement_Inc.h +++ b/Client/gui/CGUIElement_Inc.h @@ -19,11 +19,11 @@ std::string GetProperty(const char* szProperty) return CGUIElement_Impl::GetProperty(szProperty); }; -CGUIPropertyIter GetPropertiesBegin(void) +CGUIPropertyIter GetPropertiesBegin() { return CGUIElement_Impl::GetPropertiesBegin(); }; -CGUIPropertyIter GetPropertiesEnd(void) +CGUIPropertyIter GetPropertiesEnd() { return CGUIElement_Impl::GetPropertiesEnd(); }; @@ -32,7 +32,7 @@ bool SetFont(const char* szFontName) { return CGUIElement_Impl::SetFont(szFontName); }; -std::string GetFont(void) +std::string GetFont() { return CGUIElement_Impl::GetFont(); }; @@ -42,7 +42,7 @@ void SetVisible(bool bVisible) { CGUIElement_Impl::SetVisible(bVisible); }; -bool IsVisible(void) +bool IsVisible() { return CGUIElement_Impl::IsVisible(); }; @@ -53,7 +53,7 @@ void SetEnabled(bool bEnabled) { CGUIElement_Impl::SetEnabled(bEnabled); }; -bool IsEnabled(void) +bool IsEnabled() { return CGUIElement_Impl::IsEnabled(); }; @@ -62,16 +62,16 @@ void SetZOrderingEnabled(bool bZOrderingEnabled) { CGUIElement_Impl::SetZOrderingEnabled(bZOrderingEnabled); }; -bool IsZOrderingEnabled(void) +bool IsZOrderingEnabled() { return CGUIElement_Impl::IsZOrderingEnabled(); }; -void BringToFront(void) +void BringToFront() { CGUIElement_Impl::BringToFront(); }; -void MoveToBack(void) +void MoveToBack() { CGUIElement_Impl::MoveToBack(); }; @@ -122,7 +122,7 @@ void SetMinimumSize(const CVector2D& vecSize) { CGUIElement_Impl::SetMinimumSize(vecSize); }; -CVector2D GetMinimumSize(void) +CVector2D GetMinimumSize() { return CGUIElement_Impl::GetMinimumSize(); }; @@ -135,7 +135,7 @@ void SetMaximumSize(const CVector2D& vecSize) { CGUIElement_Impl::SetMaximumSize(vecSize); }; -CVector2D GetMaximumSize(void) +CVector2D GetMaximumSize() { return CGUIElement_Impl::GetMaximumSize(); }; @@ -151,7 +151,7 @@ void SetText(const char* Text) }; #endif -std::string GetText(void) +std::string GetText() { return CGUIElement_Impl::GetText(); }; @@ -160,11 +160,11 @@ void SetAlpha(float fAlpha) { CGUIElement_Impl::SetAlpha(fAlpha); }; -float GetAlpha(void) +float GetAlpha() { return CGUIElement_Impl::GetAlpha(); }; -float GetEffectiveAlpha(void) +float GetEffectiveAlpha() { return CGUIElement_Impl::GetEffectiveAlpha(); }; @@ -172,25 +172,25 @@ void SetInheritsAlpha(bool bInheritsAlpha) { CGUIElement_Impl::SetInheritsAlpha(bInheritsAlpha); }; -bool GetInheritsAlpha(void) +bool GetInheritsAlpha() { return CGUIElement_Impl::GetInheritsAlpha(); }; -void Activate(void) +void Activate() { CGUIElement_Impl::Activate(); }; -void Deactivate(void) +void Deactivate() { CGUIElement_Impl::Deactivate(); }; -bool IsActive(void) +bool IsActive() { return CGUIElement_Impl::IsActive(); }; -void ForceRedraw(void) +void ForceRedraw() { CGUIElement_Impl::ForceRedraw(); }; @@ -198,7 +198,7 @@ void SetAlwaysOnTop(bool bAlwaysOnTop) { CGUIElement_Impl::SetAlwaysOnTop(bAlwaysOnTop); }; -bool IsAlwaysOnTop(void) +bool IsAlwaysOnTop() { return CGUIElement_Impl::IsAlwaysOnTop(); }; @@ -225,12 +225,12 @@ void SetParent(CGUIElement* pParent) { CGUIElement_Impl::SetParent(pParent); }; -CGUIElement* GetParent(void) +CGUIElement* GetParent() { return CGUIElement_Impl::GetParent(); }; -CEGUI::Window* GetWindow(void) +CEGUI::Window* GetWindow() { return CGUIElement_Impl::GetWindow(); }; @@ -239,7 +239,7 @@ void SetUserData(void* pData) { CGUIElement_Impl::SetUserData(pData); }; -void* GetUserData(void) +void* GetUserData() { return CGUIElement_Impl::GetUserData(); }; @@ -293,23 +293,23 @@ void SetEnterKeyHandler(GUI_CALLBACK Callback) CGUIElement_Impl::SetEnterKeyHandler(Callback); }; -bool Event_OnClick(void) +bool Event_OnClick() { return CGUIElement_Impl::Event_OnClick(); }; -bool Event_OnDoubleClick(void) +bool Event_OnDoubleClick() { return CGUIElement_Impl::Event_OnDoubleClick(); }; -bool Event_OnMouseEnter(void) +bool Event_OnMouseEnter() { return CGUIElement_Impl::Event_OnMouseEnter(); }; -bool Event_OnMouseLeave(void) +bool Event_OnMouseLeave() { return CGUIElement_Impl::Event_OnMouseLeave(); }; -bool Event_OnMouseButtonDown(void) +bool Event_OnMouseButtonDown() { return CGUIElement_Impl::Event_OnMouseButtonDown(); }; diff --git a/Client/gui/CGUIFont_Impl.cpp b/Client/gui/CGUIFont_Impl.cpp index 848354e53a1..3b028fef02b 100644 --- a/Client/gui/CGUIFont_Impl.cpp +++ b/Client/gui/CGUIFont_Impl.cpp @@ -38,7 +38,7 @@ CGUIFont_Impl::CGUIFont_Impl(CGUI_Impl* pGUI, const char* szFontName, const char SetAutoScalingEnabled(bAutoScale); } -CGUIFont_Impl::~CGUIFont_Impl(void) +CGUIFont_Impl::~CGUIFont_Impl() { m_pFontManager->destroyFont(m_pFont); } @@ -65,7 +65,7 @@ void CGUIFont_Impl::DrawTextString(const char* szText, CRect2D DrawArea, float f fScaleX, fScaleY); } -bool CGUIFont_Impl::IsAntiAliasingEnabled(void) +bool CGUIFont_Impl::IsAntiAliasingEnabled() { return m_pFont->isAntiAliased(); } @@ -75,7 +75,7 @@ void CGUIFont_Impl::SetAutoScalingEnabled(bool bAutoScaled) m_pFont->setAutoScalingEnabled(bAutoScaled); } -bool CGUIFont_Impl::IsAutoScalingEnabled(void) +bool CGUIFont_Impl::IsAutoScalingEnabled() { return m_pFont->isAutoScaled(); } @@ -107,7 +107,7 @@ float CGUIFont_Impl::GetTextExtent(const char* szText, float fScale) return m_pFont->getTextExtent(CGUI_Impl::GetUTFString(szText), fScale); } -CEGUI::Font* CGUIFont_Impl::GetFont(void) +CEGUI::Font* CGUIFont_Impl::GetFont() { return m_pFont; } diff --git a/Client/gui/CGUIFont_Impl.h b/Client/gui/CGUIFont_Impl.h index fe8684deeb0..2b7b895de85 100644 --- a/Client/gui/CGUIFont_Impl.h +++ b/Client/gui/CGUIFont_Impl.h @@ -19,12 +19,12 @@ class CGUIFont_Impl : public CGUIFont public: CGUIFont_Impl(class CGUI_Impl* pManager, const char* szFontName, const char* szFontFile, unsigned int uSize = 8, unsigned int uFlags = 0, bool bAutoScale = false); - ~CGUIFont_Impl(void); + ~CGUIFont_Impl(); void SetAntiAliasingEnabled(bool bAntialiased); - bool IsAntiAliasingEnabled(void); + bool IsAntiAliasingEnabled(); void SetAutoScalingEnabled(bool bAutoScaled); - bool IsAutoScalingEnabled(void); + bool IsAutoScalingEnabled(); void SetNativeResolution(int iX, int iY); @@ -32,7 +32,7 @@ class CGUIFont_Impl : public CGUIFont float GetFontHeight(float fScale = 1.0f); float GetTextExtent(const char* szText, float fScale = 1.0f); - CEGUI::Font* GetFont(void); + CEGUI::Font* GetFont(); void DrawTextString(const char* szText, CRect2D DrawArea, float fZ, CRect2D ClipRect, unsigned long ulFormat, unsigned long ulColor, float fScaleX, float fScaleY); diff --git a/Client/gui/CGUIGridList_Impl.cpp b/Client/gui/CGUIGridList_Impl.cpp index bcb027cf820..72582fa6a6f 100644 --- a/Client/gui/CGUIGridList_Impl.cpp +++ b/Client/gui/CGUIGridList_Impl.cpp @@ -63,7 +63,7 @@ CGUIGridList_Impl::CGUIGridList_Impl(CGUI_Impl* pGUI, CGUIElement* pParent, bool } } -CGUIGridList_Impl::~CGUIGridList_Impl(void) +CGUIGridList_Impl::~CGUIGridList_Impl() { Clear(); DestroyElement(); @@ -74,7 +74,7 @@ void CGUIGridList_Impl::SetSortingEnabled(bool bEnabled) reinterpret_cast(m_pWindow)->setUserSortControlEnabled(bEnabled); } -bool CGUIGridList_Impl::IsSortingEnabled(void) +bool CGUIGridList_Impl::IsSortingEnabled() { return reinterpret_cast(m_pWindow)->isUserSortControlEnabled(); } @@ -153,7 +153,7 @@ void CGUIGridList_Impl::SetVerticalScrollBar(bool bEnabled) reinterpret_cast(m_pWindow)->setShowVertScrollbar(bEnabled); } -int CGUIGridList_Impl::GetRowCount(void) +int CGUIGridList_Impl::GetRowCount() { try { @@ -165,7 +165,7 @@ int CGUIGridList_Impl::GetRowCount(void) } } -int CGUIGridList_Impl::GetColumnCount(void) +int CGUIGridList_Impl::GetColumnCount() { try { @@ -177,7 +177,7 @@ int CGUIGridList_Impl::GetColumnCount(void) } } -void CGUIGridList_Impl::ForceUpdate(void) +void CGUIGridList_Impl::ForceUpdate() { reinterpret_cast(m_pWindow)->forceUpdate(); } @@ -256,7 +256,7 @@ void CGUIGridList_Impl::AutoSizeColumn(unsigned int hColumn) } } -void CGUIGridList_Impl::Clear(void) +void CGUIGridList_Impl::Clear() { try { @@ -554,7 +554,7 @@ void CGUIGridList_Impl::SetItemImage(int iRow, int hColumn, CGUIStaticImage* pIm } } -float CGUIGridList_Impl::GetHorizontalScrollPosition(void) +float CGUIGridList_Impl::GetHorizontalScrollPosition() { try { @@ -568,7 +568,7 @@ float CGUIGridList_Impl::GetHorizontalScrollPosition(void) return 0.0f; } -float CGUIGridList_Impl::GetVerticalScrollPosition(void) +float CGUIGridList_Impl::GetVerticalScrollPosition() { try { @@ -624,7 +624,7 @@ int CGUIGridList_Impl::GetColumnIndex(int hColumn) return hColumn - 1; } -int CGUIGridList_Impl::GetSelectedCount(void) +int CGUIGridList_Impl::GetSelectedCount() { return reinterpret_cast(m_pWindow)->getSelectedCount(); } @@ -672,7 +672,7 @@ void CGUIGridList_Impl::SetSelectionMode(SelectionMode mode) } } -SelectionMode CGUIGridList_Impl::GetSelectionMode(void) +SelectionMode CGUIGridList_Impl::GetSelectionMode() { return (SelectionMode)reinterpret_cast(m_pWindow)->getSelectionMode(); } @@ -682,7 +682,7 @@ void CGUIGridList_Impl::GetVisibleRowRange(int& iFirst, int& iLast) reinterpret_cast(m_pWindow)->getVisibleRowRange(iFirst, iLast); } -CGUIListItem* CGUIGridList_Impl::GetSelectedItem(void) +CGUIListItem* CGUIGridList_Impl::GetSelectedItem() { return GetListItem(reinterpret_cast(m_pWindow)->getFirstSelectedItem()); } @@ -695,7 +695,7 @@ CGUIListItem* CGUIGridList_Impl::GetNextSelectedItem(CGUIListItem* pItem) return GetListItem(reinterpret_cast(m_pWindow)->getFirstSelectedItem()); } -int CGUIGridList_Impl::GetSelectedItemRow(void) +int CGUIGridList_Impl::GetSelectedItemRow() { CEGUI::ListboxItem* pItem = reinterpret_cast(m_pWindow)->getFirstSelectedItem(); if (pItem) @@ -710,7 +710,7 @@ int CGUIGridList_Impl::GetSelectedItemRow(void) return -1; } -int CGUIGridList_Impl::GetSelectedItemColumn(void) +int CGUIGridList_Impl::GetSelectedItemColumn() { CEGUI::ListboxItem* pItem = reinterpret_cast(m_pWindow)->getFirstSelectedItem(); if (pItem) @@ -794,7 +794,7 @@ bool CGUIGridList_Impl::Event_OnSortColumn(const CEGUI::EventArgs& e) return true; } -unsigned int CGUIGridList_Impl::GetUniqueHandle(void) +unsigned int CGUIGridList_Impl::GetUniqueHandle() { return ++m_hUniqueHandle; } diff --git a/Client/gui/CGUIGridList_Impl.h b/Client/gui/CGUIGridList_Impl.h index 6124a4d0a05..33b6eba6c18 100644 --- a/Client/gui/CGUIGridList_Impl.h +++ b/Client/gui/CGUIGridList_Impl.h @@ -20,7 +20,7 @@ class CGUIGridList_Impl : public CGUIGridList, public CGUIElement_Impl { public: CGUIGridList_Impl(class CGUI_Impl* pGUI, CGUIElement* pParent = NULL, bool bFrame = true); - ~CGUIGridList_Impl(void); + ~CGUIGridList_Impl(); unsigned int AddColumn(const char* szTitle, float fWidth); void RemoveColumn(unsigned int uiColumn); @@ -31,14 +31,14 @@ class CGUIGridList_Impl : public CGUIGridList, public CGUIElement_Impl const char* GetColumnTitle(int hColumn); void SetSelectionMode(SelectionMode mode); - SelectionMode GetSelectionMode(void); + SelectionMode GetSelectionMode(); int SetRowItemsText(int iRow, std::vector >* m_items); - void ForceUpdate(void); + void ForceUpdate(); int AddRow(bool bFast = false, std::vector >* m_items = NULL); void RemoveRow(int iRow); int InsertRowAfter(int iRow, std::vector >* m_items = NULL); - void Clear(void); + void Clear(); CGUIListItem* GetItem(int iRow, int hColumn); const char* GetItemText(int iRow, int hColumn); int SetItemText(int iRow, int hColumn, const char* szText, bool bNumber = false, bool bSection = false, bool bFast = false, const char* szSortText = NULL); @@ -51,11 +51,11 @@ class CGUIGridList_Impl : public CGUIGridList, public CGUIElement_Impl void SetHorizontalScrollBar(bool bEnabled); void SetVerticalScrollBar(bool bEnabled); void SetSortingEnabled(bool bEnabled); - bool IsSortingEnabled(void); + bool IsSortingEnabled(); void SetItemImage(int iRow, int hColumn, CGUIStaticImage* pImage); - float GetHorizontalScrollPosition(void); - float GetVerticalScrollPosition(void); + float GetHorizontalScrollPosition(); + float GetVerticalScrollPosition(); void SetHorizontalScrollPosition(float fPosition); void SetVerticalScrollPosition(float fPosition); @@ -63,13 +63,13 @@ class CGUIGridList_Impl : public CGUIGridList, public CGUIElement_Impl int GetItemColumnIndex(CGUIListItem* pItem); int GetItemRowIndex(CGUIListItem* pItem); void GetVisibleRowRange(int& iFirst, int& iLast); - int GetSelectedCount(void); - CGUIListItem* GetSelectedItem(void); + int GetSelectedCount(); + CGUIListItem* GetSelectedItem(); CGUIListItem* GetNextSelectedItem(CGUIListItem* pItem); - int GetSelectedItemRow(void); - int GetSelectedItemColumn(void); - int GetRowCount(void); - int GetColumnCount(void); + int GetSelectedItemRow(); + int GetSelectedItemColumn(); + int GetRowCount(); + int GetColumnCount(); bool IsColumnSegmentSizingEnabled(int hColumn); void SetColumnSegmentSizingEnabled(int hColumn, bool bEnabled); @@ -82,7 +82,7 @@ class CGUIGridList_Impl : public CGUIGridList, public CGUIElement_Impl void SetSortColumnHandler(GUI_CALLBACK Callback); void SetIgnoreTextSpacer(bool bIgnoreTextSpacer) { m_bIgnoreTextSpacer = bIgnoreTextSpacer; }; - eCGUIType GetType(void) { return CGUI_GRIDLIST; }; + eCGUIType GetType() { return CGUI_GRIDLIST; }; #include "CGUIElement_Inc.h" @@ -91,7 +91,7 @@ class CGUIGridList_Impl : public CGUIGridList, public CGUIElement_Impl int m_iIndex; - unsigned int GetUniqueHandle(void); + unsigned int GetUniqueHandle(); CGUIListItem_Impl* GetListItem(CEGUI::ListboxItem* pItem); unsigned int m_hUniqueHandle; diff --git a/Client/gui/CGUILabel_Impl.cpp b/Client/gui/CGUILabel_Impl.cpp index 9ba5afbec0a..0ad20fb62af 100644 --- a/Client/gui/CGUILabel_Impl.cpp +++ b/Client/gui/CGUILabel_Impl.cpp @@ -56,7 +56,7 @@ CGUILabel_Impl::CGUILabel_Impl(CGUI_Impl* pGUI, CGUIElement* pParent, const char } } -CGUILabel_Impl::~CGUILabel_Impl(void) +CGUILabel_Impl::~CGUILabel_Impl() { DestroyElement(); } @@ -72,7 +72,7 @@ void CGUILabel_Impl::SetVerticalAlign(CGUIVerticalAlign eAlign) reinterpret_cast(m_pWindow)->setVerticalFormatting(static_cast(eAlign)); } -CGUIVerticalAlign CGUILabel_Impl::GetVerticalAlign(void) +CGUIVerticalAlign CGUILabel_Impl::GetVerticalAlign() { return static_cast(reinterpret_cast(m_pWindow)->getVerticalFormatting()); } @@ -82,7 +82,7 @@ void CGUILabel_Impl::SetHorizontalAlign(CGUIHorizontalAlign eAlign) reinterpret_cast(m_pWindow)->setHorizontalFormatting(static_cast(eAlign)); } -CGUIHorizontalAlign CGUILabel_Impl::GetHorizontalAlign(void) +CGUIHorizontalAlign CGUILabel_Impl::GetHorizontalAlign() { return static_cast(reinterpret_cast(m_pWindow)->getHorizontalFormatting()); } @@ -97,7 +97,7 @@ void CGUILabel_Impl::SetTextColor(unsigned char ucRed, unsigned char ucGreen, un reinterpret_cast(m_pWindow)->setTextColours(CEGUI::colour(1.0f / 255.0f * ucRed, 1.0f / 255.0f * ucGreen, 1.0f / 255.0f * ucBlue)); } -CGUIColor CGUILabel_Impl::GetTextColor(void) +CGUIColor CGUILabel_Impl::GetTextColor() { CGUIColor temp; GetTextColor(temp.R, temp.G, temp.B); @@ -118,7 +118,7 @@ void CGUILabel_Impl::SetFrameEnabled(bool bFrameEnabled) reinterpret_cast(m_pWindow)->setFrameEnabled(bFrameEnabled); } -bool CGUILabel_Impl::IsFrameEnabled(void) +bool CGUILabel_Impl::IsFrameEnabled() { return reinterpret_cast(m_pWindow)->isFrameEnabled(); } @@ -129,7 +129,7 @@ float CGUILabel_Impl::GetCharacterWidth(int iCharIndex) return true; } -float CGUILabel_Impl::GetFontHeight(void) +float CGUILabel_Impl::GetFontHeight() { const CEGUI::Font* pFont = m_pWindow->getFont(); if (pFont) @@ -137,7 +137,7 @@ float CGUILabel_Impl::GetFontHeight(void) return 14.0f; } -float CGUILabel_Impl::GetTextExtent(void) +float CGUILabel_Impl::GetTextExtent() { const CEGUI::Font* pFont = m_pWindow->getFont(); if (pFont) diff --git a/Client/gui/CGUILabel_Impl.h b/Client/gui/CGUILabel_Impl.h index eead6f2a138..e3b4a41d52b 100644 --- a/Client/gui/CGUILabel_Impl.h +++ b/Client/gui/CGUILabel_Impl.h @@ -20,28 +20,28 @@ class CGUILabel_Impl : public CGUILabel, public CGUIElement_Impl { public: CGUILabel_Impl(class CGUI_Impl* pGUI, CGUIElement* pParent = NULL, const char* szText = ""); - ~CGUILabel_Impl(void); + ~CGUILabel_Impl(); void SetText(const char* Text); void SetVerticalAlign(CGUIVerticalAlign eAlign); - CGUIVerticalAlign GetVerticalAlign(void); + CGUIVerticalAlign GetVerticalAlign(); void SetHorizontalAlign(CGUIHorizontalAlign eAlign); - CGUIHorizontalAlign GetHorizontalAlign(void); + CGUIHorizontalAlign GetHorizontalAlign(); void SetTextColor(CGUIColor Color); void SetTextColor(unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue); - CGUIColor GetTextColor(void); + CGUIColor GetTextColor(); void GetTextColor(unsigned char& ucRed, unsigned char& ucGreen, unsigned char& ucBlue); void SetFrameEnabled(bool bFrameEnabled); - bool IsFrameEnabled(void); + bool IsFrameEnabled(); float GetCharacterWidth(int iCharIndex); - float GetFontHeight(void); - float GetTextExtent(void); + float GetFontHeight(); + float GetTextExtent(); - eCGUIType GetType(void) { return CGUI_LABEL; }; + eCGUIType GetType() { return CGUI_LABEL; }; #define EXCLUDE_SET_TEXT #include "CGUIElement_Inc.h" diff --git a/Client/gui/CGUIListItem_Impl.cpp b/Client/gui/CGUIListItem_Impl.cpp index 625a793cc76..5956a2bccf6 100644 --- a/Client/gui/CGUIListItem_Impl.cpp +++ b/Client/gui/CGUIListItem_Impl.cpp @@ -39,7 +39,7 @@ CGUIListItem_Impl::CGUIListItem_Impl(const char* szText, unsigned int uiType, CG m_pData = NULL; } -CGUIListItem_Impl::~CGUIListItem_Impl(void) +CGUIListItem_Impl::~CGUIListItem_Impl() { if (m_deleteDataCallback) m_deleteDataCallback(m_pData); @@ -84,17 +84,17 @@ void CGUIListItem_Impl::SetImage(CGUIStaticImage* pImage) } } -std::string CGUIListItem_Impl::GetText(void) const +std::string CGUIListItem_Impl::GetText() const { return CGUI_Impl::GetUTFString(m_pListItem->getText().c_str()).c_str(); } -CEGUI::ListboxItem* CGUIListItem_Impl::GetListItem(void) +CEGUI::ListboxItem* CGUIListItem_Impl::GetListItem() { return m_pListItem; } -bool CGUIListItem_Impl::GetSelectedState(void) +bool CGUIListItem_Impl::GetSelectedState() { return m_pListItem->isSelected(); } diff --git a/Client/gui/CGUIListItem_Impl.h b/Client/gui/CGUIListItem_Impl.h index 316e64107b4..7abefb65a2d 100644 --- a/Client/gui/CGUIListItem_Impl.h +++ b/Client/gui/CGUIListItem_Impl.h @@ -28,12 +28,12 @@ class CGUIListItem_Impl : public CGUIListItem }; CGUIListItem_Impl(const char* szText = "", unsigned int uiType = 0, CGUIStaticImage_Impl* pImage = NULL); - ~CGUIListItem_Impl(void); + ~CGUIListItem_Impl(); - std::string GetText(void) const; + std::string GetText() const; void SetText(const char* pszText, const char* pszSortText = NULL); - void* GetData(void) const { return m_pData; } + void* GetData() const { return m_pData; } void SetData(void* pData, CGUICallback deleteDataCallback = NULL) { m_pData = pData; @@ -45,13 +45,13 @@ class CGUIListItem_Impl : public CGUIListItem void SetFont(const char* szFontName); void SetImage(CGUIStaticImage* Image); - bool GetSelectedState(void); + bool GetSelectedState(); void SetSelectedState(bool bState); bool GetColor(unsigned char& ucRed, unsigned char& ucGreen, unsigned char& ucBlue, unsigned char& ucAlpha); void SetColor(unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue, unsigned char ucAlpha); - CEGUI::ListboxItem* GetListItem(void); + CEGUI::ListboxItem* GetListItem(); unsigned int ItemType; diff --git a/Client/gui/CGUIMemo_Impl.cpp b/Client/gui/CGUIMemo_Impl.cpp index 29acbcba105..dd557192b7b 100644 --- a/Client/gui/CGUIMemo_Impl.cpp +++ b/Client/gui/CGUIMemo_Impl.cpp @@ -52,7 +52,7 @@ CGUIMemo_Impl::CGUIMemo_Impl(CGUI_Impl* pGUI, CGUIElement* pParent, const char* } } -CGUIMemo_Impl::~CGUIMemo_Impl(void) +CGUIMemo_Impl::~CGUIMemo_Impl() { if (GetParent() == NULL) { @@ -70,18 +70,18 @@ void CGUIMemo_Impl::SetReadOnly(bool bReadOnly) reinterpret_cast(m_pWindow)->setReadOnly(bReadOnly); } -bool CGUIMemo_Impl::IsReadOnly(void) +bool CGUIMemo_Impl::IsReadOnly() { return reinterpret_cast(m_pWindow)->isReadOnly(); } -void CGUIMemo_Impl::EnsureCaratIsVisible(void) +void CGUIMemo_Impl::EnsureCaratIsVisible() { CEGUI::MultiLineEditbox* wndMemo = reinterpret_cast(m_pWindow); wndMemo->setCaratIndex((wndMemo->getText()).length()); } -unsigned int CGUIMemo_Impl::GetCaretIndex(void) +unsigned int CGUIMemo_Impl::GetCaretIndex() { return static_cast(reinterpret_cast(m_pWindow)->getCaratIndex()); } @@ -91,7 +91,7 @@ void CGUIMemo_Impl::SetCaretIndex(unsigned int uiIndex) reinterpret_cast(m_pWindow)->setCaratIndex(uiIndex); } -float CGUIMemo_Impl::GetVerticalScrollPosition(void) +float CGUIMemo_Impl::GetVerticalScrollPosition() { CEGUI::Scrollbar* pScrollbar = reinterpret_cast(m_pWindow)->d_vertScrollbar; if (pScrollbar) @@ -111,12 +111,12 @@ void CGUIMemo_Impl::SetVerticalScrollPosition(float fPosition) } } -float CGUIMemo_Impl::GetMaxVerticalScrollPosition(void) +float CGUIMemo_Impl::GetMaxVerticalScrollPosition() { return GetScrollbarDocumentSize() - GetScrollbarPageSize(); } -float CGUIMemo_Impl::GetScrollbarDocumentSize(void) +float CGUIMemo_Impl::GetScrollbarDocumentSize() { CEGUI::Scrollbar* pScrollbar = reinterpret_cast(m_pWindow)->d_vertScrollbar; if (pScrollbar) @@ -127,7 +127,7 @@ float CGUIMemo_Impl::GetScrollbarDocumentSize(void) return 1.0f; } -float CGUIMemo_Impl::GetScrollbarPageSize(void) +float CGUIMemo_Impl::GetScrollbarPageSize() { CEGUI::Scrollbar* pScrollbar = reinterpret_cast(m_pWindow)->d_vertScrollbar; if (pScrollbar) @@ -143,22 +143,22 @@ void CGUIMemo_Impl::SetSelection(unsigned int uiStart, unsigned int uiEnd) reinterpret_cast(m_pWindow)->setSelection(uiStart, uiEnd); } -unsigned int CGUIMemo_Impl::GetSelectionStart(void) +unsigned int CGUIMemo_Impl::GetSelectionStart() { return static_cast(reinterpret_cast(m_pWindow)->getSelectionStartIndex()); } -unsigned int CGUIMemo_Impl::GetSelectionEnd(void) +unsigned int CGUIMemo_Impl::GetSelectionEnd() { return static_cast(reinterpret_cast(m_pWindow)->getSelectionEndIndex()); } -unsigned int CGUIMemo_Impl::GetSelectionLength(void) +unsigned int CGUIMemo_Impl::GetSelectionLength() { return static_cast(reinterpret_cast(m_pWindow)->getSelectionLength()); } -bool CGUIMemo_Impl::ActivateOnTab(void) +bool CGUIMemo_Impl::ActivateOnTab() { // Only select this as active if its visible and writable if (IsVisible() && !IsReadOnly()) diff --git a/Client/gui/CGUIMemo_Impl.h b/Client/gui/CGUIMemo_Impl.h index e3e9c5b6979..64932fe1c93 100644 --- a/Client/gui/CGUIMemo_Impl.h +++ b/Client/gui/CGUIMemo_Impl.h @@ -18,32 +18,32 @@ class CGUIMemo_Impl : public CGUIMemo, public CGUIElement_Impl, public CGUITabLi { public: CGUIMemo_Impl(class CGUI_Impl* pGUI, CGUIElement* pParent = NULL, const char* szText = ""); - ~CGUIMemo_Impl(void); + ~CGUIMemo_Impl(); void SetReadOnly(bool bReadOnly); - bool IsReadOnly(void); + bool IsReadOnly(); - size_t GetCaretIndex(void); + size_t GetCaretIndex(); void SetCaretIndex(size_t Index); - float GetVerticalScrollPosition(void); + float GetVerticalScrollPosition(); void SetVerticalScrollPosition(float fPosition); - float GetMaxVerticalScrollPosition(void); - float GetScrollbarDocumentSize(void); - float GetScrollbarPageSize(void); + float GetMaxVerticalScrollPosition(); + float GetScrollbarDocumentSize(); + float GetScrollbarPageSize(); void SetSelection(unsigned int uiStart, unsigned int uiEnd); - unsigned int GetSelectionStart(void); - unsigned int GetSelectionEnd(void); - unsigned int GetSelectionLength(void); + unsigned int GetSelectionStart(); + unsigned int GetSelectionEnd(); + unsigned int GetSelectionLength(); - void EnsureCaratIsVisible(void); + void EnsureCaratIsVisible(); - bool ActivateOnTab(void); + bool ActivateOnTab(); void SetTextChangedHandler(const GUI_CALLBACK& Callback); - eCGUIType GetType(void) { return CGUI_MEMO; }; + eCGUIType GetType() { return CGUI_MEMO; }; #include "CGUIElement_Inc.h" diff --git a/Client/gui/CGUIMessageBox_Impl.cpp b/Client/gui/CGUIMessageBox_Impl.cpp index 73ede9248f0..345a212a0ed 100644 --- a/Client/gui/CGUIMessageBox_Impl.cpp +++ b/Client/gui/CGUIMessageBox_Impl.cpp @@ -88,7 +88,7 @@ CGUIMessageBox_Impl::CGUIMessageBox_Impl(CGUI_Impl* pGUI, const char* szTitle, c m_pWindow->Activate(); } -CGUIMessageBox_Impl::~CGUIMessageBox_Impl(void) +CGUIMessageBox_Impl::~CGUIMessageBox_Impl() { if (m_pButton) delete m_pButton; @@ -113,7 +113,7 @@ void CGUIMessageBox_Impl::SetAutoDestroy(bool bAutoDestroy) m_bAutoDestroy = bAutoDestroy; } -bool CGUIMessageBox_Impl::GetAutoDestroy(void) +bool CGUIMessageBox_Impl::GetAutoDestroy() { return m_bAutoDestroy; } @@ -123,7 +123,7 @@ void CGUIMessageBox_Impl::SetVisible(bool bVisible) m_pWindow->SetVisible(true); } -bool CGUIMessageBox_Impl::IsVisible(void) +bool CGUIMessageBox_Impl::IsVisible() { return m_pWindow->IsVisible(); } @@ -143,7 +143,7 @@ bool CGUIMessageBox_Impl::OnResponseHandler(CGUIElement* pElement) return true; } -CGUIWindow* CGUIMessageBox_Impl::GetWindow(void) +CGUIWindow* CGUIMessageBox_Impl::GetWindow() { return m_pWindow; } diff --git a/Client/gui/CGUIMessageBox_Impl.h b/Client/gui/CGUIMessageBox_Impl.h index 31b55b3777a..b2527d7dfda 100644 --- a/Client/gui/CGUIMessageBox_Impl.h +++ b/Client/gui/CGUIMessageBox_Impl.h @@ -21,17 +21,17 @@ class CGUIMessageBox_Impl : public CGUIMessageBox { public: CGUIMessageBox_Impl(class CGUI_Impl* pGUI, const char* szTitle, const char* szCaption, unsigned int uiFlags); - ~CGUIMessageBox_Impl(void); + ~CGUIMessageBox_Impl(); void SetAutoDestroy(bool bAutoDestroy); - bool GetAutoDestroy(void); + bool GetAutoDestroy(); void SetVisible(bool bVisible); - bool IsVisible(void); + bool IsVisible(); void SetClickHandler(GUI_CALLBACK Callback); - CGUIWindow* GetWindow(void); + CGUIWindow* GetWindow(); private: bool OnResponseHandler(CGUIElement* pElement); diff --git a/Client/gui/CGUIProgressBar_Impl.cpp b/Client/gui/CGUIProgressBar_Impl.cpp index 82311f85aef..2d5b1afc1e2 100644 --- a/Client/gui/CGUIProgressBar_Impl.cpp +++ b/Client/gui/CGUIProgressBar_Impl.cpp @@ -44,7 +44,7 @@ CGUIProgressBar_Impl::CGUIProgressBar_Impl(CGUI_Impl* pGUI, CGUIElement* pParent } } -CGUIProgressBar_Impl::~CGUIProgressBar_Impl(void) +CGUIProgressBar_Impl::~CGUIProgressBar_Impl() { DestroyElement(); } @@ -54,7 +54,7 @@ void CGUIProgressBar_Impl::SetProgress(float fProgress) reinterpret_cast(m_pWindow)->setProgress(fProgress); } -float CGUIProgressBar_Impl::GetProgress(void) +float CGUIProgressBar_Impl::GetProgress() { return reinterpret_cast(m_pWindow)->getProgress(); } diff --git a/Client/gui/CGUIProgressBar_Impl.h b/Client/gui/CGUIProgressBar_Impl.h index 7531abc589d..b23e989570d 100644 --- a/Client/gui/CGUIProgressBar_Impl.h +++ b/Client/gui/CGUIProgressBar_Impl.h @@ -18,12 +18,12 @@ class CGUIProgressBar_Impl : public CGUIProgressBar, public CGUIElement_Impl { public: CGUIProgressBar_Impl(class CGUI_Impl* pGUI, CGUIElement* pParent = NULL); - ~CGUIProgressBar_Impl(void); + ~CGUIProgressBar_Impl(); void SetProgress(float fProgress); - float GetProgress(void); + float GetProgress(); - eCGUIType GetType(void) { return CGUI_PROGRESSBAR; }; + eCGUIType GetType() { return CGUI_PROGRESSBAR; }; #include "CGUIElement_Inc.h" diff --git a/Client/gui/CGUIRadioButton_Impl.cpp b/Client/gui/CGUIRadioButton_Impl.cpp index 4d05f45a1d2..3d4477c287d 100644 --- a/Client/gui/CGUIRadioButton_Impl.cpp +++ b/Client/gui/CGUIRadioButton_Impl.cpp @@ -48,7 +48,7 @@ CGUIRadioButton_Impl::CGUIRadioButton_Impl(CGUI_Impl* pGUI, CGUIElement* pParent } } -CGUIRadioButton_Impl::~CGUIRadioButton_Impl(void) +CGUIRadioButton_Impl::~CGUIRadioButton_Impl() { DestroyElement(); } @@ -58,7 +58,7 @@ void CGUIRadioButton_Impl::SetSelected(bool bChecked) reinterpret_cast(m_pWindow)->setSelected(bChecked); } -bool CGUIRadioButton_Impl::GetSelected(void) +bool CGUIRadioButton_Impl::GetSelected() { return reinterpret_cast(m_pWindow)->isSelected(); } diff --git a/Client/gui/CGUIRadioButton_Impl.h b/Client/gui/CGUIRadioButton_Impl.h index 34b1e2bedb5..58607a430bb 100644 --- a/Client/gui/CGUIRadioButton_Impl.h +++ b/Client/gui/CGUIRadioButton_Impl.h @@ -18,12 +18,12 @@ class CGUIRadioButton_Impl : public CGUIRadioButton, public CGUIElement_Impl { public: CGUIRadioButton_Impl(class CGUI_Impl* pGUI, CGUIElement* pParent = NULL, const char* szCaption = ""); - ~CGUIRadioButton_Impl(void); + ~CGUIRadioButton_Impl(); void SetSelected(bool bChecked); - bool GetSelected(void); + bool GetSelected(); - eCGUIType GetType(void) { return CGUI_RADIOBUTTON; }; + eCGUIType GetType() { return CGUI_RADIOBUTTON; }; #include "CGUIElement_Inc.h" diff --git a/Client/gui/CGUIScrollBar_Impl.cpp b/Client/gui/CGUIScrollBar_Impl.cpp index 2d534515898..8b31a09eff2 100644 --- a/Client/gui/CGUIScrollBar_Impl.cpp +++ b/Client/gui/CGUIScrollBar_Impl.cpp @@ -45,7 +45,7 @@ CGUIScrollBar_Impl::CGUIScrollBar_Impl(CGUI_Impl* pGUI, bool bHorizontal, CGUIEl } } -CGUIScrollBar_Impl::~CGUIScrollBar_Impl(void) +CGUIScrollBar_Impl::~CGUIScrollBar_Impl() { DestroyElement(); } @@ -55,7 +55,7 @@ void CGUIScrollBar_Impl::SetScrollPosition(float fPosition) reinterpret_cast(m_pWindow)->setScrollPosition(fPosition); } -float CGUIScrollBar_Impl::GetScrollPosition(void) +float CGUIScrollBar_Impl::GetScrollPosition() { return reinterpret_cast(m_pWindow)->getScrollPosition(); } diff --git a/Client/gui/CGUIScrollBar_Impl.h b/Client/gui/CGUIScrollBar_Impl.h index 0c384610f85..95146260035 100644 --- a/Client/gui/CGUIScrollBar_Impl.h +++ b/Client/gui/CGUIScrollBar_Impl.h @@ -18,14 +18,14 @@ class CGUIScrollBar_Impl : public CGUIScrollBar, public CGUIElement_Impl { public: CGUIScrollBar_Impl(class CGUI_Impl* pGUI, bool bHorizontal, CGUIElement* pParent = NULL); - ~CGUIScrollBar_Impl(void); + ~CGUIScrollBar_Impl(); void SetOnScrollHandler(const GUI_CALLBACK& Callback); void SetScrollPosition(float fPosition); - float GetScrollPosition(void); + float GetScrollPosition(); - eCGUIType GetType(void) { return CGUI_SCROLLBAR; }; + eCGUIType GetType() { return CGUI_SCROLLBAR; }; #include "CGUIElement_Inc.h" diff --git a/Client/gui/CGUIScrollPane_Impl.cpp b/Client/gui/CGUIScrollPane_Impl.cpp index 43766c9fcba..25e6ba396b8 100644 --- a/Client/gui/CGUIScrollPane_Impl.cpp +++ b/Client/gui/CGUIScrollPane_Impl.cpp @@ -47,7 +47,7 @@ CGUIScrollPane_Impl::CGUIScrollPane_Impl(CGUI_Impl* pGUI, CGUIElement* pParent) SetVerticalScrollStepSize(100.0f); } -CGUIScrollPane_Impl::~CGUIScrollPane_Impl(void) +CGUIScrollPane_Impl::~CGUIScrollPane_Impl() { DestroyElement(); } @@ -92,7 +92,7 @@ void CGUIScrollPane_Impl::SetVerticalScrollPosition(float fPosition) } } -float CGUIScrollPane_Impl::GetHorizontalScrollPosition(void) +float CGUIScrollPane_Impl::GetHorizontalScrollPosition() { try { @@ -113,7 +113,7 @@ float CGUIScrollPane_Impl::GetHorizontalScrollPosition(void) } } -float CGUIScrollPane_Impl::GetVerticalScrollPosition(void) +float CGUIScrollPane_Impl::GetVerticalScrollPosition() { try { @@ -156,7 +156,7 @@ void CGUIScrollPane_Impl::SetVerticalScrollStepSize(float fPosition) } } -float CGUIScrollPane_Impl::GetHorizontalScrollStepSize(void) +float CGUIScrollPane_Impl::GetHorizontalScrollStepSize() { try { @@ -168,7 +168,7 @@ float CGUIScrollPane_Impl::GetHorizontalScrollStepSize(void) } } -float CGUIScrollPane_Impl::GetVerticalScrollStepSize(void) +float CGUIScrollPane_Impl::GetVerticalScrollStepSize() { try { diff --git a/Client/gui/CGUIScrollPane_Impl.h b/Client/gui/CGUIScrollPane_Impl.h index c011e43038d..e1eac8464e9 100644 --- a/Client/gui/CGUIScrollPane_Impl.h +++ b/Client/gui/CGUIScrollPane_Impl.h @@ -18,24 +18,24 @@ class CGUIScrollPane_Impl : public CGUIScrollPane, public CGUIElement_Impl, publ { public: CGUIScrollPane_Impl(class CGUI_Impl* pGUI, CGUIElement* pParent = NULL); - ~CGUIScrollPane_Impl(void); + ~CGUIScrollPane_Impl(); void SetHorizontalScrollBar(bool bEnabled); void SetVerticalScrollBar(bool bEnabled); void SetHorizontalScrollPosition(float fPosition); - float GetHorizontalScrollPosition(void); + float GetHorizontalScrollPosition(); void SetVerticalScrollPosition(float fPosition); - float GetVerticalScrollPosition(void); + float GetVerticalScrollPosition(); void SetHorizontalScrollStepSize(float fPosition); - float GetHorizontalScrollStepSize(void); + float GetHorizontalScrollStepSize(); void SetVerticalScrollStepSize(float fPosition); - float GetVerticalScrollStepSize(void); + float GetVerticalScrollStepSize(); - eCGUIType GetType(void) { return CGUI_SCROLLPANE; }; + eCGUIType GetType() { return CGUI_SCROLLPANE; }; #include "CGUIElement_Inc.h" diff --git a/Client/gui/CGUIStaticImage_Impl.cpp b/Client/gui/CGUIStaticImage_Impl.cpp index e0461bfe775..c7e304621e6 100644 --- a/Client/gui/CGUIStaticImage_Impl.cpp +++ b/Client/gui/CGUIStaticImage_Impl.cpp @@ -51,7 +51,7 @@ CGUIStaticImage_Impl::CGUIStaticImage_Impl(CGUI_Impl* pGUI, CGUIElement* pParent } } -CGUIStaticImage_Impl::~CGUIStaticImage_Impl(void) +CGUIStaticImage_Impl::~CGUIStaticImage_Impl() { // Clear the image Clear(); @@ -123,7 +123,7 @@ bool CGUIStaticImage_Impl::LoadFromTexture(CGUITexture* pTexture) return true; } -void CGUIStaticImage_Impl::Clear(void) +void CGUIStaticImage_Impl::Clear() { // Stop the control from using it reinterpret_cast(m_pWindow)->setImage(NULL); @@ -163,17 +163,17 @@ void CGUIStaticImage_Impl::SetFrameEnabled(bool bFrameEnabled) reinterpret_cast(m_pWindow)->setFrameEnabled(bFrameEnabled); } -bool CGUIStaticImage_Impl::IsFrameEnabled(void) +bool CGUIStaticImage_Impl::IsFrameEnabled() { return reinterpret_cast(m_pWindow)->isFrameEnabled(); } -CEGUI::Image* CGUIStaticImage_Impl::GetDirectImage(void) +CEGUI::Image* CGUIStaticImage_Impl::GetDirectImage() { return const_cast(reinterpret_cast(m_pWindow)->getImage()); } -void CGUIStaticImage_Impl::Render(void) +void CGUIStaticImage_Impl::Render() { return reinterpret_cast(m_pWindow)->render(); } diff --git a/Client/gui/CGUIStaticImage_Impl.h b/Client/gui/CGUIStaticImage_Impl.h index bf5cab6e5dc..b5afed424ad 100644 --- a/Client/gui/CGUIStaticImage_Impl.h +++ b/Client/gui/CGUIStaticImage_Impl.h @@ -21,21 +21,21 @@ class CGUIStaticImage_Impl : public CGUIStaticImage, public CGUIElement_Impl, pu { public: CGUIStaticImage_Impl(class CGUI_Impl* pGUI, CGUIElement* pParent = NULL); - ~CGUIStaticImage_Impl(void); + ~CGUIStaticImage_Impl(); bool LoadFromFile(const char* szFilename); bool LoadFromTexture(CGUITexture* pTexture); bool GetNativeSize(CVector2D& vecSize); - void Clear(void); + void Clear(); void SetFrameEnabled(bool bFrameEnabled); - bool IsFrameEnabled(void); + bool IsFrameEnabled(); - CEGUI::Image* GetDirectImage(void); + CEGUI::Image* GetDirectImage(); - void Render(void); + void Render(); - eCGUIType GetType(void) { return CGUI_STATICIMAGE; } + eCGUIType GetType() { return CGUI_STATICIMAGE; } private: class CGUI_Impl* m_pGUI; diff --git a/Client/gui/CGUITabList.h b/Client/gui/CGUITabList.h index 6d1e4f6cf6d..15595e13fad 100644 --- a/Client/gui/CGUITabList.h +++ b/Client/gui/CGUITabList.h @@ -16,8 +16,8 @@ typedef std::list::const_iterator CGUITabIterator; class CGUITabList { public: - CGUITabList(void){}; - ~CGUITabList(void){}; + CGUITabList(){}; + ~CGUITabList(){}; void AddItem(CGUITabListItem* pItem) { m_Items.push_back(pItem); }; void RemoveItem(CGUITabListItem* pItem) { m_Items.remove(pItem); }; diff --git a/Client/gui/CGUITabListItem.h b/Client/gui/CGUITabListItem.h index 8e4d0eb8a60..6fa8f8764ee 100644 --- a/Client/gui/CGUITabListItem.h +++ b/Client/gui/CGUITabListItem.h @@ -15,5 +15,5 @@ class CGUITabListItem : public CGUIElement { public: - virtual bool ActivateOnTab(void) = 0; + virtual bool ActivateOnTab() = 0; }; diff --git a/Client/gui/CGUITabPanel_Impl.cpp b/Client/gui/CGUITabPanel_Impl.cpp index 7cc829881c3..9a6d5ba9804 100644 --- a/Client/gui/CGUITabPanel_Impl.cpp +++ b/Client/gui/CGUITabPanel_Impl.cpp @@ -48,7 +48,7 @@ CGUITabPanel_Impl::CGUITabPanel_Impl(CGUI_Impl* pGUI, CGUIElement* pParent) } } -CGUITabPanel_Impl::~CGUITabPanel_Impl(void) +CGUITabPanel_Impl::~CGUITabPanel_Impl() { DestroyElement(); } @@ -67,7 +67,7 @@ void CGUITabPanel_Impl::DeleteTab(CGUITab* pTab) return; } -CGUITab* CGUITabPanel_Impl::GetSelectedTab(void) +CGUITab* CGUITabPanel_Impl::GetSelectedTab() { CEGUI::TabControl* pControl = reinterpret_cast(m_pWindow); @@ -110,7 +110,7 @@ void CGUITabPanel_Impl::SetSelectedIndex(unsigned int uiIndex) }; } -unsigned int CGUITabPanel_Impl::GetSelectedIndex(void) +unsigned int CGUITabPanel_Impl::GetSelectedIndex() { unsigned int uiIndex = 0; try @@ -123,7 +123,7 @@ unsigned int CGUITabPanel_Impl::GetSelectedIndex(void) return uiIndex; } -unsigned int CGUITabPanel_Impl::GetTabCount(void) +unsigned int CGUITabPanel_Impl::GetTabCount() { unsigned int uiIndex = 0; try diff --git a/Client/gui/CGUITabPanel_Impl.h b/Client/gui/CGUITabPanel_Impl.h index 9ac36cc35fc..82370222555 100644 --- a/Client/gui/CGUITabPanel_Impl.h +++ b/Client/gui/CGUITabPanel_Impl.h @@ -23,22 +23,22 @@ class CGUITabPanel_Impl : public CGUITabPanel, public CGUIElement_Impl public: CGUITabPanel_Impl(class CGUI_Impl* pGUI, CGUIElement* pParent = NULL); - ~CGUITabPanel_Impl(void); + ~CGUITabPanel_Impl(); CGUITab* CreateTab(const char* szCaption); void DeleteTab(CGUITab* pTab); - CGUITab* GetSelectedTab(void); + CGUITab* GetSelectedTab(); void SetSelectedTab(CGUITab* pTab); void SetSelectedIndex(unsigned int uiIndex); - unsigned int GetSelectedIndex(void); + unsigned int GetSelectedIndex(); - unsigned int GetTabCount(void); + unsigned int GetTabCount(); bool IsTabSelected(CGUITab* pTab); - eCGUIType GetType(void) { return CGUI_TABPANEL; }; + eCGUIType GetType() { return CGUI_TABPANEL; }; void SetSelectionHandler(GUI_CALLBACK Callback); diff --git a/Client/gui/CGUITab_Impl.cpp b/Client/gui/CGUITab_Impl.cpp index 09b64f4164b..8ec4ec35b26 100644 --- a/Client/gui/CGUITab_Impl.cpp +++ b/Client/gui/CGUITab_Impl.cpp @@ -45,7 +45,7 @@ CGUITab_Impl::CGUITab_Impl(CGUI_Impl* pGUI, CGUIElement_Impl* pParent, const cha } } -CGUITab_Impl::~CGUITab_Impl(void) +CGUITab_Impl::~CGUITab_Impl() { CGUIElement_Impl* pParent = static_cast(m_pParent); CEGUI::TabControl* pControl = reinterpret_cast(((CGUITabPanel_Impl*)pParent)->m_pWindow); @@ -67,7 +67,7 @@ void CGUITab_Impl::SetVisible(bool bVisible) pControl->requestChildWindowLayout(); } -bool CGUITab_Impl::IsVisible(void) +bool CGUITab_Impl::IsVisible() { CGUIElement_Impl* pParent = static_cast(m_pParent); CEGUI::TabControl* pControl = reinterpret_cast(((CGUITabPanel_Impl*)pParent)->m_pWindow); @@ -81,7 +81,7 @@ void CGUITab_Impl::SetEnabled(bool bEnabled) pControl->getButtonForTabContents(m_pWindow)->setEnabled(bEnabled); } -bool CGUITab_Impl::IsEnabled(void) +bool CGUITab_Impl::IsEnabled() { CGUIElement_Impl* pParent = static_cast(m_pParent); CEGUI::TabControl* pControl = reinterpret_cast(((CGUITabPanel_Impl*)pParent)->m_pWindow); diff --git a/Client/gui/CGUITab_Impl.h b/Client/gui/CGUITab_Impl.h index c827f8635fd..b95aaf77212 100644 --- a/Client/gui/CGUITab_Impl.h +++ b/Client/gui/CGUITab_Impl.h @@ -18,11 +18,11 @@ class CGUITab_Impl : public CGUITab, public CGUIElement_Impl, public CGUITabList { public: CGUITab_Impl(class CGUI_Impl* pManager, CGUIElement_Impl* pParent, const char* szCaption); - ~CGUITab_Impl(void); + ~CGUITab_Impl(); void SetCaption(const char* szCaption); - eCGUIType GetType(void) { return CGUI_TAB; }; + eCGUIType GetType() { return CGUI_TAB; }; #define SETVISIBLE_HACK #define SETENABLED_HACK @@ -31,7 +31,7 @@ class CGUITab_Impl : public CGUITab, public CGUIElement_Impl, public CGUITabList #undef SETVISIBLE_HACK void SetVisible(bool bVisible); - bool IsVisible(void); + bool IsVisible(); void SetEnabled(bool bEnabled); - bool IsEnabled(void); + bool IsEnabled(); }; diff --git a/Client/gui/CGUITexture_Impl.cpp b/Client/gui/CGUITexture_Impl.cpp index 60948b7179b..db5b620c86f 100644 --- a/Client/gui/CGUITexture_Impl.cpp +++ b/Client/gui/CGUITexture_Impl.cpp @@ -20,7 +20,7 @@ CGUITexture_Impl::CGUITexture_Impl(CGUI_Impl* pGUI) m_pTexture = m_pRenderer->createTexture(); } -CGUITexture_Impl::~CGUITexture_Impl(void) +CGUITexture_Impl::~CGUITexture_Impl() { if (m_pTexture) m_pRenderer->destroyTexture(m_pTexture); @@ -45,14 +45,14 @@ void CGUITexture_Impl::LoadFromMemory(const void* pBuffer, unsigned int uiWidth, m_pTexture->loadFromMemory(pBuffer, uiWidth, uiHeight); } -void CGUITexture_Impl::Clear(void) +void CGUITexture_Impl::Clear() { // Destroy the previous texture and recreate it (empty) m_pRenderer->destroyTexture(m_pTexture); m_pTexture = m_pRenderer->createTexture(); } -CEGUI::Texture* CGUITexture_Impl::GetTexture(void) +CEGUI::Texture* CGUITexture_Impl::GetTexture() { return m_pTexture; } @@ -62,7 +62,7 @@ void CGUITexture_Impl::SetTexture(CEGUI::Texture* pTexture) m_pTexture = pTexture; } -LPDIRECT3DTEXTURE9 CGUITexture_Impl::GetD3DTexture(void) +LPDIRECT3DTEXTURE9 CGUITexture_Impl::GetD3DTexture() { return reinterpret_cast(m_pTexture)->getD3DTexture(); } diff --git a/Client/gui/CGUITexture_Impl.h b/Client/gui/CGUITexture_Impl.h index 62c2f2c796e..dae677ca9e7 100644 --- a/Client/gui/CGUITexture_Impl.h +++ b/Client/gui/CGUITexture_Impl.h @@ -23,15 +23,15 @@ class CGUITexture_Impl : public CGUITexture { public: CGUITexture_Impl(class CGUI_Impl* pGUI); - ~CGUITexture_Impl(void); + ~CGUITexture_Impl(); bool LoadFromFile(const char* szFilename); void LoadFromMemory(const void* pBuffer, unsigned int uiWidth, unsigned int uiHeight); - void Clear(void); + void Clear(); - CEGUI::Texture* GetTexture(void); + CEGUI::Texture* GetTexture(); void SetTexture(CEGUI::Texture* pTexture); - LPDIRECT3DTEXTURE9 GetD3DTexture(void); + LPDIRECT3DTEXTURE9 GetD3DTexture(); void CreateTexture(unsigned int width, unsigned int height); diff --git a/Client/gui/CGUIWindow_Impl.cpp b/Client/gui/CGUIWindow_Impl.cpp index 67fdd401485..2c0e4aaee66 100644 --- a/Client/gui/CGUIWindow_Impl.cpp +++ b/Client/gui/CGUIWindow_Impl.cpp @@ -71,7 +71,7 @@ CGUIWindow_Impl::CGUIWindow_Impl(CGUI_Impl* pGUI, CGUIElement* pParent, const ch } } -CGUIWindow_Impl::~CGUIWindow_Impl(void) +CGUIWindow_Impl::~CGUIWindow_Impl() { DestroyElement(); } @@ -81,7 +81,7 @@ void CGUIWindow_Impl::SetMovable(bool bMovable) reinterpret_cast(m_pWindow)->setDragMovingEnabled(bMovable); } -bool CGUIWindow_Impl::IsMovable(void) +bool CGUIWindow_Impl::IsMovable() { return reinterpret_cast(m_pWindow)->isDragMovingEnabled(); } @@ -91,7 +91,7 @@ void CGUIWindow_Impl::SetSizingEnabled(bool bResizeEnabled) reinterpret_cast(m_pWindow)->setSizingEnabled(bResizeEnabled); } -bool CGUIWindow_Impl::IsSizingEnabled(void) +bool CGUIWindow_Impl::IsSizingEnabled() { return reinterpret_cast(m_pWindow)->isSizingEnabled(); } @@ -101,7 +101,7 @@ void CGUIWindow_Impl::SetFrameEnabled(bool bFrameEnabled) reinterpret_cast(m_pWindow)->setFrameEnabled(bFrameEnabled); } -bool CGUIWindow_Impl::IsFrameEnabled(void) +bool CGUIWindow_Impl::IsFrameEnabled() { return reinterpret_cast(m_pWindow)->isFrameEnabled(); } @@ -111,7 +111,7 @@ void CGUIWindow_Impl::SetCloseButtonEnabled(bool bCloseButtonEnabled) reinterpret_cast(m_pWindow)->setCloseButtonEnabled(bCloseButtonEnabled); } -bool CGUIWindow_Impl::IsCloseButtonEnabled(void) +bool CGUIWindow_Impl::IsCloseButtonEnabled() { return reinterpret_cast(m_pWindow)->isCloseButtonEnabled(); } @@ -121,7 +121,7 @@ void CGUIWindow_Impl::SetTitlebarEnabled(bool bTitlebarEnabled) reinterpret_cast(m_pWindow)->setTitleBarEnabled(bTitlebarEnabled); } -bool CGUIWindow_Impl::IsTitlebarEnabled(void) +bool CGUIWindow_Impl::IsTitlebarEnabled() { return reinterpret_cast(m_pWindow)->isTitleBarEnabled(); } diff --git a/Client/gui/CGUIWindow_Impl.h b/Client/gui/CGUIWindow_Impl.h index 19bc9581b84..0acac35ae14 100644 --- a/Client/gui/CGUIWindow_Impl.h +++ b/Client/gui/CGUIWindow_Impl.h @@ -18,22 +18,22 @@ class CGUIWindow_Impl : public CGUIWindow, public CGUIElement_Impl, public CGUIT { public: CGUIWindow_Impl(class CGUI_Impl* pGUI, CGUIElement* pParent = NULL, const char* szCaption = "", const SString& strLayoutFile = ""); - ~CGUIWindow_Impl(void); + ~CGUIWindow_Impl(); void SetMovable(bool bMovable); - bool IsMovable(void); + bool IsMovable(); void SetSizingEnabled(bool bResizeEnabled); - bool IsSizingEnabled(void); + bool IsSizingEnabled(); void SetFrameEnabled(bool bFrameEnabled); - bool IsFrameEnabled(void); + bool IsFrameEnabled(); void SetCloseButtonEnabled(bool bCloseButtonEnabled); - bool IsCloseButtonEnabled(void); + bool IsCloseButtonEnabled(); void SetTitlebarEnabled(bool bTitlebarEnabled); - bool IsTitlebarEnabled(void); + bool IsTitlebarEnabled(); void SetCloseClickHandler(GUI_CALLBACK Callback); - eCGUIType GetType(void) { return CGUI_WINDOW; }; + eCGUIType GetType() { return CGUI_WINDOW; }; #include "CGUIElement_Inc.h" diff --git a/Client/gui/CGUI_Impl.cpp b/Client/gui/CGUI_Impl.cpp index 1079bfe8b56..26d8339767f 100644 --- a/Client/gui/CGUI_Impl.cpp +++ b/Client/gui/CGUI_Impl.cpp @@ -102,7 +102,7 @@ CGUI_Impl::CGUI_Impl(IDirect3DDevice9* pDevice) : m_HasSchemeLoaded(false), m_fC } } -CGUI_Impl::~CGUI_Impl(void) +CGUI_Impl::~CGUI_Impl() { } @@ -179,7 +179,7 @@ void CGUI_Impl::SubscribeToMouseEvents() pEvents->subscribeEvent("Window/" + CEGUI::Window::EventDeactivated, CEGUI::Event::Subscriber(&CGUI_Impl::Event_FocusLost, this)); } -CVector2D CGUI_Impl::GetResolution(void) +CVector2D CGUI_Impl::GetResolution() { return CVector2D(m_pRenderer->getWidth(), m_pRenderer->getHeight()); } @@ -189,7 +189,7 @@ void CGUI_Impl::SetResolution(float fWidth, float fHeight) reinterpret_cast(m_pRenderer)->setDisplaySize(CEGUI::Size(fWidth, fHeight)); } -void CGUI_Impl::Draw(void) +void CGUI_Impl::Draw() { // Redraw the changed elements if (!m_RedrawQueue.empty()) @@ -214,12 +214,12 @@ void CGUI_Impl::Draw(void) m_RenderOkTimer.Reset(); } -void CGUI_Impl::Invalidate(void) +void CGUI_Impl::Invalidate() { reinterpret_cast(m_pRenderer)->preD3DReset(); } -void CGUI_Impl::Restore(void) +void CGUI_Impl::Restore() { try { @@ -232,7 +232,7 @@ void CGUI_Impl::Restore(void) } } -void CGUI_Impl::DrawMouseCursor(void) +void CGUI_Impl::DrawMouseCursor() { CEGUI::MouseCursor::getSingleton().draw(); } @@ -278,7 +278,7 @@ void CGUI_Impl::ProcessKeyboardInput(unsigned long ulKey, bool bIsDown) } } -bool CGUI_Impl::GetGUIInputEnabled(void) +bool CGUI_Impl::GetGUIInputEnabled() { switch (m_eInputMode) { @@ -327,7 +327,7 @@ void CGUI_Impl::SetGUIInputMode(eInputMode a_eMode) m_eInputMode = a_eMode; } -eInputMode CGUI_Impl::GetGUIInputMode(void) +eInputMode CGUI_Impl::GetGUIInputMode() { return m_eInputMode; } @@ -469,7 +469,7 @@ CGUIWebBrowser* CGUI_Impl::_CreateWebBrowser(CGUIElement_Impl* pParent) return new CGUIWebBrowser_Impl(this, pParent); } -CGUITexture* CGUI_Impl::CreateTexture(void) +CGUITexture* CGUI_Impl::CreateTexture() { return new CGUITexture_Impl(this); } @@ -491,7 +491,7 @@ void CGUI_Impl::SetCursorEnabled(bool bEnabled) } } -bool CGUI_Impl::IsCursorEnabled(void) +bool CGUI_Impl::IsCursorEnabled() { return CEGUI::MouseCursor::getSingleton().isVisible(); } @@ -504,12 +504,12 @@ void CGUI_Impl::SetCursorAlpha(float fAlpha, bool bOnlyCurrentServer) m_fCurrentServerCursorAlpha = fAlpha; } -float CGUI_Impl::GetCurrentServerCursorAlpha(void) +float CGUI_Impl::GetCurrentServerCursorAlpha() { return m_fCurrentServerCursorAlpha; } -eCursorType CGUI_Impl::GetCursorType(void) +eCursorType CGUI_Impl::GetCursorType() { auto image = CEGUI::MouseCursor::getSingleton().getImage(); @@ -569,32 +569,32 @@ bool CGUI_Impl::LoadImageset(const SString& strFilename) } } -CEGUI::FontManager* CGUI_Impl::GetFontManager(void) +CEGUI::FontManager* CGUI_Impl::GetFontManager() { return m_pFontManager; } -CEGUI::ImagesetManager* CGUI_Impl::GetImageSetManager(void) +CEGUI::ImagesetManager* CGUI_Impl::GetImageSetManager() { return m_pImageSetManager; } -CEGUI::System* CGUI_Impl::GetGUISystem(void) +CEGUI::System* CGUI_Impl::GetGUISystem() { return m_pSystem; } -CEGUI::Renderer* CGUI_Impl::GetRenderer(void) +CEGUI::Renderer* CGUI_Impl::GetRenderer() { return m_pRenderer; } -CEGUI::SchemeManager* CGUI_Impl::GetSchemeManager(void) +CEGUI::SchemeManager* CGUI_Impl::GetSchemeManager() { return m_pSchemeManager; } -CEGUI::WindowManager* CGUI_Impl::GetWindowManager(void) +CEGUI::WindowManager* CGUI_Impl::GetWindowManager() { return m_pWindowManager; } @@ -626,37 +626,37 @@ bool CGUI_Impl::Event_CharacterKey(const CEGUI::EventArgs& Args) return true; } -CGUIFont* CGUI_Impl::GetDefaultFont(void) +CGUIFont* CGUI_Impl::GetDefaultFont() { return m_pDefaultFont; } -CGUIFont* CGUI_Impl::GetSmallFont(void) +CGUIFont* CGUI_Impl::GetSmallFont() { return m_pSmallFont; } -CGUIFont* CGUI_Impl::GetBoldFont(void) +CGUIFont* CGUI_Impl::GetBoldFont() { return m_pBoldFont; } -CGUIFont* CGUI_Impl::GetClearFont(void) +CGUIFont* CGUI_Impl::GetClearFont() { return m_pClearFont; } -CGUIFont* CGUI_Impl::GetSAHeaderFont(void) +CGUIFont* CGUI_Impl::GetSAHeaderFont() { return m_pSAHeaderFont; } -CGUIFont* CGUI_Impl::GetSAGothicFont(void) +CGUIFont* CGUI_Impl::GetSAGothicFont() { return m_pSAGothicFont; } -CGUIFont* CGUI_Impl::GetSansFont(void) +CGUIFont* CGUI_Impl::GetSansFont() { return m_pSansFont; } @@ -1014,12 +1014,12 @@ void CGUI_Impl::PopGuiWorkingDirectory(const SString& strDirCheck) ApplyGuiWorkingDirectory(); } -void CGUI_Impl::ApplyGuiWorkingDirectory(void) +void CGUI_Impl::ApplyGuiWorkingDirectory() { CEGUI::System::getSingleton().SetGuiWorkingDirectory(m_GuiWorkingDirectoryStack.back()); } -const SString& CGUI_Impl::GetGuiWorkingDirectory(void) const +const SString& CGUI_Impl::GetGuiWorkingDirectory() const { dassert(!m_GuiWorkingDirectoryStack.empty()); return m_GuiWorkingDirectoryStack.back(); @@ -1559,7 +1559,7 @@ CGUIStaticImage* CGUI_Impl::CreateStaticImage(CGUIGridList* pParent) return _CreateStaticImage(wnd); } -CGUIStaticImage* CGUI_Impl::CreateStaticImage(void) +CGUIStaticImage* CGUI_Impl::CreateStaticImage() { return _CreateStaticImage(NULL); } @@ -1576,12 +1576,12 @@ CGUITabPanel* CGUI_Impl::CreateTabPanel(CGUITab* pParent) return _CreateTabPanel(wnd); } -CGUITabPanel* CGUI_Impl::CreateTabPanel(void) +CGUITabPanel* CGUI_Impl::CreateTabPanel() { return _CreateTabPanel(NULL); } -CGUIScrollPane* CGUI_Impl::CreateScrollPane(void) +CGUIScrollPane* CGUI_Impl::CreateScrollPane() { return _CreateScrollPane(NULL); } @@ -1659,7 +1659,7 @@ void CGUI_Impl::ClearInputHandlers(eInputChannel channel) m_FocusLostHandlers[channel] = GUI_CALLBACK_FOCUS(); } -void CGUI_Impl::ClearSystemKeys(void) +void CGUI_Impl::ClearSystemKeys() { // Unpress any held system keys unsigned int uiSysKeys = CEGUI::System::getSingleton().getSystemKeys(); diff --git a/Client/gui/CGUI_Impl.h b/Client/gui/CGUI_Impl.h index 7e776dc4968..3bb4823459b 100644 --- a/Client/gui/CGUI_Impl.h +++ b/Client/gui/CGUI_Impl.h @@ -61,25 +61,25 @@ class CGUI_Impl : public CGUI, public CGUITabList { public: CGUI_Impl(IDirect3DDevice9* pDevice); - ~CGUI_Impl(void); + ~CGUI_Impl(); void SetSkin(const char* szName); void SetBidiEnabled(bool bEnabled); - void Draw(void); - void Invalidate(void); - void Restore(void); + void Draw(); + void Invalidate(); + void Restore(); - void DrawMouseCursor(void); + void DrawMouseCursor(); void ProcessMouseInput(CGUIMouseInput eMouseInput, unsigned long ulX = 0, unsigned long ulY = 0, CGUIMouseButton eMouseButton = NoButton); void ProcessKeyboardInput(unsigned long ulKey, bool bIsDown); void ProcessCharacter(unsigned long ulCharacter); // - bool GetGUIInputEnabled(void); + bool GetGUIInputEnabled(); void SetGUIInputMode(eInputMode a_eMode); - eInputMode GetGUIInputMode(void); + eInputMode GetGUIInputMode(); static CEGUI::String GetUTFString(const char* szInput); static CEGUI::String GetUTFString(const std::string& strInput); static CEGUI::String GetUTFString(const CEGUI::String& strInput); // Not defined @@ -115,15 +115,15 @@ class CGUI_Impl : public CGUI, public CGUITabList CGUIStaticImage* CreateStaticImage(CGUIElement* pParent); CGUIStaticImage* CreateStaticImage(CGUITab* pParent); CGUIStaticImage* CreateStaticImage(CGUIGridList* pParent); - CGUIStaticImage* CreateStaticImage(void); + CGUIStaticImage* CreateStaticImage(); CGUITabPanel* CreateTabPanel(CGUIElement* pParent); CGUITabPanel* CreateTabPanel(CGUITab* pParent); - CGUITabPanel* CreateTabPanel(void); + CGUITabPanel* CreateTabPanel(); CGUIScrollPane* CreateScrollPane(CGUIElement* pParent); CGUIScrollPane* CreateScrollPane(CGUITab* pParent); - CGUIScrollPane* CreateScrollPane(void); + CGUIScrollPane* CreateScrollPane(); CGUIScrollBar* CreateScrollBar(bool bHorizontal, CGUIElement* pParent = NULL); CGUIScrollBar* CreateScrollBar(bool bHorizontal, CGUITab* pParent = NULL); @@ -137,41 +137,41 @@ class CGUI_Impl : public CGUI, public CGUITabList CGUIWindow* CreateWnd(CGUIElement* pParent = NULL, const char* szCaption = ""); // - CGUITexture* CreateTexture(void); + CGUITexture* CreateTexture(); CGUIFont* CreateFnt(const char* szFontName, const char* szFontFile, unsigned int uSize = 8, unsigned int uFlags = 0, bool bAutoScale = false); void SetCursorEnabled(bool bEnabled); - bool IsCursorEnabled(void); + bool IsCursorEnabled(); void SetCursorAlpha(float fAlpha, bool bOnlyCurrentServer = false); - float GetCurrentServerCursorAlpha(void); - eCursorType GetCursorType(void); + float GetCurrentServerCursorAlpha(); + eCursorType GetCursorType(); void AddChild(CGUIElement_Impl* pChild); - CEGUI::FontManager* GetFontManager(void); - CEGUI::ImagesetManager* GetImageSetManager(void); - CEGUI::Renderer* GetRenderer(void); - CEGUI::System* GetGUISystem(void); - CEGUI::SchemeManager* GetSchemeManager(void); - CEGUI::WindowManager* GetWindowManager(void); + CEGUI::FontManager* GetFontManager(); + CEGUI::ImagesetManager* GetImageSetManager(); + CEGUI::Renderer* GetRenderer(); + CEGUI::System* GetGUISystem(); + CEGUI::SchemeManager* GetSchemeManager(); + CEGUI::WindowManager* GetWindowManager(); void GetUniqueName(char* pBuf); CEGUI::Window* GetMasterWindow(CEGUI::Window* Window); - CVector2D GetResolution(void); + CVector2D GetResolution(); void SetResolution(float fWidth, float fHeight); - CGUIFont* GetDefaultFont(void); - CGUIFont* GetSmallFont(void); - CGUIFont* GetBoldFont(void); - CGUIFont* GetClearFont(void); - CGUIFont* GetSAHeaderFont(void); - CGUIFont* GetSAGothicFont(void); - CGUIFont* GetSansFont(void); + CGUIFont* GetDefaultFont(); + CGUIFont* GetSmallFont(); + CGUIFont* GetBoldFont(); + CGUIFont* GetClearFont(); + CGUIFont* GetSAHeaderFont(); + CGUIFont* GetSAGothicFont(); + CGUIFont* GetSansFont(); bool IsFontPresent(const char* szFont) { return m_pFontManager->isFontPresent(szFont); } float GetTextExtent(const char* szText, const char* szFont = "default-normal"); float GetMaxTextExtent(SString strFont, SString arg, ...); - const SString& GetGuiWorkingDirectory(void) const; + const SString& GetGuiWorkingDirectory() const; void SetDefaultGuiWorkingDirectory(const SString& strDir); void PushGuiWorkingDirectory(const SString& strDir); void PopGuiWorkingDirectory(const SString& strDirCheck = ""); @@ -253,9 +253,9 @@ class CGUI_Impl : public CGUI, public CGUITabList m_Channel = channel; } void ClearInputHandlers(eInputChannel channel); - void ClearSystemKeys(void); + void ClearSystemKeys(); - bool IsTransferBoxVisible(void) { return m_bTransferBoxVisible; }; + bool IsTransferBoxVisible() { return m_bTransferBoxVisible; }; void SetTransferBoxVisible(bool bVisible) { m_bTransferBoxVisible = bVisible; }; bool Event_CharacterKey(const CEGUI::EventArgs& e); @@ -277,7 +277,7 @@ class CGUI_Impl : public CGUI, public CGUITabList void AddToRedrawQueue(CGUIElement* pWindow); void RemoveFromRedrawQueue(CGUIElement* pWindow); - void CleanDeadPool(void); + void CleanDeadPool(); CGUIWindow* LoadLayout(CGUIElement* pParent, const SString& strFilename); bool LoadImageset(const SString& strFilename); @@ -300,7 +300,7 @@ class CGUI_Impl : public CGUI, public CGUITabList void SubscribeToMouseEvents(); CGUIFont* CreateFntFromWinFont(const char* szFontName, const char* szFontWinReg, const char* szFontWinFile, unsigned int uSize = 8, unsigned int uFlags = 0, bool bAutoScale = false); - void ApplyGuiWorkingDirectory(void); + void ApplyGuiWorkingDirectory(); IDirect3DDevice9* m_pDevice; diff --git a/Client/loader/CExePatchedStatus.cpp b/Client/loader/CExePatchedStatus.cpp index 05970bfc6a2..dc4c8de36a0 100644 --- a/Client/loader/CExePatchedStatus.cpp +++ b/Client/loader/CExePatchedStatus.cpp @@ -39,7 +39,7 @@ SExePatchedStatus GetExePatchedStatus(bool bUseExeCopy) // Check which patches should be applied // ////////////////////////////////////////////////////////// -SExePatchedStatus GetExePatchRequirements(void) +SExePatchedStatus GetExePatchRequirements() { SExePatchedStatus status; status.bTimestamp = GetApplicationSettingInt("aero-enabled") ? true : false; @@ -82,7 +82,7 @@ bool SetExePatchedStatus(bool bUseExeCopy, const SExePatchedStatus& status) // Returns true if patches should be applied to exe copy // ////////////////////////////////////////////////////////// -bool ShouldUseExeCopy(void) +bool ShouldUseExeCopy() { SString strUseCopyReason; if (GetApplicationSettingInt("nvhacks", "optimus")) @@ -116,7 +116,7 @@ bool ShouldUseExeCopy(void) // Return true if there might be an alt-tab black screen problem when using gta_sa.exe // ////////////////////////////////////////////////////////// -bool RequiresAltTabFix(void) +bool RequiresAltTabFix() { // Exception for optimus because of better hi-perf detection when using gta_sa.exe if (GetApplicationSettingInt("nvhacks", "optimus")) @@ -184,7 +184,7 @@ uint64 GetExeFileSize(bool bUseExeCopy) // Return false if needs admin access // ////////////////////////////////////////////////////////// -bool CopyExe(void) +bool CopyExe() { SString strGTAEXEPathFrom = GetExePathFilename(false); SString strGTAEXEPathTo = GetExePathFilename(true); @@ -219,7 +219,7 @@ SString GetExePathFilename(bool bUseExeCopy) // Return full path and filename of exe we will probably be using // ////////////////////////////////////////////////////////// -SString GetUsingExePathFilename(void) +SString GetUsingExePathFilename() { return GetExePathFilename(ShouldUseExeCopy()); } @@ -534,7 +534,7 @@ EPatchResult UpdatePatchStatusNvightmare(const SString& strGTAEXEPath, EPatchMod // Return true if checksum for some dlls will cause problems // ////////////////////////////////////////////////////////// -bool GetPatchRequirementAltModules(void) +bool GetPatchRequirementAltModules() { // Only do file check once per launch static bool bDone = false; @@ -773,7 +773,7 @@ EPatchResult UpdatePatchStatusEntryPoint(const SString& strGTAEXEPath, EPatchMod // Return true if AddressOfEntryPoint in gta_sa.exe should be fixed (in proxy_sa.exe) // ////////////////////////////////////////////////////////// -bool GetPatchRequirementEntryPoint(void) +bool GetPatchRequirementEntryPoint() { // Only do file check once per launch static bool bDone = false; diff --git a/Client/loader/CExePatchedStatus.h b/Client/loader/CExePatchedStatus.h index 165f8a65967..4789e3de8c0 100644 --- a/Client/loader/CExePatchedStatus.h +++ b/Client/loader/CExePatchedStatus.h @@ -41,21 +41,21 @@ enum EPatchResult }; SExePatchedStatus GetExePatchedStatus(bool bUseExeCopy); -SExePatchedStatus GetExePatchRequirements(void); +SExePatchedStatus GetExePatchRequirements(); bool SetExePatchedStatus(bool bUseExeCopy, const SExePatchedStatus& reqStatus); -bool ShouldUseExeCopy(void); -bool RequiresAltTabFix(void); +bool ShouldUseExeCopy(); +bool RequiresAltTabFix(); SString GetPatchExeAdminReason(bool bUseExeCopy, const SExePatchedStatus& reqStatus); uint64 GetExeFileSize(bool bUseExeCopy); -bool CopyExe(void); +bool CopyExe(); SString GetExePathFilename(bool bUseExeCopy); -SString GetUsingExePathFilename(void); -bool GetPatchRequirementAltModules(void); +SString GetUsingExePathFilename(); +bool GetPatchRequirementAltModules(); EPatchResult UpdatePatchStatusNvightmare(const SString& strGTAEXEPath, EPatchMode mode); EPatchResult UpdatePatchStatusTimestamp(const SString& strGTAEXEPath, EPatchMode mode); EPatchResult UpdatePatchStatusLargeMem(const SString& strGTAEXEPath, EPatchMode mode); EPatchResult UpdatePatchStatusDep(const SString& strGTAEXEPath, EPatchMode mode); -bool GetPatchRequirementAltModules(void); +bool GetPatchRequirementAltModules(); EPatchResult UpdatePatchStatusAltModules(const SString& strGTAEXEPath, EPatchMode mode); -bool GetPatchRequirementEntryPoint(void); +bool GetPatchRequirementEntryPoint(); EPatchResult UpdatePatchStatusEntryPoint(const SString& strGTAEXEPath, EPatchMode mode); diff --git a/Client/loader/CInstallManager.cpp b/Client/loader/CInstallManager.cpp index 835751ff6e1..06d18157ed2 100644 --- a/Client/loader/CInstallManager.cpp +++ b/Client/loader/CInstallManager.cpp @@ -22,7 +22,7 @@ namespace ////////////////////////////////////////////////////////// // Ensure report log stuff has correct tags - void UpdateSettingsForReportLog(void) + void UpdateSettingsForReportLog() { UpdateMTAVersionApplicationSetting(); SetApplicationSetting("os-version", SString("%d.%d", GetOSVersion().dwMajor, GetOSVersion().dwMinor)); @@ -35,13 +35,13 @@ namespace // Comms between 'Admin' and 'User' processes void SendStringToUserProcess(const SString& strText) { SetApplicationSetting("admin2user_comms", strText); } - SString ReceiveStringFromAdminProcess(void) { return GetApplicationSetting("admin2user_comms"); } + SString ReceiveStringFromAdminProcess() { return GetApplicationSetting("admin2user_comms"); } - bool IsBlockingUserProcess(void) { return GetApplicationSetting("admin2user_comms") == "user_waiting"; } + bool IsBlockingUserProcess() { return GetApplicationSetting("admin2user_comms") == "user_waiting"; } - void SetIsBlockingUserProcess(void) { SetApplicationSetting("admin2user_comms", "user_waiting"); } + void SetIsBlockingUserProcess() { SetApplicationSetting("admin2user_comms", "user_waiting"); } - void ClearIsBlockingUserProcess(void) + void ClearIsBlockingUserProcess() { if (IsBlockingUserProcess()) SetApplicationSetting("admin2user_comms", ""); @@ -57,7 +57,7 @@ namespace ////////////////////////////////////////////////////////// CInstallManager* g_pInstallManager = NULL; -CInstallManager* GetInstallManager(void) +CInstallManager* GetInstallManager() { if (!g_pInstallManager) g_pInstallManager = new CInstallManager(); @@ -71,7 +71,7 @@ CInstallManager* GetInstallManager(void) // // ////////////////////////////////////////////////////////// -void CInstallManager::InitSequencer(void) +void CInstallManager::InitSequencer() { #define CR "\n" SString strSource = CR "initial: " // *** Starts here by default @@ -204,7 +204,7 @@ void CInstallManager::SetMTASAPathSource(const SString& strCommandLineIn) // Process next step // ////////////////////////////////////////////////////////// -SString CInstallManager::Continue(void) +SString CInstallManager::Continue() { // Initial report line DWORD dwProcessId = GetCurrentProcessId(); @@ -273,7 +273,7 @@ void CInstallManager::RestoreSequencerFromSnapshot(const SString& strText) // Save current sequencer position to a string // ////////////////////////////////////////////////////////// -SString CInstallManager::GetSequencerSnapshot(void) +SString CInstallManager::GetSequencerSnapshot() { m_pSequencer->SetVariable("LastResult", ""); return m_pSequencer->SaveStateToString(); @@ -286,7 +286,7 @@ SString CInstallManager::GetSequencerSnapshot(void) // Get path to launch exe // ////////////////////////////////////////////////////////// -SString CInstallManager::GetLauncherPathFilename(void) +SString CInstallManager::GetLauncherPathFilename() { SString strLocation = m_pSequencer->GetVariable(INSTALL_LOCATION); SString strResult = PathJoin(strLocation == "far" ? GetSystemCurrentDirectory() : GetMTASAPath(), MTA_EXE_NAME); @@ -306,7 +306,7 @@ SString CInstallManager::GetLauncherPathFilename(void) // Save the state of the sequencer and launch process as admin // ////////////////////////////////////////////////////////// -SString CInstallManager::_ChangeToAdmin(void) +SString CInstallManager::_ChangeToAdmin() { if (!IsUserAdmin()) { @@ -339,7 +339,7 @@ SString CInstallManager::_ChangeToAdmin(void) // Save the state of the sequencer and exit back to the user process // ////////////////////////////////////////////////////////// -SString CInstallManager::_ChangeFromAdmin(void) +SString CInstallManager::_ChangeFromAdmin() { if (IsUserAdmin() && IsBlockingUserProcess()) { @@ -358,7 +358,7 @@ SString CInstallManager::_ChangeFromAdmin(void) // // ////////////////////////////////////////////////////////// -SString CInstallManager::_ShowCrashFailDialog(void) +SString CInstallManager::_ShowCrashFailDialog() { // Crashed before gta game started ? if (WatchDogIsSectionOpen("L1")) @@ -399,7 +399,7 @@ SString CInstallManager::_ShowCrashFailDialog(void) // // ////////////////////////////////////////////////////////// -SString CInstallManager::_CheckOnRestartCommand(void) +SString CInstallManager::_CheckOnRestartCommand() { // Check for pending update const SString strResult = CheckOnRestartCommand(); @@ -426,7 +426,7 @@ SString CInstallManager::_CheckOnRestartCommand(void) // // ////////////////////////////////////////////////////////// -SString CInstallManager::_MaybeSwitchToTempExe(void) +SString CInstallManager::_MaybeSwitchToTempExe() { // If a new "Multi Theft Auto.exe" exists, let that complete the install if (m_pSequencer->GetVariable(INSTALL_LOCATION) == "far") @@ -447,7 +447,7 @@ SString CInstallManager::_MaybeSwitchToTempExe(void) // // ////////////////////////////////////////////////////////// -SString CInstallManager::_SwitchBackFromTempExe(void) +SString CInstallManager::_SwitchBackFromTempExe() { // If currently running temp install exe, switch back if (m_pSequencer->GetVariable(INSTALL_LOCATION) == "far") @@ -470,7 +470,7 @@ SString CInstallManager::_SwitchBackFromTempExe(void) // // ////////////////////////////////////////////////////////// -SString CInstallManager::_InstallFiles(void) +SString CInstallManager::_InstallFiles() { WatchDogReset(); @@ -500,7 +500,7 @@ SString CInstallManager::_InstallFiles(void) // // ////////////////////////////////////////////////////////// -SString CInstallManager::_ShowCopyFailDialog(void) +SString CInstallManager::_ShowCopyFailDialog() { int iResponse = MessageBoxUTF8(NULL, _("Could not update due to file conflicts. Please close other applications and retry"), _("Error") + _E("CL02"), MB_RETRYCANCEL | MB_ICONERROR | MB_TOPMOST); @@ -534,7 +534,7 @@ void MigrateFile(const SString& strFilenameOld, const SString& strFilenameNew) // Make sure new reg/dir structure is ok // ////////////////////////////////////////////////////////// -SString CInstallManager::_ProcessLayoutChecks(void) +SString CInstallManager::_ProcessLayoutChecks() { // // Validation @@ -668,7 +668,7 @@ SString CInstallManager::_ProcessLayoutChecks(void) // Make sure required language files exist // ////////////////////////////////////////////////////////// -SString CInstallManager::_ProcessLangFileChecks(void) +SString CInstallManager::_ProcessLangFileChecks() { if (!HasGTAPath()) return "ok"; @@ -744,7 +744,7 @@ SString CInstallManager::_ProcessLangFileChecks(void) // Return false if admin required // ////////////////////////////////////////////////////////// -bool CInstallManager::UpdateOptimusSymbolExport(void) +bool CInstallManager::UpdateOptimusSymbolExport() { return _ProcessExePatchChecks() == "ok"; } @@ -782,7 +782,7 @@ SString CInstallManager::MaybeRenameExe(const SString& strGTAPath) // Check which changes need to be made to the exe and make a copy if required // ////////////////////////////////////////////////////////// -SString CInstallManager::_ProcessExePatchChecks(void) +SString CInstallManager::_ProcessExePatchChecks() { if (!HasGTAPath()) return "ok"; @@ -829,7 +829,7 @@ SString CInstallManager::_ProcessExePatchChecks(void) // // ////////////////////////////////////////////////////////// -SString CInstallManager::_ProcessServiceChecks(void) +SString CInstallManager::_ProcessServiceChecks() { if (!CheckService(CHECK_SERVICE_PRE_GAME)) { @@ -849,7 +849,7 @@ SString CInstallManager::_ProcessServiceChecks(void) // Remove/add required options from AppCompatFlags/Layers // ////////////////////////////////////////////////////////// -SString CInstallManager::_ProcessAppCompatChecks(void) +SString CInstallManager::_ProcessAppCompatChecks() { BOOL bIsWOW64 = false; // 64bit OS IsWow64Process(GetCurrentProcess(), &bIsWOW64); @@ -960,7 +960,7 @@ SString CInstallManager::_ProcessAppCompatChecks(void) // // ////////////////////////////////////////////////////////// -SString CInstallManager::_InstallNewsItems(void) +SString CInstallManager::_InstallNewsItems() { // Get install news queue CArgMap queue; @@ -1017,7 +1017,7 @@ SString CInstallManager::_InstallNewsItems(void) // // ////////////////////////////////////////////////////////// -SString CInstallManager::_Quit(void) +SString CInstallManager::_Quit() { ExitProcess(0); // return "ok"; diff --git a/Client/loader/CInstallManager.h b/Client/loader/CInstallManager.h index ca30eb8abc0..529b9617b1b 100644 --- a/Client/loader/CInstallManager.h +++ b/Client/loader/CInstallManager.h @@ -22,33 +22,33 @@ class CInstallManager { public: void SetMTASAPathSource(const SString& strCommandLineIn); - void InitSequencer(void); + void InitSequencer(); SString Continue(/*const SString& strCommandLine*/); void RestoreSequencerFromSnapshot(const SString& strText); - SString GetSequencerSnapshot(void); - SString GetLauncherPathFilename(void); - bool UpdateOptimusSymbolExport(void); + SString GetSequencerSnapshot(); + SString GetLauncherPathFilename(); + bool UpdateOptimusSymbolExport(); SString MaybeRenameExe(const SString& strGTAPath); protected: - SString _ShowCrashFailDialog(void); - SString _CheckOnRestartCommand(void); - SString _MaybeSwitchToTempExe(void); - SString _SwitchBackFromTempExe(void); - SString _InstallFiles(void); - SString _ChangeToAdmin(void); - SString _ShowCopyFailDialog(void); - SString _ProcessLayoutChecks(void); - SString _ProcessLangFileChecks(void); - SString _ProcessExePatchChecks(void); - SString _ProcessServiceChecks(void); - SString _ProcessAppCompatChecks(void); - SString _ChangeFromAdmin(void); - SString _InstallNewsItems(void); - SString _Quit(void); + SString _ShowCrashFailDialog(); + SString _CheckOnRestartCommand(); + SString _MaybeSwitchToTempExe(); + SString _SwitchBackFromTempExe(); + SString _InstallFiles(); + SString _ChangeToAdmin(); + SString _ShowCopyFailDialog(); + SString _ProcessLayoutChecks(); + SString _ProcessLangFileChecks(); + SString _ProcessExePatchChecks(); + SString _ProcessServiceChecks(); + SString _ProcessAppCompatChecks(); + SString _ChangeFromAdmin(); + SString _InstallNewsItems(); + SString _Quit(); CSequencerType* m_pSequencer; SString m_strAdminReason; }; -CInstallManager* GetInstallManager(void); +CInstallManager* GetInstallManager(); diff --git a/Client/loader/CSequencer.h b/Client/loader/CSequencer.h index 444b6eaa676..065603b62f2 100644 --- a/Client/loader/CSequencer.h +++ b/Client/loader/CSequencer.h @@ -51,7 +51,7 @@ template class CBadLang { protected: - typedef SString (T::*PFNVOIDVOID)(void); + typedef SString (T::*PFNVOIDVOID)(); std::map m_FunctionMap; std::map m_VariableMap; @@ -60,7 +60,7 @@ class CBadLang T* m_pOuter; public: - CBadLang(void) + CBadLang() { m_uiCurrLine = 0; m_pOuter = 0; @@ -129,7 +129,7 @@ class CBadLang } // Serializationish - SString SaveStateToString(void) + SString SaveStateToString() { // Save PC - Count valid lines between current line and previous label int iBackCount = 0; @@ -180,10 +180,10 @@ class CBadLang bool IsLineLabel(const SString& strLine) { return CSourceLine(strLine).GetToken(0).EndsWith(":"); } - bool AtEnd(void) { return m_uiCurrLine >= m_LineList.size(); } + bool AtEnd() { return m_uiCurrLine >= m_LineList.size(); } // Process - void ProcessNextLine(void) + void ProcessNextLine() { if (!AtEnd()) ProcessCommand(m_LineList[m_uiCurrLine++]); diff --git a/Client/loader/D3DStuff.cpp b/Client/loader/D3DStuff.cpp index 27c9d8e9a3a..fa6cb33965c 100644 --- a/Client/loader/D3DStuff.cpp +++ b/Client/loader/D3DStuff.cpp @@ -64,7 +64,7 @@ namespace // Try detecting optimus via NvAPI // ////////////////////////////////////////////////////////// -bool NvOptimusDetect(void) +bool NvOptimusDetect() { if (NvAPI_Initialize() != NVAPI_OK) { @@ -119,7 +119,7 @@ bool NvOptimusDetect(void) // Look all busy and important in case any graphic drivers are looking // ////////////////////////////////////////////////////////// -void BeginD3DStuff(void) +void BeginD3DStuff() { pD3D9 = Direct3DCreate9(D3D_SDK_VERSION); @@ -208,7 +208,7 @@ void BeginD3DStuff(void) // Clean up // ////////////////////////////////////////////////////////// -void EndD3DStuff(void) +void EndD3DStuff() { for (uint i = 0; i < NUMELMS(pD3DVertexDeclarations); i++) SAFE_RELEASE(pD3DVertexDeclarations[i]); diff --git a/Client/loader/D3DStuff.h b/Client/loader/D3DStuff.h index 92a4332a071..1218210de8a 100644 --- a/Client/loader/D3DStuff.h +++ b/Client/loader/D3DStuff.h @@ -8,5 +8,5 @@ * *****************************************************************************/ -void BeginD3DStuff(void); -void EndD3DStuff(void); +void BeginD3DStuff(); +void EndD3DStuff(); diff --git a/Client/loader/Dialogs.cpp b/Client/loader/Dialogs.cpp index c3970b2d657..3653ed43c9c 100644 --- a/Client/loader/Dialogs.cpp +++ b/Client/loader/Dialogs.cpp @@ -217,7 +217,7 @@ void ShowSplash(HINSTANCE hInstance) // // Hide splash dialog // -void HideSplash(void) +void HideSplash() { if (hwndSplash) { @@ -229,7 +229,7 @@ void HideSplash(void) // // Hide splash dialog temporarily // -void SuspendSplash(void) +void SuspendSplash() { if (hwndSplash) { @@ -240,7 +240,7 @@ void SuspendSplash(void) // // Show splash dialog if was previously suspended // -void ResumeSplash(void) +void ResumeSplash() { if (hwndSplash) { @@ -273,7 +273,7 @@ void ShowProgressDialog(HINSTANCE hInstance, const SString& strTitle, bool bAllo SetWindowPos(hwndProgressDialog, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); } -void HideProgressDialog(void) +void HideProgressDialog() { if (hwndProgressDialog) { @@ -331,7 +331,7 @@ void StartPseudoProgress(HINSTANCE hInstance, const SString& strTitle, const SSt UpdateProgress(30, 100); } -void StopPseudoProgress(void) +void StopPseudoProgress() { if (hwndProgressDialog) { @@ -395,7 +395,7 @@ SString ShowCrashedDialog(HINSTANCE hInstance, const SString& strMessage) return "ok"; } -void HideCrashedDialog(void) +void HideCrashedDialog() { if (hwndCrashedDialog) { @@ -486,7 +486,7 @@ void ShowD3dDllDialog(HINSTANCE hInstance, const SString& strPath) ResumeSplash(); } -void HideD3dDllDialog(void) +void HideD3dDllDialog() { if (hwndD3dDllDialog) { @@ -575,7 +575,7 @@ void ShowOptimusDialog(HINSTANCE hInstance) ResumeSplash(); } -void HideOptimusDialog(void) +void HideOptimusDialog() { if (hwndOptimusDialog) { @@ -667,7 +667,7 @@ void ShowNoAvDialog(HINSTANCE hInstance, bool bEnableScaremongering) ResumeSplash(); } -void HideNoAvDialog(void) +void HideNoAvDialog() { if (hwndNoAvDialog) { @@ -684,7 +684,7 @@ void HideNoAvDialog(void) // For checking string are correct // /////////////////////////////////////////////////////////////// -void TestDialogs(void) +void TestDialogs() { #if 0 #if 1 diff --git a/Client/loader/Dialogs.h b/Client/loader/Dialogs.h index 1d29e1cffa5..f3e5ac96718 100644 --- a/Client/loader/Dialogs.h +++ b/Client/loader/Dialogs.h @@ -9,27 +9,27 @@ *****************************************************************************/ void ShowSplash(HINSTANCE hInstance); -void HideSplash(void); +void HideSplash(); void ShowProgressDialog(HINSTANCE hInstance, const SString& strTitle, bool bAllowCancel = false); -void HideProgressDialog(void); +void HideProgressDialog(); bool UpdateProgress(int iPos, int iMax, const SString& strMsg = ""); void StartPseudoProgress(HINSTANCE hInstance, const SString& strTitle, const SString& strMsg); -void StopPseudoProgress(void); +void StopPseudoProgress(); SString ShowCrashedDialog(HINSTANCE hInstance, const SString& strMessage); -void HideCrashedDialog(void); +void HideCrashedDialog(); void ShowD3dDllDialog(HINSTANCE hInstance, const SString& strPath); -void HideD3dDllDialog(void); +void HideD3dDllDialog(); void ShowOptimusDialog(HINSTANCE hInstance); -void HideOptimusDialog(void); +void HideOptimusDialog(); void ShowNoAvDialog(HINSTANCE hInstance, bool bEnableScaremongering); -void HideNoAvDialog(void); +void HideNoAvDialog(); #ifdef MTA_DEBUG -void TestDialogs(void); +void TestDialogs(); #endif diff --git a/Client/loader/Install.cpp b/Client/loader/Install.cpp index a7fee0dfc69..639a758fcdb 100644 --- a/Client/loader/Install.cpp +++ b/Client/loader/Install.cpp @@ -43,7 +43,7 @@ struct SFileItem // Copy directory tree at current dirctory to GetMTASAPath () // /////////////////////////////////////////////////////////////// -bool DoInstallFiles(void) +bool DoInstallFiles() { SString strCurrentDir = PathConform(GetSystemCurrentDirectory()); @@ -254,7 +254,7 @@ bool ExtractFiles(const SString& strFile) // Changes current directory if required // ////////////////////////////////////////////////////////// -SString CheckOnRestartCommand(void) +SString CheckOnRestartCommand() { const SString strMTASAPath = GetMTASAPath(); diff --git a/Client/loader/MainFunctions.cpp b/Client/loader/MainFunctions.cpp index 041653192dd..8d866ff44bc 100644 --- a/Client/loader/MainFunctions.cpp +++ b/Client/loader/MainFunctions.cpp @@ -26,11 +26,11 @@ class CLocalizationDummy : public CLocalizationInterface virtual SString TranslatePlural(const SString& strSingular, const SString& strPlural, int iNum) { return strPlural; } virtual SString TranslatePluralWithContext(const SString& strContext, const SString& strSingular, const SString& strPlural, int iNum) { return strPlural; } - virtual std::vector GetAvailableLocales(void) { return std::vector(); } - virtual bool IsLocalized(void) { return false; } - virtual SString GetLanguageDirectory(void) { return ""; } - virtual SString GetLanguageCode(void) { return "en_US"; } - virtual SString GetLanguageName(void) { return "English"; } + virtual std::vector GetAvailableLocales() { return std::vector(); } + virtual bool IsLocalized() { return false; } + virtual SString GetLanguageDirectory() { return ""; } + virtual SString GetLanguageCode() { return "en_US"; } + virtual SString GetLanguageName() { return "English"; } }; CLocalizationInterface* g_pLocalization = new CLocalizationDummy(); @@ -149,7 +149,7 @@ void InitLocalization(bool bShowErrors) // Check and handle commands (from the installer) // ////////////////////////////////////////////////////////// -void HandleSpecialLaunchOptions(void) +void HandleSpecialLaunchOptions() { // Handle service install request from the installer if (CommandLineContains("/kdinstall")) @@ -185,7 +185,7 @@ void HandleSpecialLaunchOptions(void) // Handle duplicate launching, or running from mtasa:// URI ? // ////////////////////////////////////////////////////////// -void HandleDuplicateLaunching(void) +void HandleDuplicateLaunching() { LPSTR lpCmdLine = GetCommandLine(); @@ -272,7 +272,7 @@ void HandleDuplicateLaunching(void) // // ////////////////////////////////////////////////////////// -void HandleTrouble(void) +void HandleTrouble() { if (CheckAndShowFileOpenFailureMessage()) return; @@ -292,7 +292,7 @@ void HandleTrouble(void) // // ////////////////////////////////////////////////////////// -void HandleResetSettings(void) +void HandleResetSettings() { if (CheckAndShowFileOpenFailureMessage()) return; @@ -347,7 +347,7 @@ void HandleResetSettings(void) // If fullscreen, then maybe change fullscreen mode // ////////////////////////////////////////////////////////// -void HandleNotUsedMainMenu(void) +void HandleNotUsedMainMenu() { AddReportLog(9310, "Loader - HandleNotUsedMainMenu"); { @@ -428,7 +428,7 @@ void HandleNotUsedMainMenu(void) // // ////////////////////////////////////////////////////////// -void HandleCustomStartMessage(void) +void HandleCustomStartMessage() { SString strStartMessage = GetApplicationSetting("diagnostics", "start-message"); SString strTrouble = GetApplicationSetting("diagnostics", "start-message-trouble"); @@ -459,7 +459,7 @@ void HandleCustomStartMessage(void) // // ////////////////////////////////////////////////////////// -void PreLaunchWatchDogs(void) +void PreLaunchWatchDogs() { assert(!CreateSingleInstanceMutex()); @@ -575,7 +575,7 @@ void PostRunWatchDogs(int iReturnCode) // Check for and maybe stop a running GTA process // ////////////////////////////////////////////////////////// -void HandleIfGTAIsAlreadyRunning(void) +void HandleIfGTAIsAlreadyRunning() { if (IsGTARunning()) { @@ -604,7 +604,7 @@ void HandleIfGTAIsAlreadyRunning(void) // Check GTA path looks good // ////////////////////////////////////////////////////////// -void ValidateGTAPath(void) +void ValidateGTAPath() { // Get path to GTA ePathResult iResult = DiscoverGTAPath(true); @@ -653,7 +653,7 @@ void ValidateGTAPath(void) // Maybe warn user if no anti-virus running // ////////////////////////////////////////////////////////// -void CheckAntiVirusStatus(void) +void CheckAntiVirusStatus() { // Get data from WMI std::vector enabledList; @@ -757,7 +757,7 @@ void CheckAntiVirusStatus(void) // Basic check for some essential files // ////////////////////////////////////////////////////////// -void CheckDataFiles(void) +void CheckDataFiles() { const SString strMTASAPath = GetMTASAPath(); const SString strGTAPath = GetGTAPath(); @@ -939,7 +939,7 @@ void CheckDataFiles(void) // Ensure DLLs are the correct version // ////////////////////////////////////////////////////////// -void CheckLibVersions(void) +void CheckLibVersions() { #if MTASA_VERSION_TYPE == VERSION_TYPE_RELEASE @@ -1310,7 +1310,7 @@ int LaunchGame(SString strCmdLine) // Parse and do something with OnQuitCommand from registry // ////////////////////////////////////////////////////////// -void HandleOnQuitCommand(void) +void HandleOnQuitCommand() { const SString strMTASAPath = GetMTASAPath(); SetCurrentDirectory(strMTASAPath); diff --git a/Client/loader/MainFunctions.h b/Client/loader/MainFunctions.h index d6241f8780a..972b24c3324 100644 --- a/Client/loader/MainFunctions.h +++ b/Client/loader/MainFunctions.h @@ -9,18 +9,18 @@ *****************************************************************************/ void InitLocalization(bool bShowErrors); -void HandleSpecialLaunchOptions(void); -void HandleDuplicateLaunching(void); -void HandleCustomStartMessage(void); -void PreLaunchWatchDogs(void); +void HandleSpecialLaunchOptions(); +void HandleDuplicateLaunching(); +void HandleCustomStartMessage(); +void PreLaunchWatchDogs(); void PostRunWatchDogs(int iReturnCode); -void HandleIfGTAIsAlreadyRunning(void); -void ValidateGTAPath(void); -void CheckAntiVirusStatus(void); -void CheckDataFiles(void); -void CheckLibVersions(void); +void HandleIfGTAIsAlreadyRunning(); +void ValidateGTAPath(); +void CheckAntiVirusStatus(); +void CheckDataFiles(); +void CheckLibVersions(); int LaunchGame(SString strCmdLine); -void HandleOnQuitCommand(void); +void HandleOnQuitCommand(); #define EXIT_OK (0) #define EXIT_ERROR (1) diff --git a/Client/loader/Utils.cpp b/Client/loader/Utils.cpp index 65595ffa506..56896d01e77 100644 --- a/Client/loader/Utils.cpp +++ b/Client/loader/Utils.cpp @@ -528,7 +528,7 @@ DWORD FindProcessId(const SString& processName) // Get list of process id's with the image name ending in "gta_sa.exe" or "proxy_sa.exe" // /////////////////////////////////////////////////////////////////////////// -std::vector GetGTAProcessList(void) +std::vector GetGTAProcessList() { std::vector result; @@ -555,7 +555,7 @@ std::vector GetGTAProcessList(void) // // /////////////////////////////////////////////////////////////////////////// -bool IsGTARunning(void) +bool IsGTARunning() { return !GetGTAProcessList().empty(); } @@ -567,7 +567,7 @@ bool IsGTARunning(void) // // /////////////////////////////////////////////////////////////////////////// -void TerminateGTAIfRunning(void) +void TerminateGTAIfRunning() { std::vector processIdList = GetGTAProcessList(); @@ -590,7 +590,7 @@ void TerminateGTAIfRunning(void) // Get list of process id's with the image name ending with the same name as this process // /////////////////////////////////////////////////////////////////////////// -std::vector GetOtherMTAProcessList(void) +std::vector GetOtherMTAProcessList() { std::vector result; @@ -617,7 +617,7 @@ std::vector GetOtherMTAProcessList(void) // // /////////////////////////////////////////////////////////////////////////// -bool IsOtherMTARunning(void) +bool IsOtherMTARunning() { return !GetOtherMTAProcessList().empty(); } @@ -629,7 +629,7 @@ bool IsOtherMTARunning(void) // // /////////////////////////////////////////////////////////////////////////// -void TerminateOtherMTAIfRunning(void) +void TerminateOtherMTAIfRunning() { std::vector processIdList = GetOtherMTAProcessList(); @@ -705,7 +705,7 @@ void SetMTASAPathSource(bool bReadFromRegistry) } } -SString GetMTASAPath(void) +SString GetMTASAPath() { if (g_strMTASAPath == "") SetMTASAPathSource(false); @@ -740,7 +740,7 @@ bool LookForGtaProcess(SString& strOutPathFilename) // // /////////////////////////////////////////////////////////////// -SString DoUserAssistedSearch(void) +SString DoUserAssistedSearch() { SString strResult; @@ -894,7 +894,7 @@ ePathResult DiscoverGTAPath(bool bFindIfMissing) // // /////////////////////////////////////////////////////////////// -SString GetGTAPath(void) +SString GetGTAPath() { if (g_strGTAPath == "") DiscoverGTAPath(false); @@ -908,7 +908,7 @@ SString GetGTAPath(void) // // /////////////////////////////////////////////////////////////// -bool HasGTAPath(void) +bool HasGTAPath() { SString strGTAPath = GetGTAPath(); if (!strGTAPath.empty()) @@ -1090,7 +1090,7 @@ void MakeRandomIndexList(int Size, std::vector& outList) // Affected by compatibility mode // /////////////////////////////////////////////////////////////// -SOSVersionInfo GetOSVersion(void) +SOSVersionInfo GetOSVersion() { OSVERSIONINFO versionInfo; memset(&versionInfo, 0, sizeof(versionInfo)); @@ -1106,7 +1106,7 @@ SOSVersionInfo GetOSVersion(void) // Ignoring compatibility mode // /////////////////////////////////////////////////////////////// -SOSVersionInfo GetRealOSVersion(void) +SOSVersionInfo GetRealOSVersion() { static SOSVersionInfo versionInfo = {0}; @@ -1146,13 +1146,13 @@ SOSVersionInfo GetRealOSVersion(void) // Works around limit for applications not manifested for Windows 10 // /////////////////////////////////////////////////////////////// -bool IsWindows10OrGreater(void) +bool IsWindows10OrGreater() { SOSVersionInfo info = GetRealOSVersion(); return info.dwMajor >= 10; } -bool IsWindows10Threshold2OrGreater(void) +bool IsWindows10Threshold2OrGreater() { SOSVersionInfo info = GetRealOSVersion(); return info.dwMajor > 10 || (info.dwMajor == 10 && info.dwBuild >= 10586); @@ -1165,7 +1165,7 @@ bool IsWindows10Threshold2OrGreater(void) // // /////////////////////////////////////////////////////////////// -BOOL IsUserAdmin(VOID) +BOOL IsUserAdmin() /*++ Routine Description: This routine returns TRUE if the caller's process is a member of the Administrators local group. Caller is NOT @@ -1247,7 +1247,7 @@ HMODULE GetLibraryHandle(const SString& strFilename, DWORD* pdwOutLastError) // // ///////////////////////////////////////////////////////////////////// -void FreeLibraryHandle(void) +void FreeLibraryHandle() { if (hLibraryModule) { @@ -1294,7 +1294,7 @@ void UpdateMTAVersionApplicationSetting(bool bQuiet) PFNINITNETREV pfnInitNetRev = static_cast(static_cast(GetProcAddress(hModule, "InitNetRev"))); if (pfnInitNetRev) pfnInitNetRev(GetProductRegistryPath(), GetProductCommonDataDir(), GetProductVersion()); - typedef unsigned short (*PFNGETNETREV)(void); + typedef unsigned short (*PFNGETNETREV)(); PFNGETNETREV pfnGetNetRev = static_cast(static_cast(GetProcAddress(hModule, "GetNetRev"))); if (pfnGetNetRev) usNetRev = pfnGetNetRev(); @@ -1426,7 +1426,7 @@ void TerminateProcess(DWORD dwProcessID, uint uiExitCode) // // /////////////////////////////////////////////////////////////////////////// -bool CreateSingleInstanceMutex(void) +bool CreateSingleInstanceMutex() { HANDLE hMutex = CreateMutex(NULL, FALSE, TEXT(MTA_GUID)); @@ -1448,7 +1448,7 @@ bool CreateSingleInstanceMutex(void) // // /////////////////////////////////////////////////////////////////////////// -void ReleaseSingleInstanceMutex(void) +void ReleaseSingleInstanceMutex() { assert(g_hMutex); CloseHandle(g_hMutex); @@ -1539,7 +1539,7 @@ int GetFileAge(const SString& strPathFilename) // Remove old files from the download cache // /////////////////////////////////////////////////////////////////////////// -void CleanDownloadCache(void) +void CleanDownloadCache() { const uint uiMaxCleanTime = 5; // Limit clean time (seconds) const uint uiCleanFileAge = 60 * 60 * 24 * 7; // Delete files older than this @@ -1711,7 +1711,7 @@ void DirectoryCopy(SString strSrcBase, SString strDestBase, bool bShowProgressDi // settings from a previous version // ////////////////////////////////////////////////////////// -void MaybeShowCopySettingsDialog(void) +void MaybeShowCopySettingsDialog() { // Check if coreconfig.xml is present const SString strMTASAPath = GetMTASAPath(); @@ -1767,7 +1767,7 @@ void MaybeShowCopySettingsDialog(void) // Returns true if message was displayed // ////////////////////////////////////////////////////////// -bool CheckAndShowFileOpenFailureMessage(void) +bool CheckAndShowFileOpenFailureMessage() { SString strFilename = GetApplicationSetting("diagnostics", "gta-fopen-fail"); @@ -1788,7 +1788,7 @@ bool CheckAndShowFileOpenFailureMessage(void) // Check for missing files that could cause a crash // ////////////////////////////////////////////////////////// -void CheckAndShowMissingFileMessage(void) +void CheckAndShowMissingFileMessage() { SString strFilename = PathJoin("text", "american.gxt"); @@ -1808,7 +1808,7 @@ void CheckAndShowMissingFileMessage(void) // Check for flagged model problems // ////////////////////////////////////////////////////////// -void CheckAndShowModelProblems(void) +void CheckAndShowModelProblems() { SString strReason; int iModelId = 0; @@ -1835,7 +1835,7 @@ void CheckAndShowModelProblems(void) // Check for flagged upgrade problems // ////////////////////////////////////////////////////////// -void CheckAndShowUpgradeProblems(void) +void CheckAndShowUpgradeProblems() { int iModelId = 0, iUpgradeId, iFrame; CArgMap argMap; @@ -1861,7 +1861,7 @@ void CheckAndShowUpgradeProblems(void) // Check for flagged img problems // ////////////////////////////////////////////////////////// -void CheckAndShowImgProblems(void) +void CheckAndShowImgProblems() { SString strFilename = GetApplicationSetting("diagnostics", "img-file-corrupt"); SetApplicationSetting("diagnostics", "img-file-corrupt", ""); @@ -1899,7 +1899,7 @@ void* LoadFunction(const char* szLibName, const char* c, const char* a, const ch // Possible BSOD situation if a new mini-dump file was created after the last game was started // ////////////////////////////////////////////////////////// -void BsodDetectionPreLaunch(void) +void BsodDetectionPreLaunch() { // BSOD detection being handled elsewhere ? int iBsodDetectSkip = GetApplicationSettingInt(DIAG_BSOD_DETECT_SKIP); @@ -1965,7 +1965,7 @@ void BsodDetectionPreLaunch(void) // Record game start time // ////////////////////////////////////////////////////////// -void BsodDetectionOnGameBegin(void) +void BsodDetectionOnGameBegin() { SetApplicationSetting("diagnostics", "game-begin-time", GetTimeString(true)); } @@ -1977,7 +1977,7 @@ void BsodDetectionOnGameBegin(void) // Unrecord game start time // ////////////////////////////////////////////////////////// -void BsodDetectionOnGameEnd(void) +void BsodDetectionOnGameEnd() { SetApplicationSetting("diagnostics", "game-begin-time", ""); } @@ -1989,7 +1989,7 @@ void BsodDetectionOnGameEnd(void) // Message to advise against running certain other programs // ////////////////////////////////////////////////////////// -void ForbodenProgramsMessage(void) +void ForbodenProgramsMessage() { std::vector forbodenList = {"ProcessHacker", "CheatEngine", "PCHunter"}; std::vector foundList; @@ -2048,7 +2048,7 @@ bool VerifyEmbeddedSignature(const SString& strFilename) // Dump some settings to the log file to help debugging // ////////////////////////////////////////////////////////// -void LogSettings(void) +void LogSettings() { struct { diff --git a/Client/loader/Utils.h b/Client/loader/Utils.h index 109a2d7bf5a..d69ac27e185 100644 --- a/Client/loader/Utils.h +++ b/Client/loader/Utils.h @@ -73,60 +73,60 @@ void InsertWinMainBlock(HANDLE hProcess); void RemoveWinMainBlock(HANDLE hProcess); void ApplyLoadingCrashPatch(HANDLE hProcess); -void TerminateGTAIfRunning(void); -bool IsGTARunning(void); -void TerminateOtherMTAIfRunning(void); -bool IsOtherMTARunning(void); +void TerminateGTAIfRunning(); +bool IsGTARunning(); +void TerminateOtherMTAIfRunning(); +bool IsOtherMTARunning(); bool CommandLineContains(const SString& strText); void DisplayErrorMessageBox(const SString& strMessage, const SString& strErrorCode = "", const SString& strTroubleType = ""); void SetMTASAPathSource(bool bReadFromRegistry); -SString GetMTASAPath(void); +SString GetMTASAPath(); ePathResult DiscoverGTAPath(bool bFindIfMissing); -SString GetGTAPath(void); -bool HasGTAPath(void); +SString GetGTAPath(); +bool HasGTAPath(); EGtaFileVersion GetGtaFileVersion(const SString& strGTAEXEPath); void GetPEFileOffsets(SPEFileOffsets& outOffsets, const SString& strGTAEXEPath); void FindFilesRecursive(const SString& strPathMatch, std::vector& outFileList, uint uiMaxDepth = 99); -SOSVersionInfo GetOSVersion(void); -SOSVersionInfo GetRealOSVersion(void); -bool IsWindows10OrGreater(void); -bool IsWindows10Threshold2OrGreater(void); +SOSVersionInfo GetOSVersion(); +SOSVersionInfo GetRealOSVersion(); +bool IsWindows10OrGreater(); +bool IsWindows10Threshold2OrGreater(); -BOOL IsUserAdmin(void); +BOOL IsUserAdmin(); void RelaunchAsAdmin(const SString& strCmdLine, const SString& strReason); void UpdateMTAVersionApplicationSetting(bool bQuiet = false); bool Is32bitProcess(DWORD processID); void TerminateProcess(DWORD dwProcessID, uint uiExitCode = 0); -bool CreateSingleInstanceMutex(void); -void ReleaseSingleInstanceMutex(void); +bool CreateSingleInstanceMutex(); +void ReleaseSingleInstanceMutex(); -SString CheckOnRestartCommand(void); -void CleanDownloadCache(void); +SString CheckOnRestartCommand(); +void CleanDownloadCache(); HMODULE GetLibraryHandle(const SString& strFilename, DWORD* pdwOutLastError = NULL); -void FreeLibraryHandle(void); +void FreeLibraryHandle(); uint WaitForObject(HANDLE hProcess, HANDLE hThread, DWORD dwMilliseconds, HANDLE hMutex); bool CheckService(uint uiStage); -void MaybeShowCopySettingsDialog(void); +void MaybeShowCopySettingsDialog(); -bool CheckAndShowFileOpenFailureMessage(void); -void CheckAndShowMissingFileMessage(void); -void CheckAndShowModelProblems(void); -void CheckAndShowUpgradeProblems(void); -void CheckAndShowImgProblems(void); +bool CheckAndShowFileOpenFailureMessage(); +void CheckAndShowMissingFileMessage(); +void CheckAndShowModelProblems(); +void CheckAndShowUpgradeProblems(); +void CheckAndShowImgProblems(); -void BsodDetectionPreLaunch(void); -void BsodDetectionOnGameBegin(void); -void BsodDetectionOnGameEnd(void); -void ForbodenProgramsMessage(void); +void BsodDetectionPreLaunch(); +void BsodDetectionOnGameBegin(); +void BsodDetectionOnGameEnd(); +void ForbodenProgramsMessage(); bool VerifyEmbeddedSignature(const SString& strFilename); -void LogSettings(void); +void LogSettings(); SString PadLeft(const SString& strText, uint uiNumSpaces, char cCharacter); bool IsDeviceSelectionDialogOpen(DWORD dwThreadId); std::vector MyEnumProcesses(bool bInclude64bit = false, bool bIncludeCurrent = false); @@ -177,7 +177,7 @@ class CStuckProcessDetector } // Returns true if process is active and hasn't changed mem usage for uiThresholdMs - bool UpdateIsStuck(void) + bool UpdateIsStuck() { PROCESS_MEMORY_COUNTERS psmemCounter; BOOL bResult = GetProcessMemoryInfo(m_hProcess, &psmemCounter, sizeof(PROCESS_MEMORY_COUNTERS)); diff --git a/Client/mods/deathmatch/CClient.cpp b/Client/mods/deathmatch/CClient.cpp index 250e7995205..f9d81f8db70 100644 --- a/Client/mods/deathmatch/CClient.cpp +++ b/Client/mods/deathmatch/CClient.cpp @@ -202,7 +202,7 @@ int CClient::ClientInitialize(const char* szArguments, CCoreInterface* pCore) return 0; } -void CClient::ClientShutdown(void) +void CClient::ClientShutdown() { // Unbind our radio controls g_pCore->GetKeyBinds()->RemoveControlFunction("radio_next", CClientGame::HandleRadioNext); @@ -216,7 +216,7 @@ void CClient::ClientShutdown(void) } } -void CClient::PreFrameExecutionHandler(void) +void CClient::PreFrameExecutionHandler() { // If the client modification is loaded, pulse it if (g_pClientGame) @@ -233,7 +233,7 @@ void CClient::PreHUDRenderExecutionHandler(bool bDidUnminimize, bool bDidRecreat } } -void CClient::PostFrameExecutionHandler(void) +void CClient::PostFrameExecutionHandler() { // If the client modification is loaded, pulse it if (g_pClientGame) @@ -242,7 +242,7 @@ void CClient::PostFrameExecutionHandler(void) } } -void CClient::IdleHandler(void) +void CClient::IdleHandler() { if (g_pClientGame) { diff --git a/Client/mods/deathmatch/CClient.h b/Client/mods/deathmatch/CClient.h index 15bed45faed..e350654ea04 100644 --- a/Client/mods/deathmatch/CClient.h +++ b/Client/mods/deathmatch/CClient.h @@ -17,12 +17,12 @@ class CClient : public CClientBase { public: int ClientInitialize(const char* szArguments, CCoreInterface* pCore); - void ClientShutdown(void); + void ClientShutdown(); - void PreFrameExecutionHandler(void); + void PreFrameExecutionHandler(); void PreHUDRenderExecutionHandler(bool bDidUnminimize, bool bDidRecreateRenderTargets); - void PostFrameExecutionHandler(void); - void IdleHandler(void); + void PostFrameExecutionHandler(); + void IdleHandler(); void RestreamModel(unsigned short usModel); bool WebsiteRequestResultHandler(const std::unordered_set& newPages); diff --git a/Client/mods/deathmatch/CVoiceRecorder.cpp b/Client/mods/deathmatch/CVoiceRecorder.cpp index 905ddbd7169..0eae56b6cb0 100644 --- a/Client/mods/deathmatch/CVoiceRecorder.cpp +++ b/Client/mods/deathmatch/CVoiceRecorder.cpp @@ -12,7 +12,7 @@ #include "StdInc.h" #include "CVoiceRecorder.h" -CVoiceRecorder::CVoiceRecorder(void) +CVoiceRecorder::CVoiceRecorder() { m_bEnabled = false; @@ -34,7 +34,7 @@ CVoiceRecorder::CVoiceRecorder(void) m_uiBufferSizeBytes = 0; } -CVoiceRecorder::~CVoiceRecorder(void) +CVoiceRecorder::~CVoiceRecorder() { DeInit(); } @@ -124,7 +124,7 @@ void CVoiceRecorder::Init(bool bEnabled, unsigned int uiServerSampleRate, unsign g_pCore->GetConsole()->Printf("Server Voice Chat Quality [%i]; Sample Rate: [%iHz]; Bitrate [%ibps]", m_ucQuality, iSamplingRate, iBitRate); } -void CVoiceRecorder::DeInit(void) +void CVoiceRecorder::DeInit() { if (!m_bEnabled) return; @@ -162,7 +162,7 @@ void CVoiceRecorder::DeInit(void) m_uiBufferSizeBytes = 0; } -const SpeexMode* CVoiceRecorder::getSpeexModeFromSampleRate(void) +const SpeexMode* CVoiceRecorder::getSpeexModeFromSampleRate() { switch (m_SampleRate) { @@ -243,7 +243,7 @@ bool CVoiceRecorder::GetPTTState() return m_VoiceState != VOICESTATE_AWAITING_INPUT; } -void CVoiceRecorder::DoPulse(void) +void CVoiceRecorder::DoPulse() { std::lock_guard lock(m_Mutex); diff --git a/Client/mods/deathmatch/CVoiceRecorder.h b/Client/mods/deathmatch/CVoiceRecorder.h index a29b4b64056..d2b0770cae3 100644 --- a/Client/mods/deathmatch/CVoiceRecorder.h +++ b/Client/mods/deathmatch/CVoiceRecorder.h @@ -47,25 +47,25 @@ enum eServerSampleRate class CVoiceRecorder { public: - CVoiceRecorder(void); - ~CVoiceRecorder(void); + CVoiceRecorder(); + ~CVoiceRecorder(); void Init(bool bEnabled, unsigned int uiServerSampleRate, unsigned char ucQuality, unsigned int uiBitrate); - bool IsEnabled(void) { return m_bEnabled; } + bool IsEnabled() { return m_bEnabled; } - void DoPulse(void); + void DoPulse(); void SetPTTState(bool bState); bool GetPTTState(); - unsigned int GetSampleRate(void) { return m_SampleRate; } - unsigned char GetSampleQuality(void) { return m_ucQuality; } + unsigned int GetSampleRate() { return m_SampleRate; } + unsigned char GetSampleQuality() { return m_ucQuality; } - const SpeexMode* getSpeexModeFromSampleRate(void); + const SpeexMode* getSpeexModeFromSampleRate(); private: - void DeInit(void); + void DeInit(); void SendFrame(const void* inputBuffer); static int PACallback(const void* inputBuffer, void* outputBuffer, unsigned long frameCount, const PaStreamCallbackTimeInfo* timeInfo, diff --git a/Client/mods/deathmatch/HeapTrace.cpp b/Client/mods/deathmatch/HeapTrace.cpp index 406996e8eb5..a2bf439122b 100644 --- a/Client/mods/deathmatch/HeapTrace.cpp +++ b/Client/mods/deathmatch/HeapTrace.cpp @@ -95,7 +95,7 @@ void RemoveTrack(void* pAddress) } } -void DumpUnfreed(void) +void DumpUnfreed() { // Make sure we got a list if (!pAllocList) @@ -156,7 +156,7 @@ void AddTrack(void* pAddress, size_t size, const char* szFile, int iLine) void RemoveTrack(void* pAddress) { } -void DumpUnfreed(void) +void DumpUnfreed() { } #endif diff --git a/Client/mods/deathmatch/HeapTrace.h b/Client/mods/deathmatch/HeapTrace.h index 04bdde306da..ca1ff5a1a24 100644 --- a/Client/mods/deathmatch/HeapTrace.h +++ b/Client/mods/deathmatch/HeapTrace.h @@ -13,4 +13,4 @@ void AddTrack(void* pAddress, size_t size, const char* szFile, int iLine); void RemoveTrack(void* pAddress); -void DumpUnfreed(void); +void DumpUnfreed(); diff --git a/Client/mods/deathmatch/logic/CAntiCheat.cpp b/Client/mods/deathmatch/logic/CAntiCheat.cpp index 27e04f45ed7..57ca55ecde5 100644 --- a/Client/mods/deathmatch/logic/CAntiCheat.cpp +++ b/Client/mods/deathmatch/logic/CAntiCheat.cpp @@ -15,13 +15,13 @@ #define ANTICHEAT_CHECKS_PER_CYCLE 5 -CAntiCheat::CAntiCheat(void) +CAntiCheat::CAntiCheat() { // Start at the first index m_LastEntry = m_Entries.begin(); } -CAntiCheat::~CAntiCheat(void) +CAntiCheat::~CAntiCheat() { // All modules should've been removed now assert(m_Entries.size() == 0); @@ -58,12 +58,12 @@ void CAntiCheat::RemoveModule(CAntiCheatModule& Module) } } -void CAntiCheat::ClearModules(void) +void CAntiCheat::ClearModules() { m_Entries.clear(); } -bool CAntiCheat::PerformChecks(void) +bool CAntiCheat::PerformChecks() { // We have entries in our vector? if (m_Entries.size() > 0) diff --git a/Client/mods/deathmatch/logic/CAntiCheat.h b/Client/mods/deathmatch/logic/CAntiCheat.h index 3d0db8e4707..42252261314 100644 --- a/Client/mods/deathmatch/logic/CAntiCheat.h +++ b/Client/mods/deathmatch/logic/CAntiCheat.h @@ -16,14 +16,14 @@ class CAntiCheat { public: - CAntiCheat(void); - ~CAntiCheat(void); + CAntiCheat(); + ~CAntiCheat(); void AddModule(CAntiCheatModule& Module); void RemoveModule(CAntiCheatModule& Module); - void ClearModules(void); + void ClearModules(); - bool PerformChecks(void); + bool PerformChecks(); private: std::list m_Entries; diff --git a/Client/mods/deathmatch/logic/CAntiCheatModule.cpp b/Client/mods/deathmatch/logic/CAntiCheatModule.cpp index a662daad3a6..4d13940624e 100644 --- a/Client/mods/deathmatch/logic/CAntiCheatModule.cpp +++ b/Client/mods/deathmatch/logic/CAntiCheatModule.cpp @@ -15,7 +15,7 @@ CAntiCheatModule::CAntiCheatModule(CAntiCheat& AntiCheat) : m_AntiCheat(AntiChea AntiCheat.AddModule(*this); } -CAntiCheatModule::~CAntiCheatModule(void) +CAntiCheatModule::~CAntiCheatModule() { m_AntiCheat.RemoveModule(*this); } diff --git a/Client/mods/deathmatch/logic/CAntiCheatModule.h b/Client/mods/deathmatch/logic/CAntiCheatModule.h index cdacb6c4fa7..ee81d2f4d49 100644 --- a/Client/mods/deathmatch/logic/CAntiCheatModule.h +++ b/Client/mods/deathmatch/logic/CAntiCheatModule.h @@ -14,12 +14,12 @@ class CAntiCheatModule { public: CAntiCheatModule(class CAntiCheat& AntiCheat); - virtual ~CAntiCheatModule(void); + virtual ~CAntiCheatModule(); // Implement this function in the anticheat module class. This should // return true if the checks were successful, and false if the player // is a cheater. - virtual bool PerformChecks(void) = 0; + virtual bool PerformChecks() = 0; private: class CAntiCheat& m_AntiCheat; diff --git a/Client/mods/deathmatch/logic/CBassAudio.cpp b/Client/mods/deathmatch/logic/CBassAudio.cpp index 76d7240007a..591acb7991f 100644 --- a/Client/mods/deathmatch/logic/CBassAudio.cpp +++ b/Client/mods/deathmatch/logic/CBassAudio.cpp @@ -60,7 +60,7 @@ namespace } // Finish with pointer - void UnlockCallbackId(void) { ms_CallbackCS.Unlock(); } + void UnlockCallbackId() { ms_CallbackCS.Unlock(); } } // namespace CBassAudio::CBassAudio(bool bStream, const SString& strPath, bool bLoop, bool bThrottle, bool b3D) @@ -89,7 +89,7 @@ CBassAudio::CBassAudio(void* pBuffer, unsigned int uiBufferLength, bool bLoop, b m_uiCallbackId = AddCallbackId(this); } -CBassAudio::~CBassAudio(void) +CBassAudio::~CBassAudio() { assert(m_uiCallbackId == 0); if (m_pSound) @@ -100,7 +100,7 @@ CBassAudio::~CBassAudio(void) SAFE_DELETE(m_pVars); } -void CBassAudio::Destroy(void) +void CBassAudio::Destroy() { RemoveCallbackId(m_uiCallbackId); m_uiCallbackId = 0; @@ -128,7 +128,7 @@ void CBassAudio::Destroy(void) // // This will return false for non streams if the file is not correct // -bool CBassAudio::BeginLoadingMedia(void) +bool CBassAudio::BeginLoadingMedia() { assert(!m_pSound && !m_bPendingPlay); @@ -478,7 +478,7 @@ void CALLBACK FreeSync(HSYNC handle, DWORD channel, DWORD data, void* user) UnlockCallbackId(); } -void CBassAudio::SetFinishedCallbacks(void) +void CBassAudio::SetFinishedCallbacks() { m_hSyncEnd = BASS_ChannelSetSync(m_pSound, BASS_SYNC_END, 0, &EndSync, m_uiCallbackId); m_hSyncFree = BASS_ChannelSetSync(m_pSound, BASS_SYNC_FREE, 0, &FreeSync, m_uiCallbackId); @@ -487,7 +487,7 @@ void CBassAudio::SetFinishedCallbacks(void) // // CBassAudio::GetReachedEndCount // -uint CBassAudio::GetReachedEndCount(void) +uint CBassAudio::GetReachedEndCount() { // Return the number of times the sound has gotten to the end return uiEndSyncCount; @@ -496,7 +496,7 @@ uint CBassAudio::GetReachedEndCount(void) // // CBassAudio::IsFreed // -bool CBassAudio::IsFreed(void) +bool CBassAudio::IsFreed() { // Check if BASS has freed the sound handle. // This could be some time after the actual sound has stopped. @@ -534,7 +534,7 @@ void CBassAudio::SetPlayPosition(double dPosition) } // Non-streams only -double CBassAudio::GetPlayPosition(void) +double CBassAudio::GetPlayPosition() { // Only relevant for non-streams, which are always ready if valid if (m_pSound) @@ -547,7 +547,7 @@ double CBassAudio::GetPlayPosition(void) } // Non-streams only -double CBassAudio::GetLength(void) +double CBassAudio::GetLength() { // Only relevant for non-streams, which are always ready if valid if (m_pSound) @@ -560,7 +560,7 @@ double CBassAudio::GetLength(void) } // Streams only -double CBassAudio::GetBufferLength(void) +double CBassAudio::GetBufferLength() { if (m_bStream && m_pSound) { @@ -608,7 +608,7 @@ SString CBassAudio::GetMetaTags(const SString& strFormat) return strMetaTags; } -float CBassAudio::GetPan(void) +float CBassAudio::GetPan() { if (m_pSound) { @@ -748,7 +748,7 @@ float* CBassAudio::GetWaveData(int iLength) } return NULL; } -DWORD CBassAudio::GetLevelData(void) +DWORD CBassAudio::GetLevelData() { if (m_pSound) { @@ -759,7 +759,7 @@ DWORD CBassAudio::GetLevelData(void) return 0; } -float CBassAudio::GetSoundBPM(void) +float CBassAudio::GetSoundBPM() { if (m_fBPM == 0.0f && !m_bStream) { @@ -806,7 +806,7 @@ void CBassAudio::SetFxEffects(int* pEnabledEffects, uint iNumElements) // // Copy state stored in m_EnabledEffects to actual BASS sound // -void CBassAudio::ApplyFxEffects(void) +void CBassAudio::ApplyFxEffects() { for (uint i = 0; i < NUMELMS(m_FxEffects) && NUMELMS(m_EnabledEffects); i++) { @@ -903,7 +903,7 @@ void CBassAudio::Process3D(const CVector& vecPlayerPosition, const CVector& vecC // // Handle stored data from other threads // -void CBassAudio::ServiceVars(void) +void CBassAudio::ServiceVars() { // Temp DWORD pSound = 0; diff --git a/Client/mods/deathmatch/logic/CBassAudio.h b/Client/mods/deathmatch/logic/CBassAudio.h index 36aa9f60f49..25c2fcb466c 100644 --- a/Client/mods/deathmatch/logic/CBassAudio.h +++ b/Client/mods/deathmatch/logic/CBassAudio.h @@ -48,16 +48,16 @@ class CBassAudio 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(void); - void Destroy(void); + ~CBassAudio(); + void Destroy(); - bool BeginLoadingMedia(void); + bool BeginLoadingMedia(); void SetPaused(bool bPaused); void SetPlayPosition(double dPosition); - double GetPlayPosition(void); - double GetLength(void); - double GetBufferLength(void); + double GetPlayPosition(); + double GetLength(); + double GetBufferLength(); void SetVolume(float fVolume); void SetPlaybackSpeed(float fSpeed); void SetPosition(const CVector& vecPosition); @@ -73,13 +73,13 @@ class CBassAudio bReverse = m_bReversed; }; void SetReversed(bool bReversed) { m_bReversed = bReversed; }; - bool GetPanEnabled(void) { return m_bPan; }; + bool GetPanEnabled() { return m_bPan; }; void SetPanEnabled(bool bPan) { m_bPan = bPan; }; void SetFxEffects(int* pEnabledEffects, uint iNumElements); SString GetMetaTags(const SString& strFormat); - uint GetReachedEndCount(void); - bool IsFreed(void); - float GetPan(void); + uint GetReachedEndCount(); + bool IsFreed(); + float GetPan(); void SetPan(float fPan); void DoPulse(const CVector& vecPlayerPosition, const CVector& vecCameraPosition, const CVector& vecLookAt); @@ -88,17 +88,17 @@ class CBassAudio void ParseShoutcastMeta(const SString& strMeta); float* GetFFTData(int iLength); float* GetWaveData(int iLength); - DWORD GetLevelData(void); - float GetSoundBPM(void); + DWORD GetLevelData(); + float GetSoundBPM(); void SetSoundBPM(float fBPM) { m_fBPM = fBPM; } protected: HSTREAM ConvertFileToMono(const SString& strPath); static void PlayStreamIntern(void* arguments); void CompleteStreamConnect(HSTREAM pSound); - void ApplyFxEffects(void); - void ServiceVars(void); - void SetFinishedCallbacks(void); + void ApplyFxEffects(); + void ServiceVars(); + void SetFinishedCallbacks(); void Process3D(const CVector& vecPlayerPosition, const CVector& vecCameraPosition, const CVector& vecLookAt); diff --git a/Client/mods/deathmatch/logic/CBitStream.h b/Client/mods/deathmatch/logic/CBitStream.h index 6c3dc657389..bb7177e15df 100644 --- a/Client/mods/deathmatch/logic/CBitStream.h +++ b/Client/mods/deathmatch/logic/CBitStream.h @@ -17,8 +17,8 @@ extern CNet* g_pNet; class CBitStream { public: - CBitStream(void) { pBitStream = g_pNet->AllocateNetBitStream(); }; - ~CBitStream(void) { g_pNet->DeallocateNetBitStream(pBitStream); }; + CBitStream() { pBitStream = g_pNet->AllocateNetBitStream(); }; + ~CBitStream() { g_pNet->DeallocateNetBitStream(pBitStream); }; NetBitStreamInterface* pBitStream; }; diff --git a/Client/mods/deathmatch/logic/CBlendedWeather.cpp b/Client/mods/deathmatch/logic/CBlendedWeather.cpp index b9de298deab..d289e0af26d 100644 --- a/Client/mods/deathmatch/logic/CBlendedWeather.cpp +++ b/Client/mods/deathmatch/logic/CBlendedWeather.cpp @@ -11,7 +11,7 @@ #include -CBlendedWeather::CBlendedWeather(void) +CBlendedWeather::CBlendedWeather() { // Init m_ucPrimaryWeather = 0; @@ -26,7 +26,7 @@ CBlendedWeather::CBlendedWeather(void) m_pWeather = g_pGame->GetWeather(); } -void CBlendedWeather::DoPulse(void) +void CBlendedWeather::DoPulse() { // Grab the current time unsigned char ucHour, ucMinute; @@ -79,7 +79,7 @@ void CBlendedWeather::SetWeatherBlended(unsigned char ucWeather, unsigned char u } } -unsigned char CBlendedWeather::GetWeather(void) +unsigned char CBlendedWeather::GetWeather() { // If we're blending the weather, return the weather we started blending from if (m_ucBlendStopHour != 0xFF) diff --git a/Client/mods/deathmatch/logic/CBlendedWeather.h b/Client/mods/deathmatch/logic/CBlendedWeather.h index 6b2599599d7..0cc16b0ee96 100644 --- a/Client/mods/deathmatch/logic/CBlendedWeather.h +++ b/Client/mods/deathmatch/logic/CBlendedWeather.h @@ -14,17 +14,17 @@ class CBlendedWeather { public: - CBlendedWeather(void); + CBlendedWeather(); - void DoPulse(void); + void DoPulse(); void SetWeather(unsigned char ucWeather); void SetWeatherBlended(unsigned char ucWeather, unsigned char ucHour); - unsigned char GetWeather(void); - unsigned char GetWeatherBlendingTo(void) { return m_ucSecondaryBlendedWeather; }; - unsigned char GetBlendedStartHour(void) { return m_ucBlendStartHour; }; - unsigned char GetBlendedStopHour(void) { return m_ucBlendStopHour; }; + unsigned char GetWeather(); + unsigned char GetWeatherBlendingTo() { return m_ucSecondaryBlendedWeather; }; + unsigned char GetBlendedStartHour() { return m_ucBlendStartHour; }; + unsigned char GetBlendedStopHour() { return m_ucBlendStopHour; }; private: unsigned char m_ucPrimaryWeather; diff --git a/Client/mods/deathmatch/logic/CCallback.h b/Client/mods/deathmatch/logic/CCallback.h index 42070cd73c7..6f309b34b19 100644 --- a/Client/mods/deathmatch/logic/CCallback.h +++ b/Client/mods/deathmatch/logic/CCallback.h @@ -15,7 +15,7 @@ template class CCallbackInterface { public: - virtual ~CCallbackInterface(void){}; + virtual ~CCallbackInterface(){}; virtual Ret operator()(Arguments) const = 0; }; @@ -72,7 +72,7 @@ class CCallback CCallback(const CCallback& copy) : m_pCallback(copy.m_pCallback) {} // Destructor - ~CCallback(void) { delete m_pCallback; } + ~CCallback() { delete m_pCallback; } // Call operator Ret operator()(Arguments Args) const { return (*m_pCallback)(Args); } diff --git a/Client/mods/deathmatch/logic/CClient3DMarker.cpp b/Client/mods/deathmatch/logic/CClient3DMarker.cpp index a93944fe64c..d2a88405d51 100644 --- a/Client/mods/deathmatch/logic/CClient3DMarker.cpp +++ b/Client/mods/deathmatch/logic/CClient3DMarker.cpp @@ -25,11 +25,11 @@ CClient3DMarker::CClient3DMarker(CClientMarker* pThis) m_ulIdentifier = (DWORD)this; } -CClient3DMarker::~CClient3DMarker(void) +CClient3DMarker::~CClient3DMarker() { } -unsigned long CClient3DMarker::Get3DMarkerType(void) +unsigned long CClient3DMarker::Get3DMarkerType() { switch (m_dwType) { @@ -67,20 +67,20 @@ bool CClient3DMarker::IsHit(const CVector& vecPosition) const return IsPointNearPoint3D(m_Matrix.vPos, vecPosition, m_fSize + 4); } -void CClient3DMarker::StreamIn(void) +void CClient3DMarker::StreamIn() { // We're now streamed in m_bMarkerStreamedIn = true; } -void CClient3DMarker::StreamOut(void) +void CClient3DMarker::StreamOut() { // We're no longer streamed in m_bMarkerStreamedIn = false; m_pMarker = NULL; } -void CClient3DMarker::DoPulse(void) +void CClient3DMarker::DoPulse() { if (m_bMarkerStreamedIn && m_bVisible && m_pThis->GetInterior() == g_pGame->GetWorld()->GetCurrentArea()) { diff --git a/Client/mods/deathmatch/logic/CClient3DMarker.h b/Client/mods/deathmatch/logic/CClient3DMarker.h index 89eb5fd1c81..2bc49f27d50 100644 --- a/Client/mods/deathmatch/logic/CClient3DMarker.h +++ b/Client/mods/deathmatch/logic/CClient3DMarker.h @@ -24,11 +24,11 @@ class CClient3DMarker : public CClientMarkerCommon }; CClient3DMarker(CClientMarker* pThis); - ~CClient3DMarker(void); + ~CClient3DMarker(); - unsigned int GetMarkerType(void) const { return CClientMarkerCommon::CLASS_3DMARKER; }; + unsigned int GetMarkerType() const { return CClientMarkerCommon::CLASS_3DMARKER; }; - unsigned long Get3DMarkerType(void); + unsigned long Get3DMarkerType(); void Set3DMarkerType(unsigned long ulType); bool IsHit(const CVector& vecPosition) const; @@ -39,23 +39,23 @@ class CClient3DMarker : public CClientMarkerCommon void GetMatrix(CMatrix& mat) { mat = m_Matrix; }; void SetMatrix(CMatrix& mat) { m_Matrix = mat; }; - bool IsVisible(void) const { return m_bVisible; }; + bool IsVisible() const { return m_bVisible; }; void SetVisible(bool bVisible) { m_bVisible = bVisible; }; - SColor GetColor(void) const { return m_Color; } + SColor GetColor() const { return m_Color; } void SetColor(const SColor& color) { m_Color = color; } - float GetSize(void) const { return m_fSize; }; + float GetSize() const { return m_fSize; }; void SetSize(float fSize) { m_fSize = fSize; }; - float GetPulseFraction(void) { return static_cast(m_pMarker->GetPulseFraction()); }; + float GetPulseFraction() { return static_cast(m_pMarker->GetPulseFraction()); }; void SetPulseFraction(float fFraction) { m_pMarker->SetPulseFraction(fFraction); }; protected: - void StreamIn(void); - void StreamOut(void); + void StreamIn(); + void StreamOut(); - void DoPulse(void); + void DoPulse(); private: CClientMarker* m_pThis; diff --git a/Client/mods/deathmatch/logic/CClientCamera.cpp b/Client/mods/deathmatch/logic/CClientCamera.cpp index 876e4c701a2..b2f7a73de7b 100644 --- a/Client/mods/deathmatch/logic/CClientCamera.cpp +++ b/Client/mods/deathmatch/logic/CClientCamera.cpp @@ -37,7 +37,7 @@ CClientCamera::CClientCamera(CClientManager* pManager) : ClassInit(this), CClien m_FixedCameraMode = EFixedCameraMode::ROTATION; } -CClientCamera::~CClientCamera(void) +CClientCamera::~CClientCamera() { // We need to be ingame if (g_pGame->GetSystemState() == 9) @@ -48,7 +48,7 @@ CClientCamera::~CClientCamera(void) CClientEntityRefManager::RemoveEntityRefs(0, &m_pFocusedPlayer, &m_pFocusedEntity, NULL); } -void CClientCamera::DoPulse(void) +void CClientCamera::DoPulse() { // If we're fixed, force the target vector if (m_bFixed) @@ -407,7 +407,7 @@ void CClientCamera::SetFocus(CVector* vecTarget, bool bSmoothTransition) } } -void CClientCamera::SetFocusToLocalPlayer(void) +void CClientCamera::SetFocusToLocalPlayer() { // Restore the camera SetFocusToLocalPlayerImpl(); @@ -425,7 +425,7 @@ void CClientCamera::SetFocusToLocalPlayer(void) m_fFOV = 70.0f; } -void CClientCamera::SetFocusToLocalPlayerImpl(void) +void CClientCamera::SetFocusToLocalPlayerImpl() { // Restore the camera m_pCamera->RestoreWithJumpCut(); @@ -544,7 +544,7 @@ void CClientCamera::SetTargetEntity(CClientEntity* pEntity) pCam->SetTargetEntity(pEntity->GetGameEntity()); } -CClientEntity* CClientCamera::GetTargetEntity(void) +CClientEntity* CClientCamera::GetTargetEntity() { CClientEntity* pReturn = NULL; if (m_pCamera) @@ -589,7 +589,7 @@ bool CClientCamera::ProcessFixedCamera(CCam* pCam) // // Return matrix being used by GTA right now // -CMatrix CClientCamera::GetGtaMatrix(void) const +CMatrix CClientCamera::GetGtaMatrix() const { CCam* pCam = m_pCamera->GetCam(m_pCamera->GetActiveCam()); diff --git a/Client/mods/deathmatch/logic/CClientCamera.h b/Client/mods/deathmatch/logic/CClientCamera.h index 6700a89309a..c702aae2d03 100644 --- a/Client/mods/deathmatch/logic/CClientCamera.h +++ b/Client/mods/deathmatch/logic/CClientCamera.h @@ -35,10 +35,10 @@ class CClientCamera : public CClientEntity friend class CClientManager; public: - void Unlink(void){}; - void DoPulse(void); + void Unlink(){}; + void DoPulse(); - eClientEntityType GetType(void) const { return CCLIENTCAMERA; }; + eClientEntityType GetType() const { return CCLIENTCAMERA; }; bool SetMatrix(const CMatrix& Matrix); bool GetMatrix(CMatrix& Matrix) const; @@ -56,35 +56,35 @@ class CClientCamera : public CClientEntity void FadeIn(float fTime); void FadeOut(float fTime, unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue); - CClientPlayer* GetFocusedPlayer(void) { return m_pFocusedPlayer; }; + CClientPlayer* GetFocusedPlayer() { return m_pFocusedPlayer; }; void SetFocus(CClientEntity* pEntity, eCamMode eMode, bool bSmoothTransition = false); void SetFocus(CClientPlayer* pPlayer, eCamMode eMode, bool bSmoothTransition = false); - void SetFocusToLocalPlayer(void); + void SetFocusToLocalPlayer(); void SetCameraViewMode(eVehicleCamMode eMode); - eVehicleCamMode GetCameraViewMode(void); + eVehicleCamMode GetCameraViewMode(); void SetCameraClip(bool bObjects, bool bVehicles); void GetCameraClip(bool& bObjects, bool& bVehicles); - bool IsInFixedMode(void) { return m_bFixed; } + bool IsInFixedMode() { return m_bFixed; } void ToggleCameraFixedMode(bool bEnabled); void SetTargetEntity(CClientEntity* pEntity); - CClientEntity* GetTargetEntity(void); + CClientEntity* GetTargetEntity(); void UnreferencePlayer(CClientPlayer* pPlayer); private: CClientCamera(CClientManager* pManager); - ~CClientCamera(void); + ~CClientCamera(); static bool StaticProcessFixedCamera(CCam* pCam); bool ProcessFixedCamera(CCam* pCam); void SetFocus(CVector* vecTarget, bool bSmoothTransition); - CMatrix GetGtaMatrix(void) const; + CMatrix GetGtaMatrix() const; void SetGtaMatrix(const CMatrix& matInNew, CCam* pCam = NULL) const; - void SetFocusToLocalPlayerImpl(void); + void SetFocusToLocalPlayerImpl(); void UnreferenceEntity(CClientEntity* pEntity); void InvalidateEntity(CClientEntity* pEntity); diff --git a/Client/mods/deathmatch/logic/CClientCheckpoint.cpp b/Client/mods/deathmatch/logic/CClientCheckpoint.cpp index 9799aa0bdc1..ca894047144 100644 --- a/Client/mods/deathmatch/logic/CClientCheckpoint.cpp +++ b/Client/mods/deathmatch/logic/CClientCheckpoint.cpp @@ -27,14 +27,14 @@ CClientCheckpoint::CClientCheckpoint(CClientMarker* pThis) m_bHasTarget = false; } -CClientCheckpoint::~CClientCheckpoint(void) +CClientCheckpoint::~CClientCheckpoint() { // Eventually destroy the checkpoint Destroy(); CClientEntityRefManager::RemoveEntityRefs(0, &m_pThis, NULL); } -unsigned long CClientCheckpoint::GetCheckpointType(void) const +unsigned long CClientCheckpoint::GetCheckpointType() const { switch (m_dwType) { @@ -305,7 +305,7 @@ bool CClientCheckpoint::IconToString(unsigned char ucIcon, SString& strOutString } } -void CClientCheckpoint::StreamIn(void) +void CClientCheckpoint::StreamIn() { // We're now streamed in m_bStreamedIn = true; @@ -317,7 +317,7 @@ void CClientCheckpoint::StreamIn(void) } } -void CClientCheckpoint::StreamOut(void) +void CClientCheckpoint::StreamOut() { // Destroy our checkpoint Destroy(); @@ -354,7 +354,7 @@ void CClientCheckpoint::Create(unsigned long ulIdentifier) } } -void CClientCheckpoint::Destroy(void) +void CClientCheckpoint::Destroy() { // Destroy it and NULL it if (m_pCheckpoint) @@ -364,7 +364,7 @@ void CClientCheckpoint::Destroy(void) } } -void CClientCheckpoint::ReCreate(void) +void CClientCheckpoint::ReCreate() { // Recreate if we're streamed in and visible if (IsStreamedIn() && m_bVisible) @@ -374,7 +374,7 @@ void CClientCheckpoint::ReCreate(void) } } -void CClientCheckpoint::ReCreateWithSameIdentifier(void) +void CClientCheckpoint::ReCreateWithSameIdentifier() { // Recreate if we're streamed in and visible if (IsStreamedIn() && m_bVisible) diff --git a/Client/mods/deathmatch/logic/CClientCheckpoint.h b/Client/mods/deathmatch/logic/CClientCheckpoint.h index ed3cb1ba6ed..17f4b09e388 100644 --- a/Client/mods/deathmatch/logic/CClientCheckpoint.h +++ b/Client/mods/deathmatch/logic/CClientCheckpoint.h @@ -35,11 +35,11 @@ class CClientCheckpoint : public CClientMarkerCommon }; CClientCheckpoint(CClientMarker* pThis); - ~CClientCheckpoint(void); + ~CClientCheckpoint(); - unsigned int GetMarkerType(void) const { return CClientMarkerCommon::CLASS_CHECKPOINT; }; + unsigned int GetMarkerType() const { return CClientMarkerCommon::CLASS_CHECKPOINT; }; - unsigned long GetCheckpointType(void) const; + unsigned long GetCheckpointType() const; void SetCheckpointType(unsigned long ulType); bool IsHit(const CVector& vecPosition) const; @@ -52,36 +52,36 @@ class CClientCheckpoint : public CClientMarkerCommon void GetMatrix(CMatrix& mat); void SetMatrix(CMatrix& mat); - bool IsVisible(void) const { return m_bVisible; } + bool IsVisible() const { return m_bVisible; } void SetVisible(bool bVisible); - unsigned int GetIcon(void) const { return m_uiIcon; } + unsigned int GetIcon() const { return m_uiIcon; } void SetIcon(unsigned int uiIcon); - SColor GetColor(void) const { return m_Color; } + SColor GetColor() const { return m_Color; } void SetColor(const SColor& color); - float GetSize(void) const { return m_fSize; }; + float GetSize() const { return m_fSize; }; void SetSize(float fSize); - bool HasTarget(void) { return m_bHasTarget; } + bool HasTarget() { return m_bHasTarget; } void SetHasTarget(bool bHasTarget) { m_bHasTarget = bHasTarget; } void GetTarget(CVector& vecTarget) { vecTarget = m_vecTarget; } void SetTarget(const CVector& vecTarget) { m_vecTarget = vecTarget; } static unsigned char StringToIcon(const char* szString); static bool IconToString(unsigned char ucIcon, SString& strOutString); - void ReCreateWithSameIdentifier(void); + void ReCreateWithSameIdentifier(); protected: - bool IsStreamedIn(void) { return m_bStreamedIn; }; - void StreamIn(void); - void StreamOut(void); + bool IsStreamedIn() { return m_bStreamedIn; }; + void StreamIn(); + void StreamOut(); private: void Create(unsigned long ulIdentifier = 0); - void Destroy(void); - void ReCreate(void); + void Destroy(); + void ReCreate(); CClientMarkerPtr m_pThis; bool m_bStreamedIn; diff --git a/Client/mods/deathmatch/logic/CClientCivilian.cpp b/Client/mods/deathmatch/logic/CClientCivilian.cpp index 43b926d0bd4..c9fd27b7faa 100644 --- a/Client/mods/deathmatch/logic/CClientCivilian.cpp +++ b/Client/mods/deathmatch/logic/CClientCivilian.cpp @@ -47,7 +47,7 @@ CClientCivilian::CClientCivilian(CClientManager* pManager, ElementID ID, CCivili m_pCivilianManager->AddToList(this); } -CClientCivilian::~CClientCivilian(void) +CClientCivilian::~CClientCivilian() { // Reset the stored pointer in the civilian ped if neccessary if (m_pCivilianPed) @@ -62,12 +62,12 @@ CClientCivilian::~CClientCivilian(void) Unlink(); } -void CClientCivilian::Unlink(void) +void CClientCivilian::Unlink() { m_pCivilianManager->RemoveFromList(this); } -int CClientCivilian::GetRotation(void) +int CClientCivilian::GetRotation() { int iRotation = 0; double dRotation; @@ -126,7 +126,7 @@ void CClientCivilian::SetRotation(int iRotation) m_pCivilianPed->SetMatrix(&pMat); } -float CClientCivilian::GetDistanceFromCentreOfMassToBaseOfModel(void) +float CClientCivilian::GetDistanceFromCentreOfMassToBaseOfModel() { if (m_pCivilianPed) { @@ -167,7 +167,7 @@ void CClientCivilian::SetTurnSpeed(const CVector& vecTurnSpeed) m_pCivilianPed->SetTurnSpeed(const_cast(&vecTurnSpeed)); } -bool CClientCivilian::IsVisible(void) +bool CClientCivilian::IsVisible() { return m_pCivilianPed->IsVisible(); } @@ -178,7 +178,7 @@ void CClientCivilian::SetVisible(bool bVisible) m_pCivilianPed->SetUsesCollision(bVisible); } -float CClientCivilian::GetHealth(void) const +float CClientCivilian::GetHealth() const { return m_pCivilianPed->GetHealth(); } @@ -189,7 +189,7 @@ void CClientCivilian::SetHealth(float fHealth) m_pCivilianPed->SetHealth(fHealth); } -int CClientCivilian::GetModelID(void) +int CClientCivilian::GetModelID() { // return m_iVehicleModel; return 0; @@ -203,15 +203,15 @@ void CClientCivilian::Dump(FILE* pFile, bool bDumpDetails, unsigned int uiIndex) { } -void CClientCivilian::Create(void) +void CClientCivilian::Create() { } -void CClientCivilian::Destroy(void) +void CClientCivilian::Destroy() { } -void CClientCivilian::ReCreate(void) +void CClientCivilian::ReCreate() { // Re-create the vehicle Destroy(); diff --git a/Client/mods/deathmatch/logic/CClientCivilian.h b/Client/mods/deathmatch/logic/CClientCivilian.h index bc2b5170952..244d6d5dd99 100644 --- a/Client/mods/deathmatch/logic/CClientCivilian.h +++ b/Client/mods/deathmatch/logic/CClientCivilian.h @@ -25,24 +25,24 @@ class CClientCivilian : public CClientEntity friend class CClientCivilianManager; public: - ~CClientCivilian(void); + ~CClientCivilian(); - void Unlink(void); + void Unlink(); - eClientEntityType GetType(void) const { return CCLIENTCIVILIAN; }; + eClientEntityType GetType() const { return CCLIENTCIVILIAN; }; - CCivilianPed* GetGameCivilian(void) { return m_pCivilianPed; } + CCivilianPed* GetGameCivilian() { return m_pCivilianPed; } void GetPosition(CVector& vecPosition) const { vecPosition = *m_pCivilianPed->GetPosition(); }; void SetPosition(const CVector& vecPosition) { m_pCivilianPed->SetPosition(const_cast(&vecPosition)); }; void GetRotationRadians(CVector& vecRotation) const; void SetRotationRadians(const CVector& vecRotation); - int GetRotation(void); + int GetRotation(); void SetRotation(int iRotation); void ModelRequestCallback(unsigned short usModelID){}; - float GetDistanceFromCentreOfMassToBaseOfModel(void); + float GetDistanceFromCentreOfMassToBaseOfModel(); bool GetMatrix(CMatrix& Matrix) const; bool SetMatrix(const CMatrix& Matrix); @@ -52,13 +52,13 @@ class CClientCivilian : public CClientEntity void GetTurnSpeed(CVector& vecTurnSpeed) const; void SetTurnSpeed(const CVector& vecTurnSpeed); - bool IsVisible(void); + bool IsVisible(); void SetVisible(bool bVisible); - float GetHealth(void) const; + float GetHealth() const; void SetHealth(float fHealth); - int GetModelID(void); + int GetModelID(); void SetModelID(int iModelID); private: @@ -67,9 +67,9 @@ class CClientCivilian : public CClientEntity void Dump(FILE* pFile, bool bDumpDetails, unsigned int uiIndex); - void Create(void); - void Destroy(void); - void ReCreate(void); + void Create(); + void Destroy(); + void ReCreate(); class CClientCivilianManager* m_pCivilianManager; diff --git a/Client/mods/deathmatch/logic/CClientCivilianManager.cpp b/Client/mods/deathmatch/logic/CClientCivilianManager.cpp index 8774429c497..48448b1abdb 100644 --- a/Client/mods/deathmatch/logic/CClientCivilianManager.cpp +++ b/Client/mods/deathmatch/logic/CClientCivilianManager.cpp @@ -19,7 +19,7 @@ CClientCivilianManager::CClientCivilianManager(CClientManager* pManager) m_bCanRemoveFromList = true; } -CClientCivilianManager::~CClientCivilianManager(void) +CClientCivilianManager::~CClientCivilianManager() { // Destroy all vehicles DeleteAll(); @@ -35,7 +35,7 @@ CClientCivilian* CClientCivilianManager::Create(CCivilianPed* pPed, ElementID ID return new CClientCivilian(m_pManager, ID, pPed); } -void CClientCivilianManager::DeleteAll(void) +void CClientCivilianManager::DeleteAll() { // Delete all the civilians m_bCanRemoveFromList = false; diff --git a/Client/mods/deathmatch/logic/CClientCivilianManager.h b/Client/mods/deathmatch/logic/CClientCivilianManager.h index 14248724137..6806ab8a782 100644 --- a/Client/mods/deathmatch/logic/CClientCivilianManager.h +++ b/Client/mods/deathmatch/logic/CClientCivilianManager.h @@ -26,9 +26,9 @@ class CClientCivilianManager public: CClientCivilian* Create(int iPedModel, ElementID ID); CClientCivilian* Create(CCivilianPed* pPed, ElementID ID); - void DeleteAll(void); + void DeleteAll(); - unsigned int Count(void) { return static_cast(m_Civilians.size()); }; + unsigned int Count() { return static_cast(m_Civilians.size()); }; static CClientCivilian* Get(ElementID ID); static inline CClientCivilian* Get(CCivilianPed* pPed) { return reinterpret_cast(pPed->GetStoredPointer()); }; @@ -36,14 +36,14 @@ class CClientCivilianManager std::list::iterator IterGet(CClientCivilian* pCivilian); std::list::reverse_iterator IterGetReverse(CClientCivilian* pCivilian); - std::list::iterator IterBegin(void) { return m_Civilians.begin(); }; - std::list::iterator IterEnd(void) { return m_Civilians.end(); }; - std::list::reverse_iterator IterReverseBegin(void) { return m_Civilians.rbegin(); }; - std::list::reverse_iterator IterReverseEnd(void) { return m_Civilians.rend(); }; + std::list::iterator IterBegin() { return m_Civilians.begin(); }; + std::list::iterator IterEnd() { return m_Civilians.end(); }; + std::list::reverse_iterator IterReverseBegin() { return m_Civilians.rbegin(); }; + std::list::reverse_iterator IterReverseEnd() { return m_Civilians.rend(); }; private: CClientCivilianManager(class CClientManager* pManager); - ~CClientCivilianManager(void); + ~CClientCivilianManager(); void AddToList(CClientCivilian* pCivilian) { m_Civilians.push_back(pCivilian); }; void RemoveFromList(CClientCivilian* pCivilian); diff --git a/Client/mods/deathmatch/logic/CClientColCircle.cpp b/Client/mods/deathmatch/logic/CClientColCircle.cpp index 2f3de900323..d1ac42022ce 100644 --- a/Client/mods/deathmatch/logic/CClientColCircle.cpp +++ b/Client/mods/deathmatch/logic/CClientColCircle.cpp @@ -28,7 +28,7 @@ bool CClientColCircle::DoHitDetection(const CVector& vecNowPosition, float fRadi return IsPointNearPoint2D(vecNowPosition, m_vecPosition, fRadius + m_fRadius); } -CSphere CClientColCircle::GetWorldBoundingSphere(void) +CSphere CClientColCircle::GetWorldBoundingSphere() { CSphere sphere; sphere.vecPosition.fX = m_vecPosition.fX; diff --git a/Client/mods/deathmatch/logic/CClientColCircle.h b/Client/mods/deathmatch/logic/CClientColCircle.h index 4c7faf2239b..f91418c6a49 100644 --- a/Client/mods/deathmatch/logic/CClientColCircle.h +++ b/Client/mods/deathmatch/logic/CClientColCircle.h @@ -16,14 +16,14 @@ class CClientColCircle : public CClientColShape public: CClientColCircle(CClientManager* pManager, ElementID ID, const CVector2D& vecPosition, float fRadius); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); virtual void DebugRender(const CVector& vecPosition, float fDrawRadius); - eColShapeType GetShapeType(void) { return COLSHAPE_CIRCLE; } + eColShapeType GetShapeType() { return COLSHAPE_CIRCLE; } bool DoHitDetection(const CVector& vecNowPosition, float fRadius); - float GetRadius(void) { return m_fRadius; }; + float GetRadius() { return m_fRadius; }; void SetRadius(float fRadius) { m_fRadius = fRadius; diff --git a/Client/mods/deathmatch/logic/CClientColCuboid.cpp b/Client/mods/deathmatch/logic/CClientColCuboid.cpp index 75d642fb80c..63c87061ac0 100644 --- a/Client/mods/deathmatch/logic/CClientColCuboid.cpp +++ b/Client/mods/deathmatch/logic/CClientColCuboid.cpp @@ -30,7 +30,7 @@ bool CClientColCuboid::DoHitDetection(const CVector& vecNowPosition, float fRadi vecNowPosition.fZ <= m_vecPosition.fZ + m_vecSize.fZ); } -CSphere CClientColCuboid::GetWorldBoundingSphere(void) +CSphere CClientColCuboid::GetWorldBoundingSphere() { CSphere sphere; sphere.vecPosition = m_vecPosition + m_vecSize * 0.5f; diff --git a/Client/mods/deathmatch/logic/CClientColCuboid.h b/Client/mods/deathmatch/logic/CClientColCuboid.h index 802d91ec13b..ba68b562751 100644 --- a/Client/mods/deathmatch/logic/CClientColCuboid.h +++ b/Client/mods/deathmatch/logic/CClientColCuboid.h @@ -16,14 +16,14 @@ class CClientColCuboid : public CClientColShape public: CClientColCuboid(CClientManager* pManager, ElementID ID, const CVector& vecPosition, const CVector& vecSize); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); virtual void DebugRender(const CVector& vecPosition, float fDrawRadius); - eColShapeType GetShapeType(void) { return COLSHAPE_CUBOID; } + eColShapeType GetShapeType() { return COLSHAPE_CUBOID; } bool DoHitDetection(const CVector& vecNowPosition, float fRadius); - const CVector& GetSize(void) { return m_vecSize; }; + const CVector& GetSize() { return m_vecSize; }; void SetSize(const CVector& vecSize) { m_vecSize = vecSize; diff --git a/Client/mods/deathmatch/logic/CClientColManager.cpp b/Client/mods/deathmatch/logic/CClientColManager.cpp index 9607b77d918..bb1050b54bb 100644 --- a/Client/mods/deathmatch/logic/CClientColManager.cpp +++ b/Client/mods/deathmatch/logic/CClientColManager.cpp @@ -13,12 +13,12 @@ using std::list; using std::vector; -CClientColManager::~CClientColManager(void) +CClientColManager::~CClientColManager() { DeleteAll(); } -void CClientColManager::DoPulse(void) +void CClientColManager::DoPulse() { // Don't use iterators here as the list may get modified for (uint i = 0; i < m_List.size(); i++) @@ -195,7 +195,7 @@ bool CClientColManager::Exists(CClientColShape* pShape) return ListContains(m_List, pShape); } -void CClientColManager::DeleteAll(void) +void CClientColManager::DeleteAll() { // Delete all of them vector cloneList = m_List; diff --git a/Client/mods/deathmatch/logic/CClientColManager.h b/Client/mods/deathmatch/logic/CClientColManager.h index 746b49e2c48..2640544805a 100644 --- a/Client/mods/deathmatch/logic/CClientColManager.h +++ b/Client/mods/deathmatch/logic/CClientColManager.h @@ -21,15 +21,15 @@ class CClientColManager friend class CClientColShape; public: - ~CClientColManager(void); + ~CClientColManager(); - void DoPulse(void); + void DoPulse(); void DoHitDetection(const CVector& vecNowPosition, float fRadius, CClientEntity* pElement, CClientColShape* pJustThis = NULL, bool bChildren = false); bool Exists(CClientColShape* pShape); - void DeleteAll(void); + void DeleteAll(); - unsigned int Count(void) { return static_cast(m_List.size()); } + unsigned int Count() { return static_cast(m_List.size()); } protected: void AddToList(CClientColShape* pShape) { m_List.push_back(pShape); }; diff --git a/Client/mods/deathmatch/logic/CClientColModel.cpp b/Client/mods/deathmatch/logic/CClientColModel.cpp index 57d9ce27cdc..7b9af5ab8ed 100644 --- a/Client/mods/deathmatch/logic/CClientColModel.cpp +++ b/Client/mods/deathmatch/logic/CClientColModel.cpp @@ -23,7 +23,7 @@ CClientColModel::CClientColModel(CClientManager* pManager, ElementID ID) : Class m_pColModelManager->AddToList(this); } -CClientColModel::~CClientColModel(void) +CClientColModel::~CClientColModel() { // Remove us from DFF manager's list m_pColModelManager->RemoveFromList(this); @@ -104,7 +104,7 @@ void CClientColModel::Restore(unsigned short usModel) m_Replaced.remove(usModel); } -void CClientColModel::RestoreAll(void) +void CClientColModel::RestoreAll() { // Loop through our replaced ids std::list::iterator iter = m_Replaced.begin(); diff --git a/Client/mods/deathmatch/logic/CClientColModel.h b/Client/mods/deathmatch/logic/CClientColModel.h index 7a77cf6d2ee..983eee4b40a 100644 --- a/Client/mods/deathmatch/logic/CClientColModel.h +++ b/Client/mods/deathmatch/logic/CClientColModel.h @@ -18,22 +18,22 @@ class CClientColModel : public CClientEntity DECLARE_CLASS(CClientColModel, CClientEntity) public: CClientColModel(class CClientManager* pManager, ElementID ID); - ~CClientColModel(void); + ~CClientColModel(); - eClientEntityType GetType(void) const { return CCLIENTCOL; } + eClientEntityType GetType() const { return CCLIENTCOL; } bool LoadCol(const SString& strFile, bool bIsRawData); - bool IsLoaded(void) { return m_pColModel != NULL; }; + bool IsLoaded() { return m_pColModel != NULL; }; bool Replace(unsigned short usModel); void Restore(unsigned short usModel); - void RestoreAll(void); + void RestoreAll(); bool HasReplaced(unsigned short usModel); static bool IsCOLData(const SString& strData); // Sorta a hack that these are required by CClientEntity... - void Unlink(void){}; + void Unlink(){}; void GetPosition(CVector& vecPosition) const {}; void SetPosition(const CVector& vecPosition){}; diff --git a/Client/mods/deathmatch/logic/CClientColModelManager.cpp b/Client/mods/deathmatch/logic/CClientColModelManager.cpp index b158eff0051..9b7b25fdb4d 100644 --- a/Client/mods/deathmatch/logic/CClientColModelManager.cpp +++ b/Client/mods/deathmatch/logic/CClientColModelManager.cpp @@ -18,13 +18,13 @@ CClientColModelManager::CClientColModelManager(class CClientManager* pManager) m_bRemoveFromList = true; } -CClientColModelManager::~CClientColModelManager(void) +CClientColModelManager::~CClientColModelManager() { // Remove all items RemoveAll(); } -void CClientColModelManager::RemoveAll(void) +void CClientColModelManager::RemoveAll() { // Make sure they don't remove themselves from the list m_bRemoveFromList = false; diff --git a/Client/mods/deathmatch/logic/CClientColModelManager.h b/Client/mods/deathmatch/logic/CClientColModelManager.h index 967fb70e458..965b558f43b 100644 --- a/Client/mods/deathmatch/logic/CClientColModelManager.h +++ b/Client/mods/deathmatch/logic/CClientColModelManager.h @@ -19,9 +19,9 @@ class CClientColModelManager public: CClientColModelManager(class CClientManager* pManager); - ~CClientColModelManager(void); + ~CClientColModelManager(); - void RemoveAll(void); + void RemoveAll(); bool Exists(CClientColModel* pCol); CClientColModel* GetElementThatReplaced(unsigned short usModel, CClientColModel* pDontSearch = NULL); @@ -29,8 +29,8 @@ class CClientColModelManager static bool IsReplacableModel(unsigned short usModel); bool RestoreModel(unsigned short usModel); - std::list::const_iterator IterBegin(void) { return m_List.begin(); } - std::list::const_iterator IterEnd(void) { return m_List.end(); } + std::list::const_iterator IterBegin() { return m_List.begin(); } + std::list::const_iterator IterEnd() { return m_List.end(); } private: void AddToList(CClientColModel* pCol) { m_List.push_back(pCol); } diff --git a/Client/mods/deathmatch/logic/CClientColPolygon.cpp b/Client/mods/deathmatch/logic/CClientColPolygon.cpp index ea2f181efbe..6f7b8fa1b21 100644 --- a/Client/mods/deathmatch/logic/CClientColPolygon.cpp +++ b/Client/mods/deathmatch/logic/CClientColPolygon.cpp @@ -95,7 +95,7 @@ bool CClientColPolygon::IsInBounds(CVector vecPoint) return fDist <= m_fRadius; } -CSphere CClientColPolygon::GetWorldBoundingSphere(void) +CSphere CClientColPolygon::GetWorldBoundingSphere() { CSphere sphere; sphere.vecPosition.fX = m_vecPosition.fX; diff --git a/Client/mods/deathmatch/logic/CClientColPolygon.h b/Client/mods/deathmatch/logic/CClientColPolygon.h index 21bdae0d14b..1ee97716f6d 100644 --- a/Client/mods/deathmatch/logic/CClientColPolygon.h +++ b/Client/mods/deathmatch/logic/CClientColPolygon.h @@ -17,10 +17,10 @@ class CClientColPolygon : public CClientColShape public: CClientColPolygon(CClientManager* pManager, ElementID ID, const CVector2D& vecPosition); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); virtual void DebugRender(const CVector& vecPosition, float fDrawRadius); - eColShapeType GetShapeType(void) { return COLSHAPE_POLYGON; } + eColShapeType GetShapeType() { return COLSHAPE_POLYGON; } bool DoHitDetection(const CVector& vecNowPosition, float fRadius); @@ -28,9 +28,9 @@ class CClientColPolygon : public CClientColShape void AddPoint(CVector2D vecPoint); - unsigned int CountPoints(void) const { return static_cast(m_Points.size()); }; - std::vector::const_iterator IterBegin(void) { return m_Points.begin(); }; - std::vector::const_iterator IterEnd(void) { return m_Points.end(); }; + unsigned int CountPoints() const { return static_cast(m_Points.size()); }; + std::vector::const_iterator IterBegin() { return m_Points.begin(); }; + std::vector::const_iterator IterEnd() { return m_Points.end(); }; protected: std::vector m_Points; diff --git a/Client/mods/deathmatch/logic/CClientColRectangle.cpp b/Client/mods/deathmatch/logic/CClientColRectangle.cpp index 9d5813e3fae..477d5726c8e 100644 --- a/Client/mods/deathmatch/logic/CClientColRectangle.cpp +++ b/Client/mods/deathmatch/logic/CClientColRectangle.cpp @@ -31,7 +31,7 @@ bool CClientColRectangle::DoHitDetection(const CVector& vecNowPosition, float fR vecNowPosition.fY <= m_vecPosition.fY + m_vecSize.fY); } -CSphere CClientColRectangle::GetWorldBoundingSphere(void) +CSphere CClientColRectangle::GetWorldBoundingSphere() { CSphere sphere; sphere.vecPosition.fX = m_vecPosition.fX + m_vecSize.fX * 0.5f; diff --git a/Client/mods/deathmatch/logic/CClientColRectangle.h b/Client/mods/deathmatch/logic/CClientColRectangle.h index 80ab1dae471..9fbd9ef7d3e 100644 --- a/Client/mods/deathmatch/logic/CClientColRectangle.h +++ b/Client/mods/deathmatch/logic/CClientColRectangle.h @@ -16,14 +16,14 @@ class CClientColRectangle : public CClientColShape public: CClientColRectangle(CClientManager* pManager, ElementID ID, const CVector2D& vecPosition, const CVector2D& vecSize); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); virtual void DebugRender(const CVector& vecPosition, float fDrawRadius); - eColShapeType GetShapeType(void) { return COLSHAPE_RECTANGLE; } + eColShapeType GetShapeType() { return COLSHAPE_RECTANGLE; } bool DoHitDetection(const CVector& vecNowPosition, float fRadius); - const CVector2D& GetSize(void) { return m_vecSize; }; + const CVector2D& GetSize() { return m_vecSize; }; void SetSize(const CVector2D& vecSize) { m_vecSize = vecSize; diff --git a/Client/mods/deathmatch/logic/CClientColShape.cpp b/Client/mods/deathmatch/logic/CClientColShape.cpp index 1364f83c1ed..907f8e9f8f7 100644 --- a/Client/mods/deathmatch/logic/CClientColShape.cpp +++ b/Client/mods/deathmatch/logic/CClientColShape.cpp @@ -31,7 +31,7 @@ CClientColShape::CClientColShape(CClientManager* pManager, ElementID ID) : Class m_pColManager->AddToList(this); } -CClientColShape::~CClientColShape(void) +CClientColShape::~CClientColShape() { if (m_pOwningMarker && m_pOwningMarker->m_pCollision == this) m_pOwningMarker->m_pCollision = NULL; @@ -43,24 +43,24 @@ CClientColShape::~CClientColShape(void) CClientEntityRefManager::RemoveEntityRefs(0, &m_pOwningMarker, &m_pOwningPickup, NULL); } -void CClientColShape::Unlink(void) +void CClientColShape::Unlink() { m_pColManager->RemoveFromList(this); } -void CClientColShape::SizeChanged(void) +void CClientColShape::SizeChanged() { UpdateSpatialData(); // Maybe queue RefreshColliders for v1.1 } -void CClientColShape::DoPulse(void) +void CClientColShape::DoPulse() { // Update our position/rotation if we're attached DoAttaching(); } -bool CClientColShape::IsAttachable(void) +bool CClientColShape::IsAttachable() { return (!m_pOwningPickup && !m_pOwningMarker); } @@ -98,7 +98,7 @@ bool CClientColShape::ColliderExists(CClientEntity* pEntity) return m_Colliders.contains(pEntity); } -void CClientColShape::RemoveAllColliders(void) +void CClientColShape::RemoveAllColliders() { CFastList::iterator iter = m_Colliders.begin(); for (; iter != m_Colliders.end(); iter++) diff --git a/Client/mods/deathmatch/logic/CClientColShape.h b/Client/mods/deathmatch/logic/CClientColShape.h index 43aa41f4088..cefb79e68c3 100644 --- a/Client/mods/deathmatch/logic/CClientColShape.h +++ b/Client/mods/deathmatch/logic/CClientColShape.h @@ -34,40 +34,40 @@ class CClientColShape : public CClientEntity public: CClientColShape(class CClientManager* pManager, ElementID ID); - ~CClientColShape(void); + ~CClientColShape(); - void Unlink(void); + void Unlink(); - virtual eColShapeType GetShapeType(void) = 0; + virtual eColShapeType GetShapeType() = 0; - void DoPulse(void); - bool IsAttachable(void); + void DoPulse(); + bool IsAttachable(); - eClientEntityType GetType(void) const { return CCLIENTCOLSHAPE; } + eClientEntityType GetType() const { return CCLIENTCOLSHAPE; } virtual void GetPosition(CVector& vecPosition) const { vecPosition = m_vecPosition; }; virtual void SetPosition(const CVector& vecPosition); virtual bool DoHitDetection(const CVector& vecNowPosition, float fRadius) = 0; - bool IsEnabled(void) { return m_bIsEnabled; }; + bool IsEnabled() { return m_bIsEnabled; }; void SetEnabled(bool bEnabled) { m_bIsEnabled = bEnabled; }; void CallHitCallback(CClientEntity& Entity); void CallLeaveCallback(CClientEntity& Entity); CClientColCallback* SetHitCallback(CClientColCallback* pCallback) { return (m_pCallback = pCallback); }; - bool GetAutoCallEvent(void) { return m_bAutoCallEvent; }; + bool GetAutoCallEvent() { return m_bAutoCallEvent; }; void SetAutoCallEvent(bool bAutoCallEvent) { m_bAutoCallEvent = bAutoCallEvent; }; void AddCollider(CClientEntity* pEntity) { m_Colliders.push_back(pEntity); } void RemoveCollider(CClientEntity* pEntity) { m_Colliders.remove(pEntity); } bool ColliderExists(CClientEntity* pEntity); - void RemoveAllColliders(void); - CFastList::iterator CollidersBegin(void) { return m_Colliders.begin(); } - CFastList::iterator CollidersEnd(void) { return m_Colliders.end(); } + void RemoveAllColliders(); + CFastList::iterator CollidersBegin() { return m_Colliders.begin(); } + CFastList::iterator CollidersEnd() { return m_Colliders.end(); } - void SizeChanged(void); + void SizeChanged(); protected: CVector m_vecPosition; diff --git a/Client/mods/deathmatch/logic/CClientColSphere.cpp b/Client/mods/deathmatch/logic/CClientColSphere.cpp index 602dbdae386..08aeee399fa 100644 --- a/Client/mods/deathmatch/logic/CClientColSphere.cpp +++ b/Client/mods/deathmatch/logic/CClientColSphere.cpp @@ -142,7 +142,7 @@ bool CClientColSphere::DoHitDetection(const CVector& vecNowPosition, float fRadi return IsPointNearPoint3D(vecNowPosition, m_vecPosition, fRadius + m_fRadius); } -CSphere CClientColSphere::GetWorldBoundingSphere(void) +CSphere CClientColSphere::GetWorldBoundingSphere() { return CSphere(m_vecPosition, m_fRadius); } diff --git a/Client/mods/deathmatch/logic/CClientColSphere.h b/Client/mods/deathmatch/logic/CClientColSphere.h index 680861c1969..45d43c38c5f 100644 --- a/Client/mods/deathmatch/logic/CClientColSphere.h +++ b/Client/mods/deathmatch/logic/CClientColSphere.h @@ -16,14 +16,14 @@ class CClientColSphere : public CClientColShape public: CClientColSphere(CClientManager* pManager, ElementID ID, const CVector& vecPosition, float fRadius); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); virtual void DebugRender(const CVector& vecPosition, float fDrawRadius); - eColShapeType GetShapeType(void) { return COLSHAPE_SPHERE; } + eColShapeType GetShapeType() { return COLSHAPE_SPHERE; } bool DoHitDetection(const CVector& vecNowPosition, float fRadius); - float GetRadius(void) { return m_fRadius; }; + float GetRadius() { return m_fRadius; }; void SetRadius(float fRadius) { m_fRadius = fRadius; diff --git a/Client/mods/deathmatch/logic/CClientColTube.cpp b/Client/mods/deathmatch/logic/CClientColTube.cpp index 5b74904614b..e0e55a0b20a 100644 --- a/Client/mods/deathmatch/logic/CClientColTube.cpp +++ b/Client/mods/deathmatch/logic/CClientColTube.cpp @@ -28,7 +28,7 @@ bool CClientColTube::DoHitDetection(const CVector& vecNowPosition, float fRadius vecNowPosition.fZ <= m_vecPosition.fZ + m_fHeight); } -CSphere CClientColTube::GetWorldBoundingSphere(void) +CSphere CClientColTube::GetWorldBoundingSphere() { CSphere sphere; sphere.vecPosition.fX = m_vecPosition.fX; diff --git a/Client/mods/deathmatch/logic/CClientColTube.h b/Client/mods/deathmatch/logic/CClientColTube.h index 454a93c64c4..8444738bebb 100644 --- a/Client/mods/deathmatch/logic/CClientColTube.h +++ b/Client/mods/deathmatch/logic/CClientColTube.h @@ -16,20 +16,20 @@ class CClientColTube : public CClientColShape public: CClientColTube(CClientManager* pManager, ElementID ID, const CVector& vecPosition, float fRadius, float fHeight); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); virtual void DebugRender(const CVector& vecPosition, float fDrawRadius); - eColShapeType GetShapeType(void) { return COLSHAPE_TUBE; } + eColShapeType GetShapeType() { return COLSHAPE_TUBE; } bool DoHitDetection(const CVector& vecNowPosition, float fRadius); - float GetRadius(void) { return m_fRadius; }; + float GetRadius() { return m_fRadius; }; void SetRadius(float fRadius) { m_fRadius = fRadius; SizeChanged(); }; - float GetHeight(void) { return m_fHeight; }; + float GetHeight() { return m_fHeight; }; void SetHeight(float fHeight) { m_fHeight = fHeight; diff --git a/Client/mods/deathmatch/logic/CClientCorona.cpp b/Client/mods/deathmatch/logic/CClientCorona.cpp index 993e068d45c..6597a888b2e 100644 --- a/Client/mods/deathmatch/logic/CClientCorona.cpp +++ b/Client/mods/deathmatch/logic/CClientCorona.cpp @@ -27,7 +27,7 @@ CClientCorona::CClientCorona(CClientMarker* pThis) m_ulIdentifier = --ulIdentifier; } -CClientCorona::~CClientCorona(void) +CClientCorona::~CClientCorona() { // Disable our corona CRegisteredCorona* pCorona = m_pCoronas->CreateCorona(m_ulIdentifier, &m_Matrix.vPos); @@ -43,13 +43,13 @@ bool CClientCorona::IsHit(const CVector& vecPosition) const return IsPointNearPoint3D(m_Matrix.vPos, vecPosition, m_fSize + 4); } -void CClientCorona::StreamIn(void) +void CClientCorona::StreamIn() { // We're now streamed in m_bStreamedIn = true; } -void CClientCorona::StreamOut(void) +void CClientCorona::StreamOut() { // Disable the corona CRegisteredCorona* pCorona = m_pCoronas->CreateCorona(m_ulIdentifier, &m_Matrix.vPos); @@ -62,7 +62,7 @@ void CClientCorona::StreamOut(void) m_bStreamedIn = false; } -void CClientCorona::DoPulse(void) +void CClientCorona::DoPulse() { CRegisteredCorona* pCorona = m_pCoronas->CreateCorona(m_ulIdentifier, &m_Matrix.vPos); if (!pCorona) diff --git a/Client/mods/deathmatch/logic/CClientCorona.h b/Client/mods/deathmatch/logic/CClientCorona.h index 1c3274f3a50..641cee4fd49 100644 --- a/Client/mods/deathmatch/logic/CClientCorona.h +++ b/Client/mods/deathmatch/logic/CClientCorona.h @@ -17,9 +17,9 @@ class CClientCorona : public CClientMarkerCommon { public: CClientCorona(CClientMarker* pThis); - ~CClientCorona(void); + ~CClientCorona(); - unsigned int GetMarkerType(void) const { return CClientMarkerCommon::CLASS_CORONA; } + unsigned int GetMarkerType() const { return CClientMarkerCommon::CLASS_CORONA; } bool IsHit(const CVector& vecPosition) const; @@ -29,21 +29,21 @@ class CClientCorona : public CClientMarkerCommon void GetMatrix(CMatrix& mat) { mat = m_Matrix; } void SetMatrix(CMatrix& mat) { m_Matrix = mat; } - bool IsVisible(void) const { return m_bVisible; }; + bool IsVisible() const { return m_bVisible; }; void SetVisible(bool bVisible) { m_bVisible = bVisible; }; - SColor GetColor(void) const { return m_Color; } + SColor GetColor() const { return m_Color; } void SetColor(const SColor& color) { m_Color = color; } - float GetSize(void) const { return m_fSize; }; + float GetSize() const { return m_fSize; }; void SetSize(float fSize) { m_fSize = fSize; }; protected: - bool IsStreamedIn(void) { return m_bStreamedIn; }; - void StreamIn(void); - void StreamOut(void); + bool IsStreamedIn() { return m_bStreamedIn; }; + void StreamIn(); + void StreamOut(); - void DoPulse(void); + void DoPulse(); private: CClientMarkerPtr m_pThis; diff --git a/Client/mods/deathmatch/logic/CClientDFF.cpp b/Client/mods/deathmatch/logic/CClientDFF.cpp index 071671f78a5..437e6ce1608 100644 --- a/Client/mods/deathmatch/logic/CClientDFF.cpp +++ b/Client/mods/deathmatch/logic/CClientDFF.cpp @@ -22,7 +22,7 @@ CClientDFF::CClientDFF(CClientManager* pManager, ElementID ID) : ClassInit(this) m_pDFFManager->AddToList(this); } -CClientDFF::~CClientDFF(void) +CClientDFF::~CClientDFF() { // Remove us from DFF manager list m_pDFFManager->RemoveFromList(this); @@ -99,7 +99,7 @@ bool CClientDFF::LoadDFF(const SString& strFile, bool bIsRawData) return true; } -void CClientDFF::UnloadDFF(void) +void CClientDFF::UnloadDFF() { for (std::map::iterator iter = m_LoadedClumpInfoMap.begin(); iter != m_LoadedClumpInfoMap.end(); ++iter) { @@ -200,7 +200,7 @@ void CClientDFF::RestoreModel(unsigned short usModel) m_Replaced.remove(usModel); } -void CClientDFF::RestoreModels(void) +void CClientDFF::RestoreModels() { // Loop through our list over replaced models std::list::iterator iter = m_Replaced.begin(); diff --git a/Client/mods/deathmatch/logic/CClientDFF.h b/Client/mods/deathmatch/logic/CClientDFF.h index 838c506b8a7..ccb1a65507a 100644 --- a/Client/mods/deathmatch/logic/CClientDFF.h +++ b/Client/mods/deathmatch/logic/CClientDFF.h @@ -17,7 +17,7 @@ class CClientDFF; struct SLoadedClumpInfo { - SLoadedClumpInfo(void) : bTriedLoad(false), pClump(NULL) {} + SLoadedClumpInfo() : bTriedLoad(false), pClump(NULL) {} bool bTriedLoad; RpClump* pClump; }; @@ -29,9 +29,9 @@ class CClientDFF : public CClientEntity public: CClientDFF(class CClientManager* pManager, ElementID ID); - ~CClientDFF(void); + ~CClientDFF(); - eClientEntityType GetType(void) const { return CCLIENTDFF; } + eClientEntityType GetType() const { return CCLIENTDFF; } bool LoadDFF(const SString& strFile, bool bIsRawData); @@ -40,18 +40,18 @@ class CClientDFF : public CClientEntity bool HasReplaced(unsigned short usModel); void RestoreModel(unsigned short usModel); - void RestoreModels(void); + void RestoreModels(); static bool IsDFFData(const SString& strData); // Sorta a hack that these are required by CClientEntity... - void Unlink(void){}; + void Unlink(){}; void GetPosition(CVector& vecPosition) const {}; void SetPosition(const CVector& vecPosition){}; protected: bool DoReplaceModel(unsigned short usModel, bool bAlphaTransparency); - void UnloadDFF(void); + void UnloadDFF(); void InternalRestoreModel(unsigned short usModel); bool ReplaceObjectModel(RpClump* pClump, ushort usModel, bool bAlphaTransparency); diff --git a/Client/mods/deathmatch/logic/CClientDFFManager.cpp b/Client/mods/deathmatch/logic/CClientDFFManager.cpp index cea4d6e9a49..ab93a65ff29 100644 --- a/Client/mods/deathmatch/logic/CClientDFFManager.cpp +++ b/Client/mods/deathmatch/logic/CClientDFFManager.cpp @@ -18,13 +18,13 @@ CClientDFFManager::CClientDFFManager(CClientManager* pManager) m_bRemoveFromList = true; } -CClientDFFManager::~CClientDFFManager(void) +CClientDFFManager::~CClientDFFManager() { // Delete all our DFF's RemoveAll(); } -void CClientDFFManager::RemoveAll(void) +void CClientDFFManager::RemoveAll() { // Make sure they don't remove themselves from our list m_bRemoveFromList = false; diff --git a/Client/mods/deathmatch/logic/CClientDFFManager.h b/Client/mods/deathmatch/logic/CClientDFFManager.h index 771df4ab3e6..fd919af94e5 100644 --- a/Client/mods/deathmatch/logic/CClientDFFManager.h +++ b/Client/mods/deathmatch/logic/CClientDFFManager.h @@ -21,9 +21,9 @@ class CClientDFFManager public: CClientDFFManager(class CClientManager* pManager); - ~CClientDFFManager(void); + ~CClientDFFManager(); - void RemoveAll(void); + void RemoveAll(); bool Exists(CClientDFF* pDFF); CClientDFF* GetElementThatReplaced(unsigned short usModel, CClientDFF* pDontSearch = NULL); @@ -31,8 +31,8 @@ class CClientDFFManager static bool IsReplacableModel(unsigned short usModel); bool RestoreModel(unsigned short usModel); - std::list::const_iterator IterBegin(void) { return m_List.begin(); } - std::list::const_iterator IterEnd(void) { return m_List.end(); } + std::list::const_iterator IterBegin() { return m_List.begin(); } + std::list::const_iterator IterEnd() { return m_List.end(); } private: void AddToList(CClientDFF* pDFF) { m_List.push_back(pDFF); } diff --git a/Client/mods/deathmatch/logic/CClientDisplay.cpp b/Client/mods/deathmatch/logic/CClientDisplay.cpp index 86b3e4405ef..1709a4eb364 100644 --- a/Client/mods/deathmatch/logic/CClientDisplay.cpp +++ b/Client/mods/deathmatch/logic/CClientDisplay.cpp @@ -22,7 +22,7 @@ CClientDisplay::CClientDisplay(CClientDisplayManager* pDisplayManager, unsigned m_pDisplayManager->AddToList(this); } -CClientDisplay::~CClientDisplay(void) +CClientDisplay::~CClientDisplay() { // Remove us from the manager m_pDisplayManager->RemoveFromList(this); diff --git a/Client/mods/deathmatch/logic/CClientDisplay.h b/Client/mods/deathmatch/logic/CClientDisplay.h index 08e6f7e42db..09865a41e77 100644 --- a/Client/mods/deathmatch/logic/CClientDisplay.h +++ b/Client/mods/deathmatch/logic/CClientDisplay.h @@ -25,30 +25,30 @@ class CClientDisplay public: CClientDisplay(class CClientDisplayManager* pDisplayManager, unsigned long ulID); - virtual ~CClientDisplay(void); + virtual ~CClientDisplay(); - unsigned long GetID(void) { return m_ulID; } - virtual eDisplayType GetType(void) = 0; + unsigned long GetID() { return m_ulID; } + virtual eDisplayType GetType() = 0; - unsigned long GetExpirationTime(void) { return m_ulExpirationTime; }; + unsigned long GetExpirationTime() { return m_ulExpirationTime; }; void SetExpirationTime(unsigned long ulTime) { m_ulExpirationTime = ulTime; }; - unsigned long GetTimeTillExpiration(void) { return m_ulExpirationTime - CClientTime::GetTime(); }; + unsigned long GetTimeTillExpiration() { return m_ulExpirationTime - CClientTime::GetTime(); }; void SetTimeTillExpiration(unsigned long ulMs) { m_ulExpirationTime = CClientTime::GetTime() + ulMs; }; - virtual const CVector& GetPosition(void) { return m_vecPosition; }; + virtual const CVector& GetPosition() { return m_vecPosition; }; virtual void SetPosition(const CVector& vecPosition) { m_vecPosition = vecPosition; }; - virtual SColor GetColor(void) const { return m_Color; } + virtual SColor GetColor() const { return m_Color; } virtual void SetColor(const SColor& color) { m_Color = color; } virtual void SetColorAlpha(unsigned char ucAlpha); - virtual bool IsVisible(void) { return m_bVisible; }; + virtual bool IsVisible() { return m_bVisible; }; virtual void SetVisible(bool bVisible) { m_bVisible = bVisible; }; - virtual void Render(void) = 0; + virtual void Render() = 0; protected: - bool IsExpired(void) { return (m_ulExpirationTime != 0 && (CClientTime::GetTime() > m_ulExpirationTime)); }; + bool IsExpired() { return (m_ulExpirationTime != 0 && (CClientTime::GetTime() > m_ulExpirationTime)); }; CClientDisplayManager* m_pDisplayManager; diff --git a/Client/mods/deathmatch/logic/CClientDisplayManager.cpp b/Client/mods/deathmatch/logic/CClientDisplayManager.cpp index c96ef479a98..5eafeea8cc9 100644 --- a/Client/mods/deathmatch/logic/CClientDisplayManager.cpp +++ b/Client/mods/deathmatch/logic/CClientDisplayManager.cpp @@ -12,13 +12,13 @@ using std::list; -CClientDisplayManager::CClientDisplayManager(void) +CClientDisplayManager::CClientDisplayManager() { // Init m_bCanRemoveFromList = true; } -CClientDisplayManager::~CClientDisplayManager(void) +CClientDisplayManager::~CClientDisplayManager() { RemoveAll(); } @@ -54,7 +54,7 @@ void CClientDisplayManager::AddToList(CClientDisplay* pDisplay) m_List.push_back(pDisplay); } -void CClientDisplayManager::RemoveAll(void) +void CClientDisplayManager::RemoveAll() { // Delete all the items in the list m_bCanRemoveFromList = false; @@ -80,7 +80,7 @@ void CClientDisplayManager::RemoveFromList(CClientDisplay* pDisplay) } } -void CClientDisplayManager::DoPulse(void) +void CClientDisplayManager::DoPulse() { // Render all our displays m_bCanRemoveFromList = false; diff --git a/Client/mods/deathmatch/logic/CClientDisplayManager.h b/Client/mods/deathmatch/logic/CClientDisplayManager.h index be9487f0c12..f4fcffdfd5a 100644 --- a/Client/mods/deathmatch/logic/CClientDisplayManager.h +++ b/Client/mods/deathmatch/logic/CClientDisplayManager.h @@ -23,17 +23,17 @@ class CClientDisplayManager friend class CClientDisplay; public: - CClientDisplayManager(void); - ~CClientDisplayManager(void); + CClientDisplayManager(); + ~CClientDisplayManager(); - void DoPulse(void); + void DoPulse(); - unsigned int Count(void) { return static_cast(m_List.size()); }; + unsigned int Count() { return static_cast(m_List.size()); }; CClientDisplay* Get(unsigned long ulID); void DrawText2D(const char* szCaption, const CVector& vecPosition, float fScale = 1.0f, RGBA rgbaColor = 0xFFFFFFFF); - void RemoveAll(void); + void RemoveAll(); void AddToList(CClientDisplay* pDisplay); void RemoveFromList(CClientDisplay* pDisplay); diff --git a/Client/mods/deathmatch/logic/CClientDummy.cpp b/Client/mods/deathmatch/logic/CClientDummy.cpp index 4207426715b..ddaf98eaba4 100644 --- a/Client/mods/deathmatch/logic/CClientDummy.cpp +++ b/Client/mods/deathmatch/logic/CClientDummy.cpp @@ -30,12 +30,12 @@ CClientDummy::CClientDummy(CClientManager* pManager, ElementID ID, const char* s } } -CClientDummy::~CClientDummy(void) +CClientDummy::~CClientDummy() { Unlink(); } -void CClientDummy::Unlink(void) +void CClientDummy::Unlink() { if (m_pGroups) { diff --git a/Client/mods/deathmatch/logic/CClientDummy.h b/Client/mods/deathmatch/logic/CClientDummy.h index 178a5647ada..a08e945f4f1 100644 --- a/Client/mods/deathmatch/logic/CClientDummy.h +++ b/Client/mods/deathmatch/logic/CClientDummy.h @@ -17,12 +17,12 @@ class CClientDummy : public CClientEntity DECLARE_CLASS(CClientDummy, CClientEntity) public: CClientDummy(class CClientManager* pManager, ElementID ID, const char* szTypeName); - ~CClientDummy(void); + ~CClientDummy(); - void Unlink(void); + void Unlink(); - eClientEntityType GetType(void) const { return CCLIENTDUMMY; } - const CVector& GetPosition(void) { return m_vecPosition; }; + eClientEntityType GetType() const { return CCLIENTDUMMY; } + const CVector& GetPosition() { return m_vecPosition; }; void GetPosition(CVector& vecPosition) const { vecPosition = m_vecPosition; }; void SetPosition(const CVector& vecPosition) { m_vecPosition = vecPosition; }; diff --git a/Client/mods/deathmatch/logic/CClientDxFont.cpp b/Client/mods/deathmatch/logic/CClientDxFont.cpp index 2dbd7e83fce..e0fc21cbfb8 100644 --- a/Client/mods/deathmatch/logic/CClientDxFont.cpp +++ b/Client/mods/deathmatch/logic/CClientDxFont.cpp @@ -30,7 +30,7 @@ CClientDxFont::CClientDxFont(CClientManager* pManager, ElementID ID, CDxFontItem // Get D3DXFont for this custom font // //////////////////////////////////////////////////////////////// -ID3DXFont* CClientDxFont::GetD3DXFont(void) +ID3DXFont* CClientDxFont::GetD3DXFont() { return GetDxFontItem()->m_pFntNormal; } diff --git a/Client/mods/deathmatch/logic/CClientDxFont.h b/Client/mods/deathmatch/logic/CClientDxFont.h index 4b66b742be1..e296be96449 100644 --- a/Client/mods/deathmatch/logic/CClientDxFont.h +++ b/Client/mods/deathmatch/logic/CClientDxFont.h @@ -14,9 +14,9 @@ class CClientDxFont : public CClientRenderElement public: CClientDxFont(CClientManager* pManager, ElementID ID, CDxFontItem* pFontItem); - eClientEntityType GetType(void) const { return CCLIENTDXFONT; } + eClientEntityType GetType() const { return CCLIENTDXFONT; } // CClientDxFont methods - CDxFontItem* GetDxFontItem(void) { return (CDxFontItem*)m_pRenderItem; } - ID3DXFont* GetD3DXFont(void); + CDxFontItem* GetDxFontItem() { return (CDxFontItem*)m_pRenderItem; } + ID3DXFont* GetD3DXFont(); }; diff --git a/Client/mods/deathmatch/logic/CClientEffect.h b/Client/mods/deathmatch/logic/CClientEffect.h index b3c228c51c4..def06249cb4 100644 --- a/Client/mods/deathmatch/logic/CClientEffect.h +++ b/Client/mods/deathmatch/logic/CClientEffect.h @@ -20,8 +20,8 @@ class CClientEffect : public CClientEntity DECLARE_CLASS(CClientEffect, CClientEntity) public: CClientEffect(CClientManager* pManager, CFxSystem* pFx, SString strEffectName, ElementID ID); - ~CClientEffect(void); - void Unlink(void); + ~CClientEffect(); + void Unlink(); void GetPosition(CVector& vecPosition) const; void SetPosition(const CVector& vecPosition); @@ -31,17 +31,17 @@ class CClientEffect : public CClientEntity bool GetMatrix(CMatrix& matrix) const; bool SetMatrix(const CMatrix& matrix); void SetEffectSpeed(float fSpeed); - float GetEffectSpeed(void) const; + float GetEffectSpeed() const; bool SetEffectDensity(float fDensity); - float GetEffectDensity(void) const; + float GetEffectDensity() const; void SetDrawDistance(float fDrawDistance); - float GetDrawDistance(void) const; + float GetDrawDistance() const; - eClientEntityType GetType(void) const { return CCLIENTEFFECT; }; + eClientEntityType GetType() const { return CCLIENTEFFECT; }; protected: friend class CClientEffectManager; - CFxSystem* GetFxSystem(void) const { return m_pFxSystem; } + CFxSystem* GetFxSystem() const { return m_pFxSystem; } void SetFxSystem(CFxSystem* pFx) { m_pFxSystem = pFx; } private: diff --git a/Client/mods/deathmatch/logic/CClientEffectManager.h b/Client/mods/deathmatch/logic/CClientEffectManager.h index 26428a29dba..6ca65bfab55 100644 --- a/Client/mods/deathmatch/logic/CClientEffectManager.h +++ b/Client/mods/deathmatch/logic/CClientEffectManager.h @@ -22,16 +22,16 @@ class CClientEffectManager public: CClientEffect* Create(const SString& strEffectName, const CVector& vecPosition, ElementID ID, bool bSoundEnable); void SAEffectDestroyed(void* pFxSAInterface); - void DeleteAll(void); + void DeleteAll(); - unsigned int Count(void) { return m_Effects.size(); }; + unsigned int Count() { return m_Effects.size(); }; static CClientEffect* Get(ElementID ID); void AddToList(CClientEffect* pEffect) { m_Effects.push_back(pEffect); } void RemoveFromList(CClientEffect* pEffect); private: CClientEffectManager(class CClientManager* pManager); - ~CClientEffectManager(void); + ~CClientEffectManager(); CClientEffect* Get(void* pFxSA); class CClientManager* m_pManager; diff --git a/Client/mods/deathmatch/logic/CClientEntity.cpp b/Client/mods/deathmatch/logic/CClientEntity.cpp index 4c7fffc7e19..0c9518e154e 100644 --- a/Client/mods/deathmatch/logic/CClientEntity.cpp +++ b/Client/mods/deathmatch/logic/CClientEntity.cpp @@ -59,7 +59,7 @@ CClientEntity::CClientEntity(ElementID ID) : ClassInit(this) g_pCore->UpdateDummyProgress(); } -CClientEntity::~CClientEntity(void) +CClientEntity::~CClientEntity() { // Make sure we won't get deleted later by the element deleter if we've been requested so if (m_bBeingDeleted) @@ -248,7 +248,7 @@ bool CClientEntity::IsMyParent(CClientEntity* pEntity, bool bRecursive) return false; } -void CClientEntity::ClearChildren(void) +void CClientEntity::ClearChildren() { // Sanity check assert(m_pParent != this); @@ -593,7 +593,7 @@ void CClientEntity::SetRotationDegrees(const CVector& vecDegrees) SetRotationRadians(vecTemp); } -bool CClientEntity::IsOutOfBounds(void) +bool CClientEntity::IsOutOfBounds() { CVector vecPosition; GetPosition(vecPosition); @@ -820,7 +820,7 @@ void CClientEntity::DeleteEvents(CLuaMain* pLuaMain, bool bRecursive) } } -void CClientEntity::DeleteAllEvents(void) +void CClientEntity::DeleteAllEvents() { m_pEventManager->DeleteAll(); } @@ -1054,7 +1054,7 @@ bool CClientEntity::CollisionExists(CClientColShape* pShape) return ListContains(m_Collisions, pShape); } -void CClientEntity::RemoveAllCollisions(void) +void CClientEntity::RemoveAllCollisions() { CFastList::iterator iter = m_Collisions.begin(); for (; iter != m_Collisions.end(); iter++) @@ -1070,7 +1070,7 @@ bool CClientEntity::IsEntityAttached(CClientEntity* pEntity) return ListContains(m_AttachedEntities, pEntity); } -void CClientEntity::ReattachEntities(void) +void CClientEntity::ReattachEntities() { // Jax: this should be called on streamIn/creation @@ -1086,7 +1086,7 @@ void CClientEntity::ReattachEntities(void) } } -bool CClientEntity::IsAttachable(void) +bool CClientEntity::IsAttachable() { switch (GetType()) { @@ -1111,7 +1111,7 @@ bool CClientEntity::IsAttachable(void) return false; } -bool CClientEntity::IsAttachToable(void) +bool CClientEntity::IsAttachToable() { switch (GetType()) { @@ -1137,7 +1137,7 @@ bool CClientEntity::IsAttachToable(void) return false; } -void CClientEntity::DoAttaching(void) +void CClientEntity::DoAttaching() { if (m_pAttachedToEntity) { @@ -1182,7 +1182,7 @@ unsigned int CClientEntity::GetTypeID(const char* szTypeName) return CCLIENTUNKNOWN; } -void CClientEntity::DeleteClientChildren(void) +void CClientEntity::DeleteClientChildren() { // Gather a list over children (we can't use the list as it changes) std::list Children; @@ -1210,7 +1210,7 @@ void CClientEntity::DeleteClientChildren(void) } } -bool CClientEntity::IsStatic(void) +bool CClientEntity::IsStatic() { CEntity* pEntity = GetGameEntity(); if (pEntity) @@ -1229,7 +1229,7 @@ void CClientEntity::SetStatic(bool bStatic) } } -bool CClientEntity::IsDoubleSided(void) +bool CClientEntity::IsDoubleSided() { CEntity* pEntity = GetGameEntity(); if (pEntity) @@ -1251,7 +1251,7 @@ void CClientEntity::SetDoubleSided(bool bDoubleSided) m_bDoubleSided = bDoubleSided; } -unsigned char CClientEntity::GetInterior(void) +unsigned char CClientEntity::GetInterior() { CEntity* pEntity = GetGameEntity(); if (pEntity) @@ -1271,7 +1271,7 @@ void CClientEntity::SetInterior(unsigned char ucInterior) m_ucInterior = ucInterior; } -bool CClientEntity::IsOnScreen(void) +bool CClientEntity::IsOnScreen() { CEntity* pEntity = GetGameEntity(); if (pEntity) @@ -1281,7 +1281,7 @@ bool CClientEntity::IsOnScreen(void) return false; } -RpClump* CClientEntity::GetClump(void) +RpClump* CClientEntity::GetClump() { CEntity* pEntity = GetGameEntity(); if (pEntity) @@ -1533,7 +1533,7 @@ void CClientEntity::SetCollidableWith(CClientEntity* pEntity, bool bCanCollide) pEntity->SetCollidableWith(this, bCanCollide); } -CSphere CClientEntity::GetWorldBoundingSphere(void) +CSphere CClientEntity::GetWorldBoundingSphere() { // Default to a point around the entity's position CVector vecPosition; @@ -1541,7 +1541,7 @@ CSphere CClientEntity::GetWorldBoundingSphere(void) return CSphere(vecPosition, 0.f); } -void CClientEntity::UpdateSpatialData(void) +void CClientEntity::UpdateSpatialData() { GetClientSpatialDatabase()->UpdateEntity(this); } @@ -1558,7 +1558,7 @@ float CClientEntity::GetDistanceBetweenBoundingSpheres(CClientEntity* pOther) // // Ensure children list snapshot is up to date and return it // -CElementListSnapshot* CClientEntity::GetChildrenListSnapshot(void) +CElementListSnapshot* CClientEntity::GetChildrenListSnapshot() { // See if list needs updating if (m_Children.GetRevision() != m_uiChildrenListSnapshotRevision || m_pChildrenListSnapshot == NULL) diff --git a/Client/mods/deathmatch/logic/CClientEntity.h b/Client/mods/deathmatch/logic/CClientEntity.h index fb9e363083b..e737e876cb2 100644 --- a/Client/mods/deathmatch/logic/CClientEntity.h +++ b/Client/mods/deathmatch/logic/CClientEntity.h @@ -149,19 +149,19 @@ class CClientEntity : public CClientEntityBase DECLARE_BASE_CLASS(CClientEntity) public: CClientEntity(ElementID ID); - virtual ~CClientEntity(void); + virtual ~CClientEntity(); - virtual eClientEntityType GetType(void) const = 0; - bool IsLocalEntity(void) { return m_ID >= MAX_SERVER_ELEMENTS; }; + virtual eClientEntityType GetType() const = 0; + bool IsLocalEntity() { return m_ID >= MAX_SERVER_ELEMENTS; }; bool IsSmartPointer() { return m_bSmartPointer; } void SetSmartPointer(bool bSmartPointer) { m_bSmartPointer = bSmartPointer; } // System entity? A system entity means it can't be removed by the server // or the client scripts. - bool IsSystemEntity(void) { return m_bSystemEntity; }; - void MakeSystemEntity(void) { m_bSystemEntity = true; }; + bool IsSystemEntity() { return m_bSystemEntity; }; + void MakeSystemEntity() { m_bSystemEntity = true; }; - virtual void Unlink(void) = 0; + virtual void Unlink() = 0; // This is used for realtime synced elements. Whenever a position/rotation change is // forced from the server either in form of spawn or setElementPosition/rotation a new @@ -169,34 +169,34 @@ class CClientEntity : public CClientEntityBase // If this value doesn't match the value from the sync packet, the packet should be // ignored. Note that if this value is 0, all sync packets should be accepted. This is // so we don't need this byte when the element is created first. - unsigned char GetSyncTimeContext(void) { return m_ucSyncTimeContext; }; + unsigned char GetSyncTimeContext() { return m_ucSyncTimeContext; }; void SetSyncTimeContext(unsigned char ucContext) { m_ucSyncTimeContext = ucContext; } bool CanUpdateSync(unsigned char ucRemote); - const SString& GetName(void) const { return m_strName; } + const SString& GetName() const { return m_strName; } void SetName(const char* szName) { m_strName.AssignLeft(szName, MAX_ELEMENT_NAME_LENGTH); } const SString& GetTypeName() { return m_strTypeName; } unsigned int GetTypeHash() { return m_uiTypeHash; } void SetTypeName(const SString& name); - CClientEntity* GetParent(void) { return m_pParent; }; + CClientEntity* GetParent() { return m_pParent; }; CClientEntity* SetParent(CClientEntity* pParent); CClientEntity* AddChild(CClientEntity* pChild); bool IsMyChild(CClientEntity* pEntity, bool bRecursive); bool IsMyParent(CClientEntity* pEntity, bool bRecursive); - bool IsBeingDeleted(void) { return m_bBeingDeleted; } + bool IsBeingDeleted() { return m_bBeingDeleted; } void SetBeingDeleted(bool bBeingDeleted) { m_bBeingDeleted = bBeingDeleted; } - void ClearChildren(void); + void ClearChildren(); - CChildListType ::const_iterator IterBegin(void) { return m_Children.begin(); } - CChildListType ::const_iterator IterEnd(void) { return m_Children.end(); } - CElementListSnapshot* GetChildrenListSnapshot(void); + CChildListType ::const_iterator IterBegin() { return m_Children.begin(); } + CChildListType ::const_iterator IterEnd() { return m_Children.end(); } + CElementListSnapshot* GetChildrenListSnapshot(); - ElementID GetID(void) { return m_ID; }; + ElementID GetID() { return m_ID; }; void SetID(ElementID ID); - CCustomData* GetCustomDataPointer(void) { return m_pCustomData; } + CCustomData* GetCustomDataPointer() { return m_pCustomData; } CLuaArgument* GetCustomData(const char* szName, bool bInheritData, bool* pbIsSynced = nullptr); bool GetCustomDataString(const char* szKey, SString& strOut, bool bInheritData); bool GetCustomDataFloat(const char* szKey, float& fOut, bool bInheritData); @@ -220,25 +220,25 @@ class CClientEntity : public CClientEntityBase virtual void SetRotationRadians(const CVector& vecRadians); virtual void SetRotationDegrees(const CVector& vecDegrees); - virtual inline unsigned short GetDimension(void) { return m_usDimension; } + virtual inline unsigned short GetDimension() { return m_usDimension; } virtual void SetDimension(unsigned short usDimension) { m_usDimension = usDimension; } virtual void ModelRequestCallback(CModelInfo* pModelInfo){}; - virtual bool IsOutOfBounds(void); - CModelInfo* GetModelInfo(void) { return m_pModelInfo; }; + virtual bool IsOutOfBounds(); + CModelInfo* GetModelInfo() { return m_pModelInfo; }; - CClientEntity* GetAttachedTo(void) { return m_pAttachedToEntity; } + CClientEntity* GetAttachedTo() { return m_pAttachedToEntity; } virtual void AttachTo(CClientEntity* pEntity); virtual void GetAttachedOffsets(CVector& vecPosition, CVector& vecRotation); virtual void SetAttachedOffsets(CVector& vecPosition, CVector& vecRotation); bool IsEntityAttached(CClientEntity* pEntity); - uint GetAttachedEntityCount(void) { return m_AttachedEntities.size(); } + uint GetAttachedEntityCount() { return m_AttachedEntities.size(); } CClientEntity* GetAttachedEntity(uint uiIndex) { return m_AttachedEntities[uiIndex]; } - void ReattachEntities(void); - virtual bool IsAttachable(void); - virtual bool IsAttachToable(void); - virtual void DoAttaching(void); + void ReattachEntities(); + virtual bool IsAttachable(); + virtual bool IsAttachToable(); + virtual void DoAttaching(); bool AddEvent(CLuaMain* pLuaMain, const char* szName, const CLuaFunctionRef& iLuaFunction, bool bPropagated, EEventPriorityType eventPriority, float fPriorityMod); @@ -247,7 +247,7 @@ class CClientEntity : public CClientEntityBase void CallParentEvent(const char* szName, const CLuaArguments& Arguments, CClientEntity* pSource); bool DeleteEvent(CLuaMain* pLuaMain, const char* szName, const CLuaFunctionRef& iLuaFunction); void DeleteEvents(CLuaMain* pLuaMain, bool bRecursive); - void DeleteAllEvents(void); + void DeleteAllEvents(); void CleanUpForVM(CLuaMain* pLuaMain, bool bRecursive); @@ -258,7 +258,7 @@ class CClientEntity : public CClientEntityBase void FindAllChildrenByType(const char* szType, struct lua_State* luaVM, bool bStreamedIn = false); void FindAllChildrenByTypeIndex(unsigned int uiTypeHash, lua_State* luaVM, unsigned int& uiIndex, bool bStreamedIn = false); - unsigned int CountChildren(void) { return static_cast(m_Children.size()); }; + unsigned int CountChildren() { return static_cast(m_Children.size()); }; void GetChildren(lua_State* luaVM); void GetChildrenByType(const char* szType, lua_State* luaVM); @@ -270,21 +270,21 @@ class CClientEntity : public CClientEntityBase m_Collisions.remove(pShape); } bool CollisionExists(CClientColShape* pShape); - void RemoveAllCollisions(void); - CFastList::iterator CollisionsBegin(void) { return m_Collisions.begin(); } - CFastList::iterator CollisionsEnd(void) { return m_Collisions.end(); } + void RemoveAllCollisions(); + CFastList::iterator CollisionsBegin() { return m_Collisions.begin(); } + CFastList::iterator CollisionsEnd() { return m_Collisions.end(); } - CElementGroup* GetElementGroup(void) { return m_pElementGroup; } + CElementGroup* GetElementGroup() { return m_pElementGroup; } void SetElementGroup(CElementGroup* elementGroup) { m_pElementGroup = elementGroup; } static unsigned int GetTypeID(const char* szTypeName); - CMapEventManager* GetEventManager(void) { return m_pEventManager; }; + CMapEventManager* GetEventManager() { return m_pEventManager; }; - void DeleteClientChildren(void); + void DeleteClientChildren(); // Returns true if this class is inherited by CClientStreamElement - virtual bool IsStreamingCompatibleClass(void) { return false; }; + virtual bool IsStreamingCompatibleClass() { return false; }; void AddOriginSourceUser(CClientPed* pModel) { m_OriginSourceUsers.push_back(pModel); } void RemoveOriginSourceUser(CClientPed* pModel) { m_OriginSourceUsers.remove(pModel); } @@ -292,34 +292,34 @@ class CClientEntity : public CClientEntityBase void AddContact(CClientPed* pModel) { m_Contacts.push_back(pModel); } void RemoveContact(CClientPed* pModel) { ListRemove(m_Contacts, pModel); } - virtual CEntity* GetGameEntity(void) { return NULL; } - virtual const CEntity* GetGameEntity(void) const { return NULL; } + virtual CEntity* GetGameEntity() { return NULL; } + virtual const CEntity* GetGameEntity() const { return NULL; } bool IsCollidableWith(CClientEntity* pEntity); void SetCollidableWith(CClientEntity* pEntity, bool bCanCollide); - bool IsDoubleSided(void); + bool IsDoubleSided(); void SetDoubleSided(bool bEnable); // Game layer functions for CEntity/CPhysical virtual void InternalAttachTo(CClientEntity* pEntity); - bool IsStatic(void); + bool IsStatic(); void SetStatic(bool bStatic); - unsigned char GetInterior(void); + unsigned char GetInterior(); virtual void SetInterior(unsigned char ucInterior); - bool IsOnScreen(void); - virtual RpClump* GetClump(void); + bool IsOnScreen(); + virtual RpClump* GetClump(); void WorldIgnore(bool bIgnore); // Spatial database - virtual CSphere GetWorldBoundingSphere(void); - virtual void UpdateSpatialData(void); + virtual CSphere GetWorldBoundingSphere(); + virtual void UpdateSpatialData(); virtual void DebugRender(const CVector& vecPosition, float fDrawRadius) {} float GetDistanceBetweenBoundingSpheres(CClientEntity* pOther); - bool IsCallPropagationEnabled(void) { return m_bCallPropagationEnabled; } + bool IsCallPropagationEnabled() { return m_bCallPropagationEnabled; } virtual void SetCallPropagationEnabled(bool bEnabled) { m_bCallPropagationEnabled = bEnabled; } protected: diff --git a/Client/mods/deathmatch/logic/CClientExplosionManager.cpp b/Client/mods/deathmatch/logic/CClientExplosionManager.cpp index 41e35eb0327..6f93daaf02f 100644 --- a/Client/mods/deathmatch/logic/CClientExplosionManager.cpp +++ b/Client/mods/deathmatch/logic/CClientExplosionManager.cpp @@ -24,7 +24,7 @@ CClientExplosionManager::CClientExplosionManager(CClientManager* pManager) m_pLastCreator = NULL; } -CClientExplosionManager::~CClientExplosionManager(void) +CClientExplosionManager::~CClientExplosionManager() { if (g_pExplosionManager == this) g_pExplosionManager = NULL; diff --git a/Client/mods/deathmatch/logic/CClientExplosionManager.h b/Client/mods/deathmatch/logic/CClientExplosionManager.h index 92884fcc305..0bfb37978f7 100644 --- a/Client/mods/deathmatch/logic/CClientExplosionManager.h +++ b/Client/mods/deathmatch/logic/CClientExplosionManager.h @@ -22,7 +22,7 @@ class CClientExplosionManager public: CClientExplosionManager(CClientManager* pManager); - ~CClientExplosionManager(void); + ~CClientExplosionManager(); // * Game-layer wrapping * static bool Hook_StaticExplosionCreation(CEntity* pGameExplodingEntity, CEntity* pGameCreator, const CVector& vecPosition, eExplosionType explosionType); diff --git a/Client/mods/deathmatch/logic/CClientGUIElement.cpp b/Client/mods/deathmatch/logic/CClientGUIElement.cpp index f9c3356719e..fdb981da333 100644 --- a/Client/mods/deathmatch/logic/CClientGUIElement.cpp +++ b/Client/mods/deathmatch/logic/CClientGUIElement.cpp @@ -86,7 +86,7 @@ CClientGUIElement::CClientGUIElement(CClientManager* pManager, CLuaMain* pLuaMai m_pGUIManager->Add(this); } -CClientGUIElement::~CClientGUIElement(void) +CClientGUIElement::~CClientGUIElement() { // Remove us from the list in the manager Unlink(); @@ -95,7 +95,7 @@ CClientGUIElement::~CClientGUIElement(void) delete m_pCGUIElement; } -void CClientGUIElement::Unlink(void) +void CClientGUIElement::Unlink() { // Detach from any custom font if (m_pFontElement) diff --git a/Client/mods/deathmatch/logic/CClientGUIElement.h b/Client/mods/deathmatch/logic/CClientGUIElement.h index fdd8d2f4f32..51d58cf5aaf 100644 --- a/Client/mods/deathmatch/logic/CClientGUIElement.h +++ b/Client/mods/deathmatch/logic/CClientGUIElement.h @@ -50,27 +50,27 @@ class CClientGUIElement : public CClientEntity public: CClientGUIElement(CClientManager* pManager, CLuaMain* pLuaMain, CGUIElement* pCGUIElement, ElementID ID = INVALID_ELEMENT_ID); - virtual ~CClientGUIElement(void); + virtual ~CClientGUIElement(); - void Unlink(void); + void Unlink(); - eClientEntityType GetType(void) const { return CCLIENTGUI; }; - eCGUIType GetCGUIType(void) const { return m_pCGUIElement->GetType(); }; - const char* GetCGUITypeName(void) const { return m_strCGUITypeName; }; + eClientEntityType GetType() const { return CCLIENTGUI; }; + eCGUIType GetCGUIType() const { return m_pCGUIElement->GetType(); }; + const char* GetCGUITypeName() const { return m_strCGUITypeName; }; - GUI_CALLBACK GetCallback1(void) { return GUI_CALLBACK(&CClientGUIElement::_CallbackEvent1, this); }; - GUI_CALLBACK GetCallback2(void) { return GUI_CALLBACK(&CClientGUIElement::_CallbackEvent2, this); }; + GUI_CALLBACK GetCallback1() { return GUI_CALLBACK(&CClientGUIElement::_CallbackEvent1, this); }; + GUI_CALLBACK GetCallback2() { return GUI_CALLBACK(&CClientGUIElement::_CallbackEvent2, this); }; void SetEvents(const char* szFunc1, const char* szFunc2 = NULL); - CLuaMain* GetVirtualMachine(void) { return m_pLuaMain; } + CLuaMain* GetVirtualMachine() { return m_pLuaMain; } // dummy overrides void SetPosition(const CVector& vecDummy){}; void GetPosition(CVector& vecDummy) const {}; // cgui element access - CGUIElement* GetCGUIElement(void) { return m_pCGUIElement; }; + CGUIElement* GetCGUIElement() { return m_pCGUIElement; }; void SetCGUIElement(CGUIElement* pCGUIElement) { m_pCGUIElement = pCGUIElement; }; SString GetFont(class CClientGuiFont** ppFontElement); diff --git a/Client/mods/deathmatch/logic/CClientGUIManager.cpp b/Client/mods/deathmatch/logic/CClientGUIManager.cpp index 1ea26ce9d66..b2eb23322c3 100644 --- a/Client/mods/deathmatch/logic/CClientGUIManager.cpp +++ b/Client/mods/deathmatch/logic/CClientGUIManager.cpp @@ -13,18 +13,18 @@ using std::list; using std::map; -CClientGUIManager::CClientGUIManager(void) +CClientGUIManager::CClientGUIManager() { m_bCanRemoveFromList = true; } -CClientGUIManager::~CClientGUIManager(void) +CClientGUIManager::~CClientGUIManager() { // Destroy all objects DeleteAll(); } -void CClientGUIManager::DeleteAll(void) +void CClientGUIManager::DeleteAll() { // We must make sure the gui elements don't interrupt our list m_bCanRemoveFromList = false; @@ -97,7 +97,7 @@ void CClientGUIManager::Remove(CClientGUIElement* pGUIElement) } } -void CClientGUIManager::DoPulse(void) +void CClientGUIManager::DoPulse() { FlushQueuedUpdates(); } diff --git a/Client/mods/deathmatch/logic/CClientGUIManager.h b/Client/mods/deathmatch/logic/CClientGUIManager.h index f23ed082c0c..6d81070e239 100644 --- a/Client/mods/deathmatch/logic/CClientGUIManager.h +++ b/Client/mods/deathmatch/logic/CClientGUIManager.h @@ -24,24 +24,24 @@ class CClientGUIManager friend class CClientGUIElement; public: - CClientGUIManager(void); - ~CClientGUIManager(void); + CClientGUIManager(); + ~CClientGUIManager(); - void DeleteAll(void); + void DeleteAll(); bool Exists(CClientGUIElement* pGUIElement); bool Exists(CGUIElement* pCGUIElement); - unsigned int Count(void) { return static_cast(m_Elements.size()); }; + unsigned int Count() { return static_cast(m_Elements.size()); }; CClientGUIElement* Get(CGUIElement* pCGUIElement); - void DoPulse(void); + void DoPulse(); void QueueGridListUpdate(CClientGUIElement* pGUIElement); private: void Add(CClientGUIElement* pGUIElement); void Remove(CClientGUIElement* pGUIElement); - void FlushQueuedUpdates(void); + void FlushQueuedUpdates(); private: bool m_bCanRemoveFromList; diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp index 13ee1a0d871..99faad0a63b 100644 --- a/Client/mods/deathmatch/logic/CClientGame.cpp +++ b/Client/mods/deathmatch/logic/CClientGame.cpp @@ -350,7 +350,7 @@ CClientGame::CClientGame(bool bLocalPlay) g_pCore->GetGraphics()->GetRenderItemManager()->SetTestMode(DX_TEST_MODE_NONE); } -CClientGame::~CClientGame(void) +CClientGame::~CClientGame() { m_bBeingDeleted = true; // Stop all explosions. Unfortunately this doesn't fix the crash @@ -540,7 +540,7 @@ void CClientGame::EnablePacketRecorder(const char* szFilename) m_pManager->GetPacketRecorder()->StartRecord(szFilename, true); } -void CClientGame::StartPlayback(void) +void CClientGame::StartPlayback() { // strcpy ( m_szNick, "Playback" ); @@ -715,7 +715,7 @@ bool CClientGame::OnCancelLocalGameClick(CGUIElement* pElement) return false; } -void CClientGame::DoPulsePreFrame(void) +void CClientGame::DoPulsePreFrame() { if (m_Status == CClientGame::STATUS_JOINED) { @@ -758,7 +758,7 @@ void CClientGame::DoPulsePreHUDRender(bool bDidUnminimize, bool bDidRecreateRend DebugElementRender(); } -void CClientGame::DoPulsePostFrame(void) +void CClientGame::DoPulsePostFrame() { TIMING_CHECKPOINT("+CClientGame::DoPulsePostFrame"); #ifdef DEBUG_KEYSTATES @@ -931,7 +931,7 @@ void CClientGame::DoPulsePostFrame(void) } } -void CClientGame::DoPulses(void) +void CClientGame::DoPulses() { TIMING_CHECKPOINT("-CClientGame::DoPulsePostFrame"); @@ -1511,7 +1511,7 @@ void CClientGame::SetMimic(unsigned int uiMimicCount) #endif -void CClientGame::DoVehicleInKeyCheck(void) +void CClientGame::DoVehicleInKeyCheck() { // Grab the controller state CControllerState cs; @@ -1533,7 +1533,7 @@ void CClientGame::DoVehicleInKeyCheck(void) } } -void CClientGame::UpdateVehicleInOut(void) +void CClientGame::UpdateVehicleInOut() { // We got told by the server to animate into a certain vehicle? if (m_VehicleInOutID != INVALID_ELEMENT_ID) @@ -1834,7 +1834,7 @@ void CClientGame::UpdateVehicleInOut(void) } } -void CClientGame::UpdatePlayerTarget(void) +void CClientGame::UpdatePlayerTarget() { CControllerState ControllerState; m_pLocalPlayer->GetControllerState(ControllerState); @@ -1897,7 +1897,7 @@ void CClientGame::UpdatePlayerTarget(void) } } -void CClientGame::UpdatePlayerWeapons(void) +void CClientGame::UpdatePlayerWeapons() { // Check whether we changed weapon slots eWeaponSlot currentSlot = m_pLocalPlayer->GetCurrentWeaponSlot(); @@ -1970,7 +1970,7 @@ void CClientGame::UpdatePlayerWeapons(void) } } -void CClientGame::UpdateTrailers(void) +void CClientGame::UpdateTrailers() { // This function is here to re-attach trailers if they fall off @@ -2019,7 +2019,7 @@ void CClientGame::UpdateTrailers(void) } } -void CClientGame::UpdateFireKey(void) +void CClientGame::UpdateFireKey() { if (m_pLocalPlayer) { @@ -2133,7 +2133,7 @@ void CClientGame::UpdateFireKey(void) } } -void CClientGame::UpdateStunts(void) +void CClientGame::UpdateStunts() { // * Two wheeler * static unsigned long ulLastCarTwoWheelCounter = 0; @@ -2270,7 +2270,7 @@ void CClientGame::ChangeVehicleWeapon(bool bNext) } } -void CClientGame::ResetVehicleInOut(void) +void CClientGame::ResetVehicleInOut() { m_ulLastVehicleInOutTime = 0; m_bIsGettingOutOfVehicle = false; @@ -2741,7 +2741,7 @@ void CClientGame::SetWanted(DWORD dwWanted) m_dwWanted = dwWanted; } -void CClientGame::AddBuiltInEvents(void) +void CClientGame::AddBuiltInEvents() { // Resource events m_Events.AddEvent("onClientResourceStart", "resource", NULL, false); @@ -2903,7 +2903,7 @@ void CClientGame::AddBuiltInEvents(void) m_Events.AddEvent("onClientWorldSound", "group, index, x, y, z", nullptr, false); } -void CClientGame::DrawFPS(void) +void CClientGame::DrawFPS() { // Draw the background float fResWidth = static_cast(g_pCore->GetGraphics()->GetViewportWidth()); @@ -3148,7 +3148,7 @@ void CClientGame::DrawWeaponsyncData(CClientPlayer* pPlayer) } } -void CClientGame::UpdateMimics(void) +void CClientGame::UpdateMimics() { // Got a local player? if (m_pLocalPlayer) @@ -3418,7 +3418,7 @@ void CClientGame::UpdateMimics(void) } } -void CClientGame::DoPaintballs(void) +void CClientGame::DoPaintballs() { if (m_pLocalPlayer) { @@ -3515,7 +3515,7 @@ void CClientGame::QuitPlayer(CClientPlayer* pPlayer, eQuitReason Reason) delete pPlayer; } -void CClientGame::Event_OnIngame(void) +void CClientGame::Event_OnIngame() { // Unpause the game g_pGame->Pause(false); @@ -3583,7 +3583,7 @@ void CClientGame::Event_OnIngame(void) WatchDogCompletedSection("L1"); } -void CClientGame::Event_OnIngameAndConnected(void) +void CClientGame::Event_OnIngameAndConnected() { m_ulVerifyTimeStart = CClientTime::GetTime(); @@ -3601,7 +3601,7 @@ bool CClientGame::StaticBreakTowLinkHandler(CVehicle* pTowingVehicle) return g_pClientGame->BreakTowLinkHandler(pTowingVehicle); } -void CClientGame::StaticDrawRadarAreasHandler(void) +void CClientGame::StaticDrawRadarAreasHandler() { g_pClientGame->DrawRadarAreasHandler(); } @@ -3621,12 +3621,12 @@ void CClientGame::StaticFireHandler(CFire* pFire) g_pClientGame->FireHandler(pFire); } -void CClientGame::StaticRender3DStuffHandler(void) +void CClientGame::StaticRender3DStuffHandler() { g_pClientGame->Render3DStuffHandler(); } -void CClientGame::StaticPreRenderSkyHandler(void) +void CClientGame::StaticPreRenderSkyHandler() { g_pClientGame->PreRenderSkyHandler(); } @@ -3669,22 +3669,22 @@ bool CClientGame::StaticBlendAnimationHierarchyHandler(CAnimBlendAssociationSAIn return g_pClientGame->BlendAnimationHierarchyHandler(pAnimAssoc, pOutAnimHierarchy, pFlags, pClump); } -void CClientGame::StaticPreWorldProcessHandler(void) +void CClientGame::StaticPreWorldProcessHandler() { g_pClientGame->PreWorldProcessHandler(); } -void CClientGame::StaticPostWorldProcessHandler(void) +void CClientGame::StaticPostWorldProcessHandler() { g_pClientGame->PostWorldProcessHandler(); } -void CClientGame::StaticPreFxRenderHandler(void) +void CClientGame::StaticPreFxRenderHandler() { g_pCore->OnPreFxRender(); } -void CClientGame::StaticPreHudRenderHandler(void) +void CClientGame::StaticPreHudRenderHandler() { g_pCore->OnPreHUDRender(); } @@ -3819,7 +3819,7 @@ void CClientGame::StaticVehicleWeaponHitHandler(SVehicleWeaponHitEvent& event) g_pClientGame->VehicleWeaponHitHandler(event); } -void CClientGame::DrawRadarAreasHandler(void) +void CClientGame::DrawRadarAreasHandler() { m_pRadarAreaManager->DoPulse(); } @@ -3890,20 +3890,20 @@ void CClientGame::ProjectileInitiateHandler(CClientProjectile* pProjectile) pProjectile->CallEvent("onClientProjectileCreation", Arguments, true); } -void CClientGame::Render3DStuffHandler(void) +void CClientGame::Render3DStuffHandler() { } -void CClientGame::PreRenderSkyHandler(void) +void CClientGame::PreRenderSkyHandler() { g_pCore->GetGraphics()->GetRenderItemManager()->PreDrawWorld(); } -void CClientGame::PreWorldProcessHandler(void) +void CClientGame::PreWorldProcessHandler() { } -void CClientGame::PostWorldProcessHandler(void) +void CClientGame::PostWorldProcessHandler() { m_pManager->GetMarkerManager()->DoPulse(); m_pManager->GetPointLightsManager()->DoPulse(); @@ -3919,7 +3919,7 @@ void CClientGame::PostWorldProcessHandler(void) m_pRootEntity->CallEvent("onClientPreRender", Arguments, false); } -void CClientGame::IdleHandler(void) +void CClientGame::IdleHandler() { // If we are minimized we do the pulsing here if (g_pCore->IsWindowMinimized()) @@ -4126,7 +4126,7 @@ bool CClientGame::ProcessCollisionHandler(CEntitySAInterface* pThisInterface, CE // // On demand files // -void CClientGame::DownloadSingularResourceFiles(void) +void CClientGame::DownloadSingularResourceFiles() { if (!IsTransferringSingularFiles()) return; @@ -5211,7 +5211,7 @@ bool CClientGame::PreWeaponFire(CPlayerPed* pPlayerPed, bool bStopIfUsingBulletS return true; } -void CClientGame::PostWeaponFire(void) +void CClientGame::PostWeaponFire() { // Send bullet sync with local damage info if (g_bBulletFireVectorsValid) @@ -5550,12 +5550,12 @@ void CClientGame::SendProjectileSync(CClientProjectile* pProjectile) } } -void CClientGame::ResetAmmoInClip(void) +void CClientGame::ResetAmmoInClip() { memset(&m_wasWeaponAmmoInClip[0], 0, sizeof(m_wasWeaponAmmoInClip)); } -void CClientGame::ResetMapInfo(void) +void CClientGame::ResetMapInfo() { // Restore some game stuff // Keybinds @@ -6190,7 +6190,7 @@ bool CClientGame::SetCloudsEnabled(bool bEnabled) m_bCloudsEnabled = bEnabled; return true; } -bool CClientGame::GetCloudsEnabled(void) +bool CClientGame::GetCloudsEnabled() { return m_bCloudsEnabled; } @@ -6200,7 +6200,7 @@ bool CClientGame::SetBirdsEnabled(bool bEnabled) m_bBirdsEnabled = bEnabled; return true; } -bool CClientGame::GetBirdsEnabled(void) +bool CClientGame::GetBirdsEnabled() { return m_bBirdsEnabled; } @@ -6257,7 +6257,7 @@ void CClientGame::InitVoice(bool bEnabled, unsigned int uiServerSampleRate, unsi // // If debug render mode is on, allow each element in range to draw some stuff // -void CClientGame::DebugElementRender(void) +void CClientGame::DebugElementRender() { if (!GetDevelopmentMode() || !GetShowCollision()) return; @@ -6444,7 +6444,7 @@ void CClientGame::GottenPlayerScreenShot(const CBuffer* pBuffer, uint uiTimeSpen ////////////////////////////////////////////////////////////////// // Process delay send list // -void CClientGame::ProcessDelayedSendList(void) +void CClientGame::ProcessDelayedSendList() { CTickCount tickCount = CTickCount::Now(); @@ -6573,7 +6573,7 @@ bool CClientGame::IsUsingAlternatePulseOrder(bool bAdvanceDelayCounter) // Output info about the connected server for player // ////////////////////////////////////////////////////////////////// -void CClientGame::OutputServerInfo(void) +void CClientGame::OutputServerInfo() { SString strTotalOutput; strTotalOutput += SString("Server info for %s", g_pNet->GetConnectedServer(true)); @@ -6707,7 +6707,7 @@ void CClientGame::ChangeFloatPrecision(bool bHigh) } } -bool CClientGame::IsHighFloatPrecision(void) const +bool CClientGame::IsHighFloatPrecision() const { return m_uiPrecisionCallDepth != 0; } @@ -6741,7 +6741,7 @@ AnimationId CClientGame::DrivebyAnimationHandler(AnimationId animId, AssocGroupI // Figure out which directory to use for the client resource file cache // ////////////////////////////////////////////////////////////////// -void CClientGame::SetFileCacheRoot(void) +void CClientGame::SetFileCacheRoot() { if (g_pCore->GetCVars()->GetValue("share_file_cache") == false) { diff --git a/Client/mods/deathmatch/logic/CClientGame.h b/Client/mods/deathmatch/logic/CClientGame.h index 93f9dd37fce..3007ca3d79d 100644 --- a/Client/mods/deathmatch/logic/CClientGame.h +++ b/Client/mods/deathmatch/logic/CClientGame.h @@ -192,7 +192,7 @@ class CClientGame class CStoredWeaponSlot { public: - CStoredWeaponSlot(void) + CStoredWeaponSlot() { ucType = 0; usAmmo = 0; @@ -223,22 +223,22 @@ class CClientGame public: ZERO_ON_NEW CClientGame(bool bLocalPlay = false); - ~CClientGame(void); + ~CClientGame(); bool StartGame(const char* szNick, const char* szPassword, eServerType Type = SERVER_TYPE_NORMAL); bool StartLocalGame(eServerType Type, const char* szPassword = NULL); void SetupLocalGame(eServerType Type); // bool StartGame ( void ); - bool IsLocalGame(void) const { return m_bLocalPlay; } + bool IsLocalGame() const { return m_bLocalPlay; } bool OnCancelLocalGameClick(CGUIElement* pElement); - void DoPulsePreFrame(void); + void DoPulsePreFrame(); void DoPulsePreHUDRender(bool bDidUnminimize, bool bDidRecreateRenderTargets); - void DoPulsePostFrame(void); - void DoPulses(void); + void DoPulsePostFrame(); + void DoPulses(); void DoPulses2(bool bCalledFromIdle); - uint GetFrameCount(void) { return m_uiFrameCount; } + uint GetFrameCount() { return m_uiFrameCount; } void HandleException(CExceptionInformation* pExceptionInformation); static void HandleRadioNext(CControlFunctionBind*); @@ -247,59 +247,59 @@ class CClientGame bool IsNickValid(const char* szNick); bool IsNametagValid(const char* szNick); - bool IsGettingIntoVehicle(void) { return m_bIsGettingIntoVehicle; }; + bool IsGettingIntoVehicle() { return m_bIsGettingIntoVehicle; }; - void StartPlayback(void); + void StartPlayback(); void EnablePacketRecorder(const char* szFilename); void InitVoice(bool bEnabled, unsigned int uiServerSampleRate, unsigned char ucQuality, unsigned int uiBitrate); // Accessors - CVoiceRecorder* GetVoiceRecorder(void) { return m_pVoiceRecorder; }; - CClientManager* GetManager(void) { return m_pManager; }; - CClientObjectManager* GetObjectManager(void) { return m_pObjectManager; }; - CClientPickupManager* GetPickupManager(void) { return m_pPickupManager; }; - CClientPlayerManager* GetPlayerManager(void) { return m_pPlayerManager; }; - CClientRadarMarkerManager* GetRadarMarkerManager(void) { return m_pRadarMarkerManager; }; - CClientVehicleManager* GetVehicleManager(void) { return m_pVehicleManager; }; - CClientTeamManager* GetTeamManager(void) { return m_pTeamManager; }; - CClientPedManager* GetPedManager(void) { return m_pPedManager; }; - CClientGUIManager* GetGUIManager(void) { return m_pGUIManager; }; - CResourceManager* GetResourceManager(void) { return m_pResourceManager; } - CLuaManager* GetLuaManager(void) { return m_pLuaManager; } - CScriptKeyBinds* GetScriptKeyBinds(void) { return m_pScriptKeyBinds; } - CScriptDebugging* GetScriptDebugging(void) { return m_pScriptDebugging; } - CRegisteredCommands* GetRegisteredCommands(void) { return &m_RegisteredCommands; } - CZoneNames* GetZoneNames(void) { return m_pZoneNames; }; - CNametags* GetNametags(void) { return m_pNametags; } - CSyncDebug* GetSyncDebug(void) { return m_pSyncDebug; }; - CRPCFunctions* GetRPCFunctions(void) { return m_pRPCFunctions; } - CSingularFileDownloadManager* GetSingularFileDownloadManager(void) { return m_pSingularFileDownloadManager; }; - - CClientEntity* GetRootEntity(void) { return m_pRootEntity; } - CEvents* GetEvents(void) { return &m_Events; } - - CBlendedWeather* GetBlendedWeather(void) { return m_pBlendedWeather; }; - CNetAPI* GetNetAPI(void) { return m_pNetAPI; }; - CClientPlayer* GetLocalPlayer(void) { return m_pLocalPlayer; }; - CRadarMap* GetRadarMap(void) { return m_pRadarMap; }; - CMovingObjectsManager* GetMovingObjectsManager(void) { return m_pMovingObjectsManager; } - - CUnoccupiedVehicleSync* GetUnoccupiedVehicleSync(void) { return m_pUnoccupiedVehicleSync; } - CPedSync* GetPedSync(void) { return m_pPedSync; } + CVoiceRecorder* GetVoiceRecorder() { return m_pVoiceRecorder; }; + CClientManager* GetManager() { return m_pManager; }; + CClientObjectManager* GetObjectManager() { return m_pObjectManager; }; + CClientPickupManager* GetPickupManager() { return m_pPickupManager; }; + CClientPlayerManager* GetPlayerManager() { return m_pPlayerManager; }; + CClientRadarMarkerManager* GetRadarMarkerManager() { return m_pRadarMarkerManager; }; + CClientVehicleManager* GetVehicleManager() { return m_pVehicleManager; }; + CClientTeamManager* GetTeamManager() { return m_pTeamManager; }; + CClientPedManager* GetPedManager() { return m_pPedManager; }; + CClientGUIManager* GetGUIManager() { return m_pGUIManager; }; + CResourceManager* GetResourceManager() { return m_pResourceManager; } + CLuaManager* GetLuaManager() { return m_pLuaManager; } + CScriptKeyBinds* GetScriptKeyBinds() { return m_pScriptKeyBinds; } + CScriptDebugging* GetScriptDebugging() { return m_pScriptDebugging; } + CRegisteredCommands* GetRegisteredCommands() { return &m_RegisteredCommands; } + CZoneNames* GetZoneNames() { return m_pZoneNames; }; + CNametags* GetNametags() { return m_pNametags; } + CSyncDebug* GetSyncDebug() { return m_pSyncDebug; }; + CRPCFunctions* GetRPCFunctions() { return m_pRPCFunctions; } + CSingularFileDownloadManager* GetSingularFileDownloadManager() { return m_pSingularFileDownloadManager; }; + + CClientEntity* GetRootEntity() { return m_pRootEntity; } + CEvents* GetEvents() { return &m_Events; } + + CBlendedWeather* GetBlendedWeather() { return m_pBlendedWeather; }; + CNetAPI* GetNetAPI() { return m_pNetAPI; }; + CClientPlayer* GetLocalPlayer() { return m_pLocalPlayer; }; + CRadarMap* GetRadarMap() { return m_pRadarMap; }; + CMovingObjectsManager* GetMovingObjectsManager() { return m_pMovingObjectsManager; } + + CUnoccupiedVehicleSync* GetUnoccupiedVehicleSync() { return m_pUnoccupiedVehicleSync; } + CPedSync* GetPedSync() { return m_pPedSync; } #ifdef WITH_OBJECT_SYNC - CObjectSync* GetObjectSync(void) { return m_pObjectSync; } + CObjectSync* GetObjectSync() { return m_pObjectSync; } #endif - CLatentTransferManager* GetLatentTransferManager(void) { return m_pLatentTransferManager; } - CClientModelCacheManager* GetModelCacheManager(void) { return m_pModelCacheManager; } - CDebugHookManager* GetDebugHookManager(void) { return m_pDebugHookManager; } + CLatentTransferManager* GetLatentTransferManager() { return m_pLatentTransferManager; } + CClientModelCacheManager* GetModelCacheManager() { return m_pModelCacheManager; } + CDebugHookManager* GetDebugHookManager() { return m_pDebugHookManager; } - CElementDeleter* GetElementDeleter(void) { return &m_ElementDeleter; } - CObjectRespawner* GetObjectRespawner(void) { return &m_ObjectRespawner; } - CRemoteCalls* GetRemoteCalls(void) { return m_pRemoteCalls; } - CResourceFileDownloadManager* GetResourceFileDownloadManager(void) { return m_pResourceFileDownloadManager; } + CElementDeleter* GetElementDeleter() { return &m_ElementDeleter; } + CObjectRespawner* GetObjectRespawner() { return &m_ObjectRespawner; } + CRemoteCalls* GetRemoteCalls() { return m_pRemoteCalls; } + CResourceFileDownloadManager* GetResourceFileDownloadManager() { return m_pResourceFileDownloadManager; } - SharedUtil::CAsyncTaskScheduler* GetAsyncTaskScheduler(void) { return m_pAsyncTaskScheduler; } + SharedUtil::CAsyncTaskScheduler* GetAsyncTaskScheduler() { return m_pAsyncTaskScheduler; } // Status toggles void ShowNetstat(int iCmd); @@ -325,21 +325,21 @@ class CClientGame bool IsShowingInterpolation() const { return m_bShowInterpolation; } #endif - CEntity* GetTargetedGameEntity(void) { return m_pTargetedGameEntity; } - CClientEntity* GetTargetedEntity(void) { return m_pTargetedEntity; } + CEntity* GetTargetedGameEntity() { return m_pTargetedGameEntity; } + CClientEntity* GetTargetedEntity() { return m_pTargetedEntity; } - CClientPlayer* GetTargetedPlayer(void) { return (m_TargetedPlayerID != INVALID_ELEMENT_ID) ? m_pPlayerManager->Get(m_TargetedPlayerID) : NULL; } + CClientPlayer* GetTargetedPlayer() { return (m_TargetedPlayerID != INVALID_ELEMENT_ID) ? m_pPlayerManager->Get(m_TargetedPlayerID) : NULL; } - CClientEntity* GetDamageEntity(void) { return m_pDamageEntity; } - ElementID GetDamagerID(void) { return m_DamagerID; } - unsigned char GetDamageWeapon(void) { return m_ucDamageWeapon; } - unsigned char GetDamageBodyPiece(void) { return m_ucDamageBodyPiece; } - bool GetDamageSent(void) { return m_bDamageSent; } + CClientEntity* GetDamageEntity() { return m_pDamageEntity; } + ElementID GetDamagerID() { return m_DamagerID; } + unsigned char GetDamageWeapon() { return m_ucDamageWeapon; } + unsigned char GetDamageBodyPiece() { return m_ucDamageBodyPiece; } + bool GetDamageSent() { return m_bDamageSent; } void SetDamageSent(bool b) { m_bDamageSent = b; } void ProcessVehicleInOutKey(bool bPassenger); - void ResetVehicleInOut(void); + void ResetVehicleInOut(); void SetAllDimensions(unsigned short usDimension); @@ -359,77 +359,77 @@ class CClientGame void ProcessServerControlBind(CControlFunctionBind* pBind); bool ProcessMessageForCursorEvents(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - bool AreCursorEventsEnabled(void) { return m_bCursorEventsEnabled; } + bool AreCursorEventsEnabled() { return m_bCursorEventsEnabled; } void SetCursorEventsEnabled(bool bCursorEventsEnabled) { m_bCursorEventsEnabled = bCursorEventsEnabled; } CClientPlayer* GetClosestRemotePlayer(const CVector& vecTemp, float fMaxDistance); - void AddBuiltInEvents(void); + void AddBuiltInEvents(); - const char* GetModRoot(void) { return m_strModRoot; }; + const char* GetModRoot() { return m_strModRoot; }; void SetGameSpeed(float fSpeed); void SetMinuteDuration(unsigned long ulDelay); - long GetMoney(void) { return m_lMoney; } + long GetMoney() { return m_lMoney; } void SetMoney(long lMoney, bool bInstant = false); void SetWanted(DWORD dwWanted); - void ResetAmmoInClip(void); + void ResetAmmoInClip(); - void ResetMapInfo(void); + void ResetMapInfo(); void DoWastedCheck(ElementID damagerID = INVALID_ELEMENT_ID, unsigned char ucWeapon = 0xFF, unsigned char ucBodyPiece = 0xFF, AssocGroupId animGroup = 0, AnimationId animId = 15); void SendPedWastedPacket(CClientPed* Ped, ElementID damagerID = INVALID_ELEMENT_ID, unsigned char ucWeapon = 0xFF, unsigned char ucBodyPiece = 0xFF, AssocGroupId animGroup = 0, AnimationId animID = 15); - CClientGUIElement* GetClickedGUIElement(void) { return m_pClickedGUIElement; } + CClientGUIElement* GetClickedGUIElement() { return m_pClickedGUIElement; } void SetClickedGUIElement(CClientGUIElement* pElement) { m_pClickedGUIElement = NULL; } void SetInitiallyFadedOut(bool bFadedOut) { m_bInitiallyFadedOut = bFadedOut; }; - bool GetHudAreaNameDisabled(void) { return m_bHudAreaNameDisabled; }; + bool GetHudAreaNameDisabled() { return m_bHudAreaNameDisabled; }; void SetHudAreaNameDisabled(bool bDisabled) { m_bHudAreaNameDisabled = bDisabled; }; bool SetGlitchEnabled(unsigned char cGlitch, bool bEnabled); bool IsGlitchEnabled(unsigned char cGlitch); bool SetCloudsEnabled(bool bEnabled); - bool GetCloudsEnabled(void); + bool GetCloudsEnabled(); bool SetBirdsEnabled(bool bEnabled); - bool GetBirdsEnabled(void); + bool GetBirdsEnabled(); - CTransferBox* GetTransferBox(void) { return m_pTransferBox; }; + CTransferBox* GetTransferBox() { return m_pTransferBox; }; void ChangeVehicleWeapon(bool bNext); void NotifyBigPacketProgress(unsigned long ulBytesReceived, unsigned long ulTotalSize); bool IsDownloadingBigPacket() const { return m_bReceivingBigPacket; } - bool IsBeingDeleted(void) { return m_bBeingDeleted; } + bool IsBeingDeleted() { return m_bBeingDeleted; } void SetDevelopmentMode(bool bEnable, bool bEnableWeb); - bool GetDevelopmentMode(void) { return m_bDevelopmentMode; } + bool GetDevelopmentMode() { return m_bDevelopmentMode; } void SetShowCollision(bool bEnable) { m_bShowCollision = bEnable; } - bool GetShowCollision(void) { return m_bShowCollision; } + bool GetShowCollision() { return m_bShowCollision; } void SetShowSound(bool bEnable) { m_bShowSound = bEnable; } - bool GetShowSound(void) { return m_bShowSound; } + bool GetShowSound() { return m_bShowSound; } void TakePlayerScreenShot(uint uiSizeX, uint uiSizeY, const SString& strTag, uint uiQuality, uint uiMaxBandwidth, uint uiMaxPacketSize, CResource* pResource, uint uiServerSentTime); static void StaticGottenPlayerScreenShot(const CBuffer* pBuffer, uint uiTimeSpentInQueue, const SString& strError); void GottenPlayerScreenShot(const CBuffer* pBuffer, uint uiTimeSpentInQueue, const SString& strError); - void ProcessDelayedSendList(void); + void ProcessDelayedSendList(); void SetWeaponTypesUsingBulletSync(const std::set& weaponTypesUsingBulletSync); bool GetWeaponTypeUsesBulletSync(eWeaponType weaponType); - SString GetHTTPURL(void) { return m_strHTTPDownloadURL; }; + SString GetHTTPURL() { return m_strHTTPDownloadURL; }; void ProjectileInitiateHandler(CClientProjectile* pProjectile); - void IdleHandler(void); - void OutputServerInfo(void); + void IdleHandler(); + void OutputServerInfo(); void TellServerSomethingImportant(uint uiId, const SString& strMessage, uint uiSendLimitForThisId = 0); void ChangeFloatPrecision(bool bHigh); - bool IsHighFloatPrecision(void) const; + bool IsHighFloatPrecision() const; bool TriggerBrowserRequestResultEvent(const std::unordered_set& newPages); void RestreamModel(unsigned short usModel); @@ -451,24 +451,24 @@ class CClientGame bool OnFocusLoss(CGUIFocusEventArgs Args); // Network update functions - void DoVehicleInKeyCheck(void); - void UpdateVehicleInOut(void); - void UpdatePlayerTarget(void); - void UpdatePlayerWeapons(void); - void UpdateTrailers(void); - void UpdateFireKey(void); - void UpdateStunts(void); + void DoVehicleInKeyCheck(); + void UpdateVehicleInOut(); + void UpdatePlayerTarget(); + void UpdatePlayerWeapons(); + void UpdateTrailers(); + void UpdateFireKey(); + void UpdateStunts(); // Internal key-bind callbacks static void StaticUpdateFireKey(CControlFunctionBind* pBind); - void DrawFPS(void); + void DrawFPS(); #ifdef MTA_DEBUG void DrawTasks(CClientPlayer* pPlayer); void DrawPlayerDetails(CClientPlayer* pPlayer); - void UpdateMimics(void); - void DoPaintballs(void); + void UpdateMimics(); + void DoPaintballs(); void DrawWeaponsyncData(CClientPlayer* pPlayer); #endif @@ -476,26 +476,26 @@ class CClientGame void DrawWeaponsyncData(CClientPlayer* pPlayer); #endif - void DownloadSingularResourceFiles(void); + void DownloadSingularResourceFiles(); void QuitPlayer(CClientPlayer* pPlayer, eQuitReason Reason); - void Event_OnIngame(void); - void Event_OnIngameAndConnected(void); + void Event_OnIngame(); + void Event_OnIngameAndConnected(); static bool StaticDamageHandler(CPed* pDamagePed, CEventDamage* pEvent); static void StaticDeathHandler(CPed* pKilledPed, unsigned char ucDeathReason, unsigned char ucBodyPart); static void StaticFireHandler(CFire* pFire); static bool StaticBreakTowLinkHandler(CVehicle* pTowedVehicle); - static void StaticDrawRadarAreasHandler(void); - static void StaticRender3DStuffHandler(void); - static void StaticPreRenderSkyHandler(void); - static void StaticRenderHeliLightHandler(void); + static void StaticDrawRadarAreasHandler(); + static void StaticRender3DStuffHandler(); + static void StaticPreRenderSkyHandler(); + static void StaticRenderHeliLightHandler(); static bool StaticChokingHandler(unsigned char ucWeaponType); - static void StaticPreWorldProcessHandler(void); - static void StaticPostWorldProcessHandler(void); - static void StaticPreFxRenderHandler(void); - static void StaticPreHudRenderHandler(void); + static void StaticPreWorldProcessHandler(); + static void StaticPostWorldProcessHandler(); + static void StaticPreFxRenderHandler(); + static void StaticPreHudRenderHandler(); static void StaticCAnimBlendAssocDestructorHandler(CAnimBlendAssociationSAInterface* pThis); static CAnimBlendAssociationSAInterface* StaticAddAnimationHandler(RpClump* pClump, AssocGroupId animGroup, AnimationId animID); static CAnimBlendAssociationSAInterface* StaticAddAnimationAndSyncHandler(RpClump* pClump, CAnimBlendAssociationSAInterface* pAnimAssocToSyncWith, @@ -533,12 +533,12 @@ class CClientGame void DeathHandler(CPed* pKilledPed, unsigned char ucDeathReason, unsigned char ucBodyPart); void FireHandler(CFire* pFire); bool BreakTowLinkHandler(CVehicle* pTowedVehicle); - void DrawRadarAreasHandler(void); - void Render3DStuffHandler(void); - void PreRenderSkyHandler(void); + void DrawRadarAreasHandler(); + void Render3DStuffHandler(); + void PreRenderSkyHandler(); bool ChokingHandler(unsigned char ucWeaponType); - void PreWorldProcessHandler(void); - void PostWorldProcessHandler(void); + void PreWorldProcessHandler(); + void PostWorldProcessHandler(); void CAnimBlendAssocDestructorHandler(CAnimBlendAssociationSAInterface* pThis); CAnimBlendAssociationSAInterface* AddAnimationHandler(RpClump* pClump, AssocGroupId animGroup, AnimationId animID); CAnimBlendAssociationSAInterface* AddAnimationAndSyncHandler(RpClump* pClump, CAnimBlendAssociationSAInterface* pAnimAssocToSyncWith, @@ -570,7 +570,7 @@ class CClientGame bool ProcessMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static bool PreWeaponFire(CPlayerPed* pPlayerPed, bool bStopIfUsingBulletSync); - static void PostWeaponFire(void); + static void PostWeaponFire(); static void BulletImpact(CPed* pInitiator, CEntity* pVictim, const CVector* pStartPosition, const CVector* pEndPosition); static void BulletFire(CPed* pInitiator, const CVector* pStartPosition, const CVector* pEndPosition); @@ -581,25 +581,25 @@ class CClientGame CEventDamage* pEvent); bool VerifySADataFiles(int iEnableClientChecks = 0); - void DebugElementRender(void); + void DebugElementRender(); void SendExplosionSync(const CVector& vecPosition, eExplosionType Type, CClientEntity* pOrigin = NULL); void SendFireSync(CFire* pFire); void SendProjectileSync(CClientProjectile* pProjectile); void SetServerVersionSortable(const SString& strVersion) { m_strServerVersionSortable = strVersion; } - const SString& GetServerVersionSortable(void) { return m_strServerVersionSortable; } + const SString& GetServerVersionSortable() { return m_strServerVersionSortable; } void SetTransferringSingularFiles(bool bTransfer) { m_bTransferringSingularFiles = bTransfer; } - bool IsTransferringSingularFiles(void) { return m_bTransferringSingularFiles; } + bool IsTransferringSingularFiles() { return m_bTransferringSingularFiles; } void SetVehExtrapolateSettings(const SVehExtrapolateSettings& settings) { m_VehExtrapolateSettings = settings; } - const SVehExtrapolateSettings& GetVehExtrapolateSettings(void) { return m_VehExtrapolateSettings; } + const SVehExtrapolateSettings& GetVehExtrapolateSettings() { return m_VehExtrapolateSettings; } void SetMiscGameSettings(const SMiscGameSettings& settings) { m_MiscGameSettings = settings; } - const SMiscGameSettings& GetMiscGameSettings(void) { return m_MiscGameSettings; } + const SMiscGameSettings& GetMiscGameSettings() { return m_MiscGameSettings; } bool IsUsingAlternatePulseOrder(bool bAdvanceDelayCounter = false); - void SetFileCacheRoot(void); - const char* GetFileCacheRoot(void) { return m_strFileCacheRoot; } + void SetFileCacheRoot(); + const char* GetFileCacheRoot() { return m_strFileCacheRoot; } void CopyStaticAssociationProperties(std::unique_ptr& pOutAnimStaticAssoc, std::unique_ptr& pOriginalAnimStaticAssoc); diff --git a/Client/mods/deathmatch/logic/CClientGroups.cpp b/Client/mods/deathmatch/logic/CClientGroups.cpp index d01c152bfe7..ab8a10344bf 100644 --- a/Client/mods/deathmatch/logic/CClientGroups.cpp +++ b/Client/mods/deathmatch/logic/CClientGroups.cpp @@ -12,7 +12,7 @@ using std::list; -void CClientGroups::DeleteAll(void) +void CClientGroups::DeleteAll() { // Delete all the elements m_bDontRemoveFromList = true; diff --git a/Client/mods/deathmatch/logic/CClientGroups.h b/Client/mods/deathmatch/logic/CClientGroups.h index ee70035fe87..225115d01a0 100644 --- a/Client/mods/deathmatch/logic/CClientGroups.h +++ b/Client/mods/deathmatch/logic/CClientGroups.h @@ -19,10 +19,10 @@ class CClientGroups friend class CClientDummy; public: - CClientGroups(void) { m_bDontRemoveFromList = false; }; - ~CClientGroups(void) { DeleteAll(); }; + CClientGroups() { m_bDontRemoveFromList = false; }; + ~CClientGroups() { DeleteAll(); }; - void DeleteAll(void); + void DeleteAll(); private: void AddToList(CClientDummy* pDummy) { m_List.push_back(pDummy); }; diff --git a/Client/mods/deathmatch/logic/CClientGuiFont.cpp b/Client/mods/deathmatch/logic/CClientGuiFont.cpp index 2472c7192e4..4a111063894 100644 --- a/Client/mods/deathmatch/logic/CClientGuiFont.cpp +++ b/Client/mods/deathmatch/logic/CClientGuiFont.cpp @@ -30,7 +30,7 @@ CClientGuiFont::CClientGuiFont(CClientManager* pManager, ElementID ID, CGuiFontI // // //////////////////////////////////////////////////////////////// -CClientGuiFont::~CClientGuiFont(void) +CClientGuiFont::~CClientGuiFont() { Unlink(); } @@ -42,7 +42,7 @@ CClientGuiFont::~CClientGuiFont(void) // Remove from manager lists // //////////////////////////////////////////////////////////////// -void CClientGuiFont::Unlink(void) +void CClientGuiFont::Unlink() { // Make sure GUI elements are not using us while (m_GUIElementUserList.size()) @@ -58,7 +58,7 @@ void CClientGuiFont::Unlink(void) // Get name CEGUI uses for this custom font // //////////////////////////////////////////////////////////////// -const SString& CClientGuiFont::GetCEGUIFontName(void) +const SString& CClientGuiFont::GetCEGUIFontName() { return GetGuiFontItem()->m_strCEGUIFontName; } diff --git a/Client/mods/deathmatch/logic/CClientGuiFont.h b/Client/mods/deathmatch/logic/CClientGuiFont.h index 9be89357ecf..820fbc5bf61 100644 --- a/Client/mods/deathmatch/logic/CClientGuiFont.h +++ b/Client/mods/deathmatch/logic/CClientGuiFont.h @@ -13,14 +13,14 @@ class CClientGuiFont : public CClientRenderElement DECLARE_CLASS(CClientGuiFont, CClientRenderElement) public: CClientGuiFont(CClientManager* pManager, ElementID ID, CGuiFontItem* pFontItem); - ~CClientGuiFont(void); + ~CClientGuiFont(); - eClientEntityType GetType(void) const { return CCLIENTGUIFONT; } - void Unlink(void); + eClientEntityType GetType() const { return CCLIENTGUIFONT; } + void Unlink(); // CClientGuiFont methods - CGuiFontItem* GetGuiFontItem(void) { return (CGuiFontItem*)m_pRenderItem; } - const SString& GetCEGUIFontName(void); + CGuiFontItem* GetGuiFontItem() { return (CGuiFontItem*)m_pRenderItem; } + const SString& GetCEGUIFontName(); void NotifyGUIElementAttach(CClientGUIElement* pGUIElement); void NotifyGUIElementDetach(CClientGUIElement* pGUIElement); diff --git a/Client/mods/deathmatch/logic/CClientManager.cpp b/Client/mods/deathmatch/logic/CClientManager.cpp index 630ea6936f7..43c6e674efd 100644 --- a/Client/mods/deathmatch/logic/CClientManager.cpp +++ b/Client/mods/deathmatch/logic/CClientManager.cpp @@ -14,7 +14,7 @@ using SharedUtil::CalcMTASAPath; extern CClientGame* g_pClientGame; -CClientManager::CClientManager(void) +CClientManager::CClientManager() { m_pMarkerStreamer = new CClientStreamer(CClientMarker::IsLimitReached, 600.0f, 300, 300); m_pObjectStreamer = new CClientStreamer(CClientObjectManager::StaticIsObjectLimitReached, 500.0f, 300, 300); @@ -61,7 +61,7 @@ CClientManager::CClientManager(void) m_pCamera->MakeSystemEntity(); } -CClientManager::~CClientManager(void) +CClientManager::~CClientManager() { m_bBeingDeleted = true; @@ -218,7 +218,7 @@ void CClientManager::DoPulse(bool bDoStandardPulses, bool bDoVehicleManagerPulse } } -void CClientManager::DoRender(void) +void CClientManager::DoRender() { if (IsGameLoaded()) { @@ -226,7 +226,7 @@ void CClientManager::DoRender(void) } } -void CClientManager::UpdateStreamers(void) +void CClientManager::UpdateStreamers() { // Is the game loaded? if (IsGameLoaded()) @@ -279,7 +279,7 @@ void CClientManager::OnUpdateStreamPosition(CClientStreamElement* pElement) } // Only enable LOD hooks when needed -void CClientManager::OnLowLODElementCreated(void) +void CClientManager::OnLowLODElementCreated() { // Switch on with first low LOD element if (m_iNumLowLODElements == 0) @@ -287,7 +287,7 @@ void CClientManager::OnLowLODElementCreated(void) m_iNumLowLODElements++; } -void CClientManager::OnLowLODElementDestroyed(void) +void CClientManager::OnLowLODElementDestroyed() { // Switch off with last low LOD element m_iNumLowLODElements--; diff --git a/Client/mods/deathmatch/logic/CClientManager.h b/Client/mods/deathmatch/logic/CClientManager.h index f3c69d939c5..ce7135ebea4 100644 --- a/Client/mods/deathmatch/logic/CClientManager.h +++ b/Client/mods/deathmatch/logic/CClientManager.h @@ -50,62 +50,62 @@ class CClientManager { public: ZERO_ON_NEW - CClientManager(void); - ~CClientManager(void); + CClientManager(); + ~CClientManager(); void DoPulse(bool bDoStandardPulses, bool bDoVehicleManagerPulse); - void DoRender(void); - void UpdateStreamers(void); + void DoRender(); + void UpdateStreamers(); - CAntiCheat& GetAntiCheat(void) { return m_AntiCheat; } - CClientCamera* GetCamera(void) { return m_pCamera; } - CClientCivilianManager* GetCivilianManager(void) { return m_pCivilianManager; } - CClientColModelManager* GetColModelManager(void) { return m_pColModelManager; } - CClientDFFManager* GetDFFManager(void) { return m_pDFFManager; } - CClientGUIManager* GetGUIManager(void) { return m_pGUIManager; } - CClientMarkerManager* GetMarkerManager(void) { return m_pMarkerManager; } - CClientStreamer* GetMarkerStreamer(void) { return m_pMarkerStreamer; } - CClientModelRequestManager* GetModelRequestManager(void) { return m_pModelRequestManager; } - CClientObjectManager* GetObjectManager(void) { return m_pObjectManager; } - CClientStreamer* GetObjectStreamer(void) { return m_pObjectStreamer; } - CClientStreamer* GetObjectLodStreamer(void) { return m_pObjectLodStreamer; } - CClientPathManager* GetPathManager(void) { return m_pPathManager; } - CClientPickupManager* GetPickupManager(void) { return m_pPickupManager; } - CClientStreamer* GetPickupStreamer(void) { return m_pPickupStreamer; } - CClientPlayerManager* GetPlayerManager(void) { return m_pPlayerManager; } - CClientStreamer* GetPlayerStreamer(void) { return m_pPlayerStreamer; } - CClientRadarAreaManager* GetRadarAreaManager(void) { return m_pRadarAreaManager; } - CClientRadarMarkerManager* GetRadarMarkerManager(void) { return m_pRadarMarkerManager; } - CClientSoundManager* GetSoundManager(void) { return m_pSoundManager; } - CClientRenderElementManager* GetRenderElementManager(void) { return m_pRenderElementManager; } - CClientTeamManager* GetTeamManager(void) { return m_pTeamManager; } - CClientDisplayManager* GetDisplayManager(void) { return m_pDisplayManager; } - CClientVehicleManager* GetVehicleManager(void) { return m_pVehicleManager; } - CClientStreamer* GetVehicleStreamer(void) { return m_pVehicleStreamer; } - CClientStreamer* GetLightStreamer(void) { return m_pLightStreamer; } - CClientPedManager* GetPedManager(void) { return m_pPedManager; } - CResourceManager* GetResourceManager(void) { return m_pResourceManager; } - CClientColManager* GetColManager(void) { return m_pColManager; } - CClientGroups* GetGroups(void) { return m_pGroups; } - CClientProjectileManager* GetProjectileManager(void) { return m_pProjectileManager; } - CClientExplosionManager* GetExplosionManager(void) { return m_pExplosionManager; } - CClientPacketRecorder* GetPacketRecorder(void) { return m_pPacketRecorder; } - CClientWaterManager* GetWaterManager(void) { return m_pWaterManager; } - CClientWeaponManager* GetWeaponManager(void) { return m_pWeaponManager; } - CClientEffectManager* GetEffectManager(void) { return m_pEffectManager; } - CClientPointLightsManager* GetPointLightsManager(void) { return m_pPointLightsManager; } + CAntiCheat& GetAntiCheat() { return m_AntiCheat; } + CClientCamera* GetCamera() { return m_pCamera; } + CClientCivilianManager* GetCivilianManager() { return m_pCivilianManager; } + CClientColModelManager* GetColModelManager() { return m_pColModelManager; } + CClientDFFManager* GetDFFManager() { return m_pDFFManager; } + CClientGUIManager* GetGUIManager() { return m_pGUIManager; } + CClientMarkerManager* GetMarkerManager() { return m_pMarkerManager; } + CClientStreamer* GetMarkerStreamer() { return m_pMarkerStreamer; } + CClientModelRequestManager* GetModelRequestManager() { return m_pModelRequestManager; } + CClientObjectManager* GetObjectManager() { return m_pObjectManager; } + CClientStreamer* GetObjectStreamer() { return m_pObjectStreamer; } + CClientStreamer* GetObjectLodStreamer() { return m_pObjectLodStreamer; } + CClientPathManager* GetPathManager() { return m_pPathManager; } + CClientPickupManager* GetPickupManager() { return m_pPickupManager; } + CClientStreamer* GetPickupStreamer() { return m_pPickupStreamer; } + CClientPlayerManager* GetPlayerManager() { return m_pPlayerManager; } + CClientStreamer* GetPlayerStreamer() { return m_pPlayerStreamer; } + CClientRadarAreaManager* GetRadarAreaManager() { return m_pRadarAreaManager; } + CClientRadarMarkerManager* GetRadarMarkerManager() { return m_pRadarMarkerManager; } + CClientSoundManager* GetSoundManager() { return m_pSoundManager; } + CClientRenderElementManager* GetRenderElementManager() { return m_pRenderElementManager; } + CClientTeamManager* GetTeamManager() { return m_pTeamManager; } + CClientDisplayManager* GetDisplayManager() { return m_pDisplayManager; } + CClientVehicleManager* GetVehicleManager() { return m_pVehicleManager; } + CClientStreamer* GetVehicleStreamer() { return m_pVehicleStreamer; } + CClientStreamer* GetLightStreamer() { return m_pLightStreamer; } + CClientPedManager* GetPedManager() { return m_pPedManager; } + CResourceManager* GetResourceManager() { return m_pResourceManager; } + CClientColManager* GetColManager() { return m_pColManager; } + CClientGroups* GetGroups() { return m_pGroups; } + CClientProjectileManager* GetProjectileManager() { return m_pProjectileManager; } + CClientExplosionManager* GetExplosionManager() { return m_pExplosionManager; } + CClientPacketRecorder* GetPacketRecorder() { return m_pPacketRecorder; } + CClientWaterManager* GetWaterManager() { return m_pWaterManager; } + CClientWeaponManager* GetWeaponManager() { return m_pWeaponManager; } + CClientEffectManager* GetEffectManager() { return m_pEffectManager; } + CClientPointLightsManager* GetPointLightsManager() { return m_pPointLightsManager; } - bool IsGameLoaded(void) { return g_pGame->GetSystemState() == 9 && !m_bGameUnloadedFlag && g_pCore->GetNetwork()->GetServerBitStreamVersion(); } - bool IsBeingDeleted(void) { return m_bBeingDeleted; } - void SetGameUnloadedFlag(void) { m_bGameUnloadedFlag = true; } + bool IsGameLoaded() { return g_pGame->GetSystemState() == 9 && !m_bGameUnloadedFlag && g_pCore->GetNetwork()->GetServerBitStreamVersion(); } + bool IsBeingDeleted() { return m_bBeingDeleted; } + void SetGameUnloadedFlag() { m_bGameUnloadedFlag = true; } void InvalidateEntity(CClientEntity* pEntity); void RestoreEntity(CClientEntity* pEntity); void UnreferenceEntity(CClientEntity* pEntity); void OnUpdateStreamPosition(CClientStreamElement* pElement); - void OnLowLODElementCreated(void); - void OnLowLODElementDestroyed(void); + void OnLowLODElementCreated(); + void OnLowLODElementDestroyed(); private: CAntiCheat m_AntiCheat; diff --git a/Client/mods/deathmatch/logic/CClientMarker.cpp b/Client/mods/deathmatch/logic/CClientMarker.cpp index 9ff2a072079..49831d36595 100644 --- a/Client/mods/deathmatch/logic/CClientMarker.cpp +++ b/Client/mods/deathmatch/logic/CClientMarker.cpp @@ -37,7 +37,7 @@ CClientMarker::CClientMarker(CClientManager* pManager, ElementID ID, int iMarker UpdateSpatialData(); } -CClientMarker::~CClientMarker(void) +CClientMarker::~CClientMarker() { // Unlink Unlink(); @@ -60,7 +60,7 @@ CClientMarker::~CClientMarker(void) } } -void CClientMarker::Unlink(void) +void CClientMarker::Unlink() { // Remove us from marker manager list m_pMarkerManager->RemoveFromList(this); @@ -102,7 +102,7 @@ bool CClientMarker::SetMatrix(const CMatrix& matrix) return true; } -void CClientMarker::DoPulse(void) +void CClientMarker::DoPulse() { // Update our position/rotation if we're attached DoAttaching(); @@ -112,7 +112,7 @@ void CClientMarker::DoPulse(void) m_pMarker->DoPulse(); } -CClientMarker::eMarkerType CClientMarker::GetMarkerType(void) const +CClientMarker::eMarkerType CClientMarker::GetMarkerType() const { // Grab the marker class type unsigned int uiMarkerType = m_pMarker->GetMarkerType(); @@ -209,7 +209,7 @@ void CClientMarker::SetMarkerType(CClientMarker::eMarkerType eType) } } -CClient3DMarker* CClientMarker::Get3DMarker(void) +CClient3DMarker* CClientMarker::Get3DMarker() { if (m_pMarker->GetMarkerType() == CClientMarkerCommon::CLASS_3DMARKER) return static_cast(m_pMarker); @@ -217,7 +217,7 @@ CClient3DMarker* CClientMarker::Get3DMarker(void) return NULL; } -CClientCheckpoint* CClientMarker::GetCheckpoint(void) +CClientCheckpoint* CClientMarker::GetCheckpoint() { if (m_pMarker->GetMarkerType() == CClientMarkerCommon::CLASS_CHECKPOINT) return static_cast(m_pMarker); @@ -225,7 +225,7 @@ CClientCheckpoint* CClientMarker::GetCheckpoint(void) return NULL; } -CClientCorona* CClientMarker::GetCorona(void) +CClientCorona* CClientMarker::GetCorona() { if (m_pMarker->GetMarkerType() == CClientMarkerCommon::CLASS_CORONA) return static_cast(m_pMarker); @@ -243,7 +243,7 @@ bool CClientMarker::IsHit(CClientEntity* pEntity) const return m_pMarker->IsHit(pEntity); } -bool CClientMarker::IsVisible(void) const +bool CClientMarker::IsVisible() const { return m_pMarker->IsVisible(); } @@ -253,7 +253,7 @@ void CClientMarker::SetVisible(bool bVisible) m_pMarker->SetVisible(bVisible); } -SColor CClientMarker::GetColor(void) const +SColor CClientMarker::GetColor() const { return m_pMarker->GetColor(); } @@ -263,7 +263,7 @@ void CClientMarker::SetColor(const SColor color) m_pMarker->SetColor(color); } -float CClientMarker::GetSize(void) const +float CClientMarker::GetSize() const { return m_pMarker->GetSize(); } @@ -346,7 +346,7 @@ bool CClientMarker::TypeToString(unsigned int uiType, SString& strOutString) } } -bool CClientMarker::IsLimitReached(void) +bool CClientMarker::IsLimitReached() { return m_uiStreamedInMarkers >= 32; } @@ -367,7 +367,7 @@ void CClientMarker::StreamIn(bool bInstantly) } } -void CClientMarker::StreamOut(void) +void CClientMarker::StreamOut() { // Streamed in? if (IsStreamedIn()) @@ -470,7 +470,7 @@ void CClientMarker::CreateOfType(int iType) } } -CSphere CClientMarker::GetWorldBoundingSphere(void) +CSphere CClientMarker::GetWorldBoundingSphere() { CSphere sphere; GetPosition(sphere.vecPosition); diff --git a/Client/mods/deathmatch/logic/CClientMarker.h b/Client/mods/deathmatch/logic/CClientMarker.h index bcf4d1d341b..58a77b64e3f 100644 --- a/Client/mods/deathmatch/logic/CClientMarker.h +++ b/Client/mods/deathmatch/logic/CClientMarker.h @@ -38,52 +38,52 @@ class CClientMarker : public CClientStreamElement, private CClientColCallback }; CClientMarker(class CClientManager* pManager, ElementID ID, int iMarkerType); - ~CClientMarker(void); + ~CClientMarker(); - void Unlink(void); + void Unlink(); void GetPosition(CVector& vecPosition) const; void SetPosition(const CVector& vecPosition); bool SetMatrix(const CMatrix& matrix); - void DoPulse(void); + void DoPulse(); - eClientEntityType GetType(void) const { return CCLIENTMARKER; } + eClientEntityType GetType() const { return CCLIENTMARKER; } - CClientMarker::eMarkerType GetMarkerType(void) const; + CClientMarker::eMarkerType GetMarkerType() const; void SetMarkerType(CClientMarker::eMarkerType eType); - class CClient3DMarker* Get3DMarker(void); - class CClientCheckpoint* GetCheckpoint(void); - class CClientCorona* GetCorona(void); + class CClient3DMarker* Get3DMarker(); + class CClientCheckpoint* GetCheckpoint(); + class CClientCorona* GetCorona(); bool IsHit(const CVector& vecPosition) const; bool IsHit(CClientEntity* pEntity) const; - bool IsVisible(void) const; + bool IsVisible() const; void SetVisible(bool bVisible); - SColor GetColor(void) const; + SColor GetColor() const; void SetColor(const SColor color); - float GetSize(void) const; + float GetSize() const; void SetSize(float fSize); static int StringToType(const char* szString); static bool TypeToString(unsigned int uiType, SString& strOutString); - static bool IsLimitReached(void); + static bool IsLimitReached(); - CClientColShape* GetColShape(void) { return m_pCollision; } + CClientColShape* GetColShape() { return m_pCollision; } void Callback_OnCollision(CClientColShape& Shape, CClientEntity& Entity); void Callback_OnLeave(CClientColShape& Shape, CClientEntity& Entity); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); protected: void StreamIn(bool bInstantly); - void StreamOut(void); + void StreamOut(); private: void CreateOfType(int iType); diff --git a/Client/mods/deathmatch/logic/CClientMarkerCommon.cpp b/Client/mods/deathmatch/logic/CClientMarkerCommon.cpp index 835bc6220ce..eceef360ea4 100644 --- a/Client/mods/deathmatch/logic/CClientMarkerCommon.cpp +++ b/Client/mods/deathmatch/logic/CClientMarkerCommon.cpp @@ -10,11 +10,11 @@ #include -CClientMarkerCommon::CClientMarkerCommon(void) +CClientMarkerCommon::CClientMarkerCommon() { } -CClientMarkerCommon::~CClientMarkerCommon(void) +CClientMarkerCommon::~CClientMarkerCommon() { } @@ -28,6 +28,6 @@ bool CClientMarkerCommon::IsHit(CClientEntity* pEntity) const return IsHit(vecPosition); } -void CClientMarkerCommon::DoPulse(void) +void CClientMarkerCommon::DoPulse() { } diff --git a/Client/mods/deathmatch/logic/CClientMarkerCommon.h b/Client/mods/deathmatch/logic/CClientMarkerCommon.h index edf182418d3..3f7e101a8aa 100644 --- a/Client/mods/deathmatch/logic/CClientMarkerCommon.h +++ b/Client/mods/deathmatch/logic/CClientMarkerCommon.h @@ -30,19 +30,19 @@ class CClientMarkerCommon ICON_INVALID, }; - CClientMarkerCommon(void); - virtual ~CClientMarkerCommon(void); + CClientMarkerCommon(); + virtual ~CClientMarkerCommon(); - virtual void DoPulse(void); - virtual unsigned int GetMarkerType(void) const = 0; + virtual void DoPulse(); + virtual unsigned int GetMarkerType() const = 0; virtual bool IsHit(const CVector& vecPosition) const = 0; bool IsHit(CClientEntity* pEntity) const; - virtual bool IsVisible(void) const = 0; + virtual bool IsVisible() const = 0; virtual void SetVisible(bool bVisible) = 0; - virtual SColor GetColor(void) const = 0; + virtual SColor GetColor() const = 0; virtual void SetColor(const SColor& color) = 0; virtual void GetPosition(CVector& vecPosition) const = 0; @@ -51,9 +51,9 @@ class CClientMarkerCommon virtual void GetMatrix(CMatrix& matrix) = 0; virtual void SetMatrix(CMatrix& matrix) = 0; - virtual float GetSize(void) const = 0; + virtual float GetSize() const = 0; virtual void SetSize(float fSize) = 0; - virtual void StreamIn(void) = 0; - virtual void StreamOut(void) = 0; + virtual void StreamIn() = 0; + virtual void StreamOut() = 0; }; diff --git a/Client/mods/deathmatch/logic/CClientMarkerManager.cpp b/Client/mods/deathmatch/logic/CClientMarkerManager.cpp index e2e65c8f971..d8defe8160d 100644 --- a/Client/mods/deathmatch/logic/CClientMarkerManager.cpp +++ b/Client/mods/deathmatch/logic/CClientMarkerManager.cpp @@ -17,7 +17,7 @@ CClientMarkerManager::CClientMarkerManager(CClientManager* pManager) m_bCanRemoveFromList = true; } -CClientMarkerManager::~CClientMarkerManager(void) +CClientMarkerManager::~CClientMarkerManager() { // Make sure all checkpoints are deleted DeleteAll(); @@ -35,7 +35,7 @@ CClientMarker* CClientMarkerManager::Get(ElementID ID) return NULL; } -void CClientMarkerManager::DeleteAll(void) +void CClientMarkerManager::DeleteAll() { // Delete each checkpoint m_bCanRemoveFromList = false; @@ -51,7 +51,7 @@ void CClientMarkerManager::DeleteAll(void) m_Markers.clear(); } -void CClientMarkerManager::DoPulse(void) +void CClientMarkerManager::DoPulse() { m_Markers.SuspendModifyOperations(); // Pulse all our markers diff --git a/Client/mods/deathmatch/logic/CClientMarkerManager.h b/Client/mods/deathmatch/logic/CClientMarkerManager.h index e0415288d8f..56fd7d1cb6a 100644 --- a/Client/mods/deathmatch/logic/CClientMarkerManager.h +++ b/Client/mods/deathmatch/logic/CClientMarkerManager.h @@ -20,14 +20,14 @@ class CClientMarkerManager friend class CClientGame; public: - unsigned int Count(void) { return static_cast(m_Markers.size()); }; + unsigned int Count() { return static_cast(m_Markers.size()); }; static CClientMarker* Get(ElementID ID); - void DeleteAll(void); + void DeleteAll(); private: CClientMarkerManager(class CClientManager* pManager); - ~CClientMarkerManager(void); - void DoPulse(void); + ~CClientMarkerManager(); + void DoPulse(); void AddToList(CClientMarker* pCheckpoint) { m_Markers.push_back(pCheckpoint); }; void RemoveFromList(CClientMarker* pCheckpoint) { diff --git a/Client/mods/deathmatch/logic/CClientMaterial.h b/Client/mods/deathmatch/logic/CClientMaterial.h index aabef95ec84..5906ba27334 100644 --- a/Client/mods/deathmatch/logic/CClientMaterial.h +++ b/Client/mods/deathmatch/logic/CClientMaterial.h @@ -14,5 +14,5 @@ class CClientMaterial : public CClientRenderElement public: CClientMaterial(CClientManager* pManager, ElementID ID) : ClassInit(this), CClientRenderElement(pManager, ID) {} - CMaterialItem* GetMaterialItem(void) { return (CMaterialItem*)m_pRenderItem; } + CMaterialItem* GetMaterialItem() { return (CMaterialItem*)m_pRenderItem; } }; diff --git a/Client/mods/deathmatch/logic/CClientModelCacheManager.cpp b/Client/mods/deathmatch/logic/CClientModelCacheManager.cpp index e777ae2b7cb..30e33fe00c9 100644 --- a/Client/mods/deathmatch/logic/CClientModelCacheManager.cpp +++ b/Client/mods/deathmatch/logic/CClientModelCacheManager.cpp @@ -36,20 +36,20 @@ class CClientModelCacheManagerImpl : public CClientModelCacheManager ZERO_ON_NEW // CClientModelCacheManager interface - virtual void DoPulse(void); + virtual void DoPulse(); virtual void OnRestreamModel(ushort usModelId); // CClientModelCacheManagerImpl methods - CClientModelCacheManagerImpl(void); - ~CClientModelCacheManagerImpl(void); + CClientModelCacheManagerImpl(); + ~CClientModelCacheManagerImpl(); - void DoPulsePedModels(void); - void DoPulseVehicleModels(void); + void DoPulsePedModels(); + void DoPulseVehicleModels(); void ProcessPlayerList(std::map& outNeedCacheList, const std::vector& playerList, float fMaxStreamDistanceSq); void ProcessPedList(std::map& outNeedCacheList, const std::vector& pedList, float fMaxStreamDistanceSq); void ProcessVehicleList(std::map& outNeedCacheList, const std::vector& vehicleList, float fMaxStreamDistanceSq); void InsertIntoNeedCacheList(std::map& outNeedCacheList, ushort usModelId, float fDistSq); - void ClearStats(void); + void ClearStats(); void AddProcessStat(const char* szTag, bool bCache, ePuresyncType syncType, ushort usModelId, const CVector& vecStartPos, const CVector& vecEndPos); protected: @@ -79,7 +79,7 @@ CClientModelCacheManager* NewClientModelCacheManager() // CClientModelCacheManagerImpl::CClientModelCacheManagerImpl // /////////////////////////////////////////////////////////////// -CClientModelCacheManagerImpl::CClientModelCacheManagerImpl(void) +CClientModelCacheManagerImpl::CClientModelCacheManagerImpl() { m_pCoreModelCacheManager = g_pCore->GetModelCacheManager(); } @@ -89,7 +89,7 @@ CClientModelCacheManagerImpl::CClientModelCacheManagerImpl(void) // CClientModelCacheManagerImpl::~CClientModelCacheManagerImpl // /////////////////////////////////////////////////////////////// -CClientModelCacheManagerImpl::~CClientModelCacheManagerImpl(void) +CClientModelCacheManagerImpl::~CClientModelCacheManagerImpl() { m_pCoreModelCacheManager->OnClientClose(); } @@ -99,7 +99,7 @@ CClientModelCacheManagerImpl::~CClientModelCacheManagerImpl(void) // CClientModelCacheManagerImpl::DoPulse // /////////////////////////////////////////////////////////////// -void CClientModelCacheManagerImpl::DoPulse(void) +void CClientModelCacheManagerImpl::DoPulse() { m_TickCountNow = CTickCount::Now(); ClearStats(); @@ -159,7 +159,7 @@ void CClientModelCacheManagerImpl::DoPulse(void) // Pulse caching system for ped models // /////////////////////////////////////////////////////////////// -void CClientModelCacheManagerImpl::DoPulsePedModels(void) +void CClientModelCacheManagerImpl::DoPulsePedModels() { // Scale up query radius to compensate for the camera speed and possible ped speeds float fPedQueryRadius = PED_STREAM_IN_DISTANCE + STREAMER_STREAM_OUT_EXTRA_DISTANCE + m_fSmoothCameraSpeed * 2 + PED_MAX_VELOCITY * 2; @@ -202,7 +202,7 @@ void CClientModelCacheManagerImpl::DoPulsePedModels(void) // Pulse caching system for vehicle models // /////////////////////////////////////////////////////////////// -void CClientModelCacheManagerImpl::DoPulseVehicleModels(void) +void CClientModelCacheManagerImpl::DoPulseVehicleModels() { // Scale up query radius to compensate for the camera speed and possible vehicle speeds float fVehicleQueryRadius = VEHICLE_STREAM_IN_DISTANCE + STREAMER_STREAM_OUT_EXTRA_DISTANCE + m_fSmoothCameraSpeed * 2 + VEHICLE_MAX_VELOCITY * 2; @@ -483,7 +483,7 @@ void CClientModelCacheManagerImpl::InsertIntoNeedCacheList(std::map::iterator iter; @@ -247,7 +247,7 @@ void CClientModelRequestManager::Cancel(CClientEntity* pEntity, bool bAllowQueue } } -void CClientModelRequestManager::DoPulse(void) +void CClientModelRequestManager::DoPulse() { // Any requests? if (m_Requests.size() > 0) diff --git a/Client/mods/deathmatch/logic/CClientModelRequestManager.h b/Client/mods/deathmatch/logic/CClientModelRequestManager.h index 8c617e87c1c..b05aefc2a68 100644 --- a/Client/mods/deathmatch/logic/CClientModelRequestManager.h +++ b/Client/mods/deathmatch/logic/CClientModelRequestManager.h @@ -28,8 +28,8 @@ class CClientModelRequestManager friend class CClientManager; public: - CClientModelRequestManager(void); - ~CClientModelRequestManager(void); + CClientModelRequestManager(); + ~CClientModelRequestManager(); bool IsLoaded(unsigned short usModelID); bool IsRequested(CModelInfo* pModelInfo); @@ -42,7 +42,7 @@ class CClientModelRequestManager void Cancel(CClientEntity* pRequester, bool bAllowQueue); private: - void DoPulse(void); + void DoPulse(); bool GetRequestEntry(CClientEntity* pRequester, std::list::iterator& iter); bool m_bDoingPulse; diff --git a/Client/mods/deathmatch/logic/CClientObject.cpp b/Client/mods/deathmatch/logic/CClientObject.cpp index fb57e082178..1fdfff052ba 100644 --- a/Client/mods/deathmatch/logic/CClientObject.cpp +++ b/Client/mods/deathmatch/logic/CClientObject.cpp @@ -55,7 +55,7 @@ CClientObject::CClientObject(CClientManager* pManager, ElementID ID, unsigned sh m_pManager->OnLowLODElementCreated(); } -CClientObject::~CClientObject(void) +CClientObject::~CClientObject() { // Unrequest whatever we've requested or we'll crash in unlucky situations m_pModelRequester->Cancel(this, false); @@ -73,7 +73,7 @@ CClientObject::~CClientObject(void) m_pManager->OnLowLODElementDestroyed(); } -void CClientObject::Unlink(void) +void CClientObject::Unlink() { m_pObjectManager->RemoveFromLists(this); g_pClientGame->GetObjectRespawner()->Unreference(this); @@ -224,7 +224,7 @@ void CClientObject::ModelRequestCallback(CModelInfo* pModelInfo) Create(); } -float CClientObject::GetDistanceFromCentreOfMassToBaseOfModel(void) +float CClientObject::GetDistanceFromCentreOfMassToBaseOfModel() { if (m_pObject) { @@ -243,7 +243,7 @@ void CClientObject::SetVisible(bool bVisible) } // Call this when m_bIsVisible, m_IsHiddenLowLod or m_pObject is changed -void CClientObject::UpdateVisibility(void) +void CClientObject::UpdateVisibility() { if (m_pObject) { @@ -272,7 +272,7 @@ void CClientObject::SetModel(unsigned short usModel) } } -bool CClientObject::IsLowLod(void) +bool CClientObject::IsLowLod() { return m_bIsLowLod; } @@ -314,14 +314,14 @@ bool CClientObject::SetLowLodObject(CClientObject* pNewLowLodObject) } } -CClientObject* CClientObject::GetLowLodObject(void) +CClientObject* CClientObject::GetLowLodObject() { if (m_bIsLowLod) return NULL; return m_pLowLodObject; } -void CClientObject::Render(void) +void CClientObject::Render() { if (m_pObject) { @@ -399,7 +399,7 @@ void CClientObject::SetCollisionEnabled(bool bCollisionEnabled) m_bUsesCollision = bCollisionEnabled; } -float CClientObject::GetHealth(void) +float CClientObject::GetHealth() { if (m_pObject) { @@ -450,7 +450,7 @@ void CClientObject::StreamIn(bool bInstantly) } } -void CClientObject::StreamOut(void) +void CClientObject::StreamOut() { // Save the health if (m_pObject) @@ -470,7 +470,7 @@ void CClientObject::StreamOut(void) } // Don't call this function directly by lua functions -void CClientObject::ReCreate(void) +void CClientObject::ReCreate() { m_fHealth = 1000.0f; @@ -480,7 +480,7 @@ void CClientObject::ReCreate(void) Create(); } -void CClientObject::Create(void) +void CClientObject::Create() { // Not already created an object? if (!m_pObject) @@ -562,7 +562,7 @@ void CClientObject::Create(void) } } -void CClientObject::Destroy(void) +void CClientObject::Destroy() { // If the object exists if (m_pObject) @@ -581,18 +581,18 @@ void CClientObject::Destroy(void) } } -void CClientObject::NotifyCreate(void) +void CClientObject::NotifyCreate() { m_pObjectManager->OnCreation(this); CClientStreamElement::NotifyCreate(); } -void CClientObject::NotifyDestroy(void) +void CClientObject::NotifyDestroy() { m_pObjectManager->OnDestruction(this); } -void CClientObject::StreamedInPulse(void) +void CClientObject::StreamedInPulse() { // Some things to do if low LOD object if (m_bIsLowLod) @@ -684,7 +684,7 @@ void CClientObject::SetTurnSpeed(const CVector& vecTurnSpeed) m_vecTurnSpeed = vecTurnSpeed; } -CSphere CClientObject::GetWorldBoundingSphere(void) +CSphere CClientObject::GetWorldBoundingSphere() { CSphere sphere; CModelInfo* pModelInfo = g_pGame->GetModelInfo(GetModel()); @@ -723,7 +723,7 @@ bool CClientObject::SetBreakable(bool bBreakable) return false; } -bool CClientObject::Break(void) +bool CClientObject::Break() { // Are we breakable? if (m_pObject && CClientObjectManager::IsBreakableModel(m_usModel) && !m_bBreakingDisabled) @@ -734,7 +734,7 @@ bool CClientObject::Break(void) return false; } -float CClientObject::GetMass(void) +float CClientObject::GetMass() { if (m_pObject) return m_pObject->GetMass(); @@ -750,7 +750,7 @@ void CClientObject::SetMass(float fMass) m_fMass = fMass; } -float CClientObject::GetTurnMass(void) +float CClientObject::GetTurnMass() { if (m_pObject) return m_pObject->GetTurnMass(); @@ -766,7 +766,7 @@ void CClientObject::SetTurnMass(float fTurnMass) m_fTurnMass = fTurnMass; } -float CClientObject::GetAirResistance(void) +float CClientObject::GetAirResistance() { if (m_pObject) return m_pObject->GetAirResistance(); @@ -782,7 +782,7 @@ void CClientObject::SetAirResistance(float fAirResistance) m_fAirResistance = fAirResistance; } -float CClientObject::GetElasticity(void) +float CClientObject::GetElasticity() { if (m_pObject) return m_pObject->GetElasticity(); @@ -798,7 +798,7 @@ void CClientObject::SetElasticity(float fElasticity) m_fElasticity = fElasticity; } -float CClientObject::GetBuoyancyConstant(void) +float CClientObject::GetBuoyancyConstant() { if (m_pObject) return m_pObject->GetBuoyancyConstant(); diff --git a/Client/mods/deathmatch/logic/CClientObject.h b/Client/mods/deathmatch/logic/CClientObject.h index 39d225d18d2..332453875bf 100644 --- a/Client/mods/deathmatch/logic/CClientObject.h +++ b/Client/mods/deathmatch/logic/CClientObject.h @@ -29,19 +29,19 @@ class CClientObject : public CClientStreamElement public: CClientObject(class CClientManager* pManager, ElementID ID, unsigned short usModel, bool bLowLod); - ~CClientObject(void); + ~CClientObject(); - void Unlink(void); + void Unlink(); - eClientEntityType GetType(void) const { return CCLIENTOBJECT; }; + eClientEntityType GetType() const { return CCLIENTOBJECT; }; - CObject* GetGameObject(void) { return m_pObject; } - CEntity* GetGameEntity(void) { return m_pObject; } - const CEntity* GetGameEntity(void) const { return m_pObject; } + CObject* GetGameObject() { return m_pObject; } + CEntity* GetGameEntity() { return m_pObject; } + const CEntity* GetGameEntity() const { return m_pObject; } void GetPosition(CVector& vecPosition) const; void SetPosition(const CVector& vecPosition); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); void GetRotationDegrees(CVector& vecRotation) const; void GetRotationRadians(CVector& vecRotation) const; @@ -61,73 +61,73 @@ class CClientObject : public CClientStreamElement void ModelRequestCallback(CModelInfo* pModelInfo); - float GetDistanceFromCentreOfMassToBaseOfModel(void); + float GetDistanceFromCentreOfMassToBaseOfModel(); - bool IsVisible(void) { return m_bIsVisible; }; + bool IsVisible() { return m_bIsVisible; }; void SetVisible(bool bVisible); - unsigned short GetModel(void) const { return m_usModel; }; + unsigned short GetModel() const { return m_usModel; }; void SetModel(unsigned short usModel); - bool IsLowLod(void); + bool IsLowLod(); bool SetLowLodObject(CClientObject* pLowLodObject); - CClientObject* GetLowLodObject(void); + CClientObject* GetLowLodObject(); - void Render(void); + void Render(); - bool IsFrozen(void) { return m_bIsFrozen; } + bool IsFrozen() { return m_bIsFrozen; } void SetFrozen(bool bFrozen); - unsigned char GetAlpha(void) { return m_ucAlpha; } + unsigned char GetAlpha() { return m_ucAlpha; } void SetAlpha(unsigned char ucAlpha); void GetScale(CVector& vecScale) const; void SetScale(const CVector& vecScale); - bool IsCollisionEnabled(void) { return m_bUsesCollision; }; + bool IsCollisionEnabled() { return m_bUsesCollision; }; void SetCollisionEnabled(bool bCollisionEnabled); - float GetHealth(void); + float GetHealth(); void SetHealth(float fHealth); - float GetTurnMass(void); + float GetTurnMass(); void SetTurnMass(float fTurnMass); - float GetAirResistance(void); + float GetAirResistance(); void SetAirResistance(float fAirResistance); - float GetElasticity(void); + float GetElasticity(); void SetElasticity(float fElasticity); - float GetBuoyancyConstant(void); + float GetBuoyancyConstant(); void SetBuoyancyConstant(float fBuoyancyConstant); void GetCenterOfMass(CVector& vecCenterOfMass) const; void SetCenterOfMass(const CVector& vecCenterOfMass); bool IsBreakable(bool bCheckModelList = true); bool SetBreakable(bool bBreakable); - bool Break(void); - bool IsRespawnEnabled(void) { return m_bRespawnEnabled; }; + bool Break(); + bool IsRespawnEnabled() { return m_bRespawnEnabled; }; void SetRespawnEnabled(bool bRespawnEnabled) { m_bRespawnEnabled = bRespawnEnabled; }; - float GetMass(void); + float GetMass(); void SetMass(float fMass); - bool IsVisibleInAllDimensions(void) { return m_bVisibleInAllDimensions; }; + bool IsVisibleInAllDimensions() { return m_bVisibleInAllDimensions; }; void SetVisibleInAllDimensions(bool bVisible, unsigned short usNewDimension = 0); - void ReCreate(void); - void UpdateVisibility(void); + void ReCreate(); + void UpdateVisibility(); - bool IsBeingRespawned(void) { return m_bBeingRespawned; }; + bool IsBeingRespawned() { return m_bBeingRespawned; }; void SetBeingRespawned(bool bBeingRespawned) { m_bBeingRespawned = bBeingRespawned; }; protected: void StreamIn(bool bInstantly); - void StreamOut(void); + void StreamOut(); - void Create(void); - void Destroy(void); + void Create(); + void Destroy(); - void NotifyCreate(void); - void NotifyDestroy(void); + void NotifyCreate(); + void NotifyDestroy(); - void StreamedInPulse(void); + void StreamedInPulse(); class CClientObjectManager* m_pObjectManager; class CClientModelRequestManager* m_pModelRequester; diff --git a/Client/mods/deathmatch/logic/CClientObjectManager.cpp b/Client/mods/deathmatch/logic/CClientObjectManager.cpp index b1b93b84d75..a6164c0d5e0 100644 --- a/Client/mods/deathmatch/logic/CClientObjectManager.cpp +++ b/Client/mods/deathmatch/logic/CClientObjectManager.cpp @@ -90,13 +90,13 @@ CClientObjectManager::CClientObjectManager(CClientManager* pManager) m_uiMaxLowLodStreamedInCount = MAX_OBJECTS_MTA - m_uiMaxStreamedInCount; } -CClientObjectManager::~CClientObjectManager(void) +CClientObjectManager::~CClientObjectManager() { // Destroy all objects DeleteAll(); } -void CClientObjectManager::DoPulse(void) +void CClientObjectManager::DoPulse() { UpdateLimitInfo(); @@ -112,7 +112,7 @@ void CClientObjectManager::DoPulse(void) assert(m_uiLowLodStreamedInCount + m_uiStreamedInCount == m_StreamedIn.size()); } -void CClientObjectManager::DeleteAll(void) +void CClientObjectManager::DeleteAll() { // Delete all the objects m_bCanRemoveFromList = false; @@ -275,7 +275,7 @@ void CClientObjectManager::OnDestruction(CClientObject* pObject) UpdateLimitInfo(); } -void CClientObjectManager::UpdateLimitInfo(void) +void CClientObjectManager::UpdateLimitInfo() { CPools* pPools = g_pGame->GetPools(); m_iEntryInfoNodeEntries = pPools->GetEntryInfoNodePool()->GetNumberOfUsedSpaces(); @@ -283,31 +283,31 @@ void CClientObjectManager::UpdateLimitInfo(void) m_iPointerNodeDoubleLinkEntries = pPools->GetPointerNodeDoubleLinkPool()->GetNumberOfUsedSpaces(); } -bool CClientObjectManager::StaticIsObjectLimitReached(void) +bool CClientObjectManager::StaticIsObjectLimitReached() { return g_pClientGame->GetObjectManager()->IsObjectLimitReached(); } -bool CClientObjectManager::StaticIsLowLodObjectLimitReached(void) +bool CClientObjectManager::StaticIsLowLodObjectLimitReached() { return g_pClientGame->GetObjectManager()->IsLowLodObjectLimitReached(); } -bool CClientObjectManager::IsObjectLimitReached(void) +bool CClientObjectManager::IsObjectLimitReached() { if (IsHardObjectLimitReached() || m_uiStreamedInCount >= m_uiMaxStreamedInCount) return true; return false; } -bool CClientObjectManager::IsLowLodObjectLimitReached(void) +bool CClientObjectManager::IsLowLodObjectLimitReached() { if (IsHardObjectLimitReached() || m_uiLowLodStreamedInCount >= m_uiMaxLowLodStreamedInCount) return true; return false; } -bool CClientObjectManager::IsHardObjectLimitReached(void) +bool CClientObjectManager::IsHardObjectLimitReached() { if (m_uiStreamedInCount + m_uiLowLodStreamedInCount >= MAX_OBJECTS_MTA) return true; diff --git a/Client/mods/deathmatch/logic/CClientObjectManager.h b/Client/mods/deathmatch/logic/CClientObjectManager.h index 683345afdca..da748395e22 100644 --- a/Client/mods/deathmatch/logic/CClientObjectManager.h +++ b/Client/mods/deathmatch/logic/CClientObjectManager.h @@ -19,14 +19,14 @@ class CClientObjectManager public: ZERO_ON_NEW CClientObjectManager(class CClientManager* pManager); - ~CClientObjectManager(void); + ~CClientObjectManager(); - void DoPulse(void); + void DoPulse(); - void DeleteAll(void); + void DeleteAll(); - unsigned int Count(void) { return static_cast(m_Objects.size()); }; - unsigned int CountCreatedObjects(void) { return static_cast(g_pGame->GetPools()->GetObjectCount()); }; + unsigned int Count() { return static_cast(m_Objects.size()); }; + unsigned int CountCreatedObjects() { return static_cast(g_pGame->GetPools()->GetObjectCount()); }; static CClientObject* Get(ElementID ID); static bool IsValidModel(unsigned long ulObjectModel); @@ -34,11 +34,11 @@ class CClientObjectManager bool Exists(CClientObject* pObject); bool ObjectsAroundPointLoaded(const CVector& vecPosition, float fRadius, unsigned short usDimension, SString* pstrStatus = NULL); - static bool StaticIsObjectLimitReached(void); - static bool StaticIsLowLodObjectLimitReached(void); - bool IsObjectLimitReached(void); - bool IsLowLodObjectLimitReached(void); - bool IsHardObjectLimitReached(void); + static bool StaticIsObjectLimitReached(); + static bool StaticIsLowLodObjectLimitReached(); + bool IsObjectLimitReached(); + bool IsLowLodObjectLimitReached(); + bool IsHardObjectLimitReached(); void RestreamObjects(unsigned short usModel); @@ -49,7 +49,7 @@ class CClientObjectManager void OnDestruction(CClientObject* pObject); protected: - void UpdateLimitInfo(void); + void UpdateLimitInfo(); int m_iEntryInfoNodeEntries; int m_iPointerNodeSingleLinkEntries; diff --git a/Client/mods/deathmatch/logic/CClientPacketRecorder.cpp b/Client/mods/deathmatch/logic/CClientPacketRecorder.cpp index 8a736fb36fb..9c96b2b54cd 100644 --- a/Client/mods/deathmatch/logic/CClientPacketRecorder.cpp +++ b/Client/mods/deathmatch/logic/CClientPacketRecorder.cpp @@ -30,7 +30,7 @@ CClientPacketRecorder::CClientPacketRecorder(CClientManager* pManager) m_uiFrameSkip = 1; } -CClientPacketRecorder::~CClientPacketRecorder(void) +CClientPacketRecorder::~CClientPacketRecorder() { Stop(); } @@ -111,7 +111,7 @@ void CClientPacketRecorder::StartRecord(const char* szOutput, bool bFrameBased) } } -void CClientPacketRecorder::Stop(void) +void CClientPacketRecorder::Stop() { // Delete the filename if (m_szFilename) @@ -129,22 +129,22 @@ void CClientPacketRecorder::Stop(void) m_lNextPacketTime = 0; } -bool CClientPacketRecorder::IsPlaying(void) +bool CClientPacketRecorder::IsPlaying() { return m_bPlaying; } -bool CClientPacketRecorder::IsRecording(void) +bool CClientPacketRecorder::IsRecording() { return m_bRecording; } -bool CClientPacketRecorder::IsPlayingOrRecording(void) +bool CClientPacketRecorder::IsPlayingOrRecording() { return m_bPlaying || m_bRecording; } -bool CClientPacketRecorder::IsFrameBased(void) +bool CClientPacketRecorder::IsFrameBased() { return m_bFrameBased; } @@ -336,7 +336,7 @@ void CClientPacketRecorder::ReadLocalData(FILE* pFile) } bool bHack = false; -void CClientPacketRecorder::DoPulse(void) +void CClientPacketRecorder::DoPulse() { // Count the frame m_lFrames += m_uiFrameSkip; diff --git a/Client/mods/deathmatch/logic/CClientPacketRecorder.h b/Client/mods/deathmatch/logic/CClientPacketRecorder.h index efa808ea96f..c56b9c90bf1 100644 --- a/Client/mods/deathmatch/logic/CClientPacketRecorder.h +++ b/Client/mods/deathmatch/logic/CClientPacketRecorder.h @@ -21,18 +21,18 @@ class CClientPacketRecorder public: CClientPacketRecorder(CClientManager* pManager); - ~CClientPacketRecorder(void); + ~CClientPacketRecorder(); void SetPacketHandler(PPACKETHANDLER pfnPacketHandler); void StartPlayback(const char* szInput, bool bFrameBased); void StartRecord(const char* szOutput, bool bFrameBased); - void Stop(void); + void Stop(); - bool IsPlaying(void); - bool IsRecording(void); - bool IsPlayingOrRecording(void); - bool IsFrameBased(void); + bool IsPlaying(); + bool IsRecording(); + bool IsPlayingOrRecording(); + bool IsFrameBased(); void SetFrameSkip(unsigned int uiFrameSkip); @@ -42,7 +42,7 @@ class CClientPacketRecorder private: void ReadLocalData(FILE* pFile); - void DoPulse(void); + void DoPulse(); CClientManager* m_pManager; char* m_szFilename; diff --git a/Client/mods/deathmatch/logic/CClientPad.cpp b/Client/mods/deathmatch/logic/CClientPad.cpp index df247def603..fd72aa7309e 100644 --- a/Client/mods/deathmatch/logic/CClientPad.cpp +++ b/Client/mods/deathmatch/logic/CClientPad.cpp @@ -106,7 +106,7 @@ const char* CClientPad::GetControlName(unsigned int uiIndex) return NULL; } -CClientPad::CClientPad(void) +CClientPad::CClientPad() { memset(&m_fStates, 0, sizeof(m_fStates)); diff --git a/Client/mods/deathmatch/logic/CClientPad.h b/Client/mods/deathmatch/logic/CClientPad.h index f4f505273e1..b5a281b7c53 100644 --- a/Client/mods/deathmatch/logic/CClientPad.h +++ b/Client/mods/deathmatch/logic/CClientPad.h @@ -24,7 +24,7 @@ class CClientPad static bool GetAnalogControlIndex(const char* szName, unsigned int& uiIndex); - CClientPad(void); + CClientPad(); bool GetControlState(const char* szName, bool& bState); bool SetControlState(const char* szName, bool bState); diff --git a/Client/mods/deathmatch/logic/CClientPathManager.cpp b/Client/mods/deathmatch/logic/CClientPathManager.cpp index 97a18a56efb..906032fe113 100644 --- a/Client/mods/deathmatch/logic/CClientPathManager.cpp +++ b/Client/mods/deathmatch/logic/CClientPathManager.cpp @@ -21,13 +21,13 @@ CClientPathManager::CClientPathManager(CClientManager* pManager) m_bRemoveFromList = true; } -CClientPathManager::~CClientPathManager(void) +CClientPathManager::~CClientPathManager() { // Destroy all path nodes DeleteAll(); } -void CClientPathManager::DeleteAll(void) +void CClientPathManager::DeleteAll() { // Delete all nodes in the list m_bRemoveFromList = false; @@ -43,7 +43,7 @@ void CClientPathManager::DeleteAll(void) m_bRemoveFromList = true; } -void CClientPathManager::DoPulse(void) +void CClientPathManager::DoPulse() { list::const_iterator iter = m_PathNodeList.begin(); for (; iter != m_PathNodeList.end(); ++iter) @@ -52,7 +52,7 @@ void CClientPathManager::DoPulse(void) } } -void CClientPathManager::LinkNodes(void) +void CClientPathManager::LinkNodes() { // Link our nodes with the IDs list::const_iterator iterList = m_PathNodeList.begin(); diff --git a/Client/mods/deathmatch/logic/CClientPathManager.h b/Client/mods/deathmatch/logic/CClientPathManager.h index e01322ee54b..5e214d81501 100644 --- a/Client/mods/deathmatch/logic/CClientPathManager.h +++ b/Client/mods/deathmatch/logic/CClientPathManager.h @@ -22,22 +22,22 @@ class CClientPathManager friend class CClientPathNode; public: - void DeleteAll(void); + void DeleteAll(); - void DoPulse(void); - void LinkNodes(void); + void DoPulse(); + void LinkNodes(); void ReverseNodes(CClientPathNode* pPathNode); bool DetachEntity(CClientEntity* pEntity); - unsigned int Count(void) { return static_cast(m_PathNodeList.size()); } + unsigned int Count() { return static_cast(m_PathNodeList.size()); } static CClientPathNode* Get(ElementID ID); - std::list::iterator IterBegin(void) { return m_PathNodeList.begin(); } - std::list::iterator IterEnd(void) { return m_PathNodeList.end(); } + std::list::iterator IterBegin() { return m_PathNodeList.begin(); } + std::list::iterator IterEnd() { return m_PathNodeList.end(); } private: CClientPathManager(CClientManager* pManager); - ~CClientPathManager(void); + ~CClientPathManager(); void AddToList(CClientPathNode* pPathNode) { m_PathNodeList.push_back(pPathNode); } void RemoveFromList(CClientPathNode* pPathNode); diff --git a/Client/mods/deathmatch/logic/CClientPathNode.cpp b/Client/mods/deathmatch/logic/CClientPathNode.cpp index 2ce3e457528..65b9582e182 100644 --- a/Client/mods/deathmatch/logic/CClientPathNode.cpp +++ b/Client/mods/deathmatch/logic/CClientPathNode.cpp @@ -30,7 +30,7 @@ CClientPathNode::CClientPathNode(CClientManager* pManager, CVector& vecPosition, m_pPathManager->AddToList(this); } -CClientPathNode::~CClientPathNode(void) +CClientPathNode::~CClientPathNode() { Unlink(); @@ -40,12 +40,12 @@ CClientPathNode::~CClientPathNode(void) m_pNextNode->SetPreviousNode(NULL); } -void CClientPathNode::Unlink(void) +void CClientPathNode::Unlink() { m_pPathManager->RemoveFromList(this); } -void CClientPathNode::DoPulse(void) +void CClientPathNode::DoPulse() { list::iterator iter = m_List.begin(); for (; iter != m_List.end(); iter++) diff --git a/Client/mods/deathmatch/logic/CClientPathNode.h b/Client/mods/deathmatch/logic/CClientPathNode.h index e679078b3df..cc1bdf48d0a 100644 --- a/Client/mods/deathmatch/logic/CClientPathNode.h +++ b/Client/mods/deathmatch/logic/CClientPathNode.h @@ -27,23 +27,23 @@ class CClientPathNode : public CClientEntity }; CClientPathNode(CClientManager* pManager, CVector& vecPosition, CVector& vecRotation, int iTime, ElementID ID, ePathNodeStyle PathStyle = PATH_STYLE_JUMP, CClientPathNode* pNextNode = NULL); - ~CClientPathNode(void); + ~CClientPathNode(); - void Unlink(void); + void Unlink(); - void DoPulse(void); + void DoPulse(); - eClientEntityType GetType(void) const { return CCLIENTPATHNODE; } + eClientEntityType GetType() const { return CCLIENTPATHNODE; } void GetPosition(CVector& vecPosition) const { vecPosition = m_vecPosition; } void SetPosition(const CVector& vecPosition) { m_vecPosition = vecPosition; } void GetRotationRadians(CVector& vecRotation) const { vecRotation = m_vecRotation; } void SetRotationRadians(const CVector& vecRotation) { m_vecRotation = vecRotation; } - int GetTime(void) { return m_iTime; } - ePathNodeStyle GetStyle(void) { return m_Style; } - CClientPathNode* GetPreviousNode(void) { return m_pPreviousNode; } + int GetTime() { return m_iTime; } + ePathNodeStyle GetStyle() { return m_Style; } + CClientPathNode* GetPreviousNode() { return m_pPreviousNode; } void SetPreviousNode(CClientPathNode* pPathNode) { m_pPreviousNode = pPathNode; } - CClientPathNode* GetNextNode(void) { return m_pNextNode; } + CClientPathNode* GetNextNode() { return m_pNextNode; } void SetNextNode(CClientPathNode* pPathNode) { m_pNextNode = pPathNode; } void SetNextNodeID(ElementID ID) { m_NextNodeID = ID; } @@ -55,8 +55,8 @@ class CClientPathNode : public CClientEntity } bool IsEntityAttached(CClientEntity* pEntity); - std::list::iterator AttachedIterBegin(void) { return m_List.begin(); } - std::list::iterator AttachedIterEnd(void) { return m_List.end(); } + std::list::iterator AttachedIterBegin() { return m_List.begin(); } + std::list::iterator AttachedIterEnd() { return m_List.end(); } private: CClientPathManager* m_pPathManager; diff --git a/Client/mods/deathmatch/logic/CClientPed.cpp b/Client/mods/deathmatch/logic/CClientPed.cpp index a54edf4fab6..720e6865b60 100644 --- a/Client/mods/deathmatch/logic/CClientPed.cpp +++ b/Client/mods/deathmatch/logic/CClientPed.cpp @@ -243,7 +243,7 @@ void CClientPed::Init(CClientManager* pManager, unsigned long ulModelID, bool bI g_pClientGame->InsertPedPointerToSet(this); } -CClientPed::~CClientPed(void) +CClientPed::~CClientPed() { // A hack to destroy custom animation by playing a default internal animation. // When IFP is unloaded by leaving the server, the pointer to its animations might @@ -402,7 +402,7 @@ float CClientPed::GetStat(unsigned short usStat) } } -void CClientPed::ResetStats(void) +void CClientPed::ResetStats() { // stats for (unsigned short us = 0; us <= NUM_PLAYER_STATS; us++) @@ -740,7 +740,7 @@ void CClientPed::Spawn(const CVector& vecPosition, float fRotation, unsigned sho SetIsDead(false); } -void CClientPed::ResetInterpolation(void) +void CClientPed::ResetInterpolation() { m_ulBeginRotationTime = 0; m_ulEndRotationTime = 0; @@ -750,7 +750,7 @@ void CClientPed::ResetInterpolation(void) RemoveTargetPosition(); } -float CClientPed::GetCameraRotation(void) +float CClientPed::GetCameraRotation() { // Local player if (m_bIsLocalPlayer) @@ -1040,7 +1040,7 @@ bool CClientPed::SetModel(unsigned long ulModel, bool bTemp) return false; } -bool CClientPed::GetCanBeKnockedOffBike(void) +bool CClientPed::GetCanBeKnockedOffBike() { if (m_pPlayerPed) { @@ -1078,7 +1078,7 @@ CVector* CClientPed::GetTransformedBonePosition(eBone bone, CVector& vecPosition return NULL; } -CClientVehicle* CClientPed::GetRealOccupiedVehicle(void) +CClientVehicle* CClientPed::GetRealOccupiedVehicle() { if (m_pPlayerPed) { @@ -1520,7 +1520,7 @@ void CClientPed::WarpIntoVehicle(CClientVehicle* pVehicle, unsigned int uiSeat) } } -void CClientPed::ResetToOutOfVehicleWeapon(void) +void CClientPed::ResetToOutOfVehicleWeapon() { if (m_pOutOfVehicleWeaponSlot != WEAPONSLOT_MAX) { @@ -1613,7 +1613,7 @@ CClientVehicle* CClientPed::RemoveFromVehicle(bool bSkipWarpIfGettingOut) return pVehicle; } -bool CClientPed::IsVisible(void) +bool CClientPed::IsVisible() { if (m_pPlayerPed) { @@ -1631,7 +1631,7 @@ void CClientPed::SetVisible(bool bVisible) m_bVisible = bVisible; } -bool CClientPed::GetUsesCollision(void) +bool CClientPed::GetUsesCollision() { /* if ( m_pPlayerPed ) @@ -1654,7 +1654,7 @@ void CClientPed::SetUsesCollision(bool bUsesCollision) } } -float CClientPed::GetMaxHealth(void) +float CClientPed::GetMaxHealth() { // TODO: Verify this formula @@ -1671,7 +1671,7 @@ float CClientPed::GetMaxHealth(void) return fMaxHealth; } -float CClientPed::GetHealth(void) +float CClientPed::GetHealth() { if (m_bHealthLocked) return m_fHealth; @@ -1738,7 +1738,7 @@ void CClientPed::InternalSetHealth(float fHealth) } } -float CClientPed::GetArmor(void) +float CClientPed::GetArmor() { if (m_bArmorLocked) return m_fArmor; @@ -1775,7 +1775,7 @@ void CClientPed::LockArmor(float fArmor) m_fArmor = fArmor; } -float CClientPed::GetOxygenLevel(void) +float CClientPed::GetOxygenLevel() { if (m_pPlayerPed) { @@ -1792,7 +1792,7 @@ void CClientPed::SetOxygenLevel(float fOxygen) } } -bool CClientPed::IsDying(void) +bool CClientPed::IsDying() { if (m_pPlayerPed) { @@ -1809,7 +1809,7 @@ bool CClientPed::IsDying(void) return false; } -bool CClientPed::IsDead(void) +bool CClientPed::IsDead() { if (m_pPlayerPed) { @@ -1954,7 +1954,7 @@ void CClientPed::SetFrozen(bool bFrozen) } } -bool CClientPed::IsFrozenWaitingForGroundToLoad(void) const +bool CClientPed::IsFrozenWaitingForGroundToLoad() const { return m_bFrozenWaitingForGroundToLoad; } @@ -2155,7 +2155,7 @@ bool CClientPed::SetCurrentWeaponSlot(eWeaponSlot weaponSlot) return false; } -eWeaponSlot CClientPed::GetCurrentWeaponSlot(void) +eWeaponSlot CClientPed::GetCurrentWeaponSlot() { if (m_pPlayerPed) { @@ -2164,7 +2164,7 @@ eWeaponSlot CClientPed::GetCurrentWeaponSlot(void) return m_CurrentWeaponSlot; } -eWeaponType CClientPed::GetCurrentWeaponType(void) +eWeaponType CClientPed::GetCurrentWeaponType() { if (m_pPlayerPed) { @@ -2177,13 +2177,13 @@ eWeaponType CClientPed::GetCurrentWeaponType(void) return WEAPONTYPE_UNARMED; } -bool CClientPed::IsCurrentWeaponUsingBulletSync(void) +bool CClientPed::IsCurrentWeaponUsingBulletSync() { eWeaponType weaponType = GetCurrentWeaponType(); return g_pClientGame->GetWeaponTypeUsesBulletSync(weaponType); } -CWeapon* CClientPed::GetWeapon(void) +CWeapon* CClientPed::GetWeapon() { if (m_pPlayerPed) { @@ -2240,7 +2240,7 @@ void CClientPed::RemoveWeapon(eWeaponType weaponType) } } -void CClientPed::RemoveAllWeapons(void) +void CClientPed::RemoveAllWeapons() { if (m_bIsLocalPlayer) { @@ -2310,7 +2310,7 @@ bool CClientPed::HasWeapon(eWeaponType weaponType) // // Check and attempt to fix weapons for remote players // -void CClientPed::ValidateRemoteWeapons(void) +void CClientPed::ValidateRemoteWeapons() { // Must be streamed in remote player if (!m_pPlayerPed || IsLocalPlayer() || GetType() != CCLIENTPLAYER) @@ -2348,7 +2348,7 @@ void CClientPed::ValidateRemoteWeapons(void) m_pPlayerPed->SetCurrentWeaponSlot(m_CurrentWeaponSlot); } -eMovementState CClientPed::GetMovementState(void) +eMovementState CClientPed::GetMovementState() { // Do we have a player, and are we on foot? (streamed in) if (m_pPlayerPed && !GetRealOccupiedVehicle()) @@ -2420,7 +2420,7 @@ bool CClientPed::GetMovementState(std::string& strStateName) return true; } -CTask* CClientPed::GetCurrentPrimaryTask(void) +CTask* CClientPed::GetCurrentPrimaryTask() { if (m_pPlayerPed) { @@ -2540,7 +2540,7 @@ bool CClientPed::KillTaskSecondary(int iTaskPriority, bool bGracefully) return false; } -CVector CClientPed::GetAim(void) const +CVector CClientPed::GetAim() const { if (m_shotSyncData) return CVector(m_shotSyncData->m_fArmDirectionX, m_shotSyncData->m_fArmDirectionY, 0); @@ -3285,7 +3285,7 @@ void CClientPed::ApplyControllerStateFixes(CControllerState& Current) } } -float CClientPed::GetCurrentRotation(void) +float CClientPed::GetCurrentRotation() { if (m_pPlayerPed) { @@ -3339,7 +3339,7 @@ void CClientPed::SetTargetRotation(unsigned long ulDelay, float fRotation, float #include "../mods/deathmatch/logic/CClientGame.h" extern CClientGame* g_pClientGame; -void CClientPed::Interpolate(void) +void CClientPed::Interpolate() { // Grab the current time unsigned long ulCurrentTime = CClientTime::GetTime(); @@ -3566,7 +3566,7 @@ void CClientPed::UpdateKeysync(bool bCleanup) } } -void CClientPed::_CreateModel(void) +void CClientPed::_CreateModel() { // Replace the loaded model info with the model we're going to load and // add a reference to it. @@ -3693,7 +3693,7 @@ void CClientPed::_CreateModel(void) } } -void CClientPed::_CreateLocalModel(void) +void CClientPed::_CreateLocalModel() { // Init the local player and grab the pointers g_pGame->InitLocalPlayer(this); @@ -3852,7 +3852,7 @@ void CClientPed::_DestroyLocalModel() m_pTaskManager = NULL; } -void CClientPed::_ChangeModel(void) +void CClientPed::_ChangeModel() { // Different model than before? if (m_pPlayerPed->GetModelIndex() != m_ulModel) @@ -3985,7 +3985,7 @@ void CClientPed::_ChangeModel(void) } } -void CClientPed::ReCreateModel(void) +void CClientPed::ReCreateModel() { // We can only recreate if we're not the local player and if we have a player model if (!m_bIsLocalPlayer && m_pPlayerPed) @@ -4107,7 +4107,7 @@ void CClientPed::StreamIn(bool bInstantly) } } -void CClientPed::StreamOut(void) +void CClientPed::StreamOut() { // Make sure we have a player ped and that we're not // the local player @@ -4193,7 +4193,7 @@ void CClientPed::InternalRemoveFromVehicle(CVehicle* pGameVehicle) } } -bool CClientPed::PerformChecks(void) +bool CClientPed::PerformChecks() { // Must be streamed in if (m_pPlayerPed) @@ -4223,7 +4223,7 @@ bool CClientPed::PerformChecks(void) return true; } -void CClientPed::StartRadio(void) +void CClientPed::StartRadio() { // We use this to avoid radio lags sometimes. Also make sure // it's not already on @@ -4237,7 +4237,7 @@ void CClientPed::StartRadio(void) } } -void CClientPed::StopRadio(void) +void CClientPed::StopRadio() { // We use this to avoid radio lags sometimes if (!m_bDontChangeRadio) @@ -4277,7 +4277,7 @@ void CClientPed::Duck(bool bDuck) m_bDucked = bDuck; } -bool CClientPed::IsDucked(void) +bool CClientPed::IsDucked() { if (m_pPlayerPed) { @@ -4332,7 +4332,7 @@ void CClientPed::SetChoking(bool bChoking) } } -bool CClientPed::IsChoking(void) +bool CClientPed::IsChoking() { // We have a task manager? if (m_pTaskManager) @@ -4562,7 +4562,7 @@ bool CClientPed::SetHasJetPack(bool bHasJetPack) return true; } -bool CClientPed::HasJetPack(void) +bool CClientPed::HasJetPack() { if (m_pPlayerPed) { @@ -4576,7 +4576,7 @@ bool CClientPed::HasJetPack(void) return m_bHasJetPack; } -bool CClientPed::IsInWater(void) +bool CClientPed::IsInWater() { if (m_pPlayerPed) { @@ -4593,7 +4593,7 @@ bool CClientPed::IsInWater(void) return m_bIsInWater; } -float CClientPed::GetDistanceFromGround(void) +float CClientPed::GetDistanceFromGround() { CVector vecPosition; GetPosition(vecPosition); @@ -4602,7 +4602,7 @@ float CClientPed::GetDistanceFromGround(void) return (vecPosition.fZ - fGroundLevel); } -bool CClientPed::IsOnGround(void) +bool CClientPed::IsOnGround() { CVector vecPosition; GetPosition(vecPosition); @@ -4610,7 +4610,7 @@ bool CClientPed::IsOnGround(void) return (vecPosition.fZ > fGroundLevel && (vecPosition.fZ - fGroundLevel) <= 1.0f); } -bool CClientPed::IsClimbing(void) +bool CClientPed::IsClimbing() { if (m_pPlayerPed) { @@ -4623,7 +4623,7 @@ bool CClientPed::IsClimbing(void) return false; } -void CClientPed::NextRadioChannel(void) +void CClientPed::NextRadioChannel() { // Is our radio on? if (m_bRadioOn) @@ -4632,7 +4632,7 @@ void CClientPed::NextRadioChannel(void) } } -void CClientPed::PreviousRadioChannel(void) +void CClientPed::PreviousRadioChannel() { // Is our radio on? if (m_bRadioOn) @@ -4829,7 +4829,7 @@ CVector CClientPed::AdjustShotOriginForWalls(const CVector& vecOrigin, const CVe return vecResultOrigin; } -eFightingStyle CClientPed::GetFightingStyle(void) +eFightingStyle CClientPed::GetFightingStyle() { if (m_pPlayerPed) { @@ -4847,7 +4847,7 @@ void CClientPed::SetFightingStyle(eFightingStyle style) m_FightingStyle = style; } -eMoveAnim CClientPed::GetMoveAnim(void) +eMoveAnim CClientPed::GetMoveAnim() { if (m_pPlayerPed) { @@ -4882,7 +4882,7 @@ unsigned int CClientPed::CountProjectiles(eWeaponType weaponType) return uiCount; } -void CClientPed::RemoveAllProjectiles(void) +void CClientPed::RemoveAllProjectiles() { CClientProjectile* pProjectile = NULL; list::iterator iter = m_Projectiles.begin(); @@ -4936,7 +4936,7 @@ void CClientPed::DestroySatchelCharges(bool bBlow, bool bDestroy) m_bDestroyingSatchels = false; } -bool CClientPed::IsEnteringVehicle(void) +bool CClientPed::IsEnteringVehicle() { if (m_pPlayerPed) { @@ -4959,7 +4959,7 @@ bool CClientPed::IsEnteringVehicle(void) return false; } -bool CClientPed::IsLeavingVehicle(void) +bool CClientPed::IsLeavingVehicle() { if (m_pPlayerPed) { @@ -4986,7 +4986,7 @@ bool CClientPed::IsLeavingVehicle(void) return false; } -bool CClientPed::IsGettingIntoVehicle(void) +bool CClientPed::IsGettingIntoVehicle() { if (m_pPlayerPed) { @@ -5018,7 +5018,7 @@ bool CClientPed::IsGettingIntoVehicle(void) return false; } -bool CClientPed::IsGettingOutOfVehicle(void) +bool CClientPed::IsGettingOutOfVehicle() { if (m_pPlayerPed) { @@ -5049,7 +5049,7 @@ bool CClientPed::IsGettingOutOfVehicle(void) return false; } -bool CClientPed::IsGettingJacked(void) +bool CClientPed::IsGettingJacked() { if (m_pPlayerPed) { @@ -5072,7 +5072,7 @@ bool CClientPed::IsGettingJacked(void) return false; } -CClientEntity* CClientPed::GetContactEntity(void) +CClientEntity* CClientPed::GetContactEntity() { CPools* pPools = g_pGame->GetPools(); if (pPools && m_pPlayerPed) @@ -5091,7 +5091,7 @@ CClientEntity* CClientPed::GetContactEntity(void) return nullptr; } -bool CClientPed::HasAkimboPointingUpwards(void) +bool CClientPed::HasAkimboPointingUpwards() { if (m_bIsLocalPlayer) { @@ -5124,7 +5124,7 @@ bool CClientPed::HasAkimboPointingUpwards(void) return false; } -float CClientPed::GetDistanceFromCentreOfMassToBaseOfModel(void) +float CClientPed::GetDistanceFromCentreOfMassToBaseOfModel() { if (m_pPlayerPed) { @@ -5290,7 +5290,7 @@ void CClientPed::SetTargetPosition(const CVector& vecPosition, unsigned long ulD } } -void CClientPed::RemoveTargetPosition(void) +void CClientPed::RemoveTargetPosition() { m_interp.pos.ulFinishTime = 0; if (m_interp.pTargetOriginSource) @@ -5300,7 +5300,7 @@ void CClientPed::RemoveTargetPosition(void) } } -void CClientPed::UpdateTargetPosition(void) +void CClientPed::UpdateTargetPosition() { if (HasTargetPosition()) { @@ -5424,7 +5424,7 @@ void CClientPed::UpdateUnderFloorFix(const CVector& vecTargetPosition, const CVe } } -CClientEntity* CClientPed::GetTargetedEntity(void) +CClientEntity* CClientPed::GetTargetedEntity() { CClientEntity* pReturn = NULL; if (m_pPlayerPed) @@ -5439,7 +5439,7 @@ CClientEntity* CClientPed::GetTargetedEntity(void) return pReturn; } -CClientPed* CClientPed::GetTargetedPed(void) +CClientPed* CClientPed::GetTargetedPed() { CClientEntity* pTargetEntity = GetTargetedEntity(); if (pTargetEntity && IS_PED(pTargetEntity)) @@ -5449,19 +5449,19 @@ CClientPed* CClientPed::GetTargetedPed(void) return NULL; } -void CClientPed::NotifyCreate(void) +void CClientPed::NotifyCreate() { m_pManager->GetPedManager()->OnCreation(this); CClientStreamElement::NotifyCreate(); } -void CClientPed::NotifyDestroy(void) +void CClientPed::NotifyDestroy() { m_pManager->GetPedManager()->OnDestruction(this); UpdateKeysync(true); } -bool CClientPed::IsSunbathing(void) +bool CClientPed::IsSunbathing() { if (m_pPlayerPed) { @@ -5542,7 +5542,7 @@ bool CClientPed::UseGun(CVector vecTarget, CClientEntity* pEntity) return false; } -bool CClientPed::IsAttachToable(void) +bool CClientPed::IsAttachToable() { // We're not attachable if we're inside a vehicle (that would get messy) if (!GetOccupiedVehicle()) @@ -5552,7 +5552,7 @@ bool CClientPed::IsAttachToable(void) return false; } -bool CClientPed::IsDoingGangDriveby(void) +bool CClientPed::IsDoingGangDriveby() { if (m_pPlayerPed) { @@ -5615,7 +5615,7 @@ void CClientPed::SetDoingGangDriveby(bool bDriveby) m_bDoingGangDriveby = bDriveby; } -bool CClientPed::IsRunningAnimation(void) +bool CClientPed::IsRunningAnimation() { if (m_pPlayerPed) { @@ -5731,7 +5731,7 @@ void CClientPed::RunNamedAnimation(CAnimBlock* pBlock, const char* szAnimName, i m_bFreezeLastFrameAnimation = bFreezeLastFrame; } -void CClientPed::KillAnimation(void) +void CClientPed::KillAnimation() { if (m_pPlayerPed) { @@ -5753,7 +5753,7 @@ void CClientPed::KillAnimation(void) SetNextAnimationNormal(); } -void CClientPed::PostWeaponFire(void) +void CClientPed::PostWeaponFire() { m_ulLastTimeFired = CClientTime::GetTime(); } @@ -5786,7 +5786,7 @@ bool CClientPed::GetBulletImpactData(CClientEntity** ppEntity, CVector* pvecHitP return false; } -bool CClientPed::IsUsingGun(void) +bool CClientPed::IsUsingGun() { if (m_pPlayerPed) { @@ -5823,7 +5823,7 @@ void CClientPed::SetFootBloodEnabled(bool bHasFootBlood) } } -bool CClientPed::IsFootBloodEnabled(void) +bool CClientPed::IsFootBloodEnabled() { if (m_pPlayerPed) { @@ -5874,7 +5874,7 @@ void CClientPed::SetVoice(const char* szVoiceType, const char* szVoice) m_pPlayerPed->SetVoice(szVoiceType, szVoice); } -bool CClientPed::IsSpeechEnabled(void) +bool CClientPed::IsSpeechEnabled() { if (m_pPlayerPed) { @@ -5895,7 +5895,7 @@ void CClientPed::SetSpeechEnabled(bool bEnabled) m_bSpeechEnabled = bEnabled; } -bool CClientPed::CanReloadWeapon(void) +bool CClientPed::CanReloadWeapon() { unsigned long ulNow = CClientTime::GetTime(); CControllerState Current; @@ -5915,7 +5915,7 @@ bool CClientPed::CanReloadWeapon(void) return false; } -bool CClientPed::ReloadWeapon(void) +bool CClientPed::ReloadWeapon() { if (m_pTaskManager) { @@ -5934,12 +5934,12 @@ bool CClientPed::ReloadWeapon(void) return false; } -bool CClientPed::IsReloadingWeapon(void) +bool CClientPed::IsReloadingWeapon() { return GetWeapon()->GetState() == WEAPONSTATE_RELOADING; } -bool CClientPed::ShouldBeStealthAiming(void) +bool CClientPed::ShouldBeStealthAiming() { if (m_pPlayerPed) { @@ -6033,7 +6033,7 @@ std::unique_ptr CClientPed::GetAnimation(AnimationId id) return nullptr; } -std::unique_ptr CClientPed::GetFirstAnimation(void) +std::unique_ptr CClientPed::GetFirstAnimation() { if (m_pPlayerPed) { @@ -6091,7 +6091,7 @@ void CClientPed::RestoreAnimations(CAnimBlock& animationBlock) } } -void CClientPed::RestoreAllAnimations(void) +void CClientPed::RestoreAllAnimations() { m_mapOfReplacedAnimations.clear(); CAnimManager* pAnimationManager = g_pGame->GetAnimManager(); @@ -6128,7 +6128,7 @@ SReplacedAnimation* CClientPed::GetReplacedAnimation(CAnimBlendHierarchySAInterf return nullptr; } -CSphere CClientPed::GetWorldBoundingSphere(void) +CSphere CClientPed::GetWorldBoundingSphere() { CSphere sphere; CModelInfo* pModelInfo = g_pGame->GetModelInfo(GetModel()); @@ -6146,7 +6146,7 @@ CSphere CClientPed::GetWorldBoundingSphere(void) } // Currently, this should only be called for the local player -void CClientPed::HandleWaitingForGroundToLoad(void) +void CClientPed::HandleWaitingForGroundToLoad() { // Check if near any MTA objects bool bNearObject = false; diff --git a/Client/mods/deathmatch/logic/CClientPed.h b/Client/mods/deathmatch/logic/CClientPed.h index e405826dee9..77ced1b57a0 100644 --- a/Client/mods/deathmatch/logic/CClientPed.h +++ b/Client/mods/deathmatch/logic/CClientPed.h @@ -136,21 +136,21 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule public: CClientPed(CClientManager* pManager, unsigned long ulModelID, ElementID ID); - ~CClientPed(void); + ~CClientPed(); - void Unlink(void){}; + void Unlink(){}; - virtual eClientEntityType GetType(void) const { return CCLIENTPED; } + virtual eClientEntityType GetType() const { return CCLIENTPED; } - CPlayerPed* GetGamePlayer(void) { return m_pPlayerPed; } - CEntity* GetGameEntity(void) { return m_pPlayerPed; } - const CEntity* GetGameEntity(void) const { return m_pPlayerPed; } + CPlayerPed* GetGamePlayer() { return m_pPlayerPed; } + CEntity* GetGameEntity() { return m_pPlayerPed; } + const CEntity* GetGameEntity() const { return m_pPlayerPed; } - bool IsLocalPlayer(void) { return m_bIsLocalPlayer; } + bool IsLocalPlayer() { return m_bIsLocalPlayer; } bool GetMatrix(CMatrix& Matrix) const; bool SetMatrix(const CMatrix& Matrix); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); void GetPosition(CVector& vecPosition) const; void SetPosition(const CVector& vecPosition) { SetPosition(vecPosition, true, true); } @@ -176,14 +176,14 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule // remove jetpack, etc... void Spawn(const CVector& vecPosition, float fRotation, unsigned short usModel, unsigned char ucInterior); - void ResetInterpolation(void); + void ResetInterpolation(); - float GetCurrentRotation(void); + float GetCurrentRotation(); void SetCurrentRotation(float fRotation, bool bIncludeTarget = true); void SetTargetRotation(float fRotation); void SetTargetRotation(unsigned long ulDelay, float fRotation, float fCameraRotation); - float GetCameraRotation(void); + float GetCameraRotation(); void SetCameraRotation(float fRotation); void GetMoveSpeed(CVector& vecMoveSpeed) const; @@ -202,21 +202,21 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule void SetTargetTarget(unsigned long ulDelay, const CVector& vecSource, const CVector& vecTarget); - int GetVehicleInOutState(void) { return m_iVehicleInOutState; }; + int GetVehicleInOutState() { return m_iVehicleInOutState; }; void SetVehicleInOutState(int iState) { m_iVehicleInOutState = iState; }; - unsigned long GetModel(void) { return m_ulModel; }; + unsigned long GetModel() { return m_ulModel; }; bool SetModel(unsigned long ulModel, bool bTemp = false); - bool GetCanBeKnockedOffBike(void); + bool GetCanBeKnockedOffBike(); void SetCanBeKnockedOffBike(bool bCanBeKnockedOffBike); - bool IsInVehicle(void) { return GetOccupiedVehicle() != NULL; }; - CClientVehicle* GetOccupiedVehicle(void) { return m_pOccupiedVehicle; }; - unsigned int GetOccupiedVehicleSeat(void) { return m_uiOccupiedVehicleSeat; }; - CClientVehicle* GetOccupyingVehicle(void) { return m_pOccupyingVehicle; }; + bool IsInVehicle() { return GetOccupiedVehicle() != NULL; }; + CClientVehicle* GetOccupiedVehicle() { return m_pOccupiedVehicle; }; + unsigned int GetOccupiedVehicleSeat() { return m_uiOccupiedVehicleSeat; }; + CClientVehicle* GetOccupyingVehicle() { return m_pOccupyingVehicle; }; - CClientVehicle* GetRealOccupiedVehicle(void); + CClientVehicle* GetRealOccupiedVehicle(); CClientVehicle* GetClosestVehicleInRange(bool bGetPositionFromClosestDoor, bool bCheckDriverDoor, bool bCheckPassengerDoors, bool bCheckStreamedOutVehicles, unsigned int* uiClosestDoor = NULL, CVector* pClosestDoorPosition = NULL, float fWithinRange = 6000.0f); bool GetClosestDoor(CClientVehicle* pVehicle, bool bCheckDriverDoor, bool bCheckPassengerDoors, unsigned int& uiClosestDoor, @@ -228,57 +228,57 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule void WarpIntoVehicle(CClientVehicle* pVehicle, unsigned int uiSeat = 0); CClientVehicle* RemoveFromVehicle(bool bIgnoreIfGettingOut = false); - bool IsVisible(void); + bool IsVisible(); void SetVisible(bool bVisible); - bool GetUsesCollision(void); + bool GetUsesCollision(); void SetUsesCollision(bool bUsesCollision); - float GetMaxHealth(void); - float GetHealth(void); + float GetMaxHealth(); + float GetHealth(); void SetHealth(float fHealth); void InternalSetHealth(float fHealth); - float GetArmor(void); + float GetArmor(); void SetArmor(float fArmor); - float GetOxygenLevel(void); + float GetOxygenLevel(); void SetOxygenLevel(float fOxygen); void LockHealth(float fHealth); void LockArmor(float fArmor); - void UnlockHealth(void) { m_bHealthLocked = false; }; - void UnlockArmor(void) { m_bArmorLocked = false; }; - bool IsHealthLocked(void) const { return m_bHealthLocked; }; - bool IsArmorLocked(void) const { return m_bArmorLocked; }; + void UnlockHealth() { m_bHealthLocked = false; }; + void UnlockArmor() { m_bArmorLocked = false; }; + bool IsHealthLocked() const { return m_bHealthLocked; }; + bool IsArmorLocked() const { return m_bArmorLocked; }; - bool IsDying(void); - bool IsDead(void); + bool IsDying(); + bool IsDead(); void SetIsDead(bool bDead) { m_bDead = bDead; }; void Kill(eWeaponType weaponType, unsigned char ucBodypart, bool bStealth = false, bool bSetDirectlyDead = false, AssocGroupId animGroup = 0, AnimationId animID = 15); void StealthKill(CClientPed* pPed); void BeHit(CClientPed* pClientPedAttacker, ePedPieceTypes hitBodyPart, int hitBodySide, int weaponId); - int GetRespawnState(void) { return m_pRespawnState; }; + int GetRespawnState() { return m_pRespawnState; }; void SetRespawnState(int iRespawnState) { m_pRespawnState = iRespawnState; }; CWeapon* GiveWeapon(eWeaponType weaponType, unsigned int uiAmmo, bool bSetAsCurrent = false); bool SetCurrentWeaponSlot(eWeaponSlot weaponSlot); - eWeaponSlot GetCurrentWeaponSlot(void); - eWeaponType GetCurrentWeaponType(void); + eWeaponSlot GetCurrentWeaponSlot(); + eWeaponType GetCurrentWeaponType(); eWeaponType GetWeaponType(eWeaponSlot slot); - CWeapon* GetWeapon(void); + CWeapon* GetWeapon(); CWeapon* GetWeapon(eWeaponSlot weaponSlot); CWeapon* GetWeapon(eWeaponType weaponType); bool HasWeapon(eWeaponType weaponType); void RemoveWeapon(eWeaponType weaponType); - void RemoveAllWeapons(void); - bool IsCurrentWeaponUsingBulletSync(void); - void ValidateRemoteWeapons(void); + void RemoveAllWeapons(); + bool IsCurrentWeaponUsingBulletSync(); + void ValidateRemoteWeapons(); std::map m_MovementStateNames; - eMovementState GetMovementState(void); + eMovementState GetMovementState(); bool GetMovementState(std::string& strStateName); - CTask* GetCurrentPrimaryTask(void); + CTask* GetCurrentPrimaryTask(); bool IsSimplestTask(int iTaskType); bool HasTask(int iTaskType, int iTaskPriority = -1, bool bPrimary = true); bool SetTask(CTask* pTask, int iTaskPriority); @@ -297,23 +297,23 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule fDirectionY = m_shotSyncData->m_fArmDirectionY; } }; - CVector GetAim(void) const; - const CVector& GetAimSource(void) { return m_shotSyncData->m_vecShotOrigin; }; - const CVector& GetAimTarget(void) { return m_shotSyncData->m_vecShotTarget; }; - unsigned char GetVehicleAimAnim(void) { return m_shotSyncData->m_cInVehicleAimDirection; }; + CVector GetAim() const; + const CVector& GetAimSource() { return m_shotSyncData->m_vecShotOrigin; }; + const CVector& GetAimTarget() { return m_shotSyncData->m_vecShotTarget; }; + unsigned char GetVehicleAimAnim() { return m_shotSyncData->m_cInVehicleAimDirection; }; void SetAim(float fArmDirectionX, float fArmDirectionY, unsigned char cInVehicleAimAnim); void SetAimInterpolated(unsigned long ulDelay, float fArmDirectionX, float fArmDirectionY, bool bAkimboAimUp, unsigned char cInVehicleAimAnim); void SetAimingData(unsigned long ulDelay, const CVector& vecTargetPosition, float fArmDirectionX, float fArmDirectionY, char cInVehicleAimAnim, CVector* pSource, bool bInterpolateAim); unsigned long GetMemoryValue(unsigned long ulOffset) { return (m_pPlayerPed) ? *m_pPlayerPed->GetMemoryValue(ulOffset) : 0; }; - unsigned long GetGameBaseAddress(void) { return (m_pPlayerPed) ? (unsigned long)m_pPlayerPed->GetMemoryValue(0) : 0; }; + unsigned long GetGameBaseAddress() { return (m_pPlayerPed) ? (unsigned long)m_pPlayerPed->GetMemoryValue(0) : 0; }; void Duck(bool bDuck); - bool IsDucked(void); + bool IsDucked(); void SetChoking(bool bChoking); - bool IsChoking(void); + bool IsChoking(); void SetWearingGoggles(bool bWearing, bool animationEnabled = true); bool IsWearingGoggles(bool bCheckMoving = false); @@ -321,126 +321,126 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule void WorldIgnore(bool bIgnore); - void ResetToOutOfVehicleWeapon(void); + void ResetToOutOfVehicleWeapon(); void RebuildModel(bool bDelayChange = false); void ProcessRebuildPlayer(bool bNeedsClothesUpdate); void SetStat(unsigned short usStat, float fValue); float GetStat(unsigned short usStat); - void ResetStats(void); + void ResetStats(); - CClientPlayerClothes* GetClothes(void) { return m_pClothes; } + CClientPlayerClothes* GetClothes() { return m_pClothes; } // This is kinda hacky, should be private but something depends on this. Should depend on some // streamer func. Perhaps use SetNeverStreamOut, but need something to reset that. void StreamIn(bool bInstantly); - void StreamOut(void); + void StreamOut(); void StreamOutWeaponForABit(eWeaponSlot eSlot); bool SetHasJetPack(bool bHasJetPack); - bool HasJetPack(void); + bool HasJetPack(); - float GetDistanceFromGround(void); + float GetDistanceFromGround(); void SetInWater(bool bIsInWater) { m_bIsInWater = bIsInWater; }; - bool IsInWater(void); - bool IsOnGround(void); + bool IsInWater(); + bool IsOnGround(); - bool IsClimbing(void); - bool IsRadioOn(void) { return m_bRadioOn; }; - void NextRadioChannel(void); - void PreviousRadioChannel(void); + bool IsClimbing(); + bool IsRadioOn() { return m_bRadioOn; }; + void NextRadioChannel(); + void PreviousRadioChannel(); bool SetCurrentRadioChannel(unsigned char ucChannel); - unsigned char GetCurrentRadioChannel(void) { return m_ucRadioChannel; }; + unsigned char GetCurrentRadioChannel() { return m_ucRadioChannel; }; - CTaskManager* GetTaskManager(void) { return m_pTaskManager; } + CTaskManager* GetTaskManager() { return m_pTaskManager; } bool GetShotData(CVector* pvecOrigin, CVector* pvecTarget = NULL, CVector* pvecGunMuzzle = NULL, CVector* pvecFireOffset = NULL, float* fAimX = NULL, float* fAimY = NULL); CVector AdjustShotOriginForWalls(const CVector& vecOrigin, const CVector& vecTarget, float fMaxPullBack); - eFightingStyle GetFightingStyle(void); + eFightingStyle GetFightingStyle(); void SetFightingStyle(eFightingStyle style); - eMoveAnim GetMoveAnim(void); + eMoveAnim GetMoveAnim(); void SetMoveAnim(eMoveAnim iAnim); void AddProjectile(CClientProjectile* pProjectile) { m_Projectiles.push_back(pProjectile); } void RemoveProjectile(CClientProjectile* pProjectile) { m_Projectiles.remove(pProjectile); } - std::list::iterator ProjectilesBegin(void) { return m_Projectiles.begin(); } - std::list::iterator ProjectilesEnd(void) { return m_Projectiles.end(); } + std::list::iterator ProjectilesBegin() { return m_Projectiles.begin(); } + std::list::iterator ProjectilesEnd() { return m_Projectiles.end(); } unsigned int CountProjectiles(eWeaponType weaponType = WEAPONTYPE_UNARMED); - void RemoveAllProjectiles(void); + void RemoveAllProjectiles(); void DestroySatchelCharges(bool bBlow = true, bool bDestroy = true); - CRemoteDataStorage* GetRemoteData(void) { return m_remoteDataStorage; } + CRemoteDataStorage* GetRemoteData() { return m_remoteDataStorage; } - bool IsEnteringVehicle(void); - bool IsLeavingVehicle(void); - bool IsGettingIntoVehicle(void); - bool IsGettingOutOfVehicle(void); - bool IsGettingJacked(void); + bool IsEnteringVehicle(); + bool IsLeavingVehicle(); + bool IsGettingIntoVehicle(); + bool IsGettingOutOfVehicle(); + bool IsGettingJacked(); - CClientEntity* GetContactEntity(void); + CClientEntity* GetContactEntity(); - bool HasAkimboPointingUpwards(void); + bool HasAkimboPointingUpwards(); - float GetDistanceFromCentreOfMassToBaseOfModel(void); + float GetDistanceFromCentreOfMassToBaseOfModel(); - unsigned char GetAlpha(void) { return m_ucAlpha; } + unsigned char GetAlpha() { return m_ucAlpha; } void SetAlpha(unsigned char ucAlpha); - bool HasTargetPosition(void) { return (m_interp.pos.ulFinishTime != 0); } - CClientEntity* GetTargetOriginSource(void) { return m_interp.pTargetOriginSource; } + bool HasTargetPosition() { return (m_interp.pos.ulFinishTime != 0); } + CClientEntity* GetTargetOriginSource() { return m_interp.pTargetOriginSource; } void GetTargetPosition(CVector& vecPosition); void SetTargetPosition(const CVector& vecPosition, unsigned long ulDelay, CClientEntity* pTargetOriginSource = NULL); - void RemoveTargetPosition(void); - void UpdateTargetPosition(void); + void RemoveTargetPosition(); + void UpdateTargetPosition(); void UpdateUnderFloorFix(const CVector& vecTargetPosition, const CVector& vecOrigin); - CClientEntity* GetTargetedEntity(void); - CClientPed* GetTargetedPed(void); + CClientEntity* GetTargetedEntity(); + CClientPed* GetTargetedPed(); - CClientEntity* GetCurrentContactEntity(void) { return m_pCurrentContactEntity; } + CClientEntity* GetCurrentContactEntity() { return m_pCurrentContactEntity; } void SetCurrentContactEntity(CClientEntity* pEntity) { m_pCurrentContactEntity = pEntity; } - bool IsSunbathing(void); + bool IsSunbathing(); void SetSunbathing(bool bSunbathing, bool bStartStanding = true); bool LookAt(CVector vecOffset, int iTime = 1000, int iBlend = 1000, CClientEntity* pEntity = NULL); bool UseGun(CVector vecTarget, CClientEntity* pEntity); - bool IsAttachToable(void); + bool IsAttachToable(); static const char* GetBodyPartName(unsigned char ucID); - bool IsDoingGangDriveby(void); + bool IsDoingGangDriveby(); void SetDoingGangDriveby(bool bDriveby); - bool IsRunningAnimation(void); + bool IsRunningAnimation(); void RunAnimation(AssocGroupId animGroup, AnimationId animID); void RunNamedAnimation(CAnimBlock* pBlock, const char* szAnimName, int iTime = -1, int iBlend = 250, bool bLoop = true, bool bUpdatePosition = true, bool bInterruptable = false, bool bFreezeLastFrame = true, bool bRunInSequence = false, bool bOffsetPed = false, bool bHoldLastFrame = false); - void KillAnimation(void); - CAnimBlock* GetAnimationBlock(void) { return m_pAnimationBlock; } - const char* GetAnimationName(void) { return m_strAnimationName; } + void KillAnimation(); + CAnimBlock* GetAnimationBlock() { return m_pAnimationBlock; } + const char* GetAnimationName() { return m_strAnimationName; } - bool IsUsingGun(void); + bool IsUsingGun(); - bool IsHeadless(void) { return m_bHeadless; } + bool IsHeadless() { return m_bHeadless; } void SetHeadless(bool bHeadless); - bool IsFrozen(void) const { return m_bFrozen; } + bool IsFrozen() const { return m_bFrozen; } void SetFrozen(bool bFrozen); - bool IsFrozenWaitingForGroundToLoad(void) const; + bool IsFrozenWaitingForGroundToLoad() const; void SetFrozenWaitingForGroundToLoad(bool bFrozen); - bool IsFootBloodEnabled(void); + bool IsFootBloodEnabled(); void SetFootBloodEnabled(bool bHasFootBlood); - bool IsOnFire(void); + bool IsOnFire(); void SetOnFire(bool bOnFire); void GetVoice(short* psVoiceType, short* psVoiceID); @@ -448,56 +448,56 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule void SetVoice(short sVoiceType, short sVoiceID); void SetVoice(const char* szVoiceType, const char* szVoice); - bool IsSpeechEnabled(void); + bool IsSpeechEnabled(); void SetSpeechEnabled(bool bEnabled); - void PostWeaponFire(void); + void PostWeaponFire(); void SetBulletImpactData(CClientEntity* pVictim, const CVector& vecHitPosition); bool GetBulletImpactData(CClientEntity** ppVictim = 0, CVector* pvecHitPosition = 0); - void ClearBulletImpactData(void) { m_bBulletImpactData = false; } + void ClearBulletImpactData() { m_bBulletImpactData = false; } - bool CanReloadWeapon(void); - bool ReloadWeapon(void); - bool IsReloadingWeapon(void); + bool CanReloadWeapon(); + bool ReloadWeapon(); + bool IsReloadingWeapon(); - bool ShouldBeStealthAiming(void); - bool IsStealthAiming(void) { return m_bStealthAiming; } + bool ShouldBeStealthAiming(); + bool IsStealthAiming() { return m_bStealthAiming; } void SetStealthAiming(bool bAiming); std::unique_ptr AddAnimation(AssocGroupId group, AnimationId id); std::unique_ptr BlendAnimation(AssocGroupId group, AnimationId id, float fBlendDelta); std::unique_ptr GetAnimation(AnimationId id); - std::unique_ptr GetFirstAnimation(void); + std::unique_ptr GetFirstAnimation(); - void DereferenceCustomAnimationBlock(void) { m_pCustomAnimationIFP = nullptr; } - std::shared_ptr GetCustomAnimationIFP(void) { return m_pCustomAnimationIFP; } - bool IsCustomAnimationPlaying(void) { return ((m_bRequestedAnimation || m_bLoopAnimation) && m_pAnimationBlock && m_bisCurrentAnimationCustom); } - void SetCustomAnimationUntriggerable(void) + void DereferenceCustomAnimationBlock() { m_pCustomAnimationIFP = nullptr; } + std::shared_ptr GetCustomAnimationIFP() { return m_pCustomAnimationIFP; } + bool IsCustomAnimationPlaying() { return ((m_bRequestedAnimation || m_bLoopAnimation) && m_pAnimationBlock && m_bisCurrentAnimationCustom); } + void SetCustomAnimationUntriggerable() { m_bRequestedAnimation = false; m_bLoopAnimation = false; } - bool IsNextAnimationCustom(void) { return m_bisNextAnimationCustom; } + bool IsNextAnimationCustom() { return m_bisNextAnimationCustom; } void SetNextAnimationCustom(const std::shared_ptr& pIFP, const SString& strAnimationName); void SetCurrentAnimationCustom(bool bCustom) { m_bisCurrentAnimationCustom = bCustom; } - bool IsCurrentAnimationCustom(void) { return m_bisCurrentAnimationCustom; } - CIFPAnimations* GetIFPAnimationsPointer(void) { return m_pIFPAnimations; } + bool IsCurrentAnimationCustom() { return m_bisCurrentAnimationCustom; } + CIFPAnimations* GetIFPAnimationsPointer() { return m_pIFPAnimations; } void SetIFPAnimationsPointer(CIFPAnimations* pIFPAnimations) { m_pIFPAnimations = pIFPAnimations; } // This will indicate that we have played custom animation, so next animation can be internal GTA animation // You must call this function after playing a custom animation - void SetNextAnimationNormal(void) { m_bisNextAnimationCustom = false; } - const SString& GetNextAnimationCustomBlockName(void) { return m_strCustomIFPBlockName; } - const SString& GetNextAnimationCustomName(void) { return m_strCustomIFPAnimationName; } - const unsigned int& GetCustomAnimationBlockNameHash(void) { return m_u32CustomBlockNameHash; } - const unsigned int& GetCustomAnimationNameHash(void) { return m_u32CustomAnimationNameHash; } + void SetNextAnimationNormal() { m_bisNextAnimationCustom = false; } + const SString& GetNextAnimationCustomBlockName() { return m_strCustomIFPBlockName; } + const SString& GetNextAnimationCustomName() { return m_strCustomIFPAnimationName; } + const unsigned int& GetCustomAnimationBlockNameHash() { return m_u32CustomBlockNameHash; } + const unsigned int& GetCustomAnimationNameHash() { return m_u32CustomAnimationNameHash; } void ReplaceAnimation(std::unique_ptr& pInternalAnimHierarchy, const std::shared_ptr& pIFP, CAnimBlendHierarchySAInterface* pCustomAnimHierarchy); void RestoreAnimation(std::unique_ptr& pInternalAnimHierarchy); void RestoreAnimations(const std::shared_ptr& IFP); void RestoreAnimations(CAnimBlock& animationBlock); - void RestoreAllAnimations(void); + void RestoreAllAnimations(); SReplacedAnimation* GetReplacedAnimation(CAnimBlendHierarchySAInterface* pInternalHierarchyInterface); protected: @@ -509,30 +509,30 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule void StreamedInPulse(bool bDoStandardPulses); void ApplyControllerStateFixes(CControllerState& Current); - void Interpolate(void); + void Interpolate(); void UpdateKeysync(bool bCleanup = false); // Used to destroy the current game ped and create a new one in the same state. - void ReCreateModel(void); + void ReCreateModel(); - void _CreateModel(void); - void _CreateLocalModel(void); - void _DestroyModel(void); - void _DestroyLocalModel(void); - void _ChangeModel(void); + void _CreateModel(); + void _CreateLocalModel(); + void _DestroyModel(); + void _DestroyLocalModel(); + void _ChangeModel(); void ModelRequestCallback(CModelInfo* pModelInfo); void InternalWarpIntoVehicle(CVehicle* pGameVehicle); void InternalRemoveFromVehicle(CVehicle* pGameVehicle); - bool PerformChecks(void); - void HandleWaitingForGroundToLoad(void); + bool PerformChecks(); + void HandleWaitingForGroundToLoad(); void UpdateStreamPosition(const CVector& vecPosition); // Used to start and stop radio for local player - void StartRadio(void); - void StopRadio(void); + void StartRadio(); + void StopRadio(); bool m_bDontChangeRadio; public: @@ -540,8 +540,8 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule void Respawn(CVector* pvecPosition = NULL, bool bRestoreState = false, bool bCameraCut = false); - void NotifyCreate(void); - void NotifyDestroy(void); + void NotifyCreate(); + void NotifyDestroy(); CClientModelRequestManager* m_pRequester; CPlayerPed* m_pPlayerPed; diff --git a/Client/mods/deathmatch/logic/CClientPedManager.cpp b/Client/mods/deathmatch/logic/CClientPedManager.cpp index 4381e8fd4a9..26d757fb226 100644 --- a/Client/mods/deathmatch/logic/CClientPedManager.cpp +++ b/Client/mods/deathmatch/logic/CClientPedManager.cpp @@ -19,12 +19,12 @@ CClientPedManager::CClientPedManager(CClientManager* pManager) m_bRemoveFromList = true; } -CClientPedManager::~CClientPedManager(void) +CClientPedManager::~CClientPedManager() { DeleteAll(); } -void CClientPedManager::DeleteAll(void) +void CClientPedManager::DeleteAll() { m_bRemoveFromList = false; vector::iterator iter = m_List.begin(); diff --git a/Client/mods/deathmatch/logic/CClientPedManager.h b/Client/mods/deathmatch/logic/CClientPedManager.h index c138b46a225..87ff6e773af 100644 --- a/Client/mods/deathmatch/logic/CClientPedManager.h +++ b/Client/mods/deathmatch/logic/CClientPedManager.h @@ -23,17 +23,17 @@ class CClientPedManager friend class CClientPed; public: - void DeleteAll(void); + void DeleteAll(); void DoPulse(bool bDoStandardPulses); CClientPed* Get(ElementID ID, bool bCheckPlayers = false); bool Exists(CClientPed* pPed); - std::vector::const_iterator IterBegin(void) { return m_List.begin(); }; - std::vector::const_iterator IterEnd(void) { return m_List.end(); }; - std::vector::const_iterator StreamedBegin(void) { return m_StreamedIn.begin(); }; - std::vector::const_iterator StreamedEnd(void) { return m_StreamedIn.end(); }; + std::vector::const_iterator IterBegin() { return m_List.begin(); }; + std::vector::const_iterator IterEnd() { return m_List.end(); }; + std::vector::const_iterator StreamedBegin() { return m_StreamedIn.begin(); }; + std::vector::const_iterator StreamedEnd() { return m_StreamedIn.end(); }; static unsigned short GetWeaponSlotFromModel(DWORD dwModelID); static bool IsValidWeaponModel(DWORD dwModelID); @@ -43,7 +43,7 @@ class CClientPedManager protected: CClientPedManager(class CClientManager* pManager); - ~CClientPedManager(void); + ~CClientPedManager(); void AddToList(CClientPed* pPed) { m_List.push_back(pPed); } void RemoveFromList(CClientPed* pPed); diff --git a/Client/mods/deathmatch/logic/CClientPerfStat.LibMemory.cpp b/Client/mods/deathmatch/logic/CClientPerfStat.LibMemory.cpp index ad266cda0dd..b0570a14437 100644 --- a/Client/mods/deathmatch/logic/CClientPerfStat.LibMemory.cpp +++ b/Client/mods/deathmatch/logic/CClientPerfStat.LibMemory.cpp @@ -20,7 +20,7 @@ namespace class CLibMemory { public: - CLibMemory(void) { memset(this, 0, sizeof(*this)); } + CLibMemory() { memset(this, 0, sizeof(*this)); } int Delta; int Current; @@ -54,12 +54,12 @@ namespace class CClientPerfStatLibMemoryImpl : public CClientPerfStatLibMemory { public: - CClientPerfStatLibMemoryImpl(void); - virtual ~CClientPerfStatLibMemoryImpl(void); + CClientPerfStatLibMemoryImpl(); + virtual ~CClientPerfStatLibMemoryImpl(); // CClientPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CClientPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CClientPerfStatLibMemory @@ -96,7 +96,7 @@ CClientPerfStatLibMemory* CClientPerfStatLibMemory::GetSingleton() // // /////////////////////////////////////////////////////////////// -CClientPerfStatLibMemoryImpl::CClientPerfStatLibMemoryImpl(void) +CClientPerfStatLibMemoryImpl::CClientPerfStatLibMemoryImpl() { m_strCategoryName = "Lib memory"; } @@ -108,7 +108,7 @@ CClientPerfStatLibMemoryImpl::CClientPerfStatLibMemoryImpl(void) // // /////////////////////////////////////////////////////////////// -CClientPerfStatLibMemoryImpl::~CClientPerfStatLibMemoryImpl(void) +CClientPerfStatLibMemoryImpl::~CClientPerfStatLibMemoryImpl() { for (unsigned int i = 0; i < m_LibraryList.size(); i++) { @@ -124,7 +124,7 @@ CClientPerfStatLibMemoryImpl::~CClientPerfStatLibMemoryImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CClientPerfStatLibMemoryImpl::GetCategoryName(void) +const SString& CClientPerfStatLibMemoryImpl::GetCategoryName() { return m_strCategoryName; } @@ -157,7 +157,7 @@ void CClientPerfStatLibMemoryImpl::UpdateLibMemory(const SString& strLibName, in // // /////////////////////////////////////////////////////////////// -void CClientPerfStatLibMemoryImpl::DoPulse(void) +void CClientPerfStatLibMemoryImpl::DoPulse() { } diff --git a/Client/mods/deathmatch/logic/CClientPerfStat.LuaMemory.cpp b/Client/mods/deathmatch/logic/CClientPerfStat.LuaMemory.cpp index 6aa37ae864d..9d6076b33e1 100644 --- a/Client/mods/deathmatch/logic/CClientPerfStat.LuaMemory.cpp +++ b/Client/mods/deathmatch/logic/CClientPerfStat.LuaMemory.cpp @@ -19,7 +19,7 @@ namespace class CLuaMainMemory { public: - CLuaMainMemory(void) { memset(this, 0, sizeof(*this)); } + CLuaMainMemory() { memset(this, 0, sizeof(*this)); } int Delta; int Current; @@ -48,12 +48,12 @@ namespace class CClientPerfStatLuaMemoryImpl : public CClientPerfStatLuaMemory { public: - CClientPerfStatLuaMemoryImpl(void); - virtual ~CClientPerfStatLuaMemoryImpl(void); + CClientPerfStatLuaMemoryImpl(); + virtual ~CClientPerfStatLuaMemoryImpl(); // CClientPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CClientPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CClientPerfStatLuaMemory @@ -92,7 +92,7 @@ CClientPerfStatLuaMemory* CClientPerfStatLuaMemory::GetSingleton() // // /////////////////////////////////////////////////////////////// -CClientPerfStatLuaMemoryImpl::CClientPerfStatLuaMemoryImpl(void) +CClientPerfStatLuaMemoryImpl::CClientPerfStatLuaMemoryImpl() { m_strCategoryName = "Lua memory"; } @@ -104,7 +104,7 @@ CClientPerfStatLuaMemoryImpl::CClientPerfStatLuaMemoryImpl(void) // // /////////////////////////////////////////////////////////////// -CClientPerfStatLuaMemoryImpl::~CClientPerfStatLuaMemoryImpl(void) +CClientPerfStatLuaMemoryImpl::~CClientPerfStatLuaMemoryImpl() { } @@ -115,7 +115,7 @@ CClientPerfStatLuaMemoryImpl::~CClientPerfStatLuaMemoryImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CClientPerfStatLuaMemoryImpl::GetCategoryName(void) +const SString& CClientPerfStatLuaMemoryImpl::GetCategoryName() { return m_strCategoryName; } @@ -178,7 +178,7 @@ void CClientPerfStatLuaMemoryImpl::UpdateLuaMemory(CLuaMain* pLuaMain, int iMemU // // /////////////////////////////////////////////////////////////// -void CClientPerfStatLuaMemoryImpl::DoPulse(void) +void CClientPerfStatLuaMemoryImpl::DoPulse() { } diff --git a/Client/mods/deathmatch/logic/CClientPerfStat.LuaTiming.cpp b/Client/mods/deathmatch/logic/CClientPerfStat.LuaTiming.cpp index fe842c06903..eaf035c05e2 100644 --- a/Client/mods/deathmatch/logic/CClientPerfStat.LuaTiming.cpp +++ b/Client/mods/deathmatch/logic/CClientPerfStat.LuaTiming.cpp @@ -112,12 +112,12 @@ namespace class CClientPerfStatLuaTimingImpl : public CClientPerfStatLuaTiming { public: - CClientPerfStatLuaTimingImpl(void); - virtual ~CClientPerfStatLuaTimingImpl(void); + CClientPerfStatLuaTimingImpl(); + virtual ~CClientPerfStatLuaTimingImpl(); // CClientPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CClientPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CClientPerfStatLuaTiming @@ -159,7 +159,7 @@ CClientPerfStatLuaTiming* CClientPerfStatLuaTiming::GetSingleton() // // /////////////////////////////////////////////////////////////// -CClientPerfStatLuaTimingImpl::CClientPerfStatLuaTimingImpl(void) +CClientPerfStatLuaTimingImpl::CClientPerfStatLuaTimingImpl() { m_strCategoryName = "Lua timing"; m_LastTickCount = 0; @@ -173,7 +173,7 @@ CClientPerfStatLuaTimingImpl::CClientPerfStatLuaTimingImpl(void) // // /////////////////////////////////////////////////////////////// -CClientPerfStatLuaTimingImpl::~CClientPerfStatLuaTimingImpl(void) +CClientPerfStatLuaTimingImpl::~CClientPerfStatLuaTimingImpl() { } @@ -184,7 +184,7 @@ CClientPerfStatLuaTimingImpl::~CClientPerfStatLuaTimingImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CClientPerfStatLuaTimingImpl::GetCategoryName(void) +const SString& CClientPerfStatLuaTimingImpl::GetCategoryName() { return m_strCategoryName; } @@ -257,7 +257,7 @@ void CClientPerfStatLuaTimingImpl::UpdateLuaTiming(CLuaMain* pLuaMain, const cha // // /////////////////////////////////////////////////////////////// -void CClientPerfStatLuaTimingImpl::DoPulse(void) +void CClientPerfStatLuaTimingImpl::DoPulse() { long long llTickCount = GetTickCount64_(); long long llDelta = llTickCount - m_LastTickCount; diff --git a/Client/mods/deathmatch/logic/CClientPerfStat.PacketUsage.cpp b/Client/mods/deathmatch/logic/CClientPerfStat.PacketUsage.cpp index dadbb2aaa41..174d242d145 100644 --- a/Client/mods/deathmatch/logic/CClientPerfStat.PacketUsage.cpp +++ b/Client/mods/deathmatch/logic/CClientPerfStat.PacketUsage.cpp @@ -23,16 +23,16 @@ class CClientPerfStatPacketUsageImpl : public CClientPerfStatPacketUsage public: ZERO_ON_NEW - CClientPerfStatPacketUsageImpl(void); - virtual ~CClientPerfStatPacketUsageImpl(void); + CClientPerfStatPacketUsageImpl(); + virtual ~CClientPerfStatPacketUsageImpl(); // CClientPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CClientPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CClientPerfStatModuleImpl - void MaybeRecordStats(void); + void MaybeRecordStats(); int m_iStatsCleared; CElapsedTime m_TimeSinceGetStats; @@ -66,7 +66,7 @@ CClientPerfStatPacketUsage* CClientPerfStatPacketUsage::GetSingleton() // // /////////////////////////////////////////////////////////////// -CClientPerfStatPacketUsageImpl::CClientPerfStatPacketUsageImpl(void) +CClientPerfStatPacketUsageImpl::CClientPerfStatPacketUsageImpl() { m_strCategoryName = "Packet usage"; } @@ -78,7 +78,7 @@ CClientPerfStatPacketUsageImpl::CClientPerfStatPacketUsageImpl(void) // // /////////////////////////////////////////////////////////////// -CClientPerfStatPacketUsageImpl::~CClientPerfStatPacketUsageImpl(void) +CClientPerfStatPacketUsageImpl::~CClientPerfStatPacketUsageImpl() { } @@ -89,7 +89,7 @@ CClientPerfStatPacketUsageImpl::~CClientPerfStatPacketUsageImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CClientPerfStatPacketUsageImpl::GetCategoryName(void) +const SString& CClientPerfStatPacketUsageImpl::GetCategoryName() { return m_strCategoryName; } @@ -101,7 +101,7 @@ const SString& CClientPerfStatPacketUsageImpl::GetCategoryName(void) // // /////////////////////////////////////////////////////////////// -void CClientPerfStatPacketUsageImpl::DoPulse(void) +void CClientPerfStatPacketUsageImpl::DoPulse() { MaybeRecordStats(); } @@ -113,7 +113,7 @@ void CClientPerfStatPacketUsageImpl::DoPulse(void) // // /////////////////////////////////////////////////////////////// -void CClientPerfStatPacketUsageImpl::MaybeRecordStats(void) +void CClientPerfStatPacketUsageImpl::MaybeRecordStats() { // Someone watching? if (m_TimeSinceGetStats.Get() < 10000) diff --git a/Client/mods/deathmatch/logic/CClientPerfStatManager.cpp b/Client/mods/deathmatch/logic/CClientPerfStatManager.cpp index 0d62ef04ca3..c70a3ea952b 100644 --- a/Client/mods/deathmatch/logic/CClientPerfStatManager.cpp +++ b/Client/mods/deathmatch/logic/CClientPerfStatManager.cpp @@ -20,17 +20,17 @@ class CClientPerfStatManagerImpl : public CClientPerfStatManager { public: - CClientPerfStatManagerImpl(void); - virtual ~CClientPerfStatManagerImpl(void); + CClientPerfStatManagerImpl(); + virtual ~CClientPerfStatManagerImpl(); // CClientPerfStatManager - virtual void DoPulse(void); + virtual void DoPulse(); virtual void GetStats(CClientPerfStatResult* pOutResult, const SString& strCategory, const SString& strOptions, const SString& strFilter); // CClientPerfStatManagerImpl void AddModule(CClientPerfStatModule* pModule); void RemoveModule(CClientPerfStatModule* pModule); - uint GetModuleCount(void); + uint GetModuleCount(); CClientPerfStatModule* GetModuleByIndex(uint uiIndex); CClientPerfStatModule* GetModuleByCategoryName(const SString& strCategory); @@ -46,7 +46,7 @@ class CClientPerfStatManagerImpl : public CClientPerfStatManager /////////////////////////////////////////////////////////////// static CClientPerfStatManagerImpl* g_pClientPerfStatManagerImp = NULL; -CClientPerfStatManager* CClientPerfStatManager::GetSingleton(void) +CClientPerfStatManager* CClientPerfStatManager::GetSingleton() { if (!g_pClientPerfStatManagerImp) g_pClientPerfStatManagerImp = new CClientPerfStatManagerImpl(); @@ -60,7 +60,7 @@ CClientPerfStatManager* CClientPerfStatManager::GetSingleton(void) // // /////////////////////////////////////////////////////////////// -CClientPerfStatManagerImpl::CClientPerfStatManagerImpl(void) +CClientPerfStatManagerImpl::CClientPerfStatManagerImpl() { AddModule(CClientPerfStatLuaTiming::GetSingleton()); AddModule(CClientPerfStatLuaMemory::GetSingleton()); @@ -75,7 +75,7 @@ CClientPerfStatManagerImpl::CClientPerfStatManagerImpl(void) // // /////////////////////////////////////////////////////////////// -CClientPerfStatManagerImpl::~CClientPerfStatManagerImpl(void) +CClientPerfStatManagerImpl::~CClientPerfStatManagerImpl() { for (uint i = 0; i < GetModuleCount(); i++) { @@ -118,7 +118,7 @@ void CClientPerfStatManagerImpl::RemoveModule(CClientPerfStatModule* pModule) // // /////////////////////////////////////////////////////////////// -uint CClientPerfStatManagerImpl::GetModuleCount(void) +uint CClientPerfStatManagerImpl::GetModuleCount() { return m_ModuleList.size(); } @@ -162,7 +162,7 @@ CClientPerfStatModule* CClientPerfStatManagerImpl::GetModuleByCategoryName(const // // /////////////////////////////////////////////////////////////// -void CClientPerfStatManagerImpl::DoPulse(void) +void CClientPerfStatManagerImpl::DoPulse() { for (uint i = 0; i < GetModuleCount(); i++) { diff --git a/Client/mods/deathmatch/logic/CClientPerfStatManager.h b/Client/mods/deathmatch/logic/CClientPerfStatManager.h index af676f00a38..633e86c8843 100644 --- a/Client/mods/deathmatch/logic/CClientPerfStatManager.h +++ b/Client/mods/deathmatch/logic/CClientPerfStatManager.h @@ -17,10 +17,10 @@ class CClientPerfStatManager { public: - virtual ~CClientPerfStatManager(void) {} + virtual ~CClientPerfStatManager() {} - virtual void DoPulse(void) = 0; + virtual void DoPulse() = 0; virtual void GetStats(CClientPerfStatResult* pOutResult, const SString& strCategory, const SString& strOptions, const SString& strFilter) = 0; - static CClientPerfStatManager* GetSingleton(void); + static CClientPerfStatManager* GetSingleton(); }; diff --git a/Client/mods/deathmatch/logic/CClientPerfStatModule.h b/Client/mods/deathmatch/logic/CClientPerfStatModule.h index 64a97e8d003..c9f03e9803e 100644 --- a/Client/mods/deathmatch/logic/CClientPerfStatModule.h +++ b/Client/mods/deathmatch/logic/CClientPerfStatModule.h @@ -47,7 +47,7 @@ class CClientPerfStatResult iNumColumns++; } - SString* AddRow(void) + SString* AddRow() { iNumRows++; cellList.insert(cellList.end(), ColumnCount(), SString()); @@ -78,10 +78,10 @@ class CClientPerfStatResult class CClientPerfStatModule { public: - virtual ~CClientPerfStatModule(void) {} + virtual ~CClientPerfStatModule() {} - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CClientPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; }; @@ -92,8 +92,8 @@ class CClientPerfStatLuaTiming : public CClientPerfStatModule { public: // CClientPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CClientPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CClientPerfStatLuaTiming @@ -101,7 +101,7 @@ class CClientPerfStatLuaTiming : public CClientPerfStatModule virtual void OnLuaMainDestroy(CLuaMain* pLuaMain) = 0; virtual void UpdateLuaTiming(CLuaMain* pLuaMain, const char* szEventName, TIMEUS timeUs) = 0; - static CClientPerfStatLuaTiming* GetSingleton(void); + static CClientPerfStatLuaTiming* GetSingleton(); }; // @@ -111,15 +111,15 @@ class CClientPerfStatLuaMemory : public CClientPerfStatModule { public: // CClientPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CClientPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CClientPerfStatLuaMemory virtual void OnLuaMainCreate(CLuaMain* pLuaMain) = 0; virtual void OnLuaMainDestroy(CLuaMain* pLuaMain) = 0; - static CClientPerfStatLuaMemory* GetSingleton(void); + static CClientPerfStatLuaMemory* GetSingleton(); }; // @@ -129,13 +129,13 @@ class CClientPerfStatLibMemory : public CClientPerfStatModule { public: // CClientPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CClientPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CClientPerfStatLibMemory - static CClientPerfStatLibMemory* GetSingleton(void); + static CClientPerfStatLibMemory* GetSingleton(); }; // @@ -145,11 +145,11 @@ class CClientPerfStatPacketUsage : public CClientPerfStatModule { public: // CClientPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CClientPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CClientPerfStatPacketUsage - static CClientPerfStatPacketUsage* GetSingleton(void); + static CClientPerfStatPacketUsage* GetSingleton(); }; diff --git a/Client/mods/deathmatch/logic/CClientPickup.cpp b/Client/mods/deathmatch/logic/CClientPickup.cpp index 857c41f5185..431532eddad 100644 --- a/Client/mods/deathmatch/logic/CClientPickup.cpp +++ b/Client/mods/deathmatch/logic/CClientPickup.cpp @@ -37,7 +37,7 @@ CClientPickup::CClientPickup(CClientManager* pManager, ElementID ID, unsigned sh UpdateStreamPosition(m_vecPosition = vecPosition); } -CClientPickup::~CClientPickup(void) +CClientPickup::~CClientPickup() { AttachTo(NULL); @@ -48,7 +48,7 @@ CClientPickup::~CClientPickup(void) Unlink(); } -void CClientPickup::Unlink(void) +void CClientPickup::Unlink() { m_pPickupManager->RemoveFromList(this); } @@ -103,13 +103,13 @@ void CClientPickup::StreamIn(bool bInstantly) NotifyCreate(); } -void CClientPickup::StreamOut(void) +void CClientPickup::StreamOut() { // Destroy it Destroy(); } -void CClientPickup::Create(void) +void CClientPickup::Create() { if (!m_pPickup && m_bVisible) { @@ -144,7 +144,7 @@ void CClientPickup::Create(void) } } -void CClientPickup::Destroy(void) +void CClientPickup::Destroy() { if (m_pCollision) { @@ -163,7 +163,7 @@ void CClientPickup::Destroy(void) } } -void CClientPickup::ReCreate(void) +void CClientPickup::ReCreate() { // If we had a pickup, destroy and recreate it if (m_pPickup) diff --git a/Client/mods/deathmatch/logic/CClientPickup.h b/Client/mods/deathmatch/logic/CClientPickup.h index af78e0c60aa..dfb3d8acb5e 100644 --- a/Client/mods/deathmatch/logic/CClientPickup.h +++ b/Client/mods/deathmatch/logic/CClientPickup.h @@ -89,40 +89,40 @@ class CClientPickup : public CClientStreamElement, private CClientColCallback }; CClientPickup(class CClientManager* pManager, ElementID ID, unsigned short usModel, CVector vecPosition = CVector(0, 0, 0)); - ~CClientPickup(void); + ~CClientPickup(); - void Unlink(void); + void Unlink(); - eClientEntityType GetType(void) const { return CCLIENTPICKUP; }; + eClientEntityType GetType() const { return CCLIENTPICKUP; }; - unsigned short GetModel(void) { return m_usModel; }; + unsigned short GetModel() { return m_usModel; }; - CPickup* GetGamePickup(void) { return m_pPickup; }; - CObject* GetGameObject(void) { return m_pObject; } - CEntity* GetGameEntity(void) { return m_pObject; } - const CEntity* GetGameEntity(void) const { return m_pObject; } + CPickup* GetGamePickup() { return m_pPickup; }; + CObject* GetGameObject() { return m_pObject; } + CEntity* GetGameEntity() { return m_pObject; } + const CEntity* GetGameEntity() const { return m_pObject; } - const CVector& GetPosition(void) { return m_vecPosition; }; + const CVector& GetPosition() { return m_vecPosition; }; void GetPosition(CVector& vecPosition) const { vecPosition = m_vecPosition; }; void SetPosition(const CVector& vecPosition); void SetModel(unsigned short usModel); - bool IsVisible(void) { return m_bVisible; }; + bool IsVisible() { return m_bVisible; }; void SetVisible(bool bVisible); - CClientColShape* GetColShape(void) { return m_pCollision; } + CClientColShape* GetColShape() { return m_pCollision; } void Callback_OnCollision(CClientColShape& Shape, CClientEntity& Entity); void Callback_OnLeave(CClientColShape& Shape, CClientEntity& Entity); protected: void StreamIn(bool bInstantly); - void StreamOut(void); + void StreamOut(); private: - void Create(void); - void Destroy(void); - void ReCreate(void); + void Create(); + void Destroy(); + void ReCreate(); CClientPickupManager* m_pPickupManager; diff --git a/Client/mods/deathmatch/logic/CClientPickupManager.cpp b/Client/mods/deathmatch/logic/CClientPickupManager.cpp index 9f3533e944b..098c3e71a6a 100644 --- a/Client/mods/deathmatch/logic/CClientPickupManager.cpp +++ b/Client/mods/deathmatch/logic/CClientPickupManager.cpp @@ -30,7 +30,7 @@ CClientPickupManager::CClientPickupManager(CClientManager* pManager) m_bPickupProcessingDisabled = false; } -CClientPickupManager::~CClientPickupManager(void) +CClientPickupManager::~CClientPickupManager() { // Delete all the pickups DeleteAll(); @@ -48,7 +48,7 @@ CClientPickup* CClientPickupManager::Get(ElementID ID) return NULL; } -void CClientPickupManager::DeleteAll(void) +void CClientPickupManager::DeleteAll() { // Delete each pickup m_bDontRemoveFromList = true; @@ -94,7 +94,7 @@ bool CClientPickupManager::IsValidWeaponID(unsigned short usWeaponID) return (usWeaponID > 0 && usWeaponID != 13 && usWeaponID != 19 && usWeaponID != 20 && usWeaponID != 21 && usWeaponID <= 46); } -bool CClientPickupManager::IsPickupLimitReached(void) +bool CClientPickupManager::IsPickupLimitReached() { // Max 600 pickups return (m_uiPickupCount >= 64); diff --git a/Client/mods/deathmatch/logic/CClientPickupManager.h b/Client/mods/deathmatch/logic/CClientPickupManager.h index 58552de50a3..901dd563c3d 100644 --- a/Client/mods/deathmatch/logic/CClientPickupManager.h +++ b/Client/mods/deathmatch/logic/CClientPickupManager.h @@ -22,31 +22,31 @@ class CClientPickupManager friend class CClientPickup; public: - unsigned int Count(void) { return static_cast(m_List.size()); }; + unsigned int Count() { return static_cast(m_List.size()); }; static CClientPickup* Get(ElementID ID); - void DeleteAll(void); + void DeleteAll(); bool Exists(CClientPickup* pPickup); - std::list::const_iterator IterBegin(void) { return m_List.begin(); }; - std::list::const_iterator IterEnd(void) { return m_List.end(); }; + std::list::const_iterator IterBegin() { return m_List.begin(); }; + std::list::const_iterator IterEnd() { return m_List.end(); }; - bool IsPickupProcessingDisabled(void) { return m_bPickupProcessingDisabled; }; + bool IsPickupProcessingDisabled() { return m_bPickupProcessingDisabled; }; void SetPickupProcessingDisabled(bool bDisabled); static bool IsValidPickupID(unsigned short usPickupID); static bool IsValidWeaponID(unsigned short usWeaponID); static unsigned short GetWeaponModel(unsigned int uiWeaponID); - static unsigned short GetHealthModel(void) { return 1240; }; - static unsigned short GetArmorModel(void) { return 1242; }; + static unsigned short GetHealthModel() { return 1240; }; + static unsigned short GetArmorModel() { return 1242; }; - static bool IsPickupLimitReached(void); + static bool IsPickupLimitReached(); void RestreamPickups(unsigned short usModel); private: CClientPickupManager(CClientManager* pManager); - ~CClientPickupManager(void); + ~CClientPickupManager(); void RemoveFromList(CClientPickup* pPickup); diff --git a/Client/mods/deathmatch/logic/CClientPlayer.cpp b/Client/mods/deathmatch/logic/CClientPlayer.cpp index 982c42edb9f..0dcc4c8da6f 100644 --- a/Client/mods/deathmatch/logic/CClientPlayer.cpp +++ b/Client/mods/deathmatch/logic/CClientPlayer.cpp @@ -87,7 +87,7 @@ CClientPlayer::CClientPlayer(CClientManager* pManager, ElementID ID, bool bIsLoc m_LastPuresyncType = PURESYNC_TYPE_NONE; } -CClientPlayer::~CClientPlayer(void) +CClientPlayer::~CClientPlayer() { // Remove us from the team if (m_pTeam) @@ -100,7 +100,7 @@ CClientPlayer::~CClientPlayer(void) delete m_voice; } -void CClientPlayer::Unlink(void) +void CClientPlayer::Unlink() { m_pManager->GetPlayerManager()->RemoveFromList(this); } @@ -160,7 +160,7 @@ void CClientPlayer::SetNametagOverrideColor(unsigned char ucR, unsigned char ucG m_bNametagColorOverridden = true; } -void CClientPlayer::RemoveNametagOverrideColor(void) +void CClientPlayer::RemoveNametagOverrideColor() { m_ucNametagColorR = 255; m_ucNametagColorG = 255; @@ -192,7 +192,7 @@ bool CClientPlayer::IsOnMyTeam(CClientPlayer* pPlayer) return false; } -void CClientPlayer::Reset(void) +void CClientPlayer::Reset() { // stats for (unsigned short us = 0; us <= NUM_PLAYER_STATS; us++) @@ -328,12 +328,12 @@ void CClientPlayer::SetRemoteVersionInfo(ushort usBitstreamVersion, uint uiBuild m_uiRemoteBuildNumber = uiBuildNumber; } -ushort CClientPlayer::GetRemoteBitstreamVersion(void) +ushort CClientPlayer::GetRemoteBitstreamVersion() { return m_usRemoteBitstreamVersion; } -uint CClientPlayer::GetRemoteBuildNumber(void) +uint CClientPlayer::GetRemoteBuildNumber() { return m_uiRemoteBuildNumber; } diff --git a/Client/mods/deathmatch/logic/CClientPlayer.h b/Client/mods/deathmatch/logic/CClientPlayer.h index 4b1ff13e76e..8735948ad9d 100644 --- a/Client/mods/deathmatch/logic/CClientPlayer.h +++ b/Client/mods/deathmatch/logic/CClientPlayer.h @@ -35,78 +35,78 @@ class CClientPlayer : public CClientPed public: CClientPlayer(CClientManager* pManager, ElementID ID, bool bIsLocalPlayer = false); - virtual ~CClientPlayer(void); + virtual ~CClientPlayer(); - void Unlink(void); + void Unlink(); - eClientEntityType GetType(void) const { return CCLIENTPLAYER; } + eClientEntityType GetType() const { return CCLIENTPLAYER; } - const char* GetNick(void) const { return m_strNick; } + const char* GetNick() const { return m_strNick; } void SetNick(const char* szNick); - unsigned int GetPing(void) { return (m_bIsLocalPlayer) ? g_pNet->GetPing() : m_uiPing; } + unsigned int GetPing() { return (m_bIsLocalPlayer) ? g_pNet->GetPing() : m_uiPing; } void SetPing(unsigned int uiPing) { m_uiPing = uiPing; } void GetNametagColor(unsigned char& ucR, unsigned char& ucG, unsigned char& ucB); void SetNametagOverrideColor(unsigned char ucR, unsigned char ucG, unsigned char ucB); - void RemoveNametagOverrideColor(void); - bool IsNametagColorOverridden(void) { return m_bNametagColorOverridden; } + void RemoveNametagOverrideColor(); + bool IsNametagColorOverridden() { return m_bNametagColorOverridden; } - const char* GetNametagText(void) { return m_strNametag.c_str(); } + const char* GetNametagText() { return m_strNametag.c_str(); } void SetNametagText(const char* szText); - bool IsNametagShowing(void) { return m_bNametagShowing; } + bool IsNametagShowing() { return m_bNametagShowing; } void SetNametagShowing(bool bShowing) { m_bNametagShowing = bShowing; } - unsigned long GetLastNametagShow(void) { return m_ulLastNametagShow; } + unsigned long GetLastNametagShow() { return m_ulLastNametagShow; } void SetLastNametagShow(unsigned long ulTime) { m_ulLastNametagShow = ulTime; } void SetIsExtrapolatingAim(bool m_bExtrap) { m_bDoExtrapolatingAim = m_bExtrap; } - bool IsExtrapolatingAim(void) { return m_bDoExtrapolatingAim; } + bool IsExtrapolatingAim() { return m_bDoExtrapolatingAim; } void UpdateAimPosition(const CVector& vecAim); - unsigned short GetLatency(void) { return m_usLatency; } + unsigned short GetLatency() { return m_usLatency; } void SetLatency(unsigned short usLatency) { m_usLatency = (m_usLatency + usLatency) / 2; } - unsigned long GetLastPuresyncTime(void) { return m_ulLastPuresyncTime; } + unsigned long GetLastPuresyncTime() { return m_ulLastPuresyncTime; } void SetLastPuresyncTime(unsigned long ulLastPuresyncTime) { m_ulLastPuresyncTime = ulLastPuresyncTime; } - const CVector& GetLastPuresyncPosition(void) { return m_vecLastPuresyncPosition; } + const CVector& GetLastPuresyncPosition() { return m_vecLastPuresyncPosition; } void SetLastPuresyncPosition(const CVector& vecPosition) { m_vecLastPuresyncPosition = vecPosition; } - bool HasConnectionTrouble(void) { return m_bHasConnectionTrouble; } + bool HasConnectionTrouble() { return m_bHasConnectionTrouble; } void SetHasConnectionTrouble(bool bHasTrouble) { m_bHasConnectionTrouble = bHasTrouble; } - ePuresyncType GetLastPuresyncType(void) { return m_LastPuresyncType; } + ePuresyncType GetLastPuresyncType() { return m_LastPuresyncType; } void SetLastPuresyncType(ePuresyncType LastPuresyncType) { m_LastPuresyncType = LastPuresyncType; } void SetLightsyncCalcedVelocity(const CVector& vecVelocity) { m_vecLightsyncCalcedVelocity = vecVelocity; } - const CVector& GetLightsyncCalcedVelocity(void) { return m_vecLightsyncCalcedVelocity; } - void IncrementPlayerSync(void) { ++m_uiPlayerSyncCount; } - void IncrementKeySync(void) { ++m_uiKeySyncCount; } - void IncrementVehicleSync(void) { ++m_uiVehicleSyncCount; } + const CVector& GetLightsyncCalcedVelocity() { return m_vecLightsyncCalcedVelocity; } + void IncrementPlayerSync() { ++m_uiPlayerSyncCount; } + void IncrementKeySync() { ++m_uiKeySyncCount; } + void IncrementVehicleSync() { ++m_uiVehicleSyncCount; } - unsigned int GetPlayerSyncCount(void) { return m_uiPlayerSyncCount; } - unsigned int GetKeySyncCount(void) { return m_uiKeySyncCount; } - unsigned int GetVehicleSyncCount(void) { return m_uiVehicleSyncCount; } + unsigned int GetPlayerSyncCount() { return m_uiPlayerSyncCount; } + unsigned int GetKeySyncCount() { return m_uiKeySyncCount; } + unsigned int GetVehicleSyncCount() { return m_uiVehicleSyncCount; } - CClientTeam* GetTeam(void) { return m_pTeam; } + CClientTeam* GetTeam() { return m_pTeam; } void SetTeam(CClientTeam* pTeam, bool bChangeTeam); bool IsOnMyTeam(CClientPlayer* pPlayer); - CClientPlayerVoice* GetVoice(void) { return m_voice; } + CClientPlayerVoice* GetVoice() { return m_voice; } void SetPlayerVoice(CClientPlayerVoice* voice) { m_voice = voice; } - float GetNametagDistance(void) { return m_fNametagDistance; } + float GetNametagDistance() { return m_fNametagDistance; } void SetNametagDistance(float fDistance) { m_fNametagDistance = fDistance; } - bool IsDeadOnNetwork(void) { return m_bNetworkDead; } + bool IsDeadOnNetwork() { return m_bNetworkDead; } void SetDeadOnNetwork(bool bDead) { m_bNetworkDead = bDead; } - void Reset(void); + void Reset(); - CClientManager* GetManager(void) { return m_pManager; } + CClientManager* GetManager() { return m_pManager; } void DischargeWeapon(eWeaponType weaponType, const CVector& vecStart, const CVector& vecEnd, float fBackupDamage, uchar ucBackupHitZone, CClientPlayer* pBackupDamagedPlayer); void SetRemoteVersionInfo(ushort usBitstreamVersion, uint uiBuildNumber); - ushort GetRemoteBitstreamVersion(void); - uint GetRemoteBuildNumber(void); + ushort GetRemoteBitstreamVersion(); + uint GetRemoteBuildNumber(); bool GetWasRecentlyInNetworkInterruption(uint uiMaxTicksAgo); void SetIsInNetworkInterruption(bool bInNetworkInterruption); diff --git a/Client/mods/deathmatch/logic/CClientPlayerClothes.cpp b/Client/mods/deathmatch/logic/CClientPlayerClothes.cpp index 4725030c0b7..b027819962e 100644 --- a/Client/mods/deathmatch/logic/CClientPlayerClothes.cpp +++ b/Client/mods/deathmatch/logic/CClientPlayerClothes.cpp @@ -306,7 +306,7 @@ CClientPlayerClothes::CClientPlayerClothes(CClientPed* pPlayerModel) } } -CClientPlayerClothes::~CClientPlayerClothes(void) +CClientPlayerClothes::~CClientPlayerClothes() { RemoveAll(false); } @@ -383,7 +383,7 @@ bool CClientPlayerClothes::RemoveClothes(unsigned char ucType, bool bRemoveFromM return false; } -void CClientPlayerClothes::AddAllToModel(void) +void CClientPlayerClothes::AddAllToModel() { if (m_pPlayerModel) { diff --git a/Client/mods/deathmatch/logic/CClientPlayerClothes.h b/Client/mods/deathmatch/logic/CClientPlayerClothes.h index 56336fb21a6..420856377d9 100644 --- a/Client/mods/deathmatch/logic/CClientPlayerClothes.h +++ b/Client/mods/deathmatch/logic/CClientPlayerClothes.h @@ -49,14 +49,14 @@ class CClientPlayerClothes { public: CClientPlayerClothes(CClientPed* pPed); - ~CClientPlayerClothes(void); + ~CClientPlayerClothes(); const SPlayerClothing* GetClothing(unsigned char ucType); void AddClothes(const char* szTexture, const char* szModel, unsigned char ucType, bool bAddToModel = true); void InternalAddClothes(const SPlayerClothing* pClothing, unsigned char ucType); bool RemoveClothes(unsigned char ucType, bool bRemoveFromModel = true); - void AddAllToModel(void); + void AddAllToModel(); void RemoveAll(bool bRemoveFromModel = true); void DefaultClothes(bool bAddToModel = true); diff --git a/Client/mods/deathmatch/logic/CClientPlayerManager.cpp b/Client/mods/deathmatch/logic/CClientPlayerManager.cpp index 1516acdea75..83a0bb31d7e 100644 --- a/Client/mods/deathmatch/logic/CClientPlayerManager.cpp +++ b/Client/mods/deathmatch/logic/CClientPlayerManager.cpp @@ -23,13 +23,13 @@ CClientPlayerManager::CClientPlayerManager(CClientManager* pManager) m_pLocalPlayer = NULL; } -CClientPlayerManager::~CClientPlayerManager(void) +CClientPlayerManager::~CClientPlayerManager() { // Destroy all players DeleteAll(); } -void CClientPlayerManager::DoPulse(void) +void CClientPlayerManager::DoPulse() { unsigned long ulCurrentTime = CClientTime::GetTime(); CClientPlayer* pPlayer = NULL; @@ -87,7 +87,7 @@ void CClientPlayerManager::DoPulse(void) } } -void CClientPlayerManager::DeleteAll(void) +void CClientPlayerManager::DeleteAll() { // Delete all the players m_bCanRemoveFromList = false; @@ -169,7 +169,7 @@ bool CClientPlayerManager::Exists(CClientPlayer* pPlayer) return m_Players.Contains(pPlayer); } -bool CClientPlayerManager::IsPlayerLimitReached(void) +bool CClientPlayerManager::IsPlayerLimitReached() { return g_pGame->GetPools()->GetPedCount() >= 110; @@ -184,7 +184,7 @@ bool CClientPlayerManager::IsValidModel(unsigned long ulModel) ulModel >= 274 && ulModel <= 288 || ulModel >= 290 && ulModel <= 312); } -void CClientPlayerManager::ResetAll(void) +void CClientPlayerManager::ResetAll() { vector::const_iterator iter = m_Players.begin(); for (; iter != m_Players.end(); iter++) diff --git a/Client/mods/deathmatch/logic/CClientPlayerManager.h b/Client/mods/deathmatch/logic/CClientPlayerManager.h index cd7bf7d31ce..1dac3319750 100644 --- a/Client/mods/deathmatch/logic/CClientPlayerManager.h +++ b/Client/mods/deathmatch/logic/CClientPlayerManager.h @@ -24,31 +24,31 @@ class CClientPlayerManager friend class CClientPlayer; public: - CClientPlayer* GetLocalPlayer(void) { return m_pLocalPlayer; }; + CClientPlayer* GetLocalPlayer() { return m_pLocalPlayer; }; void SetLocalPlayer(CClientPlayer* pPlayer) { m_pLocalPlayer = pPlayer; }; - void DoPulse(void); - void DeleteAll(void); + void DoPulse(); + void DeleteAll(); - unsigned int Count(void) { return static_cast(m_Players.size()); }; + unsigned int Count() { return static_cast(m_Players.size()); }; static CClientPlayer* Get(ElementID ID); CClientPlayer* Get(const char* szNick, bool bCaseSensitive = false); CClientPlayer* Get(CPlayerPed* pPlayer, bool bValidatePointer); bool Exists(CClientPlayer* pPlayer); - static bool IsPlayerLimitReached(void); + static bool IsPlayerLimitReached(); - std::vector::const_iterator IterBegin(void) { return m_Players.begin(); }; - std::vector::const_iterator IterEnd(void) { return m_Players.end(); }; + std::vector::const_iterator IterBegin() { return m_Players.begin(); }; + std::vector::const_iterator IterEnd() { return m_Players.end(); }; static bool IsValidModel(unsigned long ulModel); - void ResetAll(void); + void ResetAll(); private: CClientPlayerManager(CClientManager* pManager); - ~CClientPlayerManager(void); + ~CClientPlayerManager(); void AddToList(CClientPlayer* pPlayer) { m_Players.push_back(pPlayer); }; void RemoveFromList(CClientPlayer* pPlayer); diff --git a/Client/mods/deathmatch/logic/CClientPlayerVoice.cpp b/Client/mods/deathmatch/logic/CClientPlayerVoice.cpp index b23c97ea923..76dddf16bf5 100644 --- a/Client/mods/deathmatch/logic/CClientPlayerVoice.cpp +++ b/Client/mods/deathmatch/logic/CClientPlayerVoice.cpp @@ -46,7 +46,7 @@ CClientPlayerVoice::CClientPlayerVoice(CClientPlayer* pPlayer, CVoiceRecorder* p m_fPlaybackSpeed = 1.0f; Init(); } -CClientPlayerVoice::~CClientPlayerVoice(void) +CClientPlayerVoice::~CClientPlayerVoice() { DeInit(); } @@ -66,7 +66,7 @@ void CALLBACK BASS_VoiceStateChange(HSYNC handle, DWORD channel, DWORD data, voi } } -void CClientPlayerVoice::Init(void) +void CClientPlayerVoice::Init() { // Grab our sample rate and quality m_SampleRate = m_pVoiceRecorder->GetSampleRate(); @@ -88,7 +88,7 @@ void CClientPlayerVoice::Init(void) speex_decoder_ctl(m_pSpeexDecoderState, SPEEX_SET_QUALITY, &ucQuality); } -void CClientPlayerVoice::DeInit(void) +void CClientPlayerVoice::DeInit() { BASS_ChannelStop(m_pBassPlaybackStream); BASS_StreamFree(m_pBassPlaybackStream); @@ -101,7 +101,7 @@ void CClientPlayerVoice::DeInit(void) m_SampleRate = SAMPLERATE_WIDEBAND; } -void CClientPlayerVoice::DoPulse(void) +void CClientPlayerVoice::DoPulse() { // Dispatch queued events ServiceEventQueue(); @@ -153,7 +153,7 @@ void CClientPlayerVoice::DecodeAndBuffer(char* pBuffer, unsigned int bytesWritte BASS_StreamPutData(m_pBassPlaybackStream, (void*)pTempBuffer, uiSpeexBlockSize); } -void CClientPlayerVoice::ServiceEventQueue(void) +void CClientPlayerVoice::ServiceEventQueue() { std::list eventQueue; { @@ -187,7 +187,7 @@ void CClientPlayerVoice::SetPlayPosition(double dPosition) } } -double CClientPlayerVoice::GetPlayPosition(void) +double CClientPlayerVoice::GetPlayPosition() { if (m_pBassPlaybackStream) { @@ -209,7 +209,7 @@ double CClientPlayerVoice::GetLength(bool bAvoidLoad) return 0; } -float CClientPlayerVoice::GetVolume(void) +float CClientPlayerVoice::GetVolume() { return m_fVolume; } @@ -225,7 +225,7 @@ void CClientPlayerVoice::SetVolume(float fVolume, bool bStore) } } -float CClientPlayerVoice::GetPlaybackSpeed(void) +float CClientPlayerVoice::GetPlaybackSpeed() { return m_fPlaybackSpeed; } @@ -331,7 +331,7 @@ float* CClientPlayerVoice::GetWaveData(int iLength) return NULL; } -DWORD CClientPlayerVoice::GetLevelData(void) +DWORD CClientPlayerVoice::GetLevelData() { if (m_pBassPlaybackStream) { @@ -366,7 +366,7 @@ bool CClientPlayerVoice::SetFxEffect(uint uiFxEffect, bool bEnable) // // Copy state stored in m_EnabledEffects to actual BASS sound // -void CClientPlayerVoice::ApplyFxEffects(void) +void CClientPlayerVoice::ApplyFxEffects() { for (uint i = 0; i < NUMELMS(m_FxEffects) && NUMELMS(m_EnabledEffects); i++) { @@ -452,7 +452,7 @@ void CClientPlayerVoice::SetPaused(bool bPaused) } } -bool CClientPlayerVoice::IsPaused(void) +bool CClientPlayerVoice::IsPaused() { return m_bPaused; } diff --git a/Client/mods/deathmatch/logic/CClientPlayerVoice.h b/Client/mods/deathmatch/logic/CClientPlayerVoice.h index 8a2a2619046..39ce38121d7 100644 --- a/Client/mods/deathmatch/logic/CClientPlayerVoice.h +++ b/Client/mods/deathmatch/logic/CClientPlayerVoice.h @@ -27,9 +27,9 @@ class CClientPlayerVoice public: ZERO_ON_NEW CClientPlayerVoice(CClientPlayer* pPlayer, CVoiceRecorder* pVoiceRecorder); - ~CClientPlayerVoice(void); + ~CClientPlayerVoice(); void DecodeAndBuffer(char* pBuffer, unsigned int bytesWritten); - void DoPulse(void); + void DoPulse(); bool m_bVoiceActive; @@ -45,40 +45,40 @@ class CClientPlayerVoice }; void SetPaused(bool bPaused); - bool IsPaused(void); + bool IsPaused(); void SetPlayPosition(double dPosition); - double GetPlayPosition(void); + double GetPlayPosition(); double GetLength(bool bAvoidLoad = false); void SetVolume(float fVolume, bool bStore = true); - float GetVolume(void); + float GetVolume(); void SetPlaybackSpeed(float fSpeed); - float GetPlaybackSpeed(void); + float GetPlaybackSpeed(); void ApplyFXModifications(float fSampleRate, float fTempo, float fPitch, bool bReversed); void GetFXModifications(float& fSampleRate, float& fTempo, float& fPitch, bool& bReversed); float* GetFFTData(int iLength); float* GetWaveData(int iLength); - bool IsPanEnabled(void); + bool IsPanEnabled(); bool SetPanEnabled(bool bPan); - DWORD GetLevelData(void); - float GetSoundBPM(void); + DWORD GetLevelData(); + float GetSoundBPM(); bool SetPan(float fPan); bool GetPan(float& fPan); bool SetFxEffect(uint uiFxEffect, bool bEnable); bool IsFxEffectEnabled(uint uiFxEffect); - bool IsActive(void) { return m_bVoiceActive; } + bool IsActive() { return m_bVoiceActive; } private: - void Init(void); - void DeInit(void); - void ServiceEventQueue(void); - void ApplyFxEffects(void); + void Init(); + void DeInit(); + void ServiceEventQueue(); + void ApplyFxEffects(); CClientPlayer* m_pPlayer; CVoiceRecorder* m_pVoiceRecorder; diff --git a/Client/mods/deathmatch/logic/CClientPointLights.cpp b/Client/mods/deathmatch/logic/CClientPointLights.cpp index e47cf46a5cc..635ffd60c7d 100644 --- a/Client/mods/deathmatch/logic/CClientPointLights.cpp +++ b/Client/mods/deathmatch/logic/CClientPointLights.cpp @@ -32,18 +32,18 @@ CClientPointLights::CClientPointLights(class CClientManager* pManager, ElementID m_pPointLightsManager->AddToList(this); } -CClientPointLights::~CClientPointLights(void) +CClientPointLights::~CClientPointLights() { // Remove us from the manager's list Unlink(); } -void CClientPointLights::Unlink(void) +void CClientPointLights::Unlink() { m_pPointLightsManager->RemoveFromList(this); } -void CClientPointLights::DoPulse(void) +void CClientPointLights::DoPulse() { // Update our position/rotation if we're attached DoAttaching(); diff --git a/Client/mods/deathmatch/logic/CClientPointLights.h b/Client/mods/deathmatch/logic/CClientPointLights.h index a33b8a67214..51286e9b5d8 100644 --- a/Client/mods/deathmatch/logic/CClientPointLights.h +++ b/Client/mods/deathmatch/logic/CClientPointLights.h @@ -21,38 +21,38 @@ class CClientPointLights : public CClientEntity public: CClientPointLights(class CClientManager* pManager, ElementID ID); - ~CClientPointLights(void); + ~CClientPointLights(); - void Unlink(void); + void Unlink(); - eClientEntityType GetType(void) const { return CCLIENTPOINTLIGHTS; }; + eClientEntityType GetType() const { return CCLIENTPOINTLIGHTS; }; - int GetMode(void) { return m_iMode; }; + int GetMode() { return m_iMode; }; void SetMode(int iMode) { m_iMode = iMode; }; void GetPosition(CVector& vecPosition) const { vecPosition = m_vecPosition; }; void SetPosition(const CVector& vecPosition) { m_vecPosition = vecPosition; }; - float GetRadius(void) { return m_fRadius; }; + float GetRadius() { return m_fRadius; }; void SetRadius(float fRadius) { m_fRadius = fRadius; }; - SColor GetColor(void) { return m_Color; }; + SColor GetColor() { return m_Color; }; void SetColor(SColor color) { m_Color = color; }; - CVector& GetDirection(void) { return m_vecDirection; }; + CVector& GetDirection() { return m_vecDirection; }; void SetDirection(CVector& vecDirection) { m_vecDirection = vecDirection; }; - bool GetCreatesShadow(void) { return m_bCreatesShadow; }; + bool GetCreatesShadow() { return m_bCreatesShadow; }; void SetCreatesShadow(bool bCreatesShadow) { m_bCreatesShadow = bCreatesShadow; }; - CClientEntity* GetAffected(void) { return m_pAffected; }; + CClientEntity* GetAffected() { return m_pAffected; }; void SetAffected(CClientEntity* pAffected) { m_pAffected = pAffected; }; void SetDimension(unsigned short usDimension); void RelateDimension(unsigned short usDimension); protected: - void DoPulse(void); + void DoPulse(); CClientPointLightsManager* m_pPointLightsManager; diff --git a/Client/mods/deathmatch/logic/CClientPointLightsManager.cpp b/Client/mods/deathmatch/logic/CClientPointLightsManager.cpp index 6ebab6640b6..547bd4c6961 100644 --- a/Client/mods/deathmatch/logic/CClientPointLightsManager.cpp +++ b/Client/mods/deathmatch/logic/CClientPointLightsManager.cpp @@ -20,7 +20,7 @@ CClientPointLightsManager::CClientPointLightsManager(CClientManager* pManager) m_usDimension = 0; } -CClientPointLightsManager::~CClientPointLightsManager(void) +CClientPointLightsManager::~CClientPointLightsManager() { // Make sure all the lights are deleted DeleteAll(); @@ -41,7 +41,7 @@ void CClientPointLightsManager::Delete(CClientPointLights* pLight) delete pLight; } -void CClientPointLightsManager::DeleteAll(void) +void CClientPointLightsManager::DeleteAll() { // Delete all the lights m_bDontRemoveFromList = true; @@ -85,7 +85,7 @@ void CClientPointLightsManager::SetDimension(unsigned short usDimension) m_usDimension = usDimension; } -void CClientPointLightsManager::DoPulse(void) +void CClientPointLightsManager::DoPulse() { // Pulse each light list::const_iterator iter = m_List.begin(); diff --git a/Client/mods/deathmatch/logic/CClientPointLightsManager.h b/Client/mods/deathmatch/logic/CClientPointLightsManager.h index 6898f902b15..9a757f86204 100644 --- a/Client/mods/deathmatch/logic/CClientPointLightsManager.h +++ b/Client/mods/deathmatch/logic/CClientPointLightsManager.h @@ -22,23 +22,23 @@ class CClientPointLightsManager public: CClientPointLightsManager(CClientManager* pManager); - ~CClientPointLightsManager(void); + ~CClientPointLightsManager(); CClientPointLights* Create(ElementID ID); void Delete(CClientPointLights* pLight); - void DeleteAll(void); + void DeleteAll(); - std::list::const_iterator IterBegin(void) { return m_List.begin(); }; - std::list::const_iterator IterEnd(void) { return m_List.end(); }; + std::list::const_iterator IterBegin() { return m_List.begin(); }; + std::list::const_iterator IterEnd() { return m_List.end(); }; static CClientPointLights* Get(ElementID ID); - unsigned short GetDimension(void) { return m_usDimension; }; + unsigned short GetDimension() { return m_usDimension; }; void SetDimension(unsigned short usDimension); - void DoPulse(void); - void RenderHeliLightHandler(void); + void DoPulse(); + void RenderHeliLightHandler(); static bool IsLightsLimitReached(); diff --git a/Client/mods/deathmatch/logic/CClientProjectile.cpp b/Client/mods/deathmatch/logic/CClientProjectile.cpp index 1e42cca67fd..adb4ca0fa9c 100644 --- a/Client/mods/deathmatch/logic/CClientProjectile.cpp +++ b/Client/mods/deathmatch/logic/CClientProjectile.cpp @@ -67,7 +67,7 @@ CClientProjectile::CClientProjectile(class CClientManager* pManager, CProjectile } } -CClientProjectile::~CClientProjectile(void) +CClientProjectile::~CClientProjectile() { // If our creator is getting destroyed, this should be null if (m_pCreator) @@ -107,7 +107,7 @@ CClientProjectile::~CClientProjectile(void) CClientEntityRefManager::RemoveEntityRefs(0, &m_pCreator, &m_pTarget, NULL); } -void CClientProjectile::Unlink(void) +void CClientProjectile::Unlink() { // Are we still linked? (this bool will be set to false when our manager is being destroyed) if (m_bLinked) @@ -124,7 +124,7 @@ void CClientProjectile::Unlink(void) } } -void CClientProjectile::DoPulse(void) +void CClientProjectile::DoPulse() { // We use initiate data to set values on creation (as it doesn't exist until a frame after our projectile hook) if (m_bInitiate) @@ -189,7 +189,7 @@ void CClientProjectile::Destroy(bool bBlow) } } -bool CClientProjectile::IsActive(void) +bool CClientProjectile::IsActive() { // Ensure airbomb is cleaned up if (m_weaponType == WEAPONTYPE_FREEFALL_BOMB && GetTickCount64_() - m_llCreationTime > AIRBOMB_MAX_LIFETIME) @@ -291,7 +291,7 @@ void CClientProjectile::SetVelocity(CVector& vecVelocity) m_pProjectile->SetMoveSpeed(&vecVelocity); } -unsigned short CClientProjectile::GetModel(void) +unsigned short CClientProjectile::GetModel() { if (m_pProjectile) return m_pProjectile->GetModelIndex(); @@ -310,14 +310,14 @@ void CClientProjectile::SetCounter(DWORD dwCounter) m_pProjectileInfo->SetCounter(dwCounter); } -DWORD CClientProjectile::GetCounter(void) +DWORD CClientProjectile::GetCounter() { if (m_pProjectile) return m_pProjectileInfo->GetCounter(); return 0; } -CClientEntity* CClientProjectile::GetSatchelAttachedTo(void) +CClientEntity* CClientProjectile::GetSatchelAttachedTo() { if (!m_pProjectile) return NULL; diff --git a/Client/mods/deathmatch/logic/CClientProjectile.h b/Client/mods/deathmatch/logic/CClientProjectile.h index a87d73e9a67..7803fae647a 100644 --- a/Client/mods/deathmatch/logic/CClientProjectile.h +++ b/Client/mods/deathmatch/logic/CClientProjectile.h @@ -27,14 +27,14 @@ class CClientVehicle; class CProjectileInitiateData { public: - CProjectileInitiateData(void) + CProjectileInitiateData() { pvecPosition = NULL; pvecRotation = NULL; pvecVelocity = NULL; usModel = 0; } - ~CProjectileInitiateData(void) + ~CProjectileInitiateData() { if (pvecPosition) delete pvecPosition; @@ -59,18 +59,18 @@ class CClientProjectile : public CClientEntity public: CClientProjectile(class CClientManager* pManager, CProjectile* pProjectile, CProjectileInfo* pProjectileInfo, CClientEntity* pCreator, CClientEntity* pTarget, eWeaponType weaponType, CVector* pvecOrigin, CVector* pvecTarget, float fForce, bool bLocal); - ~CClientProjectile(void); + ~CClientProjectile(); - eClientEntityType GetType(void) const { return CCLIENTPROJECTILE; } - CEntity* GetGameEntity(void) { return m_pProjectile; } - const CEntity* GetGameEntity(void) const { return m_pProjectile; } - void Unlink(void); + eClientEntityType GetType() const { return CCLIENTPROJECTILE; } + CEntity* GetGameEntity() { return m_pProjectile; } + const CEntity* GetGameEntity() const { return m_pProjectile; } + void Unlink(); - void DoPulse(void); + void DoPulse(); void Initiate(CVector& vecPosition, CVector& vecRotation, CVector& vecVelocity, unsigned short usModel); void Destroy(bool bBlow = true); - bool IsActive(void); + bool IsActive(); bool GetMatrix(CMatrix& matrix) const; bool SetMatrix(const CMatrix& matrix); void GetPosition(CVector& vecPosition) const; @@ -81,18 +81,18 @@ class CClientProjectile : public CClientEntity void SetRotationDegrees(const CVector& vecRotation); void GetVelocity(CVector& vecVelocity); void SetVelocity(CVector& vecVelocity); - unsigned short GetModel(void); + unsigned short GetModel(); void SetModel(unsigned short usModel); void SetCounter(DWORD dwCounter); - DWORD GetCounter(void); - CClientEntity* GetCreator(void) { return m_pCreator; } - CClientEntity* GetTargetEntity(void) { return m_pTarget; } - eWeaponType GetWeaponType(void) { return m_weaponType; } - CVector* GetOrigin(void) { return m_pvecOrigin; } - CVector* GetTarget(void) { return m_pvecTarget; } - float GetForce(void) { return m_fForce; } - bool IsLocal(void) { return m_bLocal; } - CClientEntity* GetSatchelAttachedTo(void); + DWORD GetCounter(); + CClientEntity* GetCreator() { return m_pCreator; } + CClientEntity* GetTargetEntity() { return m_pTarget; } + eWeaponType GetWeaponType() { return m_weaponType; } + CVector* GetOrigin() { return m_pvecOrigin; } + CVector* GetTarget() { return m_pvecTarget; } + float GetForce() { return m_fForce; } + bool IsLocal() { return m_bLocal; } + CClientEntity* GetSatchelAttachedTo(); protected: CClientProjectileManager* m_pProjectileManager; diff --git a/Client/mods/deathmatch/logic/CClientProjectileManager.cpp b/Client/mods/deathmatch/logic/CClientProjectileManager.cpp index 7c2e23db8a2..862ebc68c40 100644 --- a/Client/mods/deathmatch/logic/CClientProjectileManager.cpp +++ b/Client/mods/deathmatch/logic/CClientProjectileManager.cpp @@ -31,7 +31,7 @@ CClientProjectileManager::CClientProjectileManager(CClientManager* pManager) m_pLastCreated = NULL; } -CClientProjectileManager::~CClientProjectileManager(void) +CClientProjectileManager::~CClientProjectileManager() { RemoveAll(); if (g_pProjectileManager == this) @@ -39,7 +39,7 @@ CClientProjectileManager::~CClientProjectileManager(void) CClientEntityRefManager::RemoveEntityRefs(0, &m_pCreator, &m_pLastCreated, NULL); } -void CClientProjectileManager::DoPulse(void) +void CClientProjectileManager::DoPulse() { CElementDeleter* pElementDeleter = g_pClientGame->GetElementDeleter(); CClientProjectile* pProjectile = NULL; @@ -57,7 +57,7 @@ void CClientProjectileManager::DoPulse(void) } } -void CClientProjectileManager::RemoveAll(void) +void CClientProjectileManager::RemoveAll() { list cloneList = m_List; list::iterator iter = cloneList.begin(); diff --git a/Client/mods/deathmatch/logic/CClientProjectileManager.h b/Client/mods/deathmatch/logic/CClientProjectileManager.h index c7ee6a1f7cf..1992ab9d6cf 100644 --- a/Client/mods/deathmatch/logic/CClientProjectileManager.h +++ b/Client/mods/deathmatch/logic/CClientProjectileManager.h @@ -22,14 +22,14 @@ class CClientProjectileManager public: CClientProjectileManager(CClientManager* pManager); - ~CClientProjectileManager(void); + ~CClientProjectileManager(); - void DoPulse(void); - void RemoveAll(void); + void DoPulse(); + void RemoveAll(); bool Exists(CClientProjectile* pProjectile); CClientProjectile* Get(CEntitySAInterface* pProjectile); - unsigned int Count(void) { return static_cast(m_List.size()); } + unsigned int Count() { return static_cast(m_List.size()); } // * Game-layer wrapping * static bool Hook_StaticProjectileAllow(CEntity* pGameCreator, eWeaponType weaponType, CVector* origin, float fForce, CVector* target, @@ -45,7 +45,7 @@ class CClientProjectileManager void AddToList(CClientProjectile* pProjectile) { m_List.push_back(pProjectile); } void RemoveFromList(CClientProjectile* pProjectile); - void TakeOutTheTrash(void); + void TakeOutTheTrash(); private: CClientManager* m_pManager; diff --git a/Client/mods/deathmatch/logic/CClientRadarArea.cpp b/Client/mods/deathmatch/logic/CClientRadarArea.cpp index cac8881d4be..e4d7b6fd241 100644 --- a/Client/mods/deathmatch/logic/CClientRadarArea.cpp +++ b/Client/mods/deathmatch/logic/CClientRadarArea.cpp @@ -29,18 +29,18 @@ CClientRadarArea::CClientRadarArea(class CClientManager* pManager, ElementID ID) m_pRadarAreaManager->AddToList(this); } -CClientRadarArea::~CClientRadarArea(void) +CClientRadarArea::~CClientRadarArea() { // Remove us from the manager's list Unlink(); } -void CClientRadarArea::Unlink(void) +void CClientRadarArea::Unlink() { m_pRadarAreaManager->RemoveFromList(this); } -void CClientRadarArea::DoPulse(void) +void CClientRadarArea::DoPulse() { DoPulse(true); } diff --git a/Client/mods/deathmatch/logic/CClientRadarArea.h b/Client/mods/deathmatch/logic/CClientRadarArea.h index 1bcb53a2acc..433e7b09a4b 100644 --- a/Client/mods/deathmatch/logic/CClientRadarArea.h +++ b/Client/mods/deathmatch/logic/CClientRadarArea.h @@ -22,35 +22,35 @@ class CClientRadarArea : public CClientEntity public: CClientRadarArea(class CClientManager* pManager, ElementID ID); - ~CClientRadarArea(void); + ~CClientRadarArea(); - void Unlink(void); + void Unlink(); - eClientEntityType GetType(void) const { return CCLIENTRADARAREA; }; + eClientEntityType GetType() const { return CCLIENTRADARAREA; }; - const CVector2D& GetPosition(void) const { return m_vecPosition; }; + const CVector2D& GetPosition() const { return m_vecPosition; }; void GetPosition(CVector2D& vecPosition) const { vecPosition = m_vecPosition; }; void GetPosition(CVector& vecPosition) const { vecPosition = CVector(m_vecPosition.fX, m_vecPosition.fY, 0.0f); }; void SetPosition(const CVector2D& vecPosition) { m_vecPosition = vecPosition; }; void SetPosition(const CVector& vecPosition) { m_vecPosition = CVector2D(vecPosition.fX, vecPosition.fY); }; - const CVector2D& GetSize(void) const { return m_vecSize; }; + const CVector2D& GetSize() const { return m_vecSize; }; void GetSize(CVector2D& vecSize) { vecSize = m_vecSize; }; void SetSize(const CVector2D& vecSize) { m_vecSize = vecSize; }; - SColor GetColor(void) const { return m_Color; }; + SColor GetColor() const { return m_Color; }; void SetColor(const SColor color) { m_Color = color; }; - bool IsFlashing(void) const { return m_bFlashing; }; + bool IsFlashing() const { return m_bFlashing; }; void SetFlashing(bool bFlashing) { m_bFlashing = bFlashing; }; - float GetAlphaFactor(void) const { return m_fAlphaFactor; }; + float GetAlphaFactor() const { return m_fAlphaFactor; }; void SetDimension(unsigned short usDimension); void RelateDimension(unsigned short usDimension); protected: - void DoPulse(void); + void DoPulse(); void DoPulse(bool bRender); CClientRadarAreaManager* m_pRadarAreaManager; diff --git a/Client/mods/deathmatch/logic/CClientRadarAreaManager.cpp b/Client/mods/deathmatch/logic/CClientRadarAreaManager.cpp index 9a55af1751a..020dae3837a 100644 --- a/Client/mods/deathmatch/logic/CClientRadarAreaManager.cpp +++ b/Client/mods/deathmatch/logic/CClientRadarAreaManager.cpp @@ -20,7 +20,7 @@ CClientRadarAreaManager::CClientRadarAreaManager(CClientManager* pManager) m_usDimension = 0; } -CClientRadarAreaManager::~CClientRadarAreaManager(void) +CClientRadarAreaManager::~CClientRadarAreaManager() { // Make sure all the radar areas are deleted DeleteAll(); @@ -41,7 +41,7 @@ void CClientRadarAreaManager::Delete(CClientRadarArea* pRadarArea) delete pRadarArea; } -void CClientRadarAreaManager::DeleteAll(void) +void CClientRadarAreaManager::DeleteAll() { // Delete all the radar areas m_bDontRemoveFromList = true; @@ -79,7 +79,7 @@ void CClientRadarAreaManager::SetDimension(unsigned short usDimension) m_usDimension = usDimension; } -void CClientRadarAreaManager::DoPulse(void) +void CClientRadarAreaManager::DoPulse() { // Always assume that we are rendering DoPulse(true); diff --git a/Client/mods/deathmatch/logic/CClientRadarAreaManager.h b/Client/mods/deathmatch/logic/CClientRadarAreaManager.h index b92c95354ba..1f9436f4536 100644 --- a/Client/mods/deathmatch/logic/CClientRadarAreaManager.h +++ b/Client/mods/deathmatch/logic/CClientRadarAreaManager.h @@ -21,23 +21,23 @@ class CClientRadarAreaManager public: CClientRadarAreaManager(CClientManager* pManager); - ~CClientRadarAreaManager(void); + ~CClientRadarAreaManager(); CClientRadarArea* Create(ElementID ID); void Delete(CClientRadarArea* pRadarArea); - void DeleteAll(void); + void DeleteAll(); - std::list::const_iterator IterBegin(void) { return m_List.begin(); }; - std::list::const_iterator IterEnd(void) { return m_List.end(); }; + std::list::const_iterator IterBegin() { return m_List.begin(); }; + std::list::const_iterator IterEnd() { return m_List.end(); }; static CClientRadarArea* Get(ElementID ID); - unsigned short GetDimension(void) { return m_usDimension; }; + unsigned short GetDimension() { return m_usDimension; }; void SetDimension(unsigned short usDimension); private: - void DoPulse(void); + void DoPulse(); void DoPulse(bool bRender); void AddToList(CClientRadarArea* pRadarArea) { m_List.push_back(pRadarArea); }; diff --git a/Client/mods/deathmatch/logic/CClientRadarMarker.cpp b/Client/mods/deathmatch/logic/CClientRadarMarker.cpp index f9c73235199..00113dea869 100644 --- a/Client/mods/deathmatch/logic/CClientRadarMarker.cpp +++ b/Client/mods/deathmatch/logic/CClientRadarMarker.cpp @@ -36,7 +36,7 @@ CClientRadarMarker::CClientRadarMarker(CClientManager* pManager, ElementID ID, s Create(); } -CClientRadarMarker::~CClientRadarMarker(void) +CClientRadarMarker::~CClientRadarMarker() { // Try to destroy it Destroy(); @@ -45,12 +45,12 @@ CClientRadarMarker::~CClientRadarMarker(void) Unlink(); } -void CClientRadarMarker::Unlink(void) +void CClientRadarMarker::Unlink() { m_pRadarMarkerManager->RemoveFromList(this); } -void CClientRadarMarker::DoPulse(void) +void CClientRadarMarker::DoPulse() { // Are we attached to something? if (m_pAttachedToEntity) @@ -177,14 +177,14 @@ void CClientRadarMarker::SetVisible(bool bVisible) m_bIsVisible = bVisible; } -bool CClientRadarMarker::Create(void) +bool CClientRadarMarker::Create() { m_pManager->GetRadarMarkerManager()->m_bOrderOnPulse = true; return true; } -void CClientRadarMarker::InternalCreate(void) +void CClientRadarMarker::InternalCreate() { // Not already got a marker? if (!m_pMarker) @@ -196,12 +196,12 @@ void CClientRadarMarker::InternalCreate(void) } } -void CClientRadarMarker::Destroy(void) +void CClientRadarMarker::Destroy() { DestroyMarker(); } -void CClientRadarMarker::CreateMarker(void) +void CClientRadarMarker::CreateMarker() { // Not already got a marker? if (!m_pMarker) @@ -231,7 +231,7 @@ void CClientRadarMarker::CreateMarker(void) } } -void CClientRadarMarker::DestroyMarker(void) +void CClientRadarMarker::DestroyMarker() { if (m_pMarker) { @@ -271,7 +271,7 @@ void CClientRadarMarker::SetOrdering(short sOrdering) } } -bool CClientRadarMarker::IsInVisibleDistance(void) +bool CClientRadarMarker::IsInVisibleDistance() { float fDistance = DistanceBetweenPoints3D(m_vecPosition, m_pRadarMarkerManager->m_vecCameraPosition); return (fDistance <= m_usVisibleDistance); diff --git a/Client/mods/deathmatch/logic/CClientRadarMarker.h b/Client/mods/deathmatch/logic/CClientRadarMarker.h index 8981b464d80..53e4f56e145 100644 --- a/Client/mods/deathmatch/logic/CClientRadarMarker.h +++ b/Client/mods/deathmatch/logic/CClientRadarMarker.h @@ -28,47 +28,47 @@ class CClientRadarMarker : public CClientEntity public: CClientRadarMarker(class CClientManager* pManager, ElementID ID, short usOrdering = 0, unsigned short usVisibleDistance = 16383); - ~CClientRadarMarker(void); + ~CClientRadarMarker(); - void Unlink(void); + void Unlink(); - eClientEntityType GetType(void) const { return CCLIENTRADARMARKER; }; + eClientEntityType GetType() const { return CCLIENTRADARMARKER; }; - void DoPulse(void); + void DoPulse(); void SetPosition(const CVector& vecPosition); void GetPosition(CVector& vecPosition) const; - unsigned short GetScale(void) { return m_usScale; }; + unsigned short GetScale() { return m_usScale; }; void SetScale(unsigned short usScale); - SColor GetColor(void) const { return m_Color; } + SColor GetColor() const { return m_Color; } void SetColor(const SColor color); - unsigned long GetSprite(void) const { return m_ulSprite; }; + unsigned long GetSprite() const { return m_ulSprite; }; void SetSprite(unsigned long ulSprite); - bool IsVisible(void) const { return m_bIsVisible; }; + bool IsVisible() const { return m_bIsVisible; }; void SetVisible(bool bVisible); void SetDimension(unsigned short usDimension); void RelateDimension(unsigned short usDimension); - short GetOrdering(void) { return m_sOrdering; } + short GetOrdering() { return m_sOrdering; } void SetOrdering(short sOrdering); - unsigned short GetVisibleDistance(void) { return m_usVisibleDistance; } + unsigned short GetVisibleDistance() { return m_usVisibleDistance; } void SetVisibleDistance(unsigned short usVisibleDistance) { m_usVisibleDistance = usVisibleDistance; } - bool IsInVisibleDistance(void); + bool IsInVisibleDistance(); private: - bool Create(void); - void InternalCreate(void); - void Destroy(void); + bool Create(); + void InternalCreate(); + void Destroy(); - void CreateMarker(void); - void DestroyMarker(void); + void CreateMarker(); + void DestroyMarker(); class CClientRadarMarkerManager* m_pRadarMarkerManager; CMarker* m_pMarker; diff --git a/Client/mods/deathmatch/logic/CClientRadarMarkerManager.cpp b/Client/mods/deathmatch/logic/CClientRadarMarkerManager.cpp index af24e2f97cc..d7273e96a01 100644 --- a/Client/mods/deathmatch/logic/CClientRadarMarkerManager.cpp +++ b/Client/mods/deathmatch/logic/CClientRadarMarkerManager.cpp @@ -20,13 +20,13 @@ CClientRadarMarkerManager::CClientRadarMarkerManager(CClientManager* pManager) m_bOrderOnPulse = false; } -CClientRadarMarkerManager::~CClientRadarMarkerManager(void) +CClientRadarMarkerManager::~CClientRadarMarkerManager() { // Remove all markers from the list DeleteAll(); } -void CClientRadarMarkerManager::DoPulse(void) +void CClientRadarMarkerManager::DoPulse() { // Grab the camera position here (so it isn't done for every marker) m_pManager->GetCamera()->GetPosition(m_vecCameraPosition); @@ -42,7 +42,7 @@ void CClientRadarMarkerManager::DoPulse(void) } } -void CClientRadarMarkerManager::DeleteAll(void) +void CClientRadarMarkerManager::DeleteAll() { // Delete all the markers in our list m_bCanRemoveFromList = false; @@ -98,7 +98,7 @@ bool CClientRadarMarkerManager::Exists(CClientRadarMarker* pRadarMarker) return false; } -void CClientRadarMarkerManager::OrderMarkers(void) +void CClientRadarMarkerManager::OrderMarkers() { m_Markers.sort(CompareOrderingIndex); diff --git a/Client/mods/deathmatch/logic/CClientRadarMarkerManager.h b/Client/mods/deathmatch/logic/CClientRadarMarkerManager.h index 0c37d1d8e0f..0fa2a303da3 100644 --- a/Client/mods/deathmatch/logic/CClientRadarMarkerManager.h +++ b/Client/mods/deathmatch/logic/CClientRadarMarkerManager.h @@ -21,19 +21,19 @@ class CClientRadarMarkerManager public: CClientRadarMarkerManager(class CClientManager* pManager); - ~CClientRadarMarkerManager(void); + ~CClientRadarMarkerManager(); - void DoPulse(void); + void DoPulse(); - void DeleteAll(void); + void DeleteAll(); static CClientRadarMarker* Get(ElementID ID); - unsigned short GetDimension(void) { return m_usDimension; } + unsigned short GetDimension() { return m_usDimension; } void SetDimension(unsigned short usDimension); - std::list::const_iterator IterBegin(void) { return m_Markers.begin(); }; - std::list::const_iterator IterEnd(void) { return m_Markers.end(); }; + std::list::const_iterator IterBegin() { return m_Markers.begin(); }; + std::list::const_iterator IterEnd() { return m_Markers.end(); }; bool Exists(CClientRadarMarker* pMarker); static bool IsValidIcon(unsigned long ulIcon) { return ulIcon <= RADAR_MARKER_LIMIT; } @@ -42,7 +42,7 @@ class CClientRadarMarkerManager void AddToList(CClientRadarMarker* pMarker) { m_Markers.push_back(pMarker); }; void RemoveFromList(CClientRadarMarker* pMarker); - void OrderMarkers(void); + void OrderMarkers(); static bool CompareOrderingIndex(CClientRadarMarker* p1, CClientRadarMarker* p2); class CClientManager* m_pManager; diff --git a/Client/mods/deathmatch/logic/CClientRenderElement.cpp b/Client/mods/deathmatch/logic/CClientRenderElement.cpp index 47b4895cf23..245e3f9f76d 100644 --- a/Client/mods/deathmatch/logic/CClientRenderElement.cpp +++ b/Client/mods/deathmatch/logic/CClientRenderElement.cpp @@ -31,7 +31,7 @@ CClientRenderElement::CClientRenderElement(CClientManager* pManager, ElementID I // // //////////////////////////////////////////////////////////////// -CClientRenderElement::~CClientRenderElement(void) +CClientRenderElement::~CClientRenderElement() { Unlink(); } @@ -43,7 +43,7 @@ CClientRenderElement::~CClientRenderElement(void) // Remove from manager lists // //////////////////////////////////////////////////////////////// -void CClientRenderElement::Unlink(void) +void CClientRenderElement::Unlink() { if (!bDoneUnlink) { diff --git a/Client/mods/deathmatch/logic/CClientRenderElement.h b/Client/mods/deathmatch/logic/CClientRenderElement.h index 3cf827397d4..f20772a397e 100644 --- a/Client/mods/deathmatch/logic/CClientRenderElement.h +++ b/Client/mods/deathmatch/logic/CClientRenderElement.h @@ -13,14 +13,14 @@ class CClientRenderElement : public CClientEntity DECLARE_CLASS(CClientRenderElement, CClientEntity) public: CClientRenderElement(CClientManager* pManager, ElementID ID); - ~CClientRenderElement(void); + ~CClientRenderElement(); - virtual void Unlink(void); + virtual void Unlink(); void GetPosition(CVector& vecPosition) const { vecPosition = CVector(); } void SetPosition(const CVector& vecPosition) {} // CClientRenderElement methods - CRenderItem* GetRenderItem(void) { return m_pRenderItem; } + CRenderItem* GetRenderItem() { return m_pRenderItem; } protected: bool bDoneUnlink; diff --git a/Client/mods/deathmatch/logic/CClientRenderElementManager.cpp b/Client/mods/deathmatch/logic/CClientRenderElementManager.cpp index 981f884aa44..116ff1ef7a7 100644 --- a/Client/mods/deathmatch/logic/CClientRenderElementManager.cpp +++ b/Client/mods/deathmatch/logic/CClientRenderElementManager.cpp @@ -35,7 +35,7 @@ CClientRenderElementManager::CClientRenderElementManager(CClientManager* pClient // // //////////////////////////////////////////////////////////////// -CClientRenderElementManager::~CClientRenderElementManager(void) +CClientRenderElementManager::~CClientRenderElementManager() { // Remove any existing while (m_ItemElementMap.size()) diff --git a/Client/mods/deathmatch/logic/CClientRenderElementManager.h b/Client/mods/deathmatch/logic/CClientRenderElementManager.h index 47cb594c494..9e1c989a42c 100644 --- a/Client/mods/deathmatch/logic/CClientRenderElementManager.h +++ b/Client/mods/deathmatch/logic/CClientRenderElementManager.h @@ -22,7 +22,7 @@ class CClientRenderElementManager { public: CClientRenderElementManager(CClientManager* pClientManager); - ~CClientRenderElementManager(void); + ~CClientRenderElementManager(); CClientDxFont* CreateDxFont(const SString& strFullFilePath, uint uiSize, bool bBold, DWORD ulQuality = DEFAULT_QUALITY); CClientGuiFont* CreateGuiFont(const SString& strFullFilePath, const SString& strUniqueName, uint uiSize); @@ -37,13 +37,13 @@ class CClientRenderElementManager CClientTexture* FindAutoTexture(const SString& strFullFilePath, const SString& strUniqueName); void Remove(CClientRenderElement* pElement); - uint GetDxFontCount(void) { return m_uiStatsDxFontCount; } - uint GetGuiFontCount(void) { return m_uiStatsGuiFontCount; } - uint GetTextureCount(void) { return m_uiStatsTextureCount; } - uint GetShaderCount(void) { return m_uiStatsShaderCount; } - uint GetRenderTargetCount(void) { return m_uiStatsRenderTargetCount; } - uint GetScreenSourceCount(void) { return m_uiStatsScreenSourceCount; } - uint GetWebBrowserCount(void) { return m_uiStatsWebBrowserCount; } + uint GetDxFontCount() { return m_uiStatsDxFontCount; } + uint GetGuiFontCount() { return m_uiStatsGuiFontCount; } + uint GetTextureCount() { return m_uiStatsTextureCount; } + uint GetShaderCount() { return m_uiStatsShaderCount; } + uint GetRenderTargetCount() { return m_uiStatsRenderTargetCount; } + uint GetScreenSourceCount() { return m_uiStatsScreenSourceCount; } + uint GetWebBrowserCount() { return m_uiStatsWebBrowserCount; } protected: CClientManager* m_pClientManager; diff --git a/Client/mods/deathmatch/logic/CClientShader.h b/Client/mods/deathmatch/logic/CClientShader.h index 881565e4d7a..f83539cf451 100644 --- a/Client/mods/deathmatch/logic/CClientShader.h +++ b/Client/mods/deathmatch/logic/CClientShader.h @@ -14,8 +14,8 @@ class CClientShader : public CClientMaterial public: CClientShader(CClientManager* pManager, ElementID ID, CShaderItem* pShaderItem); - eClientEntityType GetType(void) const { return CCLIENTSHADER; } + eClientEntityType GetType() const { return CCLIENTSHADER; } // CClientShader methods - CShaderItem* GetShaderItem(void) { return (CShaderItem*)m_pRenderItem; } + CShaderItem* GetShaderItem() { return (CShaderItem*)m_pRenderItem; } }; diff --git a/Client/mods/deathmatch/logic/CClientSound.cpp b/Client/mods/deathmatch/logic/CClientSound.cpp index ef17cfa54fe..0508ad2a4f5 100644 --- a/Client/mods/deathmatch/logic/CClientSound.cpp +++ b/Client/mods/deathmatch/logic/CClientSound.cpp @@ -31,7 +31,7 @@ CClientSound::CClientSound(CClientManager* pManager, ElementID ID) : ClassInit(t m_uiFrameNumberCreated = g_pClientGame->GetFrameCount(); } -CClientSound::~CClientSound(void) +CClientSound::~CClientSound() { Destroy(); m_pSoundManager->RemoveFromList(this); @@ -47,7 +47,7 @@ CClientSound::~CClientSound(void) // For spatial database // //////////////////////////////////////////////////////////// -CSphere CClientSound::GetWorldBoundingSphere(void) +CSphere CClientSound::GetWorldBoundingSphere() { return CSphere(m_vecPosition, m_fMaxDistance); } @@ -59,7 +59,7 @@ CSphere CClientSound::GetWorldBoundingSphere(void) // Sound is now close enough to be heard, so must be activated // //////////////////////////////////////////////////////////// -void CClientSound::DistanceStreamIn(void) +void CClientSound::DistanceStreamIn() { if (!m_pAudio) { @@ -79,7 +79,7 @@ void CClientSound::DistanceStreamIn(void) // Sound is now far enough away to not be heard, so can be deactivated // //////////////////////////////////////////////////////////// -void CClientSound::DistanceStreamOut(void) +void CClientSound::DistanceStreamOut() { if (m_pAudio) { @@ -99,7 +99,7 @@ void CClientSound::DistanceStreamOut(void) // Create underlying audio // //////////////////////////////////////////////////////////// -bool CClientSound::Create(void) +bool CClientSound::Create() { if (m_pAudio) return false; @@ -158,7 +158,7 @@ bool CClientSound::Create(void) // Destroy underlying audio // //////////////////////////////////////////////////////////// -void CClientSound::Destroy(void) +void CClientSound::Destroy() { if (!m_pAudio) return; @@ -176,7 +176,7 @@ void CClientSound::Destroy(void) // // //////////////////////////////////////////////////////////// -void CClientSound::BeginSimulationOfPlayPosition(void) +void CClientSound::BeginSimulationOfPlayPosition() { // Only 3d sounds will be distance streamed in and out. Also streams can't be seeked. // So only non-streamed 3D sounds need the play position simulated. @@ -198,7 +198,7 @@ void CClientSound::BeginSimulationOfPlayPosition(void) // // //////////////////////////////////////////////////////////// -void CClientSound::EndSimulationOfPlayPositionAndApply(void) +void CClientSound::EndSimulationOfPlayPositionAndApply() { if (m_SimulatedPlayPosition.IsValid()) { @@ -307,7 +307,7 @@ void CClientSound::SetPlayPosition(double dPosition) } } -double CClientSound::GetPlayPosition(void) +double CClientSound::GetPlayPosition() { if (m_pAudio) { @@ -365,7 +365,7 @@ double CClientSound::GetBufferLength() return 0; } -float CClientSound::GetVolume(void) +float CClientSound::GetVolume() { return m_fVolume; } @@ -378,7 +378,7 @@ void CClientSound::SetVolume(float fVolume, bool bStore) m_pAudio->SetVolume(m_fVolume); } -float CClientSound::GetPlaybackSpeed(void) +float CClientSound::GetPlaybackSpeed() { return m_fPlaybackSpeed; } @@ -451,7 +451,7 @@ void CClientSound::SetPaused(bool bPaused) m_pAudio->SetPaused(m_bPaused); } -bool CClientSound::IsPaused(void) +bool CClientSound::IsPaused() { return m_bPaused; } @@ -463,7 +463,7 @@ void CClientSound::SetMinDistance(float fDistance) m_pAudio->SetMinDistance(m_fMinDistance); } -float CClientSound::GetMinDistance(void) +float CClientSound::GetMinDistance() { return m_fMinDistance; } @@ -480,7 +480,7 @@ void CClientSound::SetMaxDistance(float fDistance) UpdateSpatialData(); } -float CClientSound::GetMaxDistance(void) +float CClientSound::GetMaxDistance() { return m_fMaxDistance; } @@ -531,7 +531,7 @@ bool CClientSound::SetPanEnabled(bool bPan) return false; } -bool CClientSound::IsPanEnabled(void) +bool CClientSound::IsPanEnabled() { if (m_pAudio) { @@ -540,7 +540,7 @@ bool CClientSound::IsPanEnabled(void) return m_bPan; } -DWORD CClientSound::GetLevelData(void) +DWORD CClientSound::GetLevelData() { if (m_pAudio) { @@ -549,7 +549,7 @@ DWORD CClientSound::GetLevelData(void) return 0; } -float CClientSound::GetSoundBPM(void) +float CClientSound::GetSoundBPM() { if (m_pAudio) { @@ -689,7 +689,7 @@ void CClientSound::Process3D(const CVector& vecPlayerPosition, const CVector& ve // // //////////////////////////////////////////////////////////// -bool CClientSound::IsFinished(void) +bool CClientSound::IsFinished() { if (m_pAudio) { diff --git a/Client/mods/deathmatch/logic/CClientSound.h b/Client/mods/deathmatch/logic/CClientSound.h index b74f280c5ca..02d17f74b06 100644 --- a/Client/mods/deathmatch/logic/CClientSound.h +++ b/Client/mods/deathmatch/logic/CClientSound.h @@ -24,11 +24,11 @@ class CClientSound : public CClientEntity public: CClientSound(CClientManager* pManager, ElementID ID); - ~CClientSound(void); + ~CClientSound(); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); - eClientEntityType GetType(void) const { return CCLIENTSOUND; } + eClientEntityType GetType() const { return CCLIENTSOUND; } bool Play(const SString& strPath, bool bLoop); bool Play(void* pMemory, unsigned int uiLength, bool bLoop); @@ -37,19 +37,19 @@ class CClientSound : public CClientEntity void PlayStream(const SString& strURL, bool bLoop, bool bThrottle, bool b3D = false); void SetPaused(bool bPaused); - bool IsPaused(void); + bool IsPaused(); void SetPlayPosition(double dPosition); - double GetPlayPosition(void); + double GetPlayPosition(); double GetLength(bool bAvoidLoad = false); double GetBufferLength(); void SetVolume(float fVolume, bool bStore = true); - float GetVolume(void); + float GetVolume(); void SetPlaybackSpeed(float fSpeed); - float GetPlaybackSpeed(void); + float GetPlaybackSpeed(); void GetPosition(CVector& vecPosition) const; void SetPosition(const CVector& vecPosition); @@ -58,19 +58,19 @@ class CClientSound : public CClientEntity void SetVelocity(const CVector& vecVelocity); void SetMinDistance(float fDistance); - float GetMinDistance(void); + float GetMinDistance(); void SetMaxDistance(float fDistance); - float GetMaxDistance(void); + float GetMaxDistance(); void ApplyFXModifications(float fSampleRate, float fTempo, float fPitch, bool bReversed); void GetFXModifications(float& fSampleRate, float& fTempo, float& fPitch, bool& bReversed); float* GetFFTData(int iLength); float* GetWaveData(int iLength); - bool IsPanEnabled(void); + bool IsPanEnabled(); bool SetPanEnabled(bool bPan); - DWORD GetLevelData(void); - float GetSoundBPM(void); + DWORD GetLevelData(); + float GetSoundBPM(); SString GetMetaTags(const SString& strFormat); @@ -80,22 +80,22 @@ class CClientSound : public CClientEntity bool SetFxEffect(uint uiFxEffect, bool bEnable); bool IsFxEffectEnabled(uint uiFxEffect); - void Unlink(void){}; + void Unlink(){}; - bool IsSoundStopped(void) { return m_pAudio == NULL; } - bool IsFinished(void); + bool IsSoundStopped() { return m_pAudio == NULL; } + bool IsFinished(); - bool IsSound3D(void) { return m_b3D; } - bool IsSoundStream(void) { return m_bStream; } + bool IsSound3D() { return m_b3D; } + bool IsSoundStream() { return m_bStream; } protected: void Process3D(const CVector& vecPlayerPosition, const CVector& vecCameraPosition, const CVector& vecLookAt); - void BeginSimulationOfPlayPosition(void); - void EndSimulationOfPlayPositionAndApply(void); - void DistanceStreamIn(void); - void DistanceStreamOut(void); - bool Create(void); - void Destroy(void); + void BeginSimulationOfPlayPosition(); + void EndSimulationOfPlayPositionAndApply(); + void DistanceStreamIn(); + void DistanceStreamOut(); + bool Create(); + void Destroy(); private: CClientSoundManager* m_pSoundManager; diff --git a/Client/mods/deathmatch/logic/CClientSoundManager.cpp b/Client/mods/deathmatch/logic/CClientSoundManager.cpp index 59fc6f166ff..4928f98610b 100644 --- a/Client/mods/deathmatch/logic/CClientSoundManager.cpp +++ b/Client/mods/deathmatch/logic/CClientSoundManager.cpp @@ -63,14 +63,14 @@ CClientSoundManager::CClientSoundManager(CClientManager* pClientManager) } } -CClientSoundManager::~CClientSoundManager(void) +CClientSoundManager::~CClientSoundManager() { ProcessStopQueues(true); BASS_Stop(); BASS_Free(); } -void CClientSoundManager::DoPulse(void) +void CClientSoundManager::DoPulse() { UpdateVolume(); diff --git a/Client/mods/deathmatch/logic/CClientSoundManager.h b/Client/mods/deathmatch/logic/CClientSoundManager.h index f617b43a88f..b5434ac7cd6 100644 --- a/Client/mods/deathmatch/logic/CClientSoundManager.h +++ b/Client/mods/deathmatch/logic/CClientSoundManager.h @@ -21,9 +21,9 @@ class CClientSoundManager public: ZERO_ON_NEW CClientSoundManager(CClientManager* pClientManager); - ~CClientSoundManager(void); + ~CClientSoundManager(); - void DoPulse(void); + void DoPulse(); void SetDimension(unsigned short usDimension); @@ -42,16 +42,16 @@ class CClientSoundManager int GetFxEffectFromName(const std::string& strEffectName); - std::map GetFxEffects(void) { return m_FxEffectNames; } + std::map GetFxEffects() { return m_FxEffectNames; } - void UpdateVolume(void); + void UpdateVolume(); void UpdateDistanceStreaming(const CVector& vecListenerPosition); void OnDistanceStreamIn(CClientSound* pSound); void OnDistanceStreamOut(CClientSound* pSound); - bool IsMinimizeMuted(void) { return m_bMinimizeMuted; }; + bool IsMinimizeMuted() { return m_bMinimizeMuted; }; void SetMinimizeMuted(bool bMute) { m_bMinimizeMuted = bMute; }; void QueueChannelStop(DWORD pSound); diff --git a/Client/mods/deathmatch/logic/CClientSpatialDatabase.cpp b/Client/mods/deathmatch/logic/CClientSpatialDatabase.cpp index 4d1a65ee93f..1babdac2769 100644 --- a/Client/mods/deathmatch/logic/CClientSpatialDatabase.cpp +++ b/Client/mods/deathmatch/logic/CClientSpatialDatabase.cpp @@ -38,7 +38,7 @@ class CClientSpatialDatabaseImpl : public CClientSpatialDatabase virtual void AllQuery(CClientEntityResult& outResult); // CClientSpatialDatabaseImpl functions - void FlushUpdateQueue(void); + void FlushUpdateQueue(); bool IsValidSphere(const CSphere& sphere); CClientEntityTree m_Tree; @@ -157,7 +157,7 @@ void CClientSpatialDatabaseImpl::AllQuery(CClientEntityResult& outResult) // Process all entities that have changed since the last call // /////////////////////////////////////////////////////////////// -void CClientSpatialDatabaseImpl::FlushUpdateQueue(void) +void CClientSpatialDatabaseImpl::FlushUpdateQueue() { std::map updateQueueCopy = m_UpdateQueue; m_UpdateQueue.clear(); diff --git a/Client/mods/deathmatch/logic/CClientStreamElement.cpp b/Client/mods/deathmatch/logic/CClientStreamElement.cpp index 1898a177621..e9cfac79856 100644 --- a/Client/mods/deathmatch/logic/CClientStreamElement.cpp +++ b/Client/mods/deathmatch/logic/CClientStreamElement.cpp @@ -29,7 +29,7 @@ CClientStreamElement::CClientStreamElement(CClientStreamer* pStreamer, ElementID m_iCachedBoundingBoxCounter = 0; } -CClientStreamElement::~CClientStreamElement(void) +CClientStreamElement::~CClientStreamElement() { m_pStreamer->RemoveElement(this); } @@ -61,7 +61,7 @@ void CClientStreamElement::InternalStreamIn(bool bInstantly) } } -void CClientStreamElement::InternalStreamOut(void) +void CClientStreamElement::InternalStreamOut() { if (m_bStreamedIn) { @@ -88,7 +88,7 @@ void CClientStreamElement::InternalStreamOut(void) } } -void CClientStreamElement::NotifyCreate(void) +void CClientStreamElement::NotifyCreate() { // Update common atrributes if (!m_bDoubleSidedInit) @@ -102,7 +102,7 @@ void CClientStreamElement::NotifyCreate(void) CallEvent("onClientElementStreamIn", Arguments, true); } -void CClientStreamElement::NotifyUnableToCreate(void) +void CClientStreamElement::NotifyUnableToCreate() { m_bAttemptingToStreamIn = false; } @@ -142,7 +142,7 @@ unsigned short CClientStreamElement::GetStreamReferences(bool bScript) } // Force the element to stream out now. It will stream back in next frame if close enough. -void CClientStreamElement::StreamOutForABit(void) +void CClientStreamElement::StreamOutForABit() { // Remove asap, very messy InternalStreamOut(); @@ -160,7 +160,7 @@ void CClientStreamElement::SetDimension(unsigned short usDimension) } } -CSphere CClientStreamElement::GetWorldBoundingSphere(void) +CSphere CClientStreamElement::GetWorldBoundingSphere() { // Default to a point at stream position return CSphere(GetStreamPosition(), 0.0f); diff --git a/Client/mods/deathmatch/logic/CClientStreamElement.h b/Client/mods/deathmatch/logic/CClientStreamElement.h index f2d17c07de4..5131b325797 100644 --- a/Client/mods/deathmatch/logic/CClientStreamElement.h +++ b/Client/mods/deathmatch/logic/CClientStreamElement.h @@ -22,32 +22,32 @@ class CClientStreamElement : public CClientEntity public: CClientStreamElement(CClientStreamer* pStreamer, ElementID ID); - ~CClientStreamElement(void); + ~CClientStreamElement(); void UpdateStreamPosition(const CVector& vecPosition); - CVector GetStreamPosition(void) { return m_vecStreamPosition; } - CClientStreamSectorRow* GetStreamRow(void) { return m_pStreamRow; } - CClientStreamSector* GetStreamSector(void) { return m_pStreamSector; } - bool IsStreamedIn(void) { return m_bStreamedIn; } + CVector GetStreamPosition() { return m_vecStreamPosition; } + CClientStreamSectorRow* GetStreamRow() { return m_pStreamRow; } + CClientStreamSector* GetStreamSector() { return m_pStreamSector; } + bool IsStreamedIn() { return m_bStreamedIn; } void InternalStreamIn(bool bInstantly); - void InternalStreamOut(void); + void InternalStreamOut(); virtual void StreamIn(bool bInstantly) = 0; - virtual void StreamOut(void) = 0; - virtual void NotifyCreate(void); - void NotifyUnableToCreate(void); + virtual void StreamOut() = 0; + virtual void NotifyCreate(); + void NotifyUnableToCreate(); void AddStreamReference(bool bScript = false); void RemoveStreamReference(bool bScript = false); unsigned short GetStreamReferences(bool bScript = false); - unsigned long GetTotalStreamReferences(void) { return m_usStreamReferences + m_usStreamReferencesScript; } - void StreamOutForABit(void); + unsigned long GetTotalStreamReferences() { return m_usStreamReferences + m_usStreamReferencesScript; } + void StreamOutForABit(); void SetDimension(unsigned short usDimension); - float GetExpDistance(void) { return m_fExpDistance; } - virtual CSphere GetWorldBoundingSphere(void); + float GetExpDistance() { return m_fExpDistance; } + virtual CSphere GetWorldBoundingSphere(); float GetDistanceToBoundingBoxSquared(const CVector& vecPosition); - bool IsStreamingCompatibleClass(void) { return true; }; + bool IsStreamingCompatibleClass() { return true; }; - virtual bool IsVisibleInAllDimensions(void) { return false; }; + virtual bool IsVisibleInAllDimensions() { return false; }; private: void SetStreamRow(CClientStreamSectorRow* pRow) { m_pStreamRow = pRow; } diff --git a/Client/mods/deathmatch/logic/CClientStreamSector.cpp b/Client/mods/deathmatch/logic/CClientStreamSector.cpp index 84b4fcd5528..39a2f38c7b1 100644 --- a/Client/mods/deathmatch/logic/CClientStreamSector.cpp +++ b/Client/mods/deathmatch/logic/CClientStreamSector.cpp @@ -27,7 +27,7 @@ CClientStreamSector::CClientStreamSector(CClientStreamSectorRow* pRow, CVector2D m_pArea = NULL; } -CClientStreamSector::~CClientStreamSector(void) +CClientStreamSector::~CClientStreamSector() { // Remove our connected sectors if (m_pLeft) diff --git a/Client/mods/deathmatch/logic/CClientStreamSector.h b/Client/mods/deathmatch/logic/CClientStreamSector.h index 2a905e0bc43..10bd3db2f3a 100644 --- a/Client/mods/deathmatch/logic/CClientStreamSector.h +++ b/Client/mods/deathmatch/logic/CClientStreamSector.h @@ -24,7 +24,7 @@ class CClientStreamSector public: CClientStreamSector(CClientStreamSectorRow* pRow, CVector2D& vecBottomLeft, CVector2D& vecTopRight); - ~CClientStreamSector(void); + ~CClientStreamSector(); bool DoesContain(CVector& vecPosition); bool DoesContain(float fX); @@ -35,14 +35,14 @@ class CClientStreamSector void Add(CClientStreamElement* pElement) { m_Elements.push_back(pElement); } void Remove(CClientStreamElement* pElement) { m_Elements.remove(pElement); } - std::list::iterator Begin(void) { return m_Elements.begin(); } - std::list::iterator End(void) { return m_Elements.end(); } + std::list::iterator Begin() { return m_Elements.begin(); } + std::list::iterator End() { return m_Elements.end(); } void AddElements(std::list* pList); void RemoveElements(std::list* pList); - unsigned int CountElements(void) { return m_Elements.size(); } + unsigned int CountElements() { return m_Elements.size(); } - CClientStreamSectorRow* GetRow(void) { return m_pRow; } + CClientStreamSectorRow* GetRow() { return m_pRow; } void GetCorners(CVector2D& vecBottomLeft, CVector2D& vecTopRight) { vecBottomLeft = m_vecBottomLeft; @@ -50,10 +50,10 @@ class CClientStreamSector } private: - bool IsActivated(void) { return m_bActivated; } + bool IsActivated() { return m_bActivated; } void SetActivated(bool bActivated) { m_bActivated = bActivated; } - bool IsExtra(void) { return m_bExtra; } + bool IsExtra() { return m_bExtra; } void SetExtra(bool bExtra) { m_bExtra = bExtra; } CVector2D m_vecBottomLeft; diff --git a/Client/mods/deathmatch/logic/CClientStreamSectorRow.cpp b/Client/mods/deathmatch/logic/CClientStreamSectorRow.cpp index 857c7f682c5..bf74f0debc8 100644 --- a/Client/mods/deathmatch/logic/CClientStreamSectorRow.cpp +++ b/Client/mods/deathmatch/logic/CClientStreamSectorRow.cpp @@ -21,7 +21,7 @@ CClientStreamSectorRow::CClientStreamSectorRow(float fBottom, float fTop, float m_pBottom = NULL; } -CClientStreamSectorRow::~CClientStreamSectorRow(void) +CClientStreamSectorRow::~CClientStreamSectorRow() { // Clear our sectors list::iterator iter = m_Sectors.begin(); diff --git a/Client/mods/deathmatch/logic/CClientStreamSectorRow.h b/Client/mods/deathmatch/logic/CClientStreamSectorRow.h index c5a3e44dd73..0fa26750fa4 100644 --- a/Client/mods/deathmatch/logic/CClientStreamSectorRow.h +++ b/Client/mods/deathmatch/logic/CClientStreamSectorRow.h @@ -23,14 +23,14 @@ class CClientStreamSectorRow public: CClientStreamSectorRow(float fBottom, float fTop, float fSectorSize, float fRowSize); - ~CClientStreamSectorRow(void); + ~CClientStreamSectorRow(); - std::list::iterator Begin(void) { return m_Sectors.begin(); } - std::list::iterator End(void) { return m_Sectors.end(); } - CClientStreamSector* Front(void) { return m_Sectors.front(); } + std::list::iterator Begin() { return m_Sectors.begin(); } + std::list::iterator End() { return m_Sectors.end(); } + CClientStreamSector* Front() { return m_Sectors.front(); } void Add(CClientStreamSector* pSector); void Remove(CClientStreamSector* pSector); - unsigned int CountSectors(void) { return m_Sectors.size(); } + unsigned int CountSectors() { return m_Sectors.size(); } bool DoesContain(CVector& vecPosition); bool DoesContain(float fY); @@ -47,7 +47,7 @@ class CClientStreamSectorRow } private: - bool IsExtra(void) { return m_bExtra; } + bool IsExtra() { return m_bExtra; } void SetExtra(bool bExtra) { m_bExtra = bExtra; } const float m_fSectorSize; diff --git a/Client/mods/deathmatch/logic/CClientStreamer.cpp b/Client/mods/deathmatch/logic/CClientStreamer.cpp index b10bf9ff07f..e0aff6d3527 100644 --- a/Client/mods/deathmatch/logic/CClientStreamer.cpp +++ b/Client/mods/deathmatch/logic/CClientStreamer.cpp @@ -34,7 +34,7 @@ CClientStreamer::CClientStreamer(StreamerLimitReachedFunction* pLimitReachedFunc OnEnterSector(m_pRow->FindOrCreateSector(m_vecPosition)); } -CClientStreamer::~CClientStreamer(void) +CClientStreamer::~CClientStreamer() { // Clear our mainland rows list::iterator iter = m_WorldRows.begin(); diff --git a/Client/mods/deathmatch/logic/CClientStreamer.h b/Client/mods/deathmatch/logic/CClientStreamer.h index d030601980c..da690293871 100644 --- a/Client/mods/deathmatch/logic/CClientStreamer.h +++ b/Client/mods/deathmatch/logic/CClientStreamer.h @@ -15,7 +15,7 @@ class CClientStreamSector; class CClientStreamSectorRow; class CClientStreamElement; -typedef bool(StreamerLimitReachedFunction)(void); +typedef bool(StreamerLimitReachedFunction)(); class CClientStreamer { @@ -23,17 +23,17 @@ class CClientStreamer public: CClientStreamer(StreamerLimitReachedFunction* pLimitReachedFunc, float fMaxDistance, float fSectorSize, float fRowSize); - ~CClientStreamer(void); + ~CClientStreamer(); void DoPulse(CVector& vecPosition); void SetDimension(unsigned short usDimension); static bool CompareExpDistance(CClientStreamElement* p1, CClientStreamElement* p2); - unsigned int CountActiveElements(void) { return (unsigned int)m_ActiveElements.size(); } + unsigned int CountActiveElements() { return (unsigned int)m_ActiveElements.size(); } bool IsActiveElement(CClientStreamElement* pElement); - std::list::iterator ActiveElementsBegin(void) { return m_ActiveElements.begin(); } - std::list::iterator ActiveElementsEnd(void) { return m_ActiveElements.end(); } + std::list::iterator ActiveElementsBegin() { return m_ActiveElements.begin(); } + std::list::iterator ActiveElementsEnd() { return m_ActiveElements.end(); } private: void CreateSectors(std::list* pList, CVector2D& vecSize, CVector2D& vecBottomLeft, CVector2D& vecTopRight); @@ -51,7 +51,7 @@ class CClientStreamer void AddToSortedList(std::list* pList, CClientStreamElement* pElement); void Restream(bool bMovedFar); - bool ReachedLimit(void) { return m_pLimitReachedFunc(); } + bool ReachedLimit() { return m_pLimitReachedFunc(); } void OnEnterSector(CClientStreamSector* pSector); void OnElementEnterSector(CClientStreamElement* pElement, CClientStreamSector* pSector); diff --git a/Client/mods/deathmatch/logic/CClientTXD.cpp b/Client/mods/deathmatch/logic/CClientTXD.cpp index 4ef8ca691d8..233d4784105 100644 --- a/Client/mods/deathmatch/logic/CClientTXD.cpp +++ b/Client/mods/deathmatch/logic/CClientTXD.cpp @@ -17,7 +17,7 @@ CClientTXD::CClientTXD(class CClientManager* pManager, ElementID ID) : ClassInit SetTypeName("txd"); } -CClientTXD::~CClientTXD(void) +CClientTXD::~CClientTXD() { // Remove us from all the models g_pGame->GetRenderWare()->ModelInfoTXDRemoveTextures(&m_ReplacementTextures); diff --git a/Client/mods/deathmatch/logic/CClientTXD.h b/Client/mods/deathmatch/logic/CClientTXD.h index 362cba313f0..f275940ecdb 100644 --- a/Client/mods/deathmatch/logic/CClientTXD.h +++ b/Client/mods/deathmatch/logic/CClientTXD.h @@ -18,13 +18,13 @@ class CClientTXD : public CClientEntity DECLARE_CLASS(CClientTXD, CClientEntity) public: CClientTXD(class CClientManager* pManager, ElementID ID); - ~CClientTXD(void); + ~CClientTXD(); - void Unlink(void){}; + void Unlink(){}; void GetPosition(CVector& vecPosition) const {}; void SetPosition(const CVector& vecPosition){}; - eClientEntityType GetType(void) const { return CCLIENTTXD; } + eClientEntityType GetType() const { return CCLIENTTXD; } bool LoadTXD(const SString& strFile, bool bFilteringEnabled, bool bIsRawData); bool Import(unsigned short usModelID); static bool IsImportableModel(unsigned short usModelID); diff --git a/Client/mods/deathmatch/logic/CClientTask.cpp b/Client/mods/deathmatch/logic/CClientTask.cpp index 4a0b3a17c7c..12214c5c1a0 100644 --- a/Client/mods/deathmatch/logic/CClientTask.cpp +++ b/Client/mods/deathmatch/logic/CClientTask.cpp @@ -319,7 +319,7 @@ bool CClientTask::WriteParameters(lua_State* luaVM, int iTableIndex) return true; } -unsigned long CClientTask::GenerateUniqueIdentifier(void) +unsigned long CClientTask::GenerateUniqueIdentifier() { return ++m_ulLastUniqueIdentifier; } @@ -339,7 +339,7 @@ void CClientTask::RemoveElement(CClientEntity* pElement) m_Elements.remove(pElement->GetID()); } -void CClientTask::ClearElements(void) +void CClientTask::ClearElements() { // Clear the list m_Elements.clear(); @@ -393,7 +393,7 @@ void CClientTask::SetParameters(const std::list& Keys, const std::l assert(m_Keys.size() == m_Values.size()); } -void CClientTask::ClearParameters(void) +void CClientTask::ClearParameters() { // Clear all the parameters m_Keys.clear(); diff --git a/Client/mods/deathmatch/logic/CClientTask.h b/Client/mods/deathmatch/logic/CClientTask.h index 25ca52222c2..5e8d48fbe57 100644 --- a/Client/mods/deathmatch/logic/CClientTask.h +++ b/Client/mods/deathmatch/logic/CClientTask.h @@ -35,25 +35,25 @@ class CClientTask bool WriteElements(lua_State* luaVM, int iTableIndex); bool WriteParameters(lua_State* luaVM, int iTableIndex); - const char* GetTaskName(void) { return m_strTaskName.c_str(); }; + const char* GetTaskName() { return m_strTaskName.c_str(); }; void SetTaskName(const char* szName) { m_strTaskName = szName ? szName : ""; }; - static unsigned long GenerateUniqueIdentifier(void); - unsigned long GetUniqueIdentifier(void) { return m_ulUniqueIdentifier; }; + static unsigned long GenerateUniqueIdentifier(); + unsigned long GetUniqueIdentifier() { return m_ulUniqueIdentifier; }; void SetUniqueIdentifier(unsigned long ulID) { m_ulUniqueIdentifier = ulID; }; void AddElement(CClientEntity* pElement); void RemoveElement(CClientEntity* pElement); - void ClearElements(void); + void ClearElements(); bool IsElementIn(CClientEntity* pElement); - const std::list& GetElements(void) { return m_Elements; }; + const std::list& GetElements() { return m_Elements; }; - const std::list& GetKeys(void) { return m_Keys; }; - const std::list& GetValues(void) { return m_Values; }; + const std::list& GetKeys() { return m_Keys; }; + const std::list& GetValues() { return m_Values; }; void SetParameter(const char* szKey, const CLuaArgument& Value); void SetParameters(const std::list& Keys, const std::list& Values); - void ClearParameters(void); + void ClearParameters(); CLuaArgument* GetParameter(const char* szKey); bool GetParameterBool(const char* szKey, bool& Bool); diff --git a/Client/mods/deathmatch/logic/CClientTeam.cpp b/Client/mods/deathmatch/logic/CClientTeam.cpp index 63f53ab2fb9..38139866959 100644 --- a/Client/mods/deathmatch/logic/CClientTeam.cpp +++ b/Client/mods/deathmatch/logic/CClientTeam.cpp @@ -27,13 +27,13 @@ CClientTeam::CClientTeam(CClientManager* pManager, ElementID ID, const char* szN m_pTeamManager->AddToList(this); } -CClientTeam::~CClientTeam(void) +CClientTeam::~CClientTeam() { RemoveAll(); Unlink(); } -void CClientTeam::Unlink(void) +void CClientTeam::Unlink() { m_pTeamManager->RemoveFromList(this); } @@ -54,7 +54,7 @@ void CClientTeam::RemovePlayer(CClientPlayer* pPlayer, bool bChangePlayer) pPlayer->SetTeam(NULL, false); } -void CClientTeam::RemoveAll(void) +void CClientTeam::RemoveAll() { list::const_iterator iter = m_List.begin(); for (; iter != m_List.end(); iter++) diff --git a/Client/mods/deathmatch/logic/CClientTeam.h b/Client/mods/deathmatch/logic/CClientTeam.h index 62c6ba45d97..c837670efec 100644 --- a/Client/mods/deathmatch/logic/CClientTeam.h +++ b/Client/mods/deathmatch/logic/CClientTeam.h @@ -24,36 +24,36 @@ class CClientTeam : public CClientEntity public: CClientTeam(CClientManager* pManager, ElementID ID, const char* szName = NULL, unsigned char ucRed = 0, unsigned char ucGreen = 0, unsigned char ucBlue = 0); - ~CClientTeam(void); + ~CClientTeam(); - eClientEntityType GetType(void) const { return CCLIENTTEAM; } + eClientEntityType GetType() const { return CCLIENTTEAM; } - void Unlink(void); + void Unlink(); - unsigned char GetID(void) { return m_ucID; } + unsigned char GetID() { return m_ucID; } - const char* GetTeamName(void) { return m_strTeamName; } + const char* GetTeamName() { return m_strTeamName; } void SetTeamName(const char* szName); void GetColor(unsigned char& ucRed, unsigned char& ucGreen, unsigned char& ucBlue); void SetColor(unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue); - bool GetFriendlyFire(void) { return m_bFriendlyFire; } + bool GetFriendlyFire() { return m_bFriendlyFire; } void SetFriendlyFire(bool bFriendlyFire) { m_bFriendlyFire = bFriendlyFire; } void AddPlayer(CClientPlayer* pPlayer, bool bChangePlayer = false); void RemovePlayer(CClientPlayer* pPlayer, bool bChangePlayer = false); - void RemoveAll(void); + void RemoveAll(); bool Exists(CClientPlayer* pPlayer); - std::list::const_iterator IterBegin(void) { return m_List.begin(); } - std::list::const_iterator IterEnd(void) { return m_List.end(); } + std::list::const_iterator IterBegin() { return m_List.begin(); } + std::list::const_iterator IterEnd() { return m_List.end(); } void GetPosition(CVector& vecPosition) const { vecPosition = m_vecPosition; } void SetPosition(const CVector& vecPosition) { m_vecPosition = vecPosition; } - unsigned int CountPlayers(void) { return static_cast(m_List.size()); } + unsigned int CountPlayers() { return static_cast(m_List.size()); } protected: CClientTeamManager* m_pTeamManager; diff --git a/Client/mods/deathmatch/logic/CClientTeamManager.cpp b/Client/mods/deathmatch/logic/CClientTeamManager.cpp index d863006c25a..874b7d72ea4 100644 --- a/Client/mods/deathmatch/logic/CClientTeamManager.cpp +++ b/Client/mods/deathmatch/logic/CClientTeamManager.cpp @@ -12,12 +12,12 @@ using std::list; -CClientTeamManager::CClientTeamManager(void) +CClientTeamManager::CClientTeamManager() { m_bRemoveFromList = true; } -CClientTeamManager::~CClientTeamManager(void) +CClientTeamManager::~CClientTeamManager() { RemoveAll(); } @@ -31,7 +31,7 @@ void CClientTeamManager::RemoveFromList(CClientTeam* pTeam) } } -void CClientTeamManager::RemoveAll(void) +void CClientTeamManager::RemoveAll() { m_bRemoveFromList = false; diff --git a/Client/mods/deathmatch/logic/CClientTeamManager.h b/Client/mods/deathmatch/logic/CClientTeamManager.h index 390764b489f..dd1ec1714d2 100644 --- a/Client/mods/deathmatch/logic/CClientTeamManager.h +++ b/Client/mods/deathmatch/logic/CClientTeamManager.h @@ -18,19 +18,19 @@ class CClientTeamManager; class CClientTeamManager { public: - CClientTeamManager(void); - ~CClientTeamManager(void); + CClientTeamManager(); + ~CClientTeamManager(); void AddToList(CClientTeam* pTeam) { m_List.push_back(pTeam); } void RemoveFromList(CClientTeam* pTeam); - void RemoveAll(void); + void RemoveAll(); bool Exists(CClientTeam* pTeam); static CClientTeam* GetTeam(ElementID ID); CClientTeam* GetTeam(const char* szName); - std::list::const_iterator IterBegin(void) { return m_List.begin(); } - std::list::const_iterator IterEnd(void) { return m_List.end(); } + std::list::const_iterator IterBegin() { return m_List.begin(); } + std::list::const_iterator IterEnd() { return m_List.end(); } private: std::list m_List; diff --git a/Client/mods/deathmatch/logic/CClientTextDisplay.cpp b/Client/mods/deathmatch/logic/CClientTextDisplay.cpp index f6629a7e041..8b7962f5b0e 100644 --- a/Client/mods/deathmatch/logic/CClientTextDisplay.cpp +++ b/Client/mods/deathmatch/logic/CClientTextDisplay.cpp @@ -22,7 +22,7 @@ CClientTextDisplay::CClientTextDisplay(CClientDisplayManager* pDisplayManager, i m_bVisible = true; } -CClientTextDisplay::~CClientTextDisplay(void) +CClientTextDisplay::~CClientTextDisplay() { } @@ -39,7 +39,7 @@ void CClientTextDisplay::SetPosition(const CVector& vecPosition) m_vecPosition = vecPosition; } -void CClientTextDisplay::Render(void) +void CClientTextDisplay::Render() { // If we're visible if (m_bVisible && !m_strCaption.empty()) diff --git a/Client/mods/deathmatch/logic/CClientTextDisplay.h b/Client/mods/deathmatch/logic/CClientTextDisplay.h index da0b17316e5..74e0cd382ad 100644 --- a/Client/mods/deathmatch/logic/CClientTextDisplay.h +++ b/Client/mods/deathmatch/logic/CClientTextDisplay.h @@ -22,9 +22,9 @@ class CClientTextDisplay : public CClientDisplay public: CClientTextDisplay(CClientDisplayManager* pDisplayManager, int ID = 0xFFFFFFFF); - ~CClientTextDisplay(void); + ~CClientTextDisplay(); - eDisplayType GetType(void) { return DISPLAY_TEXT; } + eDisplayType GetType() { return DISPLAY_TEXT; } void SetCaption(const char* szCaption); @@ -34,15 +34,15 @@ class CClientTextDisplay : public CClientDisplay void SetColorAlpha(unsigned char ucAlpha); void SetShadowAlpha(unsigned char ucShadowAlpha); - float GetScale(void) { return m_fScale; }; + float GetScale() { return m_fScale; }; void SetScale(float fScale); - unsigned long GetFormat(void) { return m_ulFormat; }; + unsigned long GetFormat() { return m_ulFormat; }; void SetFormat(unsigned long ulFormat); void SetVisible(bool bVisible); - void Render(void); + void Render(); static void SetGlobalScale(float fScale) { m_fGlobalScale = fScale; } diff --git a/Client/mods/deathmatch/logic/CClientTexture.h b/Client/mods/deathmatch/logic/CClientTexture.h index e1d792d4ca2..5321f24f238 100644 --- a/Client/mods/deathmatch/logic/CClientTexture.h +++ b/Client/mods/deathmatch/logic/CClientTexture.h @@ -14,10 +14,10 @@ class CClientTexture : public CClientMaterial public: CClientTexture(CClientManager* pManager, ElementID ID, CTextureItem* pTextureItem); - eClientEntityType GetType(void) const { return CCLIENTTEXTURE; } + eClientEntityType GetType() const { return CCLIENTTEXTURE; } // CClientTexture methods - CTextureItem* GetTextureItem(void) { return (CTextureItem*)m_pRenderItem; } + CTextureItem* GetTextureItem() { return (CTextureItem*)m_pRenderItem; } }; class CClientRenderTarget : public CClientTexture @@ -29,10 +29,10 @@ class CClientRenderTarget : public CClientTexture { } - eClientEntityType GetType(void) const { return CCLIENTRENDERTARGET; } + eClientEntityType GetType() const { return CCLIENTRENDERTARGET; } // CClientRenderTarget methods - CRenderTargetItem* GetRenderTargetItem(void) { return (CRenderTargetItem*)m_pRenderItem; } + CRenderTargetItem* GetRenderTargetItem() { return (CRenderTargetItem*)m_pRenderItem; } }; class CClientScreenSource : public CClientTexture @@ -44,8 +44,8 @@ class CClientScreenSource : public CClientTexture { } - eClientEntityType GetType(void) const { return CCLIENTSCREENSOURCE; } + eClientEntityType GetType() const { return CCLIENTSCREENSOURCE; } // CClientScreenSource methods - CScreenSourceItem* GetScreenSourceItem(void) { return (CScreenSourceItem*)m_pRenderItem; } + CScreenSourceItem* GetScreenSourceItem() { return (CScreenSourceItem*)m_pRenderItem; } }; diff --git a/Client/mods/deathmatch/logic/CClientVehicle.cpp b/Client/mods/deathmatch/logic/CClientVehicle.cpp index cddf4ebbc78..3c9e0532895 100644 --- a/Client/mods/deathmatch/logic/CClientVehicle.cpp +++ b/Client/mods/deathmatch/logic/CClientVehicle.cpp @@ -172,7 +172,7 @@ CClientVehicle::CClientVehicle(CClientManager* pManager, ElementID ID, unsigned m_bJustStreamedIn = false; } -CClientVehicle::~CClientVehicle(void) +CClientVehicle::~CClientVehicle() { // Unreference us m_pManager->UnreferenceEntity(this); @@ -244,7 +244,7 @@ CClientVehicle::~CClientVehicle(void) &m_pPickedUpWinchEntity, NULL); } -void CClientVehicle::Unlink(void) +void CClientVehicle::Unlink() { m_pVehicleManager->RemoveFromLists(this); } @@ -438,7 +438,7 @@ bool CClientVehicle::SetTaxiLightOn(bool bLightOn) return false; } -float CClientVehicle::GetDistanceFromCentreOfMassToBaseOfModel(void) +float CClientVehicle::GetDistanceFromCentreOfMassToBaseOfModel() { if (m_pVehicle) { @@ -583,7 +583,7 @@ void CClientVehicle::SetTurnSpeed(const CVector& vecTurnSpeed) } } -bool CClientVehicle::IsVisible(void) +bool CClientVehicle::IsVisible() { if (m_pVehicle) { @@ -740,7 +740,7 @@ void CClientVehicle::AllowDoorRatioSetting(unsigned char ucDoor, bool bAllow, bo } } -bool CClientVehicle::AreDoorsLocked(void) +bool CClientVehicle::AreDoorsLocked() { if (m_pVehicle) { @@ -758,7 +758,7 @@ void CClientVehicle::SetDoorsLocked(bool bLocked) m_bDoorsLocked = bLocked; } -bool CClientVehicle::AreDoorsUndamageable(void) +bool CClientVehicle::AreDoorsUndamageable() { if (m_pVehicle) { @@ -776,7 +776,7 @@ void CClientVehicle::SetDoorsUndamageable(bool bUndamageable) m_bDoorsUndamageable = bUndamageable; } -float CClientVehicle::GetHealth(void) const +float CClientVehicle::GetHealth() const { // If we're blown, return 0 if (m_bBlown) @@ -809,7 +809,7 @@ void CClientVehicle::SetHealth(float fHealth) m_fHealth = fHealth; } -void CClientVehicle::Fix(void) +void CClientVehicle::Fix() { m_bBlown = false; m_bBlowNextFrame = false; @@ -938,7 +938,7 @@ void CClientVehicle::Blow(bool bAllowMovement) m_bBlown = true; } -CVehicleColor& CClientVehicle::GetColor(void) +CVehicleColor& CClientVehicle::GetColor() { if (m_pVehicle) { @@ -1093,7 +1093,7 @@ void CClientVehicle::SetVariant(unsigned char ucVariant, unsigned char ucVariant ReCreate(); } -bool CClientVehicle::IsEngineBroken(void) +bool CClientVehicle::IsEngineBroken() { if (m_pVehicle) { @@ -1119,7 +1119,7 @@ void CClientVehicle::SetEngineBroken(bool bEngineBroken) m_bEngineBroken = bEngineBroken; } -bool CClientVehicle::IsEngineOn(void) +bool CClientVehicle::IsEngineOn() { if (m_pVehicle) { @@ -1139,7 +1139,7 @@ void CClientVehicle::SetEngineOn(bool bEngineOn) m_bEngineOn = bEngineOn; } -bool CClientVehicle::CanBeDamaged(void) +bool CClientVehicle::CanBeDamaged() { if (m_pVehicle) { @@ -1150,7 +1150,7 @@ bool CClientVehicle::CanBeDamaged(void) } // This can be called frequently to ensure the correct setting gets to the SA vehicle -void CClientVehicle::CalcAndUpdateCanBeDamagedFlag(void) +void CClientVehicle::CalcAndUpdateCanBeDamagedFlag() { bool bCanBeDamaged = false; @@ -1188,7 +1188,7 @@ void CClientVehicle::SetSyncUnoccupiedDamage(bool bCanBeDamaged) CalcAndUpdateTyresCanBurstFlag(); } -bool CClientVehicle::GetTyresCanBurst(void) +bool CClientVehicle::GetTyresCanBurst() { if (m_pVehicle) { @@ -1199,7 +1199,7 @@ bool CClientVehicle::GetTyresCanBurst(void) } // This can be called frequently to ensure the correct setting gets to the SA vehicle -void CClientVehicle::CalcAndUpdateTyresCanBurstFlag(void) +void CClientVehicle::CalcAndUpdateTyresCanBurstFlag() { bool bTyresCanBurst = false; @@ -1222,7 +1222,7 @@ void CClientVehicle::CalcAndUpdateTyresCanBurstFlag(void) m_bTyresCanBurst = bTyresCanBurst; } -float CClientVehicle::GetGasPedal(void) +float CClientVehicle::GetGasPedal() { if (m_pVehicle) { @@ -1232,7 +1232,7 @@ float CClientVehicle::GetGasPedal(void) return m_fGasPedal; } -bool CClientVehicle::IsBelowWater(void) const +bool CClientVehicle::IsBelowWater() const { CVector vecPosition; GetPosition(vecPosition); @@ -1249,7 +1249,7 @@ bool CClientVehicle::IsBelowWater(void) const return false; } -bool CClientVehicle::IsDrowning(void) const +bool CClientVehicle::IsDrowning() const { if (m_pVehicle) { @@ -1259,7 +1259,7 @@ bool CClientVehicle::IsDrowning(void) const return false; } -bool CClientVehicle::IsDriven(void) const +bool CClientVehicle::IsDriven() const { if (m_pVehicle) { @@ -1271,7 +1271,7 @@ bool CClientVehicle::IsDriven(void) const } } -bool CClientVehicle::IsUpsideDown(void) const +bool CClientVehicle::IsUpsideDown() const { if (m_pVehicle) { @@ -1282,13 +1282,13 @@ bool CClientVehicle::IsUpsideDown(void) const return false; } -bool CClientVehicle::IsBlown(void) const +bool CClientVehicle::IsBlown() const { // Game layer functions aren't reliable return m_bBlown; } -bool CClientVehicle::IsSirenOrAlarmActive(void) +bool CClientVehicle::IsSirenOrAlarmActive() { if (m_pVehicle) { @@ -1307,7 +1307,7 @@ void CClientVehicle::SetSirenOrAlarmActive(bool bActive) m_bSireneOrAlarmActive = bActive; } -float CClientVehicle::GetLandingGearPosition(void) +float CClientVehicle::GetLandingGearPosition() { if (m_bHasLandingGear) { @@ -1331,7 +1331,7 @@ void CClientVehicle::SetLandingGearPosition(float fPosition) } } -bool CClientVehicle::IsLandingGearDown(void) +bool CClientVehicle::IsLandingGearDown() { if (m_bHasLandingGear) { @@ -1358,7 +1358,7 @@ void CClientVehicle::SetLandingGearDown(bool bLandingGearDown) } } -unsigned short CClientVehicle::GetAdjustablePropertyValue(void) +unsigned short CClientVehicle::GetAdjustablePropertyValue() { unsigned short usPropertyValue; if (m_pVehicle) @@ -1405,7 +1405,7 @@ void CClientVehicle::_SetAdjustablePropertyValue(unsigned short usValue) m_usAdjustablePropertyValue = usValue; } -bool CClientVehicle::HasMovingCollision(void) +bool CClientVehicle::HasMovingCollision() { return (m_usModel == VT_FORKLIFT || m_usModel == VT_FIRELA || m_usModel == VT_ANDROM || m_usModel == VT_DUMPER || m_usModel == VT_DOZER || m_usModel == VT_PACKER); @@ -1578,7 +1578,7 @@ void CClientVehicle::SetLightStatus(unsigned char ucLight, unsigned char ucStatu } } -float CClientVehicle::GetHeliRotorSpeed(void) +float CClientVehicle::GetHeliRotorSpeed() { if (m_pVehicle && m_eVehicleType == CLIENTVEHICLE_HELI) { @@ -1597,7 +1597,7 @@ void CClientVehicle::SetHeliRotorSpeed(float fSpeed) m_fHeliRotorSpeed = fSpeed; } -bool CClientVehicle::IsHeliSearchLightVisible(void) +bool CClientVehicle::IsHeliSearchLightVisible() { if (m_pVehicle && m_eVehicleType == CLIENTVEHICLE_HELI) { @@ -1628,7 +1628,7 @@ void CClientVehicle::SetCollisionEnabled(bool bCollisionEnabled) m_bIsCollisionEnabled = bCollisionEnabled; } -bool CClientVehicle::GetCanShootPetrolTank(void) +bool CClientVehicle::GetCanShootPetrolTank() { if (m_pVehicle) { @@ -1647,7 +1647,7 @@ void CClientVehicle::SetCanShootPetrolTank(bool bCanShoot) m_bCanShootPetrolTank = bCanShoot; } -bool CClientVehicle::GetCanBeTargettedByHeatSeekingMissiles(void) +bool CClientVehicle::GetCanBeTargettedByHeatSeekingMissiles() { if (m_pVehicle) { @@ -1694,7 +1694,7 @@ CClientPed* CClientVehicle::GetOccupant(int iSeat) const return NULL; } -CClientPed* CClientVehicle::GetControllingPlayer(void) +CClientPed* CClientVehicle::GetControllingPlayer() { CClientPed* pControllingPlayer = m_pDriver; @@ -1724,7 +1724,7 @@ CClientPed* CClientVehicle::GetControllingPlayer(void) return pControllingPlayer; } -void CClientVehicle::ClearForOccupants(void) +void CClientVehicle::ClearForOccupants() { // TODO: Also check passenger seats for players // If there are people in the vehicle, remove them from the vehicle @@ -1735,7 +1735,7 @@ void CClientVehicle::ClearForOccupants(void) } } -void CClientVehicle::PlaceProperlyOnGround(void) +void CClientVehicle::PlaceProperlyOnGround() { if (m_pVehicle) { @@ -1772,7 +1772,7 @@ unsigned long CClientVehicle::GetMemoryValue(unsigned long ulOffset) return 0; } -unsigned long CClientVehicle::GetGameBaseAddress(void) +unsigned long CClientVehicle::GetGameBaseAddress() { if (m_pVehicle) { @@ -1805,7 +1805,7 @@ void CClientVehicle::FadeOut(bool bFadeOut) } } -bool CClientVehicle::IsFadingOut(void) +bool CClientVehicle::IsFadingOut() { if (m_pVehicle) { @@ -1857,7 +1857,7 @@ void CClientVehicle::SetFrozen(bool bFrozen) } } -bool CClientVehicle::IsFrozenWaitingForGroundToLoad(void) const +bool CClientVehicle::IsFrozenWaitingForGroundToLoad() const { return m_bFrozenWaitingForGroundToLoad; } @@ -1917,7 +1917,7 @@ void CClientVehicle::SetFrozenWaitingForGroundToLoad(bool bFrozen, bool bSuspend } } -CClientVehicle* CClientVehicle::GetPreviousTrainCarriage(void) +CClientVehicle* CClientVehicle::GetPreviousTrainCarriage() { if (IsDerailed()) return NULL; @@ -1939,7 +1939,7 @@ CClientVehicle* CClientVehicle::GetPreviousTrainCarriage(void) return m_pPreviousLink; } -CClientVehicle* CClientVehicle::GetNextTrainCarriage(void) +CClientVehicle* CClientVehicle::GetNextTrainCarriage() { if (IsDerailed()) return NULL; @@ -2068,7 +2068,7 @@ CClientVehicle* CClientVehicle::GetChainEngine() return pChainEngine; } -bool CClientVehicle::IsDerailed(void) +bool CClientVehicle::IsDerailed() { if (GetVehicleType() == CLIENTVEHICLE_TRAIN) { @@ -2094,7 +2094,7 @@ void CClientVehicle::SetDerailed(bool bDerailed) } } -bool CClientVehicle::IsDerailable(void) +bool CClientVehicle::IsDerailable() { if (m_pVehicle) { @@ -2112,7 +2112,7 @@ void CClientVehicle::SetDerailable(bool bDerailable) m_bIsDerailable = bDerailable; } -bool CClientVehicle::GetTrainDirection(void) +bool CClientVehicle::GetTrainDirection() { if (m_pVehicle) { @@ -2130,7 +2130,7 @@ void CClientVehicle::SetTrainDirection(bool bDirection) m_bTrainDirection = bDirection; } -float CClientVehicle::GetTrainSpeed(void) +float CClientVehicle::GetTrainSpeed() { if (m_pVehicle) { @@ -2148,7 +2148,7 @@ void CClientVehicle::SetTrainSpeed(float fSpeed) m_fTrainSpeed = fSpeed; } -float CClientVehicle::GetTrainPosition(void) +float CClientVehicle::GetTrainPosition() { if (m_pVehicle) { @@ -2166,7 +2166,7 @@ void CClientVehicle::SetTrainPosition(float fTrainPosition, bool bRecalcOnRailDi m_fTrainPosition = fTrainPosition; } -uchar CClientVehicle::GetTrainTrack(void) +uchar CClientVehicle::GetTrainTrack() { if (m_pVehicle) { @@ -2193,12 +2193,12 @@ void CClientVehicle::SetOverrideLights(unsigned char ucOverrideLights) m_ucOverrideLights = ucOverrideLights; } -bool CClientVehicle::IsNitroInstalled(void) +bool CClientVehicle::IsNitroInstalled() { return this->GetUpgrades()->GetSlotState(8) != 0; } -void CClientVehicle::StreamedInPulse(void) +void CClientVehicle::StreamedInPulse() { // Make sure the vehicle doesn't go too far down if (m_pVehicle) @@ -2495,7 +2495,7 @@ void CClientVehicle::StreamIn(bool bInstantly) } } -void CClientVehicle::StreamOut(void) +void CClientVehicle::StreamOut() { // Destroy the vehicle. Destroy(); @@ -2507,13 +2507,13 @@ void CClientVehicle::StreamOut(void) m_pModelRequester->Cancel(this, true); } -bool CClientVehicle::DoCheckHasLandingGear(void) +bool CClientVehicle::DoCheckHasLandingGear() { return (m_usModel == VT_ANDROM || m_usModel == VT_AT400 || m_usModel == VT_NEVADA || m_usModel == VT_RUSTLER || m_usModel == VT_SHAMAL || m_usModel == VT_HYDRA || m_usModel == VT_STUNT); } -void CClientVehicle::Create(void) +void CClientVehicle::Create() { // If the vehicle doesn't exist if (!m_pVehicle) @@ -2890,7 +2890,7 @@ void CClientVehicle::Create(void) } } -void CClientVehicle::Destroy(void) +void CClientVehicle::Destroy() { // If the vehicle exists if (m_pVehicle) @@ -3016,7 +3016,7 @@ void CClientVehicle::Destroy(void) } } -void CClientVehicle::ReCreate(void) +void CClientVehicle::ReCreate() { // Recreate the vehicle if it exists if (m_pVehicle) @@ -3032,18 +3032,18 @@ void CClientVehicle::ModelRequestCallback(CModelInfo* pModelInfo) Create(); } -void CClientVehicle::NotifyCreate(void) +void CClientVehicle::NotifyCreate() { m_pVehicleManager->OnCreation(this); CClientStreamElement::NotifyCreate(); } -void CClientVehicle::NotifyDestroy(void) +void CClientVehicle::NotifyDestroy() { m_pVehicleManager->OnDestruction(this); } -CClientVehicle* CClientVehicle::GetTowedVehicle(void) +CClientVehicle* CClientVehicle::GetTowedVehicle() { if (m_pVehicle) { @@ -3062,7 +3062,7 @@ CClientVehicle* CClientVehicle::GetTowedVehicle(void) return m_pTowedVehicle; } -CClientVehicle* CClientVehicle::GetRealTowedVehicle(void) +CClientVehicle* CClientVehicle::GetRealTowedVehicle() { if (m_pVehicle) { @@ -3306,7 +3306,7 @@ bool CClientVehicle::PickupEntityWithWinch(CClientEntity* pEntity) return false; } -bool CClientVehicle::ReleasePickedUpEntityWithWinch(void) +bool CClientVehicle::ReleasePickedUpEntityWithWinch() { if (m_pVehicle) { @@ -3330,7 +3330,7 @@ void CClientVehicle::SetRopeHeightForHeli(float fRopeHeight) } } -CClientEntity* CClientVehicle::GetPickedUpEntityWithWinch(void) +CClientEntity* CClientVehicle::GetPickedUpEntityWithWinch() { CClientEntity* pEntity = m_pPickedUpWinchEntity; if (m_pVehicle) @@ -3364,7 +3364,7 @@ bool CClientVehicle::SetRegPlate(const char* szPlate) return false; } -unsigned char CClientVehicle::GetPaintjob(void) +unsigned char CClientVehicle::GetPaintjob() { if (m_pVehicle) { @@ -3387,7 +3387,7 @@ void CClientVehicle::SetPaintjob(unsigned char ucPaintjob) } } -float CClientVehicle::GetDirtLevel(void) +float CClientVehicle::GetDirtLevel() { if (m_pVehicle) { @@ -3405,7 +3405,7 @@ void CClientVehicle::SetDirtLevel(float fDirtLevel) } m_fDirtLevel = fDirtLevel; } -bool CClientVehicle::IsOnWater(void) +bool CClientVehicle::IsOnWater() { if (m_pVehicle) { @@ -3424,7 +3424,7 @@ bool CClientVehicle::IsOnWater(void) return false; } -bool CClientVehicle::IsInWater(void) +bool CClientVehicle::IsInWater() { if (m_pModelInfo) { @@ -3448,7 +3448,7 @@ bool CClientVehicle::IsInWater(void) return false; } -float CClientVehicle::GetDistanceFromGround(void) +float CClientVehicle::GetDistanceFromGround() { CVector vecPosition; GetPosition(vecPosition); @@ -3461,7 +3461,7 @@ float CClientVehicle::GetDistanceFromGround(void) return (vecPosition.fZ - fGroundLevel); } -bool CClientVehicle::IsOnGround(void) +bool CClientVehicle::IsOnGround() { if (m_pModelInfo) { @@ -3501,7 +3501,7 @@ void CClientVehicle::LockSteering(bool bLock) return; } -bool CClientVehicle::IsSmokeTrailEnabled(void) +bool CClientVehicle::IsSmokeTrailEnabled() { if (m_pVehicle) { @@ -3519,7 +3519,7 @@ void CClientVehicle::SetSmokeTrailEnabled(bool bEnabled) m_bSmokeTrail = bEnabled; } -void CClientVehicle::ResetInterpolation(void) +void CClientVehicle::ResetInterpolation() { if (HasTargetPosition()) SetPosition(m_interp.pos.vecTarget); @@ -3529,7 +3529,7 @@ void CClientVehicle::ResetInterpolation(void) m_interp.rot.ulFinishTime = 0; } -void CClientVehicle::Interpolate(void) +void CClientVehicle::Interpolate() { // Interpolate it if: It has a driver and it's not local and we're not syncing it or // It has no driver and we're not syncing it. @@ -3632,7 +3632,7 @@ void CClientVehicle::SetTargetPosition(const CVector& vecTargetPosition, unsigne } } -void CClientVehicle::RemoveTargetPosition(void) +void CClientVehicle::RemoveTargetPosition() { m_interp.pos.ulFinishTime = 0; } @@ -3674,12 +3674,12 @@ void CClientVehicle::SetTargetRotation(const CVector& vecRotation, unsigned long } } -void CClientVehicle::RemoveTargetRotation(void) +void CClientVehicle::RemoveTargetRotation() { m_interp.rot.ulFinishTime = 0; } -void CClientVehicle::UpdateTargetPosition(void) +void CClientVehicle::UpdateTargetPosition() { if (HasTargetPosition()) { @@ -3778,7 +3778,7 @@ void CClientVehicle::UpdateTargetPosition(void) } } -void CClientVehicle::UpdateTargetRotation(void) +void CClientVehicle::UpdateTargetRotation() { // Do we have a rotation to move towards? and are we streamed in? if (HasTargetRotation()) @@ -3841,7 +3841,7 @@ void CClientVehicle::UpdateUnderFloorFix(const CVector& vecTargetPosition, bool } } -bool CClientVehicle::IsEnterable(void) +bool CClientVehicle::IsEnterable() { if (m_pVehicle) { @@ -3862,14 +3862,14 @@ bool CClientVehicle::IsEnterable(void) return false; } -bool CClientVehicle::HasRadio(void) +bool CClientVehicle::HasRadio() { if (m_eVehicleType != CLIENTVEHICLE_BMX) return true; return false; } -bool CClientVehicle::HasPoliceRadio(void) +bool CClientVehicle::HasPoliceRadio() { switch (m_usModel) { @@ -3888,7 +3888,7 @@ bool CClientVehicle::HasPoliceRadio(void) return false; } -void CClientVehicle::RemoveAllProjectiles(void) +void CClientVehicle::RemoveAllProjectiles() { CClientProjectile* pProjectile = NULL; list::iterator iter = m_Projectiles.begin(); @@ -3909,7 +3909,7 @@ void CClientVehicle::SetGravity(const CVector& vecGravity) m_vecGravity = vecGravity; } -SColor CClientVehicle::GetHeadLightColor(void) +SColor CClientVehicle::GetHeadLightColor() { if (m_pVehicle) { @@ -3918,7 +3918,7 @@ SColor CClientVehicle::GetHeadLightColor(void) return m_HeadLightColor; } -int CClientVehicle::GetCurrentGear(void) +int CClientVehicle::GetCurrentGear() { if (m_pVehicle) { @@ -4218,7 +4218,7 @@ void CClientVehicle::UnpairPedAndVehicle(CClientPed* pClientPed) } } -void CClientVehicle::ApplyHandling(void) +void CClientVehicle::ApplyHandling() { if (m_pVehicle) m_pVehicle->RecalculateHandling(); @@ -4226,7 +4226,7 @@ void CClientVehicle::ApplyHandling(void) m_bHasCustomHandling = true; } -CHandlingEntry* CClientVehicle::GetHandlingData(void) +CHandlingEntry* CClientVehicle::GetHandlingData() { if (m_pVehicle) { @@ -4239,7 +4239,7 @@ CHandlingEntry* CClientVehicle::GetHandlingData(void) return NULL; } -CSphere CClientVehicle::GetWorldBoundingSphere(void) +CSphere CClientVehicle::GetWorldBoundingSphere() { CSphere sphere; CModelInfo* pModelInfo = g_pGame->GetModelInfo(GetModel()); @@ -4257,7 +4257,7 @@ CSphere CClientVehicle::GetWorldBoundingSphere(void) } // Currently, this should only be called if the local player is, or was just in the vehicle -void CClientVehicle::HandleWaitingForGroundToLoad(void) +void CClientVehicle::HandleWaitingForGroundToLoad() { // Check if near any MTA objects bool bNearObject = false; @@ -4410,7 +4410,7 @@ void CClientVehicle::SetVehicleFlags(bool bEnable360, bool bEnableRandomiser, bo } } -void CClientVehicle::RemoveVehicleSirens(void) +void CClientVehicle::RemoveVehicleSirens() { if (m_pVehicle) { diff --git a/Client/mods/deathmatch/logic/CClientVehicle.h b/Client/mods/deathmatch/logic/CClientVehicle.h index ebbede8d5e7..4d88506d28d 100644 --- a/Client/mods/deathmatch/logic/CClientVehicle.h +++ b/Client/mods/deathmatch/logic/CClientVehicle.h @@ -86,7 +86,7 @@ struct SDelayedSyncVehicleData struct SLastSyncedVehData { - SLastSyncedVehData(void) + SLastSyncedVehData() { // Initialize to a known state memset(this, 0, sizeof(*this)); @@ -138,14 +138,14 @@ class CClientVehicle : public CClientStreamElement CClientVehicle(CClientManager* pManager, ElementID ID, unsigned short usModel, unsigned char ucVariation, unsigned char ucVariation2); public: - ~CClientVehicle(void); + ~CClientVehicle(); - void Unlink(void); + void Unlink(); - eClientEntityType GetType(void) const { return CCLIENTVEHICLE; }; + eClientEntityType GetType() const { return CCLIENTVEHICLE; }; - const char* GetNamePointer(void) { return m_pModelInfo->GetNameIfVehicle(); }; - eClientVehicleType GetVehicleType(void) { return m_eVehicleType; }; + const char* GetNamePointer() { return m_pModelInfo->GetNameIfVehicle(); }; + eClientVehicleType GetVehicleType() { return m_eVehicleType; }; void GetPosition(CVector& vecPosition) const; void SetPosition(const CVector& vecPosition) { SetPosition(vecPosition, true); } @@ -160,11 +160,11 @@ class CClientVehicle : public CClientStreamElement void SetRotationRadians(const CVector& vecRotation) { SetRotationRadians(vecRotation, true); } void SetRotationRadians(const CVector& vecRotation, bool bResetInterpolation); - float GetDistanceFromCentreOfMassToBaseOfModel(void); + float GetDistanceFromCentreOfMassToBaseOfModel(); bool GetMatrix(CMatrix& Matrix) const; bool SetMatrix(const CMatrix& Matrix); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); void GetMoveSpeed(CVector& vecMoveSpeed) const; void GetMoveSpeedMeters(CVector& vecMoveSpeed) const; @@ -172,7 +172,7 @@ class CClientVehicle : public CClientStreamElement void GetTurnSpeed(CVector& vecTurnSpeed) const; void SetTurnSpeed(const CVector& vecTurnSpeed); - bool IsVisible(void); + bool IsVisible(); void SetVisible(bool bVisible); void SetDoorOpenRatio(unsigned char ucDoor, float fRatio, unsigned long ulDelay = 0, bool bForced = false); @@ -180,7 +180,7 @@ class CClientVehicle : public CClientStreamElement void SetSwingingDoorsAllowed(bool bAllowed); bool AreSwingingDoorsAllowed() const; void AllowDoorRatioSetting(unsigned char ucDoor, bool bAllow, bool bAutoReallowAfterDelay = true); - bool AreDoorsLocked(void); + bool AreDoorsLocked(); void SetDoorsLocked(bool bLocked); private: @@ -190,71 +190,71 @@ class CClientVehicle : public CClientStreamElement void ProcessDoorInterpolation(); public: - bool AreDoorsUndamageable(void); + bool AreDoorsUndamageable(); void SetDoorsUndamageable(bool bUndamageable); - float GetHealth(void) const; + float GetHealth() const; void SetHealth(float fHealth); - void Fix(void); + void Fix(); void Blow(bool bAllowMovement = false); - bool IsVehicleBlown(void) { return m_bBlown; }; + bool IsVehicleBlown() { return m_bBlown; }; - CVehicleColor& GetColor(void); + CVehicleColor& GetColor(); void SetColor(const CVehicleColor& color); void GetTurretRotation(float& fHorizontal, float& fVertical); void SetTurretRotation(float fHorizontal, float fVertical); - unsigned short GetModel(void) { return m_usModel; }; + unsigned short GetModel() { return m_usModel; }; void SetModelBlocking(unsigned short usModel, unsigned char ucVariant, unsigned char ucVariant2); - unsigned char GetVariant(void) { return m_ucVariation; }; - unsigned char GetVariant2(void) { return m_ucVariation2; }; + unsigned char GetVariant() { return m_ucVariation; }; + unsigned char GetVariant2() { return m_ucVariation2; }; void SetVariant(unsigned char ucVariant, unsigned char ucVariant2); - bool IsEngineBroken(void); + bool IsEngineBroken(); void SetEngineBroken(bool bEngineBroken); - bool IsEngineOn(void); + bool IsEngineOn(); void SetEngineOn(bool bEngineOn); - bool CanBeDamaged(void); - void CalcAndUpdateCanBeDamagedFlag(void); + bool CanBeDamaged(); + void CalcAndUpdateCanBeDamagedFlag(); void SetScriptCanBeDamaged(bool bCanBeDamaged); void SetSyncUnoccupiedDamage(bool bCanBeDamaged); - bool GetScriptCanBeDamaged(void) { return m_bScriptCanBeDamaged; }; + bool GetScriptCanBeDamaged() { return m_bScriptCanBeDamaged; }; - bool GetTyresCanBurst(void); - void CalcAndUpdateTyresCanBurstFlag(void); + bool GetTyresCanBurst(); + void CalcAndUpdateTyresCanBurstFlag(); - float GetGasPedal(void); + float GetGasPedal(); - bool IsBelowWater(void) const; - bool IsDrowning(void) const; - bool IsDriven(void) const; - bool IsUpsideDown(void) const; - bool IsBlown(void) const; + bool IsBelowWater() const; + bool IsDrowning() const; + bool IsDriven() const; + bool IsUpsideDown() const; + bool IsBlown() const; - bool IsSirenOrAlarmActive(void); + bool IsSirenOrAlarmActive(); void SetSirenOrAlarmActive(bool bActive); - bool HasLandingGear(void) { return m_bHasLandingGear; }; - float GetLandingGearPosition(void); + bool HasLandingGear() { return m_bHasLandingGear; }; + float GetLandingGearPosition(); void SetLandingGearPosition(float fPosition); - bool IsLandingGearDown(void); + bool IsLandingGearDown(); void SetLandingGearDown(bool bLandingGearDown); - bool HasAdjustableProperty(void) { return m_bHasAdjustableProperty; }; - unsigned short GetAdjustablePropertyValue(void); + bool HasAdjustableProperty() { return m_bHasAdjustableProperty; }; + unsigned short GetAdjustablePropertyValue(); void SetAdjustablePropertyValue(unsigned short usValue); - bool HasMovingCollision(void); + bool HasMovingCollision(); private: void _SetAdjustablePropertyValue(unsigned short usValue); public: - bool HasDamageModel(void) { return m_bHasDamageModel; } + bool HasDamageModel() { return m_bHasDamageModel; } unsigned char GetDoorStatus(unsigned char ucDoor); unsigned char GetWheelStatus(unsigned char ucWheel); bool IsWheelCollided(unsigned char ucWheel); @@ -268,166 +268,166 @@ class CClientVehicle : public CClientStreamElement bool GetWheelMissing(unsigned char ucWheel, const SString& strWheelName = ""); // TODO: Make the class remember on virtualization - float GetHeliRotorSpeed(void); + float GetHeliRotorSpeed(); void SetHeliRotorSpeed(float fSpeed); - bool IsHeliSearchLightVisible(void); + bool IsHeliSearchLightVisible(); void SetHeliSearchLightVisible(bool bVisible); void ReportMissionAudioEvent(unsigned short usSound); - bool IsCollisionEnabled(void) { return m_bIsCollisionEnabled; }; + bool IsCollisionEnabled() { return m_bIsCollisionEnabled; }; void SetCollisionEnabled(bool bCollisionEnabled); - bool GetCanShootPetrolTank(void); + bool GetCanShootPetrolTank(); void SetCanShootPetrolTank(bool bCanShoot); - bool GetCanBeTargettedByHeatSeekingMissiles(void); + bool GetCanBeTargettedByHeatSeekingMissiles(); void SetCanBeTargettedByHeatSeekingMissiles(bool bEnabled); - unsigned char GetAlpha(void) { return m_ucAlpha; } + unsigned char GetAlpha() { return m_ucAlpha; } void SetAlpha(unsigned char ucAlpha); CClientPed* GetOccupant(int iSeat = 0) const; - CClientPed* GetControllingPlayer(void); - void ClearForOccupants(void); + CClientPed* GetControllingPlayer(); + void ClearForOccupants(); - void PlaceProperlyOnGround(void); + void PlaceProperlyOnGround(); void FuckCarCompletely(bool bKeepWheels); unsigned long GetMemoryValue(unsigned long ulOffset); - unsigned long GetGameBaseAddress(void); + unsigned long GetGameBaseAddress(); void WorldIgnore(bool bWorldIgnore); - bool IsVirtual(void) { return m_pVehicle == NULL; }; + bool IsVirtual() { return m_pVehicle == NULL; }; void FadeOut(bool bFadeOut); - bool IsFadingOut(void); + bool IsFadingOut(); - bool IsFrozen(void) { return m_bIsFrozen; }; + bool IsFrozen() { return m_bIsFrozen; }; void SetFrozen(bool bFrozen); void SetScriptFrozen(bool bFrozen) { m_bScriptFrozen = bFrozen; }; - bool IsFrozenWaitingForGroundToLoad(void) const; + bool IsFrozenWaitingForGroundToLoad() const; void SetFrozenWaitingForGroundToLoad(bool bFrozen, bool bDisableAsyncLoading); - CClientVehicle* GetPreviousTrainCarriage(void); - CClientVehicle* GetNextTrainCarriage(void); + CClientVehicle* GetPreviousTrainCarriage(); + CClientVehicle* GetNextTrainCarriage(); void SetPreviousTrainCarriage(CClientVehicle* pPrevious); void SetNextTrainCarriage(CClientVehicle* pNext); - bool IsChainEngine(void) { return m_bChainEngine; }; + bool IsChainEngine() { return m_bChainEngine; }; void SetIsChainEngine(bool bChainEngine = true, bool bTemporary = false); - CClientVehicle* GetChainEngine(void); + CClientVehicle* GetChainEngine(); bool IsTrainConnectedTo(CClientVehicle* pTrailer); - bool IsDerailed(void); + bool IsDerailed(); void SetDerailed(bool bDerailed); - bool IsDerailable(void); + bool IsDerailable(); void SetDerailable(bool bDerailable); - bool GetTrainDirection(void); + bool GetTrainDirection(); void SetTrainDirection(bool bDirection); - float GetTrainSpeed(void); + float GetTrainSpeed(); void SetTrainSpeed(float fSpeed); - float GetTrainPosition(void); + float GetTrainPosition(); void SetTrainPosition(float fTrainPosition, bool bRecalcOnRailDistance = true); - uchar GetTrainTrack(void); + uchar GetTrainTrack(); void SetTrainTrack(uchar ucTrack); - unsigned char GetOverrideLights(void) { return m_ucOverrideLights; } + unsigned char GetOverrideLights() { return m_ucOverrideLights; } void SetOverrideLights(unsigned char ucOverrideLights); bool SetTaxiLightOn(bool bLightOn); bool IsTaxiLightOn() { return m_bTaxiLightOn; } - CVehicle* GetGameVehicle(void) { return m_pVehicle; } - CEntity* GetGameEntity(void) { return m_pVehicle; } - const CEntity* GetGameEntity(void) const { return m_pVehicle; } - CVehicleUpgrades* GetUpgrades(void) { return m_pUpgrades; } - CModelInfo* GetModelInfo(void) { return m_pModelInfo; } - - CClientVehicle* GetTowedVehicle(void); - CClientVehicle* GetRealTowedVehicle(void); + CVehicle* GetGameVehicle() { return m_pVehicle; } + CEntity* GetGameEntity() { return m_pVehicle; } + const CEntity* GetGameEntity() const { return m_pVehicle; } + CVehicleUpgrades* GetUpgrades() { return m_pUpgrades; } + CModelInfo* GetModelInfo() { return m_pModelInfo; } + + CClientVehicle* GetTowedVehicle(); + CClientVehicle* GetRealTowedVehicle(); bool SetTowedVehicle(CClientVehicle* pVehicle, const CVector* vecRotationDegrees = NULL); - CClientVehicle* GetTowedByVehicle(void) { return m_pTowedByVehicle; } + CClientVehicle* GetTowedByVehicle() { return m_pTowedByVehicle; } bool InternalSetTowLink(CClientVehicle* pTrailer); - eWinchType GetWinchType(void) { return m_eWinchType; } + eWinchType GetWinchType() { return m_eWinchType; } bool SetWinchType(eWinchType winchType); bool PickupEntityWithWinch(CClientEntity* pEntity); - bool ReleasePickedUpEntityWithWinch(void); + bool ReleasePickedUpEntityWithWinch(); void SetRopeHeightForHeli(float fRopeHeight); - CClientEntity* GetPickedUpEntityWithWinch(void); + CClientEntity* GetPickedUpEntityWithWinch(); - const char* GetRegPlate(void) { return m_strRegPlate.empty() ? NULL : m_strRegPlate.c_str(); } + const char* GetRegPlate() { return m_strRegPlate.empty() ? NULL : m_strRegPlate.c_str(); } bool SetRegPlate(const char* szPlate); - unsigned char GetPaintjob(void); + unsigned char GetPaintjob(); void SetPaintjob(unsigned char ucPaintjob); - float GetDirtLevel(void); + float GetDirtLevel(); void SetDirtLevel(float fDirtLevel); - char GetNitroCount(void); - float GetNitroLevel(void); + char GetNitroCount(); + float GetNitroLevel(); void SetNitroCount(char cCount); void SetNitroLevel(float fLevel); bool IsWindowOpen(uchar ucWindow); bool SetWindowOpen(uchar ucWindow, bool bOpen); - bool IsNitroInstalled(void); + bool IsNitroInstalled(); - float GetDistanceFromGround(void); + float GetDistanceFromGround(); void SetInWater(bool bState) { m_bIsInWater = bState; } - bool IsInWater(void); - bool IsOnGround(void); - bool IsOnWater(void); + bool IsInWater(); + bool IsOnGround(); + bool IsOnWater(); void LockSteering(bool bLock); - bool IsSmokeTrailEnabled(void); + bool IsSmokeTrailEnabled(); void SetSmokeTrailEnabled(bool bEnabled); - void ResetInterpolation(void); + void ResetInterpolation(); - void Interpolate(void); - void UpdateKeysync(void); + void Interpolate(); + void UpdateKeysync(); void GetInitialDoorStates(SFixedArray& ucOutDoorStates); // Time dependent interpolation void GetTargetPosition(CVector& vecPosition) { vecPosition = m_interp.pos.vecTarget; } void SetTargetPosition(const CVector& vecPosition, unsigned long ulDelay, bool bValidVelocityZ = false, float fVelocityZ = 0.f); - void RemoveTargetPosition(void); - bool HasTargetPosition(void) { return (m_interp.pos.ulFinishTime != 0); } + void RemoveTargetPosition(); + bool HasTargetPosition() { return (m_interp.pos.ulFinishTime != 0); } void GetTargetRotation(CVector& vecRotation) { vecRotation = m_interp.rot.vecTarget; } void SetTargetRotation(const CVector& vecRotation, unsigned long ulDelay); - void RemoveTargetRotation(void); - bool HasTargetRotation(void) { return (m_interp.rot.ulFinishTime != 0); } + void RemoveTargetRotation(); + bool HasTargetRotation() { return (m_interp.rot.ulFinishTime != 0); } - void UpdateTargetPosition(void); - void UpdateTargetRotation(void); + void UpdateTargetPosition(); + void UpdateTargetRotation(); void UpdateUnderFloorFix(const CVector& vecTargetPosition, bool bValidVelocityZ, float fVelocityZ); - unsigned long GetIllegalTowBreakTime(void) { return m_ulIllegalTowBreakTime; } + unsigned long GetIllegalTowBreakTime() { return m_ulIllegalTowBreakTime; } void SetIllegalTowBreakTime(unsigned long ulTime) { m_ulIllegalTowBreakTime = ulTime; } void GetGravity(CVector& vecGravity) const { vecGravity = m_vecGravity; } void SetGravity(const CVector& vecGravity); - SColor GetHeadLightColor(void); + SColor GetHeadLightColor(); void SetHeadLightColor(const SColor color); - int GetCurrentGear(void); + int GetCurrentGear(); - bool IsEnterable(void); - bool HasRadio(void); - bool HasPoliceRadio(void); + bool IsEnterable(); + bool HasRadio(); + bool HasPoliceRadio(); - void ReCreate(void); + void ReCreate(); void ModelRequestCallback(CModelInfo* pModelInfo); @@ -436,15 +436,15 @@ class CClientVehicle : public CClientStreamElement // you're going to recreate it very quickly again. CClientVehicleManager::IsVehicleLimitReached // returns true often when the player is in an area full of vehicles so don't fatal // error or something if it does return true. - void Create(void); - void Destroy(void); + void Create(); + void Destroy(); void AddProjectile(CClientProjectile* pProjectile) { m_Projectiles.push_back(pProjectile); } void RemoveProjectile(CClientProjectile* pProjectile) { m_Projectiles.remove(pProjectile); } - std::list::iterator ProjectilesBegin(void) { return m_Projectiles.begin(); } - std::list::iterator ProjectilesEnd(void) { return m_Projectiles.end(); } + std::list::iterator ProjectilesBegin() { return m_Projectiles.begin(); } + std::list::iterator ProjectilesEnd() { return m_Projectiles.end(); } - void RemoveAllProjectiles(void); + void RemoveAllProjectiles(); static void SetPedOccupiedVehicle(CClientPed* pClientPed, CClientVehicle* pVehicle, unsigned int uiSeat, unsigned char ucDoor); static void SetPedOccupyingVehicle(CClientPed* pClientPed, CClientVehicle* pVehicle, unsigned int uiSeat, unsigned char ucDoor); @@ -452,21 +452,21 @@ class CClientVehicle : public CClientStreamElement static void UnpairPedAndVehicle(CClientPed* pClientPed, CClientVehicle* pVehicle); static void UnpairPedAndVehicle(CClientPed* pClientPed); - void ApplyHandling(void); - CHandlingEntry* GetHandlingData(void); - const CHandlingEntry* GetOriginalHandlingData(void) { return m_pOriginalHandlingEntry; } + void ApplyHandling(); + CHandlingEntry* GetHandlingData(); + const CHandlingEntry* GetOriginalHandlingData() { return m_pOriginalHandlingEntry; } - uint GetTimeSinceLastPush(void) { return (uint)(CTickCount::Now() - m_LastPushedTime).ToLongLong(); } - void ResetLastPushTime(void) { m_LastPushedTime = CTickCount::Now(); } + uint GetTimeSinceLastPush() { return (uint)(CTickCount::Now() - m_LastPushedTime).ToLongLong(); } + void ResetLastPushTime() { m_LastPushedTime = CTickCount::Now(); } - bool DoesVehicleHaveSirens(void) { return m_tSirenBeaconInfo.m_bOverrideSirens; } + bool DoesVehicleHaveSirens() { return m_tSirenBeaconInfo.m_bOverrideSirens; } bool GiveVehicleSirens(unsigned char ucSirenType, unsigned char ucSirenCount); void SetVehicleSirenPosition(unsigned char ucSirenID, CVector vecPos); void SetVehicleSirenMinimumAlpha(unsigned char ucSirenID, DWORD dwPercentage); void SetVehicleSirenColour(unsigned char ucSirenID, SColor tVehicleSirenColour); void SetVehicleFlags(bool bEnable360, bool bEnableRandomiser, bool bEnableLOSCheck, bool bEnableSilent); - void RemoveVehicleSirens(void); + void RemoveVehicleSirens(); bool ResetComponentPosition(const SString& vehicleComponent); bool SetComponentPosition(const SString& vehicleComponent, CVector vecPosition, EComponentBaseType base = EComponentBase::PARENT); @@ -482,12 +482,12 @@ class CClientVehicle : public CClientStreamElement bool SetComponentVisible(const SString& vehicleComponent, bool bVisible); bool GetComponentVisible(const SString& vehicleComponent, bool& bVisible); - std::map::iterator ComponentsBegin(void) { return m_ComponentData.begin(); } - std::map::iterator ComponentsEnd(void) { return m_ComponentData.end(); } + std::map::iterator ComponentsBegin() { return m_ComponentData.begin(); } + std::map::iterator ComponentsEnd() { return m_ComponentData.end(); } bool DoesSupportUpgrade(const SString& strFrameName); - bool AreHeliBladeCollisionsEnabled(void) { return m_bEnableHeliBladeCollisions; } + bool AreHeliBladeCollisionsEnabled() { return m_bEnableHeliBladeCollisions; } void SetHeliBladeCollisionsEnabled(bool bEnable) { m_bEnableHeliBladeCollisions = bEnable; } @@ -501,16 +501,16 @@ class CClientVehicle : public CClientStreamElement void GetComponentParentToRootMatrix(const SString& vehicleComponent, CMatrix& matOutParentToRoot); void StreamIn(bool bInstantly); - void StreamOut(void); + void StreamOut(); - void NotifyCreate(void); - void NotifyDestroy(void); + void NotifyCreate(); + void NotifyDestroy(); - bool DoCheckHasLandingGear(void); - void HandleWaitingForGroundToLoad(void); - bool DoesNeedToWaitForGroundToLoad(void); + bool DoCheckHasLandingGear(); + void HandleWaitingForGroundToLoad(); + bool DoesNeedToWaitForGroundToLoad(); - void StreamedInPulse(void); + void StreamedInPulse(); class CClientObjectManager* m_pObjectManager; CClientVehicleManager* m_pVehicleManager; diff --git a/Client/mods/deathmatch/logic/CClientVehicleManager.cpp b/Client/mods/deathmatch/logic/CClientVehicleManager.cpp index b37ae09818f..00e121a79fa 100644 --- a/Client/mods/deathmatch/logic/CClientVehicleManager.cpp +++ b/Client/mods/deathmatch/logic/CClientVehicleManager.cpp @@ -347,13 +347,13 @@ CClientVehicleManager::CClientVehicleManager(CClientManager* pManager) } } -CClientVehicleManager::~CClientVehicleManager(void) +CClientVehicleManager::~CClientVehicleManager() { // Destroy all vehicles DeleteAll(); } -void CClientVehicleManager::DeleteAll(void) +void CClientVehicleManager::DeleteAll() { // Delete all the vehicles m_bCanRemoveFromList = false; @@ -368,7 +368,7 @@ void CClientVehicleManager::DeleteAll(void) m_bCanRemoveFromList = true; } -void CClientVehicleManager::DoPulse(void) +void CClientVehicleManager::DoPulse() { CClientVehicle* pVehicle = NULL; // Loop through our streamed-in vehicles @@ -713,7 +713,7 @@ bool CClientVehicleManager::Exists(CClientVehicle* pVehicle) return ListContains(m_List, pVehicle); } -bool CClientVehicleManager::IsVehicleLimitReached(void) +bool CClientVehicleManager::IsVehicleLimitReached() { // GTA allows max 110 vehicles. We restrict ourselves to 64 for now // due to FPS issues and crashes around 100 vehicles. diff --git a/Client/mods/deathmatch/logic/CClientVehicleManager.h b/Client/mods/deathmatch/logic/CClientVehicleManager.h index d4d4b6bbf87..d5a9e0750dd 100644 --- a/Client/mods/deathmatch/logic/CClientVehicleManager.h +++ b/Client/mods/deathmatch/logic/CClientVehicleManager.h @@ -22,15 +22,15 @@ class CClientVehicleManager public: ZERO_ON_NEW CClientVehicleManager(CClientManager* pManager); - ~CClientVehicleManager(void); + ~CClientVehicleManager(); - void DeleteAll(void); + void DeleteAll(); - unsigned int Count(void) { return static_cast(m_List.size()); }; + unsigned int Count() { return static_cast(m_List.size()); }; static CClientVehicle* Get(ElementID ID); CClientVehicle* GetClosest(CVector& vecPosition, float fRadius); - void DoPulse(void); + void DoPulse(); static bool IsTrainModel(unsigned long ulModel); static bool IsValidModel(unsigned long ulModel); @@ -52,15 +52,15 @@ class CClientVehicleManager bool Exists(CClientVehicle* pVehicle); - static bool IsVehicleLimitReached(void); + static bool IsVehicleLimitReached(); void RestreamVehicles(unsigned short usModel); void RestreamVehicleUpgrades(unsigned short usModel); - std::vector::const_iterator IterBegin(void) { return m_List.begin(); }; - std::vector::const_iterator IterEnd(void) { return m_List.end(); }; - std::vector::const_iterator StreamedBegin(void) { return m_StreamedIn.begin(); }; - std::vector::const_iterator StreamedEnd(void) { return m_StreamedIn.end(); }; + std::vector::const_iterator IterBegin() { return m_List.begin(); }; + std::vector::const_iterator IterEnd() { return m_List.end(); }; + std::vector::const_iterator StreamedBegin() { return m_StreamedIn.begin(); }; + std::vector::const_iterator StreamedEnd() { return m_StreamedIn.end(); }; void AddToList(CClientVehicle* pVehicle) { m_List.push_back(pVehicle); }; void RemoveFromLists(CClientVehicle* pVehicle); diff --git a/Client/mods/deathmatch/logic/CClientWater.cpp b/Client/mods/deathmatch/logic/CClientWater.cpp index eb2c6fd37a7..7cd75346fa5 100644 --- a/Client/mods/deathmatch/logic/CClientWater.cpp +++ b/Client/mods/deathmatch/logic/CClientWater.cpp @@ -54,7 +54,7 @@ CClientWater::~CClientWater() Destroy(); } -bool CClientWater::Create(void) +bool CClientWater::Create() { if (m_pPoly) return false; @@ -71,7 +71,7 @@ bool CClientWater::Create(void) return true; } -bool CClientWater::Destroy(void) +bool CClientWater::Destroy() { if (!m_pPoly) return false; diff --git a/Client/mods/deathmatch/logic/CClientWater.h b/Client/mods/deathmatch/logic/CClientWater.h index 45da951a6c4..3bf67236fa8 100644 --- a/Client/mods/deathmatch/logic/CClientWater.h +++ b/Client/mods/deathmatch/logic/CClientWater.h @@ -18,8 +18,8 @@ class CClientWater : public CClientEntity CClientWater(CClientManager* pManager, ElementID ID, CVector& vecL, CVector& vecR, CVector& vecTB, bool bShallow = false); ~CClientWater(); - bool Create(void); - bool Destroy(void); + bool Create(); + bool Destroy(); bool Exists() { return m_pPoly != nullptr; } eClientEntityType GetType() const { return CCLIENTWATER; } diff --git a/Client/mods/deathmatch/logic/CClientWaterManager.cpp b/Client/mods/deathmatch/logic/CClientWaterManager.cpp index b453da4a007..195a0f6f476 100644 --- a/Client/mods/deathmatch/logic/CClientWaterManager.cpp +++ b/Client/mods/deathmatch/logic/CClientWaterManager.cpp @@ -18,7 +18,7 @@ CClientWaterManager::CClientWaterManager(CClientManager* pManager) m_bDontRemoveFromList = false; } -CClientWaterManager::~CClientWaterManager(void) +CClientWaterManager::~CClientWaterManager() { DeleteAll(); } @@ -35,7 +35,7 @@ CClientWater* CClientWaterManager::Get(ElementID ID) return NULL; } -void CClientWaterManager::DeleteAll(void) +void CClientWaterManager::DeleteAll() { // Delete each water poly m_bDontRemoveFromList = true; @@ -103,7 +103,7 @@ bool CClientWaterManager::SetAllElementWaterLevel(float fLevel, void* pChangeSou return true; } -void CClientWaterManager::ResetWorldWaterLevel(void) +void CClientWaterManager::ResetWorldWaterLevel() { g_pGame->GetWaterManager()->ResetWorldWaterLevel(); } diff --git a/Client/mods/deathmatch/logic/CClientWaterManager.h b/Client/mods/deathmatch/logic/CClientWaterManager.h index bbe78285f8f..c8ce98ebc68 100644 --- a/Client/mods/deathmatch/logic/CClientWaterManager.h +++ b/Client/mods/deathmatch/logic/CClientWaterManager.h @@ -21,30 +21,30 @@ class CClientWaterManager friend class CClientWater; public: - unsigned int Count(void) { return static_cast(m_List.size()); }; + unsigned int Count() { return static_cast(m_List.size()); }; static CClientWater* Get(ElementID ID); - void DeleteAll(void); + void DeleteAll(); bool Exists(CClientWater* pWater); bool GetWaterLevel(CVector& vecPosition, float* pfLevel, bool bCheckWaves, CVector* pvecUnknown); bool SetPositionWaterLevel(const CVector& vecPosition, float fLevel, void* pChangeSource); bool SetWorldWaterLevel(float fLevel, void* pChangeSource, bool bIncludeWorldNonSeaLevel); bool SetAllElementWaterLevel(float fLevel, void* pChangeSource); - void ResetWorldWaterLevel(void); + void ResetWorldWaterLevel(); float GetWaveLevel(); void SetWaveLevel(float fWaveLevel); - unsigned short GetDimension(void) { return m_usDimension; }; + unsigned short GetDimension() { return m_usDimension; }; void SetDimension(unsigned short usDimension); - std::list::const_iterator IterBegin(void) { return m_List.begin(); }; - std::list::const_iterator IterEnd(void) { return m_List.end(); }; + std::list::const_iterator IterBegin() { return m_List.begin(); }; + std::list::const_iterator IterEnd() { return m_List.end(); }; private: CClientWaterManager(CClientManager* pManager); - ~CClientWaterManager(void); + ~CClientWaterManager(); void AddToList(CClientWater* pWater); void RemoveFromList(CClientWater* pWater); diff --git a/Client/mods/deathmatch/logic/CClientWeapon.cpp b/Client/mods/deathmatch/logic/CClientWeapon.cpp index 50da3b4feb6..028d6f30146 100644 --- a/Client/mods/deathmatch/logic/CClientWeapon.cpp +++ b/Client/mods/deathmatch/logic/CClientWeapon.cpp @@ -62,7 +62,7 @@ CClientWeapon::CClientWeapon(CClientManager* pManager, ElementID ID, eWeaponType m_iWeaponFireRate = GetWeaponFireTime(m_pWeaponStat); } -CClientWeapon::~CClientWeapon(void) +CClientWeapon::~CClientWeapon() { m_pManager->GetWeaponManager()->RemoveFromList(this); @@ -75,7 +75,7 @@ CClientWeapon::~CClientWeapon(void) CClientEntityRefManager::RemoveEntityRefs(0, &m_pTarget, &m_pOwner, NULL); } -void CClientWeapon::DoPulse(void) +void CClientWeapon::DoPulse() { /*if ( m_bHasTargetDirection ) { @@ -180,7 +180,7 @@ void CClientWeapon::DoPulse(void) } } -void CClientWeapon::Create(void) +void CClientWeapon::Create() { CClientObject::Create(); if (m_weaponConfig.bDisableWeaponModel) @@ -195,7 +195,7 @@ void CClientWeapon::Create(void) } } -void CClientWeapon::Destroy(void) +void CClientWeapon::Destroy() { CClientObject::Destroy(); @@ -555,7 +555,7 @@ void CClientWeapon::SetWeaponTarget(CVector vecTarget) m_targetType = TARGET_TYPE_VECTOR; } -void CClientWeapon::ResetWeaponTarget(void) +void CClientWeapon::ResetWeaponTarget() { m_pTarget = NULL; m_vecTarget = CVector(0, 0, 0); @@ -694,27 +694,27 @@ void CClientWeapon::SetWeaponFireTime(int iFireTime) m_iWeaponFireRate = iFireTime; } -int CClientWeapon::GetWeaponFireTime(void) +int CClientWeapon::GetWeaponFireTime() { return m_iWeaponFireRate; } -void CClientWeapon::ResetWeaponFireTime(void) +void CClientWeapon::ResetWeaponFireTime() { m_iWeaponFireRate = GetWeaponFireTime(m_pWeaponStat); } -eTargetType CClientWeapon::GetWeaponTargetType(void) +eTargetType CClientWeapon::GetWeaponTargetType() { return m_targetType; } -CVector CClientWeapon::GetWeaponVectorTarget(void) +CVector CClientWeapon::GetWeaponVectorTarget() { return m_vecTarget; } -CClientEntity* CClientWeapon::GetWeaponEntityTarget(void) +CClientEntity* CClientWeapon::GetWeaponEntityTarget() { return m_pTarget; } diff --git a/Client/mods/deathmatch/logic/CClientWeapon.h b/Client/mods/deathmatch/logic/CClientWeapon.h index 8a3888e8f8d..b4a2d79ecab 100644 --- a/Client/mods/deathmatch/logic/CClientWeapon.h +++ b/Client/mods/deathmatch/logic/CClientWeapon.h @@ -45,24 +45,24 @@ class CClientWeapon : public CClientObject DECLARE_CLASS(CClientWeapon, CClientObject) public: CClientWeapon(CClientManager* pManager, ElementID ID, eWeaponType type); - ~CClientWeapon(void); + ~CClientWeapon(); - eClientEntityType GetType(void) const { return CCLIENTWEAPON; }; + eClientEntityType GetType() const { return CCLIENTWEAPON; }; - eWeaponType GetWeaponType(void) { return m_Type; } - eWeaponState GetWeaponState(void) { return m_State; } + eWeaponType GetWeaponType() { return m_Type; } + eWeaponState GetWeaponState() { return m_State; } void SetWeaponState(eWeaponState state) { m_State = state; } void SetWeaponTarget(CClientEntity* pTarget, int subTarget); void SetWeaponTarget(CVector vecTarget); - CVector GetWeaponVectorTarget(void); - CClientEntity* GetWeaponEntityTarget(void); - eTargetType GetWeaponTargetType(void); - void ResetWeaponTarget(void); + CVector GetWeaponVectorTarget(); + CClientEntity* GetWeaponEntityTarget(); + eTargetType GetWeaponTargetType(); + void ResetWeaponTarget(); - void DoPulse(void); + void DoPulse(); - void Create(void); - void Destroy(void); + void Create(); + void Destroy(); void Fire(bool bServerFire = false); @@ -77,11 +77,11 @@ class CClientWeapon : public CClientObject void SetDirection(CVector& vecDirection); void SetTargetDirection(CVector& vecDirection); void LookAt(CVector& vecPosition, bool bInterpolate = false); - CWeaponStat* GetWeaponStat(void) { return m_pWeaponStat; } - CClientPlayer* GetOwner(void) { return m_pOwner; } + CWeaponStat* GetWeaponStat() { return m_pWeaponStat; } + CClientPlayer* GetOwner() { return m_pOwner; } void SetOwner(CClientPlayer* pOwner) { m_pOwner = pOwner; } void SetFireRotationNoTarget(const CVector& vecRotation) { m_vecFireRotationNoTarget = vecRotation; } - const CVector& GetFireRotationNoTarget(void) { return m_vecFireRotationNoTarget; } + const CVector& GetFireRotationNoTarget() { return m_vecFireRotationNoTarget; } bool SetFlags(eWeaponFlags flags, bool bData); bool SetFlags(const SLineOfSightFlags flags); @@ -89,19 +89,19 @@ class CClientWeapon : public CClientObject bool GetFlags(eWeaponFlags flags, bool& bData); bool GetFlags(SLineOfSightFlags& flags); - SWeaponConfiguration GetFlags(void) { return m_weaponConfig; } + SWeaponConfiguration GetFlags() { return m_weaponConfig; } void DoGunShells(CVector vecOrigin, CVector vecDirection); static int GetWeaponFireTime(CWeaponStat* pWeaponStat); void SetWeaponFireTime(int iWeaponFireTime); - int GetWeaponFireTime(void); - void ResetWeaponFireTime(void); + int GetWeaponFireTime(); + void ResetWeaponFireTime(); void SetClipAmmo(int iAmmo) { m_nAmmoInClip = iAmmo; } - int GetClipAmmo(void) { return m_nAmmoInClip; } + int GetClipAmmo() { return m_nAmmoInClip; } void SetAmmo(int iAmmo) { m_nAmmoTotal = iAmmo; } - int GetAmmo(void) { return m_nAmmoTotal; } + int GetAmmo() { return m_nAmmoTotal; } private: CClientManager* m_pManager; diff --git a/Client/mods/deathmatch/logic/CClientWeaponManager.cpp b/Client/mods/deathmatch/logic/CClientWeaponManager.cpp index 541b3a1ba50..df8ae0db702 100644 --- a/Client/mods/deathmatch/logic/CClientWeaponManager.cpp +++ b/Client/mods/deathmatch/logic/CClientWeaponManager.cpp @@ -17,7 +17,7 @@ CClientWeaponManager::CClientWeaponManager(CClientManager* pManager) m_bDeleteAll = false; } -CClientWeaponManager::~CClientWeaponManager(void) +CClientWeaponManager::~CClientWeaponManager() { m_bDeleteAll = true; list::iterator iter = m_Weapons.begin(); @@ -36,7 +36,7 @@ void CClientWeaponManager::RemoveFromList(CClientWeapon* pWeapon) } } -void CClientWeaponManager::DoPulse(void) +void CClientWeaponManager::DoPulse() { list::iterator iter = m_Weapons.begin(); for (; iter != m_Weapons.end(); iter++) diff --git a/Client/mods/deathmatch/logic/CClientWeaponManager.h b/Client/mods/deathmatch/logic/CClientWeaponManager.h index 6f14279e273..ee982eade51 100644 --- a/Client/mods/deathmatch/logic/CClientWeaponManager.h +++ b/Client/mods/deathmatch/logic/CClientWeaponManager.h @@ -19,9 +19,9 @@ class CClientWeaponManager public: CClientWeaponManager(class CClientManager* pManager); - ~CClientWeaponManager(void); + ~CClientWeaponManager(); - void DoPulse(void); + void DoPulse(); private: void AddToList(CClientWeapon* pWeapon) { m_Weapons.push_back(pWeapon); } diff --git a/Client/mods/deathmatch/logic/CCustomData.h b/Client/mods/deathmatch/logic/CCustomData.h index 2697c8da494..01e5eb81cdb 100644 --- a/Client/mods/deathmatch/logic/CCustomData.h +++ b/Client/mods/deathmatch/logic/CCustomData.h @@ -30,8 +30,8 @@ class CCustomData bool Delete(const char* szName); - std::map::const_iterator IterBegin(void) { return m_Data.begin(); } - std::map::const_iterator IterEnd(void) { return m_Data.end(); } + std::map::const_iterator IterBegin() { return m_Data.begin(); } + std::map::const_iterator IterEnd() { return m_Data.end(); } private: std::map m_Data; diff --git a/Client/mods/deathmatch/logic/CDeathmatchObject.cpp b/Client/mods/deathmatch/logic/CDeathmatchObject.cpp index 76cc2d2da32..705133c4563 100644 --- a/Client/mods/deathmatch/logic/CDeathmatchObject.cpp +++ b/Client/mods/deathmatch/logic/CDeathmatchObject.cpp @@ -25,7 +25,7 @@ CDeathmatchObject::CDeathmatchObject(CClientManager* pManager, CMovingObjectsMan m_pMoveAnimation = NULL; } -CDeathmatchObject::~CDeathmatchObject(void) +CDeathmatchObject::~CDeathmatchObject() { _StopMovement(true); @@ -44,7 +44,7 @@ CDeathmatchObject::CDeathmatchObject(CClientManager* pManager, CMovingObjectsMan m_pMoveAnimation = NULL; } -CDeathmatchObject::~CDeathmatchObject(void) +CDeathmatchObject::~CDeathmatchObject() { _StopMovement(true); } @@ -71,7 +71,7 @@ void CDeathmatchObject::StartMovement(const CPositionRotationAnimation& a_rMoveA } } -void CDeathmatchObject::StopMovement(void) +void CDeathmatchObject::StopMovement() { _StopMovement(true); } @@ -89,7 +89,7 @@ void CDeathmatchObject::_StopMovement(bool a_bUnregister) } } -void CDeathmatchObject::UpdateMovement(void) +void CDeathmatchObject::UpdateMovement() { SPositionRotation positionRotation; bool bStillRunning = m_pMoveAnimation->GetValue(positionRotation); diff --git a/Client/mods/deathmatch/logic/CDeathmatchObject.h b/Client/mods/deathmatch/logic/CDeathmatchObject.h index 5500f9a872a..5124960155a 100644 --- a/Client/mods/deathmatch/logic/CDeathmatchObject.h +++ b/Client/mods/deathmatch/logic/CDeathmatchObject.h @@ -23,7 +23,7 @@ class CDeathmatchObject : public CClientObject #else CDeathmatchObject(CClientManager* pManager, class CMovingObjectsManager* pMovingObjectsManager, ElementID ID, unsigned short usModel, bool bLowLod); #endif - ~CDeathmatchObject(void); + ~CDeathmatchObject(); // CClientEntity interface void SetPosition(const CVector& vecPosition); @@ -33,10 +33,10 @@ class CDeathmatchObject : public CClientObject void SetOrientation(const CVector& vecPosition, const CVector& vecRotationRadians); void StartMovement(const CPositionRotationAnimation& a_rMoveAnimation); - void UpdateMovement(void); - void StopMovement(void); + void UpdateMovement(); + void StopMovement(); - bool IsMoving(void) { return m_pMoveAnimation != NULL; }; + bool IsMoving() { return m_pMoveAnimation != NULL; }; void UpdateContactingBegin(const CVector& vecPreviousPosition, const CVector& vecPreviousRotation); void UpdateContacting(const CVector& vecCenterOfRotation, const CVector& vecFrameTranslation, const CVector& vecFrameRotation); diff --git a/Client/mods/deathmatch/logic/CDeathmatchVehicle.cpp b/Client/mods/deathmatch/logic/CDeathmatchVehicle.cpp index d52b55395ff..c82478a66f6 100644 --- a/Client/mods/deathmatch/logic/CDeathmatchVehicle.cpp +++ b/Client/mods/deathmatch/logic/CDeathmatchVehicle.cpp @@ -26,7 +26,7 @@ CDeathmatchVehicle::CDeathmatchVehicle(CClientManager* pManager, CUnoccupiedVehi SetIsSyncing(false); } -CDeathmatchVehicle::~CDeathmatchVehicle(void) +CDeathmatchVehicle::~CDeathmatchVehicle() { if (m_bIsSyncing && m_pUnoccupiedVehicleSync) { @@ -40,7 +40,7 @@ void CDeathmatchVehicle::SetIsSyncing(bool bIsSyncing) SetSyncUnoccupiedDamage(m_bIsSyncing); } -bool CDeathmatchVehicle::SyncDamageModel(void) +bool CDeathmatchVehicle::SyncDamageModel() { SVehicleDamageSync damage(true, true, true, true, true); bool bChanges = false; @@ -122,7 +122,7 @@ bool CDeathmatchVehicle::SyncDamageModel(void) return false; } -void CDeathmatchVehicle::ResetDamageModelSync(void) +void CDeathmatchVehicle::ResetDamageModelSync() { for (int i = 0; i < MAX_DOORS; i++) m_ucLastDoorStates[i] = GetDoorStatus(i); diff --git a/Client/mods/deathmatch/logic/CDeathmatchVehicle.h b/Client/mods/deathmatch/logic/CDeathmatchVehicle.h index 27048b10d8f..229f9a4a459 100644 --- a/Client/mods/deathmatch/logic/CDeathmatchVehicle.h +++ b/Client/mods/deathmatch/logic/CDeathmatchVehicle.h @@ -19,13 +19,13 @@ class CDeathmatchVehicle : public CClientVehicle public: CDeathmatchVehicle(CClientManager* pManager, class CUnoccupiedVehicleSync* pUnoccupiedVehicleSync, ElementID ID, unsigned short usVehicleModel, unsigned char ucVariant, unsigned char ucVariant2); - ~CDeathmatchVehicle(void); + ~CDeathmatchVehicle(); - bool IsSyncing(void) { return m_bIsSyncing; }; + bool IsSyncing() { return m_bIsSyncing; }; void SetIsSyncing(bool bIsSyncing); - bool SyncDamageModel(void); - void ResetDamageModelSync(void); + bool SyncDamageModel(); + void ResetDamageModelSync(); private: class CUnoccupiedVehicleSync* m_pUnoccupiedVehicleSync; diff --git a/Client/mods/deathmatch/logic/CDownloadableResource.cpp b/Client/mods/deathmatch/logic/CDownloadableResource.cpp index c95b1a08457..cff149586ba 100644 --- a/Client/mods/deathmatch/logic/CDownloadableResource.cpp +++ b/Client/mods/deathmatch/logic/CDownloadableResource.cpp @@ -30,29 +30,29 @@ CDownloadableResource::CDownloadableResource(CResource* pResource, eResourceType g_pClientGame->GetResourceManager()->OnAddResourceFile(this); } -CDownloadableResource::~CDownloadableResource(void) +CDownloadableResource::~CDownloadableResource() { g_pClientGame->GetResourceFileDownloadManager()->OnRemoveResourceFile(this); g_pClientGame->GetResourceManager()->OnRemoveResourceFile(this); } -bool CDownloadableResource::DoesClientAndServerChecksumMatch(void) +bool CDownloadableResource::DoesClientAndServerChecksumMatch() { return (m_LastClientChecksum == m_ServerChecksum); } -CChecksum CDownloadableResource::GenerateClientChecksum(void) +CChecksum CDownloadableResource::GenerateClientChecksum() { m_LastClientChecksum = CChecksum::GenerateChecksumFromFile(m_strName); return m_LastClientChecksum; } -CChecksum CDownloadableResource::GetServerChecksum(void) +CChecksum CDownloadableResource::GetServerChecksum() { return m_ServerChecksum; } -int CDownloadableResource::GetDownloadPriorityGroup(void) +int CDownloadableResource::GetDownloadPriorityGroup() { return m_pResource->GetDownloadPriorityGroup(); } diff --git a/Client/mods/deathmatch/logic/CDownloadableResource.h b/Client/mods/deathmatch/logic/CDownloadableResource.h index aeb8d9de162..d8893c4e8f3 100644 --- a/Client/mods/deathmatch/logic/CDownloadableResource.h +++ b/Client/mods/deathmatch/logic/CDownloadableResource.h @@ -38,29 +38,29 @@ class CDownloadableResource public: CDownloadableResource(CResource* pResource, eResourceType resourceType, const char* szName, const char* szNameShort, uint uiDownloadSize, CChecksum serverChecksum, bool bAutoDownload); - virtual ~CDownloadableResource(void); + virtual ~CDownloadableResource(); - bool DoesClientAndServerChecksumMatch(void); + bool DoesClientAndServerChecksumMatch(); - eResourceType GetResourceType(void) { return m_resourceType; }; - const char* GetName(void) { return m_strName; }; - const char* GetShortName(void) { return m_strNameShort; }; - CResource* GetResource(void) { return m_pResource; } - int GetDownloadPriorityGroup(void); - uint GetDownloadSize(void) { return m_uiDownloadSize; } - uint GetHttpServerIndex(void) { return m_uiHttpServerIndex; } + eResourceType GetResourceType() { return m_resourceType; }; + const char* GetName() { return m_strName; }; + const char* GetShortName() { return m_strNameShort; }; + CResource* GetResource() { return m_pResource; } + int GetDownloadPriorityGroup(); + uint GetDownloadSize() { return m_uiDownloadSize; } + uint GetHttpServerIndex() { return m_uiHttpServerIndex; } void SetHttpServerIndex(uint uiHttpServerIndex) { m_uiHttpServerIndex = uiHttpServerIndex; } - CChecksum GenerateClientChecksum(void); - CChecksum GetServerChecksum(void); + CChecksum GenerateClientChecksum(); + CChecksum GetServerChecksum(); - bool IsAutoDownload(void) { return m_bAutoDownload; }; - void SetDownloaded(void) { m_bDownloaded = true; }; - bool IsDownloaded(void) { return m_bDownloaded; }; + bool IsAutoDownload() { return m_bAutoDownload; }; + void SetDownloaded() { m_bDownloaded = true; }; + bool IsDownloaded() { return m_bDownloaded; }; void SetIsWaitingForDownload(bool bInDownloadQueue) { m_bInDownloadQueue = bInDownloadQueue; }; - bool IsWaitingForDownload(void) { return m_bInDownloadQueue; }; + bool IsWaitingForDownload() { return m_bInDownloadQueue; }; void SetModifedByScript(bool bModifedByScript) { m_bModifedByScript = bModifedByScript; }; - bool IsModifedByScript(void) { return m_bModifedByScript; }; + bool IsModifedByScript() { return m_bModifedByScript; }; protected: CResource* m_pResource; diff --git a/Client/mods/deathmatch/logic/CDynamicLibrary.cpp b/Client/mods/deathmatch/logic/CDynamicLibrary.cpp index f37242c5757..cb5932fe492 100644 --- a/Client/mods/deathmatch/logic/CDynamicLibrary.cpp +++ b/Client/mods/deathmatch/logic/CDynamicLibrary.cpp @@ -11,13 +11,13 @@ #include -CDynamicLibrary::CDynamicLibrary(void) +CDynamicLibrary::CDynamicLibrary() { // Init m_hModule = 0; } -CDynamicLibrary::~CDynamicLibrary(void) +CDynamicLibrary::~CDynamicLibrary() { // Make sure we unload Unload(); @@ -45,7 +45,7 @@ bool CDynamicLibrary::Load(const char* szFilename) return m_hModule != 0; } -void CDynamicLibrary::Unload(void) +void CDynamicLibrary::Unload() { // Got a module? if (m_hModule != 0) @@ -61,7 +61,7 @@ void CDynamicLibrary::Unload(void) } } -bool CDynamicLibrary::IsLoaded(void) +bool CDynamicLibrary::IsLoaded() { return m_hModule != 0; } diff --git a/Client/mods/deathmatch/logic/CDynamicLibrary.h b/Client/mods/deathmatch/logic/CDynamicLibrary.h index cf8d4ff8433..2a47fe61645 100644 --- a/Client/mods/deathmatch/logic/CDynamicLibrary.h +++ b/Client/mods/deathmatch/logic/CDynamicLibrary.h @@ -18,12 +18,12 @@ class CDynamicLibrary { public: - CDynamicLibrary(void); - ~CDynamicLibrary(void); + CDynamicLibrary(); + ~CDynamicLibrary(); bool Load(const char* szFilename); - void Unload(void); - bool IsLoaded(void); + void Unload(); + bool IsLoaded(); void* GetProcedureAddress(const char* szProcName); diff --git a/Client/mods/deathmatch/logic/CElementArray.cpp b/Client/mods/deathmatch/logic/CElementArray.cpp index f594ef577c1..6e23e8a0e45 100644 --- a/Client/mods/deathmatch/logic/CElementArray.cpp +++ b/Client/mods/deathmatch/logic/CElementArray.cpp @@ -15,7 +15,7 @@ using namespace std; SFixedArray CElementIDs::m_Elements; CStack CElementIDs::m_ClientStack; -void CElementIDs::Initialize(void) +void CElementIDs::Initialize() { memset(&m_Elements[0], 0, sizeof(m_Elements)); } @@ -45,7 +45,7 @@ void CElementIDs::SetElement(ElementID ID, CClientEntity* pEntity) #endif } -ElementID CElementIDs::PopClientID(void) +ElementID CElementIDs::PopClientID() { // Pop an unique ID ElementID ID; diff --git a/Client/mods/deathmatch/logic/CElementArray.h b/Client/mods/deathmatch/logic/CElementArray.h index 6f1dcb425af..a126e07c140 100644 --- a/Client/mods/deathmatch/logic/CElementArray.h +++ b/Client/mods/deathmatch/logic/CElementArray.h @@ -17,12 +17,12 @@ class CClientEntity; class CElementIDs { public: - static void Initialize(void); + static void Initialize(); static CClientEntity* GetElement(ElementID ID); static void SetElement(ElementID ID, CClientEntity* pEntity); - static ElementID PopClientID(void); + static ElementID PopClientID(); static void PushClientID(ElementID ID); private: diff --git a/Client/mods/deathmatch/logic/CElementGroup.cpp b/Client/mods/deathmatch/logic/CElementGroup.cpp index 7de46d1f77c..29a151d0cd0 100644 --- a/Client/mods/deathmatch/logic/CElementGroup.cpp +++ b/Client/mods/deathmatch/logic/CElementGroup.cpp @@ -46,7 +46,7 @@ void CElementGroup::Remove(class CClientEntity* element) m_elements.remove(element); } -unsigned int CElementGroup::GetCount(void) +unsigned int CElementGroup::GetCount() { return m_elements.size(); } \ No newline at end of file diff --git a/Client/mods/deathmatch/logic/CElementGroup.h b/Client/mods/deathmatch/logic/CElementGroup.h index e23153806f6..65db4057f99 100644 --- a/Client/mods/deathmatch/logic/CElementGroup.h +++ b/Client/mods/deathmatch/logic/CElementGroup.h @@ -24,5 +24,5 @@ class CElementGroup ~CElementGroup(); void Add(CClientEntity* element); void Remove(CClientEntity* element); - unsigned int GetCount(void); + unsigned int GetCount(); }; diff --git a/Client/mods/deathmatch/logic/CEvents.cpp b/Client/mods/deathmatch/logic/CEvents.cpp index efd739abeba..a62f39e2e5b 100644 --- a/Client/mods/deathmatch/logic/CEvents.cpp +++ b/Client/mods/deathmatch/logic/CEvents.cpp @@ -12,13 +12,13 @@ using std::list; -CEvents::CEvents(void) +CEvents::CEvents() { m_bWasEventCancelled = false; m_bEventCancelled = false; } -CEvents::~CEvents(void) +CEvents::~CEvents() { RemoveAllEvents(); } @@ -106,7 +106,7 @@ SEvent* CEvents::Get(const char* szName) return NULL; } -void CEvents::RemoveAllEvents(void) +void CEvents::RemoveAllEvents() { // Delete all items CFastHashMap::const_iterator iter = m_EventHashMap.begin(); @@ -119,14 +119,14 @@ void CEvents::RemoveAllEvents(void) m_EventHashMap.clear(); } -void CEvents::PreEventPulse(void) +void CEvents::PreEventPulse() { m_CancelledList.push_back(m_bEventCancelled); m_bEventCancelled = false; m_bWasEventCancelled = false; } -void CEvents::PostEventPulse(void) +void CEvents::PostEventPulse() { m_bWasEventCancelled = m_bEventCancelled; m_bEventCancelled = m_CancelledList.back() ? true : false; @@ -138,7 +138,7 @@ void CEvents::CancelEvent(bool bCancelled) m_bEventCancelled = bCancelled; } -bool CEvents::WasEventCancelled(void) +bool CEvents::WasEventCancelled() { return m_bWasEventCancelled; } diff --git a/Client/mods/deathmatch/logic/CEvents.h b/Client/mods/deathmatch/logic/CEvents.h index e2d02c097d8..e5a5ede8ec8 100644 --- a/Client/mods/deathmatch/logic/CEvents.h +++ b/Client/mods/deathmatch/logic/CEvents.h @@ -25,8 +25,8 @@ struct SEvent class CEvents { public: - CEvents(void); - ~CEvents(void); + CEvents(); + ~CEvents(); bool AddEvent(const char* szName, const char* szArguments, class CLuaMain* pLuaMain, bool bAllowRemoteTrigger); void RemoveEvent(SEvent* pEvent); @@ -36,17 +36,17 @@ class CEvents bool Exists(const char* szName) { return Get(szName) != NULL; }; SEvent* Get(const char* szName); - CFastHashMap::const_iterator IterBegin(void) { return m_EventHashMap.begin(); }; - CFastHashMap::const_iterator IterEnd(void) { return m_EventHashMap.end(); }; + CFastHashMap::const_iterator IterBegin() { return m_EventHashMap.begin(); }; + CFastHashMap::const_iterator IterEnd() { return m_EventHashMap.end(); }; - void PreEventPulse(void); - void PostEventPulse(void); + void PreEventPulse(); + void PostEventPulse(); void CancelEvent(bool bCancelled = true); - bool WasEventCancelled(void); + bool WasEventCancelled(); private: - void RemoveAllEvents(void); + void RemoveAllEvents(); CFastHashMap m_EventHashMap; std::vector m_CancelledList; diff --git a/Client/mods/deathmatch/logic/CFileReader.cpp b/Client/mods/deathmatch/logic/CFileReader.cpp index e5838defde1..e6f4278cba4 100644 --- a/Client/mods/deathmatch/logic/CFileReader.cpp +++ b/Client/mods/deathmatch/logic/CFileReader.cpp @@ -11,12 +11,12 @@ #include #include -CFileReader::CFileReader(void) +CFileReader::CFileReader() { m_u32BytesReadFromBuffer = 0; } -void CFileReader::FreeFileReaderMemory(void) +void CFileReader::FreeFileReaderMemory() { std::vector().swap(m_vecFileDataBuffer); m_u32BytesReadFromBuffer = 0; diff --git a/Client/mods/deathmatch/logic/CFileReader.h b/Client/mods/deathmatch/logic/CFileReader.h index 3da73e11fa5..d02c32ca9e0 100644 --- a/Client/mods/deathmatch/logic/CFileReader.h +++ b/Client/mods/deathmatch/logic/CFileReader.h @@ -20,11 +20,11 @@ class CFileReader SIZE_ERROR = -1 }; - CFileReader(void); + CFileReader(); bool LoadFileToMemory(const SString& strFilePath); bool LoadDataBufferToMemory(const SString& buffer); // Do not call any file reader functions after calling this function - void FreeFileReaderMemory(void); + void FreeFileReaderMemory(); template void ReadBuffer(T* pDestination) diff --git a/Client/mods/deathmatch/logic/CFoo.cpp b/Client/mods/deathmatch/logic/CFoo.cpp index 3e69a13ef26..f5a18603e08 100644 --- a/Client/mods/deathmatch/logic/CFoo.cpp +++ b/Client/mods/deathmatch/logic/CFoo.cpp @@ -15,7 +15,7 @@ bool bFoo_PlayerLimitCrash = false; -void CFoo::DoPulse(void) +void CFoo::DoPulse() { CClientManager* pManager = g_pClientGame->GetManager(); if (pManager->IsGameLoaded()) diff --git a/Client/mods/deathmatch/logic/CFoo.h b/Client/mods/deathmatch/logic/CFoo.h index e25ccae5ede..f7be2cb5857 100644 --- a/Client/mods/deathmatch/logic/CFoo.h +++ b/Client/mods/deathmatch/logic/CFoo.h @@ -19,13 +19,13 @@ class CFoo #ifdef MTA_DEBUG void Init(class CClientGame* pClientGame) { g_pClientGame = pClientGame; }; - void DoPulse(void); + void DoPulse(); void Test(const char* szString); class CClientGame* g_pClientGame; #else void Init(CClientGame* pClientGame){}; - void DoPulse(void){}; + void DoPulse(){}; void Test(const char* szString){}; #endif }; diff --git a/Client/mods/deathmatch/logic/CIFPAnimations.cpp b/Client/mods/deathmatch/logic/CIFPAnimations.cpp index 77049f11105..a7c9cb12c43 100644 --- a/Client/mods/deathmatch/logic/CIFPAnimations.cpp +++ b/Client/mods/deathmatch/logic/CIFPAnimations.cpp @@ -12,12 +12,12 @@ #include "game/CAnimBlendSequence.h" #include "game/CAnimBlendHierarchy.h" -CIFPAnimations::~CIFPAnimations(void) +CIFPAnimations::~CIFPAnimations() { DeleteAnimations(); } -void CIFPAnimations::DeleteAnimations(void) +void CIFPAnimations::DeleteAnimations() { CAnimManager* pAnimManager = g_pGame->GetAnimManager(); for (auto& Animation : vecAnimations) diff --git a/Client/mods/deathmatch/logic/CIFPAnimations.h b/Client/mods/deathmatch/logic/CIFPAnimations.h index bc5dfd3fb00..87c81f543eb 100644 --- a/Client/mods/deathmatch/logic/CIFPAnimations.h +++ b/Client/mods/deathmatch/logic/CIFPAnimations.h @@ -26,6 +26,6 @@ class CIFPAnimations std::vector vecAnimations; public: - ~CIFPAnimations(void); - void DeleteAnimations(void); + ~CIFPAnimations(); + void DeleteAnimations(); }; diff --git a/Client/mods/deathmatch/logic/CLocalServer.cpp b/Client/mods/deathmatch/logic/CLocalServer.cpp index 58ee9c9ae17..f2e5a1acbd0 100644 --- a/Client/mods/deathmatch/logic/CLocalServer.cpp +++ b/Client/mods/deathmatch/logic/CLocalServer.cpp @@ -133,7 +133,7 @@ CLocalServer::CLocalServer(const char* szConfig) Load(); } -CLocalServer::~CLocalServer(void) +CLocalServer::~CLocalServer() { if (m_pConfig) delete m_pConfig; @@ -178,7 +178,7 @@ bool CLocalServer::OnCancelButtonClick(CGUIElement* pElement) return true; } -bool CLocalServer::Load(void) +bool CLocalServer::Load() { // Get server module root SString strServerPath = CalcMTASAPath(PathJoin("server", "mods", "deathmatch")); @@ -334,7 +334,7 @@ void CLocalServer::GetResourceNameList(std::vector& outResourceNameList } } -bool CLocalServer::Save(void) +bool CLocalServer::Save() { if (m_pConfig && m_pConfig->GetRootNode()) { diff --git a/Client/mods/deathmatch/logic/CLocalServer.h b/Client/mods/deathmatch/logic/CLocalServer.h index 842bdf94fa8..f1529f394e3 100644 --- a/Client/mods/deathmatch/logic/CLocalServer.h +++ b/Client/mods/deathmatch/logic/CLocalServer.h @@ -18,7 +18,7 @@ class CLocalServer { public: CLocalServer(const char* szConfig); - ~CLocalServer(void); + ~CLocalServer(); protected: bool OnStartButtonClick(CGUIElement* pElement); @@ -27,15 +27,15 @@ class CLocalServer bool OnDelButtonClick(CGUIElement* pElement); // Server config - bool Load(void); - bool Save(void); + bool Load(); + bool Save(); void StoreConfigValue(const char* szNode, const char* szValue); void HandleResource(const char* szResource); void GetResourceNameList(std::vector& outResourceNameList, const SString& strResourceDirectoryPath); - std::string GetConfigName(void) { return m_strConfig; }; + std::string GetConfigName() { return m_strConfig; }; private: std::string m_strConfig; diff --git a/Client/mods/deathmatch/logic/CMapEvent.cpp b/Client/mods/deathmatch/logic/CMapEvent.cpp index fd34eebdca5..3754b042f8e 100644 --- a/Client/mods/deathmatch/logic/CMapEvent.cpp +++ b/Client/mods/deathmatch/logic/CMapEvent.cpp @@ -28,7 +28,7 @@ CMapEvent::CMapEvent(CLuaMain* pMain, const char* szName, const CLuaFunctionRef& m_bForceAspectRatioAdjustment = m_bAllowAspectRatioAdjustment && SStringX(pMain->GetScriptName()) == "customblips"; } -CMapEvent::~CMapEvent(void) +CMapEvent::~CMapEvent() { } diff --git a/Client/mods/deathmatch/logic/CMapEvent.h b/Client/mods/deathmatch/logic/CMapEvent.h index 87a7c5acbe9..152aa67ba8e 100644 --- a/Client/mods/deathmatch/logic/CMapEvent.h +++ b/Client/mods/deathmatch/logic/CMapEvent.h @@ -19,13 +19,13 @@ class CMapEvent friend class CMapEventManager; public: - class CLuaMain* GetVM(void) { return m_pMain; }; - const SString& GetName(void) { return m_strName; }; - CLuaFunctionRef GetLuaFunction(void) { return m_iLuaFunction; }; - bool IsBeingDestroyed(void) { return m_bBeingDestroyed; } - bool IsPropagated(void) { return m_bPropagated; } - bool ShouldAllowAspectRatioAdjustment(void) { return m_bAllowAspectRatioAdjustment; } - bool ShouldForceAspectRatioAdjustment(void) { return m_bForceAspectRatioAdjustment; } + class CLuaMain* GetVM() { return m_pMain; }; + const SString& GetName() { return m_strName; }; + CLuaFunctionRef GetLuaFunction() { return m_iLuaFunction; }; + bool IsBeingDestroyed() { return m_bBeingDestroyed; } + bool IsPropagated() { return m_bPropagated; } + bool ShouldAllowAspectRatioAdjustment() { return m_bAllowAspectRatioAdjustment; } + bool ShouldForceAspectRatioAdjustment() { return m_bForceAspectRatioAdjustment; } void Call(const class CLuaArguments& Arguments); bool IsHigherPriorityThan(const CMapEvent* pOther); @@ -33,7 +33,7 @@ class CMapEvent private: CMapEvent(class CLuaMain* pMain, const char* szName, const CLuaFunctionRef& iLuaFunction, bool bPropagated, EEventPriorityType eventPriority, float fPriorityMod); - ~CMapEvent(void); + ~CMapEvent(); void SetBeingDestroyed(bool bBeingDestroyed) { m_bBeingDestroyed = bBeingDestroyed; } diff --git a/Client/mods/deathmatch/logic/CMapEventManager.cpp b/Client/mods/deathmatch/logic/CMapEventManager.cpp index c4b1a0d5223..27042ffa1cb 100644 --- a/Client/mods/deathmatch/logic/CMapEventManager.cpp +++ b/Client/mods/deathmatch/logic/CMapEventManager.cpp @@ -11,13 +11,13 @@ #include "StdInc.h" bool g_bAllowAspectRatioAdjustment = false; -CMapEventManager::CMapEventManager(void) +CMapEventManager::CMapEventManager() { m_bIteratingList = false; m_bHasEvents = false; } -CMapEventManager::~CMapEventManager(void) +CMapEventManager::~CMapEventManager() { // If this happens while we're iterating the list, we're screwed dassert(!m_bIteratingList); @@ -100,7 +100,7 @@ bool CMapEventManager::Delete(CLuaMain* pLuaMain, const char* szName, const CLua return bRemovedSomeone; } -void CMapEventManager::DeleteAll(void) +void CMapEventManager::DeleteAll() { // Delete all the events EventsIter iter = m_EventsMap.begin(); @@ -302,7 +302,7 @@ bool CMapEventManager::Call(const char* szName, const CLuaArguments& Arguments, return bCalled; } -void CMapEventManager::TakeOutTheTrash(void) +void CMapEventManager::TakeOutTheTrash() { // Loop through our trashcan deleting every item std::list::const_iterator iterTrash = m_TrashCan.begin(); diff --git a/Client/mods/deathmatch/logic/CMapEventManager.h b/Client/mods/deathmatch/logic/CMapEventManager.h index 838160fc130..e6500fefdd3 100644 --- a/Client/mods/deathmatch/logic/CMapEventManager.h +++ b/Client/mods/deathmatch/logic/CMapEventManager.h @@ -17,21 +17,21 @@ class CMapEventManager { public: - CMapEventManager(void); - ~CMapEventManager(void); + CMapEventManager(); + ~CMapEventManager(); bool Add(CLuaMain* pLuaMain, const char* szName, const CLuaFunctionRef& iLuaFunction, bool bPropagated, EEventPriorityType eventPriority, float fPriorityMod); bool Delete(CLuaMain* pLuaMain, const char* szName = NULL, const CLuaFunctionRef& iLuaFunction = CLuaFunctionRef()); - void DeleteAll(void); + void DeleteAll(); bool HandleExists(CLuaMain* pLuaMain, const char* szName, const CLuaFunctionRef& iLuaFunction); - bool HasEvents(void) const { return m_bHasEvents; } + bool HasEvents() const { return m_bHasEvents; } void GetHandles(CLuaMain* pLuaMain, const char* szName, lua_State* luaVM); bool Call(const char* szName, const CLuaArguments& Arguments, class CClientEntity* pSource, class CClientEntity* pThis); private: - void TakeOutTheTrash(void); + void TakeOutTheTrash(); void AddInternal(CMapEvent* pEvent); bool m_bHasEvents; diff --git a/Client/mods/deathmatch/logic/CModelNames.cpp b/Client/mods/deathmatch/logic/CModelNames.cpp index 300eae200f6..b7050470d4a 100644 --- a/Client/mods/deathmatch/logic/CModelNames.cpp +++ b/Client/mods/deathmatch/logic/CModelNames.cpp @@ -10519,7 +10519,7 @@ ushort CModelNames::ResolveClothesTexID(const SString& strTexNameOrNumber) // // Initialize id <-> name maps // -void CModelNames::InitializeMaps(void) +void CModelNames::InitializeMaps() { if (!ms_ModelIDNameMap.empty()) return; diff --git a/Client/mods/deathmatch/logic/CModelNames.h b/Client/mods/deathmatch/logic/CModelNames.h index 8a238ed7d1b..1767cdcd61b 100644 --- a/Client/mods/deathmatch/logic/CModelNames.h +++ b/Client/mods/deathmatch/logic/CModelNames.h @@ -24,7 +24,7 @@ class CModelNames static ushort ResolveClothesTexID(const SString& strTexNameOrNumber); protected: - static void InitializeMaps(void); + static void InitializeMaps(); static std::map ms_ModelIDNameMap; static std::map ms_NameModelIDMap; diff --git a/Client/mods/deathmatch/logic/CMovingObjectsManager.cpp b/Client/mods/deathmatch/logic/CMovingObjectsManager.cpp index 385e7698e0b..273c8f63656 100644 --- a/Client/mods/deathmatch/logic/CMovingObjectsManager.cpp +++ b/Client/mods/deathmatch/logic/CMovingObjectsManager.cpp @@ -13,7 +13,7 @@ using std::list; -void CMovingObjectsManager::DoPulse(void) +void CMovingObjectsManager::DoPulse() { // Pulse all the objects we're moving bool bRemoved = false; diff --git a/Client/mods/deathmatch/logic/CMovingObjectsManager.h b/Client/mods/deathmatch/logic/CMovingObjectsManager.h index 4a1742a2f6b..388ca4af76b 100644 --- a/Client/mods/deathmatch/logic/CMovingObjectsManager.h +++ b/Client/mods/deathmatch/logic/CMovingObjectsManager.h @@ -24,7 +24,7 @@ class CMovingObjectsManager m_List.remove(pObject); }; - void DoPulse(void); + void DoPulse(); private: std::list m_List; diff --git a/Client/mods/deathmatch/logic/CNametags.cpp b/Client/mods/deathmatch/logic/CNametags.cpp index 4516c9d7af7..dbf2643f368 100644 --- a/Client/mods/deathmatch/logic/CNametags.cpp +++ b/Client/mods/deathmatch/logic/CNametags.cpp @@ -38,12 +38,12 @@ CNametags::CNametags(CClientManager* pManager) g_pCore->GetGraphics()->GetRenderItemManager()->CreateTexture(CalcMTASAPath("MTA\\cgui\\images\\16-message-warn.png"), NULL, false); } -CNametags::~CNametags(void) +CNametags::~CNametags() { SAFE_RELEASE(m_pConnectionTroubleIcon); } -void CNametags::DoPulse(void) +void CNametags::DoPulse() { if (m_bVisible) { @@ -54,7 +54,7 @@ void CNametags::DoPulse(void) } } -void CNametags::DrawFromAim(void) +void CNametags::DrawFromAim() { unsigned long ulCurrentTime = CClientTime::GetTime(); @@ -254,7 +254,7 @@ void CNametags::DrawFromAim(void) } } -void CNametags::DrawDefault(void) +void CNametags::DrawDefault() { // Grab the resolution width and height static float fResWidth = static_cast(g_pCore->GetGraphics()->GetViewportWidth()); diff --git a/Client/mods/deathmatch/logic/CNametags.h b/Client/mods/deathmatch/logic/CNametags.h index 0b410a54530..e9a5f90f52e 100644 --- a/Client/mods/deathmatch/logic/CNametags.h +++ b/Client/mods/deathmatch/logic/CNametags.h @@ -22,22 +22,22 @@ class CNametags { public: CNametags(CClientManager* pManager); - ~CNametags(void); + ~CNametags(); - bool GetDrawHealth(void) { return m_bDrawHealth; }; + bool GetDrawHealth() { return m_bDrawHealth; }; void SetDrawHealth(bool bDrawHealth) { m_bDrawHealth = bDrawHealth; }; - void DoPulse(void); + void DoPulse(); - void DrawFromAim(void); - void DrawDefault(void); + void DrawFromAim(); + void DrawDefault(); void DrawTagForPlayer(CClientPlayer* pPlayer, unsigned char ucAlpha); - unsigned int GetDimension(void) { return m_usDimension; } + unsigned int GetDimension() { return m_usDimension; } void SetDimension(unsigned short usDimension) { m_usDimension = usDimension; } - bool IsVisible(void) { return m_bVisible; } + bool IsVisible() { return m_bVisible; } void SetVisible(bool bVisible) { m_bVisible = bVisible; } private: diff --git a/Client/mods/deathmatch/logic/CNetAPI.cpp b/Client/mods/deathmatch/logic/CNetAPI.cpp index 9a47836a4de..d0f6cda32ca 100644 --- a/Client/mods/deathmatch/logic/CNetAPI.cpp +++ b/Client/mods/deathmatch/logic/CNetAPI.cpp @@ -226,7 +226,7 @@ bool CNetAPI::ProcessPacket(unsigned char bytePacketID, NetBitStreamInterface& B return false; } -void CNetAPI::ResetReturnPosition(void) +void CNetAPI::ResetReturnPosition() { m_bStoredReturnSync = false; @@ -276,7 +276,7 @@ bool CNetAPI::IsDriveByWeapon(unsigned char ucID) return ((ucID >= 22 && ucID <= 33) || ucID == 38); } -void CNetAPI::DoPulse(void) +void CNetAPI::DoPulse() { m_bIsNetworkTrouble = false; @@ -516,7 +516,7 @@ bool CNetAPI::IsSmallKeySyncNeeded(CClientPed* pPlayerModel) return false; } -bool CNetAPI::IsPureSyncNeeded(void) +bool CNetAPI::IsPureSyncNeeded() { unsigned long ulCurrentTime = CClientTime::GetTime(); if (ulCurrentTime >= m_ulLastPuresyncTime + TICK_RATE) diff --git a/Client/mods/deathmatch/logic/CNetAPI.h b/Client/mods/deathmatch/logic/CNetAPI.h index c31f37a76a5..ed0dc291d91 100644 --- a/Client/mods/deathmatch/logic/CNetAPI.h +++ b/Client/mods/deathmatch/logic/CNetAPI.h @@ -42,24 +42,24 @@ class CNetAPI ZERO_ON_NEW CNetAPI(CClientManager* pManager); - void DoPulse(void); + void DoPulse(); bool ProcessPacket(unsigned char bytePacketID, NetBitStreamInterface& bitStream); - void ResetReturnPosition(void); + void ResetReturnPosition(); void AddInterpolation(const CVector& vecPosition); bool GetInterpolation(CVector& vecPosition, unsigned short usLatency); void SendBulletSyncFire(eWeaponType weaponType, const CVector& vecStart, const CVector& vecEnd, float fDamage, uchar ucHitZone, CClientPlayer* pRemoteDamagedPlayer); void SendBulletSyncCustomWeaponFire(CClientWeapon* pWeapon, const CVector& vecStart, const CVector& vecEnd); - bool IsNetworkTrouble(void) { return m_bIsNetworkTrouble; } + bool IsNetworkTrouble() { return m_bIsNetworkTrouble; } static bool IsWeaponIDAkimbo(unsigned char ucWeaponID); static bool IsDriveByWeapon(unsigned char ucWeaponID); private: bool IsSmallKeySyncNeeded(CClientPed* pPed); - bool IsPureSyncNeeded(void); + bool IsPureSyncNeeded(); void ReadKeysync(CClientPlayer* pPlayer, NetBitStreamInterface& BitStream); void WriteKeysync(CClientPed* pPed, NetBitStreamInterface& BitStream); @@ -94,7 +94,7 @@ class CNetAPI void ReadVehiclePartsState(CClientVehicle* pVehicle, NetBitStreamInterface& BitStream); public: - bool IsCameraSyncNeeded(void); + bool IsCameraSyncNeeded(); void WriteCameraSync(NetBitStreamInterface& BitStream); void RPC(eServerRPCFunctions ID, NetBitStreamInterface* pBitStream = NULL); diff --git a/Client/mods/deathmatch/logic/CNetworkStats.cpp b/Client/mods/deathmatch/logic/CNetworkStats.cpp index 8f8a445819a..970b56576fa 100644 --- a/Client/mods/deathmatch/logic/CNetworkStats.cpp +++ b/Client/mods/deathmatch/logic/CNetworkStats.cpp @@ -17,7 +17,7 @@ CNetworkStats::CNetworkStats(CClientDisplayManager* pDisplayManager) Reset(); } -void CNetworkStats::Reset(void) +void CNetworkStats::Reset() { m_ulLastUpdateTime = CClientTime::GetTime(); @@ -35,7 +35,7 @@ void CNetworkStats::Reset(void) m_ullLastBytesReceived = stats.bytesReceived; } -void CNetworkStats::Draw(void) +void CNetworkStats::Draw() { // Time to update? if (CClientTime::GetTime() >= m_ulLastUpdateTime + 1000) @@ -152,7 +152,7 @@ void CNetworkStats::Draw(void) g_pCore->GetGraphics()->DrawStringQueued(fX, fY, fX, fY, 0xFFFFFFFF, strBuffer, 1, 1, DT_NOCLIP, NULL, true); } -void CNetworkStats::Update(void) +void CNetworkStats::Update() { NetStatistics stats; g_pNet->GetNetworkStatistics(&stats); diff --git a/Client/mods/deathmatch/logic/CNetworkStats.h b/Client/mods/deathmatch/logic/CNetworkStats.h index db391167115..32ad389dfd5 100644 --- a/Client/mods/deathmatch/logic/CNetworkStats.h +++ b/Client/mods/deathmatch/logic/CNetworkStats.h @@ -18,11 +18,11 @@ class CNetworkStats public: CNetworkStats(CClientDisplayManager* pDisplayManager); - void Draw(void); - void Reset(void); + void Draw(); + void Reset(); private: - void Update(void); + void Update(); CClientDisplayManager* m_pDisplayManager; diff --git a/Client/mods/deathmatch/logic/CObjectRespawner.cpp b/Client/mods/deathmatch/logic/CObjectRespawner.cpp index 7604a70844e..6b1a71e7639 100644 --- a/Client/mods/deathmatch/logic/CObjectRespawner.cpp +++ b/Client/mods/deathmatch/logic/CObjectRespawner.cpp @@ -32,7 +32,7 @@ void CObjectRespawner::Respawn(CClientObject* pObject) } } -void CObjectRespawner::DoRespawnAll(void) +void CObjectRespawner::DoRespawnAll() { for (uint i = 0; i < m_List.size(); i++) { diff --git a/Client/mods/deathmatch/logic/CObjectRespawner.h b/Client/mods/deathmatch/logic/CObjectRespawner.h index 5b767d6bddb..c32c8aeb6de 100644 --- a/Client/mods/deathmatch/logic/CObjectRespawner.h +++ b/Client/mods/deathmatch/logic/CObjectRespawner.h @@ -14,11 +14,11 @@ class CObjectRespawner { public: - CObjectRespawner(void); - ~CObjectRespawner(void) { DoRespawnAll(); }; + CObjectRespawner(); + ~CObjectRespawner() { DoRespawnAll(); }; void Respawn(CClientObject* pObject); - void DoRespawnAll(void); + void DoRespawnAll(); bool IsBeingRespawned(CClientObject* pObject); void Unreference(CClientObject* pObject); diff --git a/Client/mods/deathmatch/logic/CObjectSync.cpp b/Client/mods/deathmatch/logic/CObjectSync.cpp index 99dfd6086e8..e0e6ce2fc5b 100644 --- a/Client/mods/deathmatch/logic/CObjectSync.cpp +++ b/Client/mods/deathmatch/logic/CObjectSync.cpp @@ -50,7 +50,7 @@ bool CObjectSync::ProcessPacket(unsigned char ucPacketID, NetBitStreamInterface& return false; } -void CObjectSync::DoPulse(void) +void CObjectSync::DoPulse() { // Has it been long enough since our last state's sync? unsigned long ulCurrentTime = CClientTime::GetTime(); @@ -72,7 +72,7 @@ void CObjectSync::RemoveObject(CDeathmatchObject* pObject) m_List.remove(pObject); } -void CObjectSync::ClearObjects(void) +void CObjectSync::ClearObjects() { m_List.clear(); } @@ -190,7 +190,7 @@ void CObjectSync::Packet_ObjectSync(NetBitStreamInterface& BitStream) } } -void CObjectSync::Sync(void) +void CObjectSync::Sync() { // Got any items? if (m_List.size() > 0) diff --git a/Client/mods/deathmatch/logic/CObjectSync.h b/Client/mods/deathmatch/logic/CObjectSync.h index 827be39f0f0..4d5e4a350df 100644 --- a/Client/mods/deathmatch/logic/CObjectSync.h +++ b/Client/mods/deathmatch/logic/CObjectSync.h @@ -22,14 +22,14 @@ class CObjectSync CObjectSync(CClientObjectManager* pObjectManager); bool ProcessPacket(unsigned char ucPacketID, NetBitStreamInterface& bitStream); - void DoPulse(void); + void DoPulse(); void AddObject(CDeathmatchObject* pObject); void RemoveObject(CDeathmatchObject* pObject); - void ClearObjects(void); + void ClearObjects(); - std::list::const_iterator IterBegin(void) { return m_List.begin(); }; - std::list::const_iterator IterEnd(void) { return m_List.end(); }; + std::list::const_iterator IterBegin() { return m_List.begin(); }; + std::list::const_iterator IterEnd() { return m_List.end(); }; bool Exists(CDeathmatchObject* pObject); @@ -38,7 +38,7 @@ class CObjectSync void Packet_ObjectStopSync(NetBitStreamInterface& BitStream); void Packet_ObjectSync(NetBitStreamInterface& BitStream); - void Sync(void); + void Sync(); void WriteObjectInformation(NetBitStreamInterface* pBitStream, CDeathmatchObject* pObject); CClientObjectManager* m_pObjectManager; diff --git a/Client/mods/deathmatch/logic/CPedSync.cpp b/Client/mods/deathmatch/logic/CPedSync.cpp index 8c9ef1c7f25..ed416f50996 100644 --- a/Client/mods/deathmatch/logic/CPedSync.cpp +++ b/Client/mods/deathmatch/logic/CPedSync.cpp @@ -23,7 +23,7 @@ CPedSync::CPedSync(CClientPedManager* pPedManager) m_ulLastSyncTime = 0; } -CPedSync::~CPedSync(void) +CPedSync::~CPedSync() { } @@ -53,7 +53,7 @@ bool CPedSync::ProcessPacket(unsigned char ucPacketID, NetBitStreamInterface& Bi return false; } -void CPedSync::DoPulse(void) +void CPedSync::DoPulse() { // Has it been long enough since our last state's sync? unsigned long ulCurrentTime = CClientTime::GetTime(); @@ -227,7 +227,7 @@ void CPedSync::Packet_PedSync(NetBitStreamInterface& BitStream) } } -void CPedSync::Update(void) +void CPedSync::Update() { // Got any items? if (m_List.size() > 0) diff --git a/Client/mods/deathmatch/logic/CPedSync.h b/Client/mods/deathmatch/logic/CPedSync.h index 0515b007091..0feb4e7a37e 100644 --- a/Client/mods/deathmatch/logic/CPedSync.h +++ b/Client/mods/deathmatch/logic/CPedSync.h @@ -18,16 +18,16 @@ class CPedSync { public: CPedSync(CClientPedManager* pPedManager); - ~CPedSync(void); + ~CPedSync(); bool ProcessPacket(unsigned char ucPacketID, NetBitStreamInterface& bitStream); - void DoPulse(void); + void DoPulse(); void AddPed(CClientPed* pPed); void RemovePed(CClientPed* pPed); - std::list::const_iterator IterBegin(void) { return m_List.begin(); }; - std::list::const_iterator IterEnd(void) { return m_List.end(); }; + std::list::const_iterator IterBegin() { return m_List.begin(); }; + std::list::const_iterator IterEnd() { return m_List.end(); }; bool Exists(CClientPed* pPed); @@ -36,7 +36,7 @@ class CPedSync void Packet_PedStopSync(NetBitStreamInterface& BitStream); void Packet_PedSync(NetBitStreamInterface& BitStream); - void Update(void); + void Update(); void WritePedInformation(NetBitStreamInterface* pBitStream, CClientPed* pPed); CClientPedManager* m_pPedManager; diff --git a/Client/mods/deathmatch/logic/CRadarMap.cpp b/Client/mods/deathmatch/logic/CRadarMap.cpp index 9b98c8ef0f6..e3154cec124 100644 --- a/Client/mods/deathmatch/logic/CRadarMap.cpp +++ b/Client/mods/deathmatch/logic/CRadarMap.cpp @@ -100,7 +100,7 @@ CRadarMap::CRadarMap(CClientManager* pManager) SetAttachedToLocalPlayer(true); } -CRadarMap::~CRadarMap(void) +CRadarMap::~CRadarMap() { // Delete our images SAFE_RELEASE(m_pRadarImage); @@ -114,7 +114,7 @@ CRadarMap::~CRadarMap(void) // Don't need to delete the help texts as those are destroyed by the display manager } -void CRadarMap::DoPulse(void) +void CRadarMap::DoPulse() { // If our radar image exists if (IsRadarShowing()) @@ -156,7 +156,7 @@ void CRadarMap::DoPulse(void) // // Precreate all the textures for the radar map markers // -void CRadarMap::CreateMarkerTextures(void) +void CRadarMap::CreateMarkerTextures() { assert(m_MarkerTextureList.empty()); SString strRadarSetDirectory = CalcMTASAPath("MTA\\cgui\\images\\radarset\\"); @@ -226,7 +226,7 @@ CTextureItem* CRadarMap::GetMarkerTexture(CClientRadarMarker* pMarker, float fLo return m_MarkerTextureList[uiListIndex]; } -void CRadarMap::DoRender(void) +void CRadarMap::DoRender() { bool bIsRadarShowing = IsRadarShowing(); @@ -427,7 +427,7 @@ bool CRadarMap::CalculateEntityOnScreenPosition(CVector vecPosition, CVector2D& return false; } -void CRadarMap::SetupMapVariables(void) +void CRadarMap::SetupMapVariables() { // Calculate the map size and the middle of the screen coords m_fMapSize = static_cast(m_uiHeight * m_fZoom); @@ -523,7 +523,7 @@ void CRadarMap::SetupMapVariables(void) } } -void CRadarMap::ZoomIn(void) +void CRadarMap::ZoomIn() { if (m_fZoom <= 4) { @@ -532,7 +532,7 @@ void CRadarMap::ZoomIn(void) } } -void CRadarMap::ZoomOut(void) +void CRadarMap::ZoomOut() { if (m_fZoom >= 1) { @@ -558,7 +558,7 @@ void CRadarMap::ZoomOut(void) } } -void CRadarMap::MoveNorth(void) +void CRadarMap::MoveNorth() { if (!m_bIsAttachedToLocal) { @@ -578,7 +578,7 @@ void CRadarMap::MoveNorth(void) } } -void CRadarMap::MoveSouth(void) +void CRadarMap::MoveSouth() { if (!m_bIsAttachedToLocal) { @@ -598,7 +598,7 @@ void CRadarMap::MoveSouth(void) } } -void CRadarMap::MoveEast(void) +void CRadarMap::MoveEast() { if (!m_bIsAttachedToLocal) { @@ -618,7 +618,7 @@ void CRadarMap::MoveEast(void) } } -void CRadarMap::MoveWest(void) +void CRadarMap::MoveWest() { if (!m_bIsAttachedToLocal) { @@ -653,7 +653,7 @@ void CRadarMap::SetAttachedToLocalPlayer(bool bIsAttachedToLocal) } } -bool CRadarMap::IsRadarShowing(void) +bool CRadarMap::IsRadarShowing() { return ((m_bIsRadarEnabled || m_bForcedState) && m_pRadarImage && m_pLocalPlayerBlip && (!g_pCore->GetConsole()->IsVisible() && !g_pCore->IsMenuVisible())); } @@ -677,7 +677,7 @@ bool CRadarMap::GetBoundingBox(CVector& vecMin, CVector& vecMax) } } -void CRadarMap::ToggleHelpText(void) +void CRadarMap::ToggleHelpText() { m_bHideHelpText = !m_bHideHelpText; } diff --git a/Client/mods/deathmatch/logic/CRadarMap.h b/Client/mods/deathmatch/logic/CRadarMap.h index b428ec969c1..7b4f6c0568f 100644 --- a/Client/mods/deathmatch/logic/CRadarMap.h +++ b/Client/mods/deathmatch/logic/CRadarMap.h @@ -20,59 +20,59 @@ class CRadarMap { public: CRadarMap(class CClientManager* pManager); - virtual ~CRadarMap(void); + virtual ~CRadarMap(); - void DoPulse(void); - void DoRender(void); + void DoPulse(); + void DoRender(); - bool IsRadarShowing(void); + bool IsRadarShowing(); - bool GetRadarEnabled(void) const { return m_bIsRadarEnabled; }; + bool GetRadarEnabled() const { return m_bIsRadarEnabled; }; void SetRadarEnabled(bool bIsRadarEnabled); - bool GetForcedState(void) const { return m_bForcedState; } + bool GetForcedState() const { return m_bForcedState; } void SetForcedState(bool bState); bool GetBoundingBox(CVector& vecMin, CVector& vecMax); - void ToggleHelpText(void); + void ToggleHelpText(); protected: void InternalSetRadarEnabled(bool bEnabled); - void CreateMarkerTextures(void); + void CreateMarkerTextures(); CTextureItem* GetMarkerTexture(CClientRadarMarker* pMarker, float fLocalZ, float* pfScale, SColor* pColor); public: - bool IsAttachedToLocalPlayer(void) const { return m_bIsAttachedToLocal; }; + bool IsAttachedToLocalPlayer() const { return m_bIsAttachedToLocal; }; void SetAttachedToLocalPlayer(bool bIsAttachedToLocal); - bool IsMovingNorth(void) const { return m_bIsMovingNorth; }; + bool IsMovingNorth() const { return m_bIsMovingNorth; }; void SetMovingNorth(bool bIsMovingNorth) { m_bIsMovingNorth = bIsMovingNorth; }; - bool IsMovingSouth(void) const { return m_bIsMovingSouth; }; + bool IsMovingSouth() const { return m_bIsMovingSouth; }; void SetMovingSouth(bool bIsMovingSouth) { m_bIsMovingSouth = bIsMovingSouth; }; - bool IsMovingEast(void) const { return m_bIsMovingEast; }; + bool IsMovingEast() const { return m_bIsMovingEast; }; void SetMovingEast(bool bIsMovingEast) { m_bIsMovingEast = bIsMovingEast; }; - bool IsMovingWest(void) const { return m_bIsMovingWest; }; + bool IsMovingWest() const { return m_bIsMovingWest; }; void SetMovingWest(bool bIsMovingWest) { m_bIsMovingWest = bIsMovingWest; }; - void ZoomIn(void); - void ZoomOut(void); + void ZoomIn(); + void ZoomOut(); SString GetBoundKeyName(const SString& strCommand); private: bool CalculateEntityOnScreenPosition(class CClientEntity* pEntity, CVector2D& vecLocalPos); bool CalculateEntityOnScreenPosition(CVector vecPosition, CVector2D& vecLocalPos); - void SetupMapVariables(void); + void SetupMapVariables(); - void MoveNorth(void); - void MoveSouth(void); - void MoveEast(void); - void MoveWest(void); + void MoveNorth(); + void MoveSouth(); + void MoveEast(); + void MoveWest(); private: class CClientManager* m_pManager; diff --git a/Client/mods/deathmatch/logic/CRegisteredCommands.cpp b/Client/mods/deathmatch/logic/CRegisteredCommands.cpp index 02d500ad922..92e31ceb96e 100644 --- a/Client/mods/deathmatch/logic/CRegisteredCommands.cpp +++ b/Client/mods/deathmatch/logic/CRegisteredCommands.cpp @@ -12,12 +12,12 @@ using std::list; -CRegisteredCommands::CRegisteredCommands(void) +CRegisteredCommands::CRegisteredCommands() { m_bIteratingList = false; } -CRegisteredCommands::~CRegisteredCommands(void) +CRegisteredCommands::~CRegisteredCommands() { ClearCommands(); } @@ -87,7 +87,7 @@ bool CRegisteredCommands::RemoveCommand(CLuaMain* pLuaMain, const char* szKey) return bFound; } -void CRegisteredCommands::ClearCommands(void) +void CRegisteredCommands::ClearCommands() { // Delete all the commands list::const_iterator iter = m_Commands.begin(); @@ -252,7 +252,7 @@ void CRegisteredCommands::GetCommands(lua_State* luaVM, CLuaMain* pTargetLuaMain } } -void CRegisteredCommands::TakeOutTheTrash(void) +void CRegisteredCommands::TakeOutTheTrash() { list::iterator iter = m_TrashCan.begin(); for (; iter != m_TrashCan.end(); iter++) diff --git a/Client/mods/deathmatch/logic/CRegisteredCommands.h b/Client/mods/deathmatch/logic/CRegisteredCommands.h index 6dc4c74bbbe..2ca6c315807 100644 --- a/Client/mods/deathmatch/logic/CRegisteredCommands.h +++ b/Client/mods/deathmatch/logic/CRegisteredCommands.h @@ -26,12 +26,12 @@ class CRegisteredCommands }; public: - CRegisteredCommands(void); - ~CRegisteredCommands(void); + CRegisteredCommands(); + ~CRegisteredCommands(); bool AddCommand(class CLuaMain* pLuaMain, const char* szKey, const CLuaFunctionRef& iLuaFunction, bool bCaseSensitive); bool RemoveCommand(class CLuaMain* pLuaMain, const char* szKey); - void ClearCommands(void); + void ClearCommands(); void CleanUpForVM(class CLuaMain* pLuaMain); bool CommandExists(const char* szKey, class CLuaMain* pLuaMain = NULL); @@ -45,7 +45,7 @@ class CRegisteredCommands SCommand* GetCommand(const char* szKey, class CLuaMain* pLuaMain = NULL); void CallCommandHandler(class CLuaMain* pLuaMain, const CLuaFunctionRef& iLuaFunction, const char* szKey, const char* szArguments); - void TakeOutTheTrash(void); + void TakeOutTheTrash(); std::list m_Commands; std::list m_TrashCan; diff --git a/Client/mods/deathmatch/logic/CRemoteCalls.cpp b/Client/mods/deathmatch/logic/CRemoteCalls.cpp index 71de5abfe7b..5f5dce490ae 100644 --- a/Client/mods/deathmatch/logic/CRemoteCalls.cpp +++ b/Client/mods/deathmatch/logic/CRemoteCalls.cpp @@ -125,7 +125,7 @@ EDownloadModeType CRemoteCalls::GetDownloadModeForQueueName(const SString& strQu } } -void CRemoteCalls::ProcessQueuedFiles(void) +void CRemoteCalls::ProcessQueuedFiles() { for (auto iter = m_QueueIndexMap.cbegin(); iter != m_QueueIndexMap.cend();) { @@ -297,7 +297,7 @@ void CRemoteCall::DownloadFinishedCallback(const SHttpDownloadResult& result) } // Return true if cancel was done -bool CRemoteCall::CancelDownload(void) +bool CRemoteCall::CancelDownload() { if (m_downloadMode != EDownloadModeType::NONE) { diff --git a/Client/mods/deathmatch/logic/CRemoteCalls.h b/Client/mods/deathmatch/logic/CRemoteCalls.h index 5eec86e5b5b..854b7f6199f 100644 --- a/Client/mods/deathmatch/logic/CRemoteCalls.h +++ b/Client/mods/deathmatch/logic/CRemoteCalls.h @@ -41,7 +41,7 @@ class CRemoteCall ~CRemoteCall(); void MakeCall(); static void DownloadFinishedCallback(const SHttpDownloadResult& result); - bool CancelDownload(void); + bool CancelDownload(); bool GetDownloadStatus(SDownloadStatus& outDownloadStatus); CLuaMain* GetVM() { return m_VM; }; bool IsFetch() { return m_bIsFetch; } @@ -75,7 +75,7 @@ class CRemoteCalls void Remove(CLuaMain* luaMain); void Remove(CRemoteCall* call); bool CallExists(CRemoteCall* call); - void ProcessQueuedFiles(void); + void ProcessQueuedFiles(); EDownloadModeType GetDownloadModeForQueueName(const SString& strQueueName, bool bAnyHost); EDownloadModeType GetDownloadModeFromQueueIndex(uint uiIndex, bool bAnyHost); }; diff --git a/Client/mods/deathmatch/logic/CResource.cpp b/Client/mods/deathmatch/logic/CResource.cpp index 8f5b330eeff..3b276dc4d1b 100644 --- a/Client/mods/deathmatch/logic/CResource.cpp +++ b/Client/mods/deathmatch/logic/CResource.cpp @@ -86,7 +86,7 @@ CResource::CResource(unsigned short usNetID, const char* szResourceName, CClient } } -CResource::~CResource(void) +CResource::~CResource() { CIdArray::PushUniqueId(this, EIdClass::RESOURCE, m_uiScriptID); // Make sure we don't force the cursor on @@ -223,12 +223,12 @@ bool CResource::CallExportedFunction(const char* szFunctionName, CLuaArguments& return false; } -bool CResource::CanBeLoaded(void) +bool CResource::CanBeLoaded() { return !IsActive() && !IsWaitingForInitialDownloads(); } -bool CResource::IsWaitingForInitialDownloads(void) +bool CResource::IsWaitingForInitialDownloads() { for (std::list::iterator iter = m_ConfigFiles.begin(); iter != m_ConfigFiles.end(); ++iter) if ((*iter)->IsWaitingForDownload()) @@ -241,7 +241,7 @@ bool CResource::IsWaitingForInitialDownloads(void) return false; } -void CResource::Load(void) +void CResource::Load() { dassert(CanBeLoaded()); m_pRootEntity = g_pClientGame->GetRootEntity(); @@ -345,7 +345,7 @@ void CResource::Load(void) assert(0); } -void CResource::Stop(void) +void CResource::Stop() { m_bStarting = false; m_bStopping = true; @@ -354,7 +354,7 @@ void CResource::Stop(void) m_pResourceEntity->CallEvent("onClientResourceStop", Arguments, true); } -SString CResource::GetState(void) +SString CResource::GetState() { if (m_bStarting) return "starting"; @@ -366,7 +366,7 @@ SString CResource::GetState(void) return "loaded"; } -void CResource::DeleteClientChildren(void) +void CResource::DeleteClientChildren() { // Run this on our resource entity if we have one if (m_pResourceEntity) diff --git a/Client/mods/deathmatch/logic/CResource.h b/Client/mods/deathmatch/logic/CResource.h index 65428cfa993..df836be132c 100644 --- a/Client/mods/deathmatch/logic/CResource.h +++ b/Client/mods/deathmatch/logic/CResource.h @@ -29,7 +29,7 @@ class CExportedFunction public: CExportedFunction(const char* szFunctionName) { m_strFunctionName.AssignLeft(szFunctionName, MAX_FUNCTION_NAME_LENGTH); }; - const char* GetFunctionName(void) { return m_strFunctionName; } + const char* GetFunctionName() { return m_strFunctionName; } }; struct SNoClientCacheScript @@ -50,64 +50,64 @@ class CResource public: CResource(unsigned short usNetID, const char* szResourceName, CClientEntity* pResourceEntity, CClientEntity* pResourceDynamicEntity, const SString& strMinServerReq, const SString& strMinClientReq, bool bEnableOOP); - ~CResource(void); + ~CResource(); - unsigned short GetNetID(void) { return m_usNetID; }; - uint GetScriptID(void) const { return m_uiScriptID; }; - const char* GetName(void) { return m_strResourceName; }; - CLuaMain* GetVM(void) { return m_pLuaVM; }; - bool IsActive(void) { return m_bActive; }; - bool CanBeLoaded(void); + unsigned short GetNetID() { return m_usNetID; }; + uint GetScriptID() const { return m_uiScriptID; }; + const char* GetName() { return m_strResourceName; }; + CLuaMain* GetVM() { return m_pLuaVM; }; + bool IsActive() { return m_bActive; }; + bool CanBeLoaded(); - void Load(void); - void Stop(void); - SString GetState(void); + void Load(); + void Stop(); + SString GetState(); CDownloadableResource* AddResourceFile(CDownloadableResource::eResourceType resourceType, const char* szFileName, uint uiDownloadSize, CChecksum serverChecksum, bool bAutoDownload); CDownloadableResource* AddConfigFile(const char* szFileName, uint uiDownloadSize, CChecksum serverChecksum); - std::list::iterator ConfigIterBegin(void) { return m_ConfigFiles.begin(); } - std::list::iterator ConfigIterEnd(void) { return m_ConfigFiles.end(); } + std::list::iterator ConfigIterBegin() { return m_ConfigFiles.begin(); } + std::list::iterator ConfigIterEnd() { return m_ConfigFiles.end(); } - CElementGroup* GetElementGroup(void) { return m_pDefaultElementGroup; } + CElementGroup* GetElementGroup() { return m_pDefaultElementGroup; } void AddToElementGroup(CClientEntity* pElement); void AddExportedFunction(const char* szFunctionName); bool CallExportedFunction(const char* szFunctionName, CLuaArguments& args, CLuaArguments& returns, CResource& caller); - class CClientEntity* GetResourceEntity(void) { return m_pResourceEntity; } + class CClientEntity* GetResourceEntity() { return m_pResourceEntity; } void SetResourceEntity(CClientEntity* pEntity) { m_pResourceEntity = pEntity; } - class CClientEntity* GetResourceDynamicEntity(void) { return m_pResourceDynamicEntity; } + class CClientEntity* GetResourceDynamicEntity() { return m_pResourceDynamicEntity; } void SetResourceDynamicEntity(CClientEntity* pEntity) { m_pResourceDynamicEntity = pEntity; } SString GetResourceDirectoryPath(eAccessType accessType, const SString& strMetaPath); - class CClientEntity* GetResourceGUIEntity(void) { return m_pResourceGUIEntity; } + class CClientEntity* GetResourceGUIEntity() { return m_pResourceGUIEntity; } void SetResourceGUIEntity(CClientEntity* pEntity) { m_pResourceGUIEntity = pEntity; } - CClientEntity* GetResourceCOLModelRoot(void) { return m_pResourceCOLRoot; }; - CClientEntity* GetResourceDFFRoot(void) { return m_pResourceDFFEntity; }; - CClientEntity* GetResourceTXDRoot(void) { return m_pResourceTXDRoot; }; - CClientEntity* GetResourceIFPRoot(void) { return m_pResourceIFPRoot; }; + CClientEntity* GetResourceCOLModelRoot() { return m_pResourceCOLRoot; }; + CClientEntity* GetResourceDFFRoot() { return m_pResourceDFFEntity; }; + CClientEntity* GetResourceTXDRoot() { return m_pResourceTXDRoot; }; + CClientEntity* GetResourceIFPRoot() { return m_pResourceIFPRoot; }; // This is to delete all the elements created in this resource that are created locally in this client - void DeleteClientChildren(void); + void DeleteClientChildren(); // Use this for cursor showing/hiding void ShowCursor(bool bShow, bool bToggleControls = true); - std::list::iterator IterBeginExportedFunctions(void) { return m_exportedFunctions.begin(); } - std::list::iterator IterEndExportedFunctions(void) { return m_exportedFunctions.end(); } + std::list::iterator IterBeginExportedFunctions() { return m_exportedFunctions.begin(); } + std::list::iterator IterEndExportedFunctions() { return m_exportedFunctions.end(); } - std::list::iterator IterBeginResourceFiles(void) { return m_ResourceFiles.begin(); } - std::list::iterator IterEndResourceFiles(void) { return m_ResourceFiles.end(); } + std::list::iterator IterBeginResourceFiles() { return m_ResourceFiles.begin(); } + std::list::iterator IterEndResourceFiles() { return m_ResourceFiles.end(); } void SetRemainingNoClientCacheScripts(unsigned short usRemaining) { m_usRemainingNoClientCacheScripts = usRemaining; } void LoadNoClientCacheScript(const char* chunk, unsigned int length, const SString& strFilename); - const SString& GetMinServerReq(void) const { return m_strMinServerReq; } - const SString& GetMinClientReq(void) const { return m_strMinClientReq; } - bool IsOOPEnabled(void) { return m_bOOPEnabled; } + const SString& GetMinServerReq() const { return m_strMinServerReq; } + const SString& GetMinClientReq() const { return m_strMinClientReq; } + bool IsOOPEnabled() { return m_bOOPEnabled; } void HandleDownloadedFileTrouble(CResourceFile* pResourceFile, bool bScript); - bool IsWaitingForInitialDownloads(void); - int GetDownloadPriorityGroup(void) { return m_iDownloadPriorityGroup; } + bool IsWaitingForInitialDownloads(); + int GetDownloadPriorityGroup() { return m_iDownloadPriorityGroup; } void SetDownloadPriorityGroup(int iDownloadPriorityGroup) { m_iDownloadPriorityGroup = iDownloadPriorityGroup; } private: diff --git a/Client/mods/deathmatch/logic/CResourceConfigItem.cpp b/Client/mods/deathmatch/logic/CResourceConfigItem.cpp index 1258244b044..a0cec6298a8 100644 --- a/Client/mods/deathmatch/logic/CResourceConfigItem.cpp +++ b/Client/mods/deathmatch/logic/CResourceConfigItem.cpp @@ -25,7 +25,7 @@ CResourceConfigItem::CResourceConfigItem(CResource* resource, const char* szShor m_pXMLRootNode = NULL; } -CResourceConfigItem::~CResourceConfigItem(void) +CResourceConfigItem::~CResourceConfigItem() { if (m_pXMLFile) { @@ -34,7 +34,7 @@ CResourceConfigItem::~CResourceConfigItem(void) } } -bool CResourceConfigItem::Start(void) +bool CResourceConfigItem::Start() { // Does the file even exist? if (FileExists(GetName())) @@ -81,7 +81,7 @@ bool CResourceConfigItem::Start(void) return false; } -bool CResourceConfigItem::Stop(void) +bool CResourceConfigItem::Stop() { if (m_pXMLFile) { diff --git a/Client/mods/deathmatch/logic/CResourceConfigItem.h b/Client/mods/deathmatch/logic/CResourceConfigItem.h index b9829770f47..fd4d3271f52 100644 --- a/Client/mods/deathmatch/logic/CResourceConfigItem.h +++ b/Client/mods/deathmatch/logic/CResourceConfigItem.h @@ -23,12 +23,12 @@ class CResourceConfigItem : public CDownloadableResource { public: CResourceConfigItem(class CResource* resource, const char* szShortName, const char* szResourceFileName, uint uiDownloadSize, CChecksum serverChecksum); - ~CResourceConfigItem(void); + ~CResourceConfigItem(); - bool Start(void); - bool Stop(void); - class CXMLFile* GetFile(void) { return m_pXMLFile; } - class CXMLNode* GetRoot(void) { return m_pXMLRootNode; } + bool Start(); + bool Stop(); + class CXMLFile* GetFile() { return m_pXMLFile; } + class CXMLNode* GetRoot() { return m_pXMLRootNode; } private: class CXMLFile* m_pXMLFile; diff --git a/Client/mods/deathmatch/logic/CResourceFileDownloadManager.cpp b/Client/mods/deathmatch/logic/CResourceFileDownloadManager.cpp index ad4c4e031a3..0b25856f20a 100644 --- a/Client/mods/deathmatch/logic/CResourceFileDownloadManager.cpp +++ b/Client/mods/deathmatch/logic/CResourceFileDownloadManager.cpp @@ -54,7 +54,7 @@ void CResourceFileDownloadManager::AddPendingFileDownload(CDownloadableResource* // Figure which download group should be running // /////////////////////////////////////////////////////////////// -void CResourceFileDownloadManager::UpdatePendingDownloads(void) +void CResourceFileDownloadManager::UpdatePendingDownloads() { // Get download group to use int iGroup = INVALID_DOWNLOAD_PRIORITY_GROUP; @@ -106,7 +106,7 @@ void CResourceFileDownloadManager::OnRemoveResourceFile(CDownloadableResource* p // Downloading initial resource files // /////////////////////////////////////////////////////////////// -void CResourceFileDownloadManager::DoPulse(void) +void CResourceFileDownloadManager::DoPulse() { if (!g_pNet->IsConnected()) return; diff --git a/Client/mods/deathmatch/logic/CResourceFileDownloadManager.h b/Client/mods/deathmatch/logic/CResourceFileDownloadManager.h index 3eeb155eaa4..9332791d04b 100644 --- a/Client/mods/deathmatch/logic/CResourceFileDownloadManager.h +++ b/Client/mods/deathmatch/logic/CResourceFileDownloadManager.h @@ -24,13 +24,13 @@ class CResourceFileDownloadManager ZERO_ON_NEW void AddServer(const SString& strUrl, int iMaxConnectionsPerClient, EDownloadModeType downloadChannel, uint uiConnectionAttempts, uint uiConnectTimeoutMs); void AddPendingFileDownload(CDownloadableResource* pDownloadableResource); - void UpdatePendingDownloads(void); + void UpdatePendingDownloads(); void OnRemoveResourceFile(CDownloadableResource* pResourceFile); - void DoPulse(void); - bool IsTransferringInitialFiles(void) { return m_bIsTransferingFiles; } + void DoPulse(); + bool IsTransferringInitialFiles() { return m_bIsTransferingFiles; } protected: - CTransferBox* GetTransferBox(void) { return g_pClientGame->GetTransferBox(); }; + CTransferBox* GetTransferBox() { return g_pClientGame->GetTransferBox(); }; void AddDownloadSize(int iSize); bool DisableHttpServer(uint uiHttpServerIndex); bool BeginResourceFileDownload(CDownloadableResource* pDownloadableResource, uint uiHttpServerIndex); diff --git a/Client/mods/deathmatch/logic/CResourceManager.cpp b/Client/mods/deathmatch/logic/CResourceManager.cpp index a911d93dcf0..88036081fec 100644 --- a/Client/mods/deathmatch/logic/CResourceManager.cpp +++ b/Client/mods/deathmatch/logic/CResourceManager.cpp @@ -13,11 +13,11 @@ using std::list; -CResourceManager::CResourceManager(void) +CResourceManager::CResourceManager() { } -CResourceManager::~CResourceManager(void) +CResourceManager::~CResourceManager() { while (!m_resources.empty()) { @@ -94,7 +94,7 @@ CResource* CResourceManager::GetResource(const char* szResourceName) return NULL; } -void CResourceManager::OnDownloadGroupFinished(void) +void CResourceManager::OnDownloadGroupFinished() { // Try to load newly ready resources for (std::list::const_iterator iter = m_resources.begin(); iter != m_resources.end(); ++iter) @@ -141,7 +141,7 @@ bool CResourceManager::Exists(CResource* pResource) return m_resources.Contains(pResource); } -void CResourceManager::StopAll(void) +void CResourceManager::StopAll() { while (m_resources.size() > 0) { diff --git a/Client/mods/deathmatch/logic/CResourceManager.h b/Client/mods/deathmatch/logic/CResourceManager.h index e2aecb782f6..f2177fa0bb4 100644 --- a/Client/mods/deathmatch/logic/CResourceManager.h +++ b/Client/mods/deathmatch/logic/CResourceManager.h @@ -28,8 +28,8 @@ enum eAccessType class CResourceManager { public: - CResourceManager(void); - ~CResourceManager(void); + CResourceManager(); + ~CResourceManager(); CResource* Add(unsigned short usNetID, const char* szResourceName, CClientEntity* pResourceEntity, CClientEntity* pResourceDynamicEntity, const SString& strMinServerReq, const SString& strMinClientReq, bool bEnableOOP); @@ -42,9 +42,9 @@ class CResourceManager bool RemoveResource(unsigned short usID); void Remove(CResource* pResource); bool Exists(CResource* pResource); - void StopAll(void); + void StopAll(); - void OnDownloadGroupFinished(void); + void OnDownloadGroupFinished(); void OnAddResourceFile(CDownloadableResource* pResourceFile); void OnRemoveResourceFile(CDownloadableResource* pResourceFile); diff --git a/Client/mods/deathmatch/logic/CScriptDebugging.cpp b/Client/mods/deathmatch/logic/CScriptDebugging.cpp index 6f064b896ba..fd51faf20b8 100644 --- a/Client/mods/deathmatch/logic/CScriptDebugging.cpp +++ b/Client/mods/deathmatch/logic/CScriptDebugging.cpp @@ -21,7 +21,7 @@ CScriptDebugging::CScriptDebugging(CLuaManager* pLuaManager) m_flushTimerHandle = NULL; } -CScriptDebugging::~CScriptDebugging(void) +CScriptDebugging::~CScriptDebugging() { // Flush any pending duplicate loggings m_DuplicateLineFilter.Flush(); @@ -117,7 +117,7 @@ bool CScriptDebugging::SetLogfile(const char* szFilename, unsigned int uiLevel) return false; } -void CScriptDebugging::UpdateLogOutput(void) +void CScriptDebugging::UpdateLogOutput() { SLogLine line; while (m_DuplicateLineFilter.PopOutputLine(line)) diff --git a/Client/mods/deathmatch/logic/CScriptDebugging.h b/Client/mods/deathmatch/logic/CScriptDebugging.h index 54294c37c3c..c0b8495740c 100644 --- a/Client/mods/deathmatch/logic/CScriptDebugging.h +++ b/Client/mods/deathmatch/logic/CScriptDebugging.h @@ -25,7 +25,7 @@ struct SLogLine unsigned char ucRed; unsigned char ucGreen; unsigned char ucBlue; - operator SString&(void) { return strText; } + operator SString&() { return strText; } bool operator==(const SLogLine& other) const { return strText == other.strText && uiMinimumDebugLevel == other.uiMinimumDebugLevel && ucRed == other.ucRed && ucGreen == other.ucGreen && @@ -37,7 +37,7 @@ class CScriptDebugging { public: CScriptDebugging(CLuaManager* pLuaManager); - ~CScriptDebugging(void); + ~CScriptDebugging(); void LogCustom(lua_State* luaVM, unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue, const char* szFormat, ...); void LogInformation(lua_State* luaVM, const char* szFormat, ...); @@ -59,8 +59,8 @@ class CScriptDebugging void PushLuaMain(CLuaMain* pLuaMain); void PopLuaMain(CLuaMain* pLuaMain); void OnLuaMainDestroy(CLuaMain* pLuaMain); - CLuaMain* GetTopLuaMain(void); - void UpdateLogOutput(void); + CLuaMain* GetTopLuaMain(); + void UpdateLogOutput(); private: SString ComposeErrorMessage(const char* szPrePend, const SLuaDebugInfo& luaDebugInfo, const char* szMessage); diff --git a/Client/mods/deathmatch/logic/CScriptFile.cpp b/Client/mods/deathmatch/logic/CScriptFile.cpp index 49a0094736a..2367dffb708 100644 --- a/Client/mods/deathmatch/logic/CScriptFile.cpp +++ b/Client/mods/deathmatch/logic/CScriptFile.cpp @@ -22,7 +22,7 @@ CScriptFile::CScriptFile(uint uiScriptId, const char* szFilename, unsigned long m_accessType = accessType; } -CScriptFile::~CScriptFile(void) +CScriptFile::~CScriptFile() { // Close the file Unload(); @@ -71,13 +71,13 @@ bool CScriptFile::Load(CResource* pResourceForFilePath, eMode Mode) return false; } -void CScriptFile::Unload(void) +void CScriptFile::Unload() { // Close the file if required SAFE_DELETE(m_pFile); } -bool CScriptFile::IsEOF(void) +bool CScriptFile::IsEOF() { if (!m_pFile) return true; @@ -86,7 +86,7 @@ bool CScriptFile::IsEOF(void) return m_pFile->FEof(); } -long CScriptFile::GetPointer(void) +long CScriptFile::GetPointer() { if (!m_pFile) return -1; @@ -94,7 +94,7 @@ long CScriptFile::GetPointer(void) return m_pFile->FTell(); } -long CScriptFile::GetSize(void) +long CScriptFile::GetSize() { if (!m_pFile) return -1; @@ -142,7 +142,7 @@ long CScriptFile::SetPointer(unsigned long ulPosition) return ulPosition; } -void CScriptFile::Flush(void) +void CScriptFile::Flush() { if (!m_pFile) return; @@ -182,7 +182,7 @@ long CScriptFile::Write(unsigned long ulSize, const char* pData) } // If file was downloaded with a resource, validate checksum -void CScriptFile::DoResourceFileCheck(void) +void CScriptFile::DoResourceFileCheck() { if (!m_pFile || m_bDoneResourceFileCheck) return; @@ -211,7 +211,7 @@ void CScriptFile::DoResourceFileCheck(void) } } -CResource* CScriptFile::GetResource(void) +CResource* CScriptFile::GetResource() { return m_pResource; } diff --git a/Client/mods/deathmatch/logic/CScriptFile.h b/Client/mods/deathmatch/logic/CScriptFile.h index ea40035c45f..461e6015694 100644 --- a/Client/mods/deathmatch/logic/CScriptFile.h +++ b/Client/mods/deathmatch/logic/CScriptFile.h @@ -26,44 +26,44 @@ class CScriptFile : public CClientEntity }; CScriptFile(uint uiScriptId, const char* szFilename, unsigned long ulMaxSize, eAccessType accessType); - ~CScriptFile(void); + ~CScriptFile(); // Functions required for linking void GetPosition(CVector& vecPosition) const {}; void SetPosition(const CVector& vecPosition){}; // Functions required by CClientEntity - eClientEntityType GetType(void) const { return SCRIPTFILE; }; - void Unlink(void){}; + eClientEntityType GetType() const { return SCRIPTFILE; }; + void Unlink(){}; // Load and unload routines bool Load(CResource* pResourceForFilePath, eMode Mode); - void Unload(void); - bool IsLoaded(void) { return m_pFile != NULL; }; - const SString& GetFilePath(void) { return m_strFilename; }; - const SString& GetAbsPath(void) { return m_strAbsPath; }; + void Unload(); + bool IsLoaded() { return m_pFile != NULL; }; + const SString& GetFilePath() { return m_strFilename; }; + const SString& GetAbsPath() { return m_strAbsPath; }; // Get the owning resource - CResource* GetResource(void); + CResource* GetResource(); // Only call functions below this if you're sure that the file is loaded. // Or you will crash. - bool IsEOF(void); - long GetPointer(void); - long GetSize(void); + bool IsEOF(); + long GetPointer(); + long GetSize(); long SetPointer(unsigned long ulPosition); - void Flush(void); + void Flush(); long Read(unsigned long ulSize, CBuffer& outBuffer); long Write(unsigned long ulSize, const char* pData); // Debug info for garbage collected files - const SLuaDebugInfo& GetLuaDebugInfo(void) { return m_LuaDebugInfo; }; + const SLuaDebugInfo& GetLuaDebugInfo() { return m_LuaDebugInfo; }; void SetLuaDebugInfo(const SLuaDebugInfo& luaDebugInfo) { m_LuaDebugInfo = luaDebugInfo; }; private: - void DoResourceFileCheck(void); + void DoResourceFileCheck(); CBinaryFileInterface* m_pFile; SString m_strFilename; // Resource relative diff --git a/Client/mods/deathmatch/logic/CScriptKeyBinds.cpp b/Client/mods/deathmatch/logic/CScriptKeyBinds.cpp index f79d50f87c3..d00f03233ef 100644 --- a/Client/mods/deathmatch/logic/CScriptKeyBinds.cpp +++ b/Client/mods/deathmatch/logic/CScriptKeyBinds.cpp @@ -166,7 +166,7 @@ static const SFixedArray g_bcControls = {{{"fire" {"group_control_back"}, {""}}}; -CScriptKeyBinds::~CScriptKeyBinds(void) +CScriptKeyBinds::~CScriptKeyBinds() { Clear(); } @@ -616,7 +616,7 @@ bool CScriptKeyBinds::ControlFunctionExists(const SScriptBindableGTAControl* pCo return bFound; } -void CScriptKeyBinds::RemoveDeletedBinds(void) +void CScriptKeyBinds::RemoveDeletedBinds() { list::iterator iter = m_List.begin(); while (iter != m_List.end()) diff --git a/Client/mods/deathmatch/logic/CScriptKeyBinds.h b/Client/mods/deathmatch/logic/CScriptKeyBinds.h index be9b962b8aa..da501f9b344 100644 --- a/Client/mods/deathmatch/logic/CScriptKeyBinds.h +++ b/Client/mods/deathmatch/logic/CScriptKeyBinds.h @@ -34,19 +34,19 @@ struct SScriptBindableGTAControl class CScriptKeyBind { public: - CScriptKeyBind(void) : boundKey(NULL), luaMain(NULL), beingDeleted(false) {} - virtual ~CScriptKeyBind(void) {} - bool IsBeingDeleted(void) { return beingDeleted; } + CScriptKeyBind() : boundKey(NULL), luaMain(NULL), beingDeleted(false) {} + virtual ~CScriptKeyBind() {} + bool IsBeingDeleted() { return beingDeleted; } const SScriptBindableKey* boundKey; CLuaMain* luaMain; bool beingDeleted; - virtual eScriptKeyBindType GetType(void) = 0; + virtual eScriptKeyBindType GetType() = 0; }; class CScriptKeyBindWithState : public CScriptKeyBind { public: - CScriptKeyBindWithState(void) { bHitState = true; } + CScriptKeyBindWithState() { bHitState = true; } bool bHitState; }; @@ -60,21 +60,21 @@ class CScriptFunctionBind class CScriptKeyFunctionBind : public CScriptKeyBindWithState, public CScriptFunctionBind { public: - eScriptKeyBindType GetType(void) { return SCRIPT_KEY_BIND_FUNCTION; } + eScriptKeyBindType GetType() { return SCRIPT_KEY_BIND_FUNCTION; } }; class CScriptControlFunctionBind : public CScriptKeyBindWithState, public CScriptFunctionBind { public: - eScriptKeyBindType GetType(void) { return SCRIPT_KEY_BIND_CONTROL_FUNCTION; } + eScriptKeyBindType GetType() { return SCRIPT_KEY_BIND_CONTROL_FUNCTION; } const SScriptBindableGTAControl* boundControl; }; class CScriptKeyBinds { public: - CScriptKeyBinds(void) : m_bProcessingKey(false) {} - ~CScriptKeyBinds(void); + CScriptKeyBinds() : m_bProcessingKey(false) {} + ~CScriptKeyBinds(); static const SScriptBindableKey* GetBindableFromKey(const char* szKey); static const SScriptBindableGTAControl* GetBindableFromControl(const char* szControl); @@ -85,8 +85,8 @@ class CScriptKeyBinds void Call(CScriptKeyBind* pKeyBind); bool ProcessKey(const char* szKey, bool bHitState, eScriptKeyBindType bindTypeconst); - std::list::iterator IterBegin(void) { return m_List.begin(); } - std::list::iterator IterEnd(void) { return m_List.end(); } + std::list::iterator IterBegin() { return m_List.begin(); } + std::list::iterator IterEnd() { return m_List.end(); } // Key-function bind funcs bool AddKeyFunction(const char* szKey, bool bHitState, CLuaMain* pLuaMain, const CLuaFunctionRef& iLuaFunction, CLuaArguments& Arguments); @@ -116,7 +116,7 @@ class CScriptKeyBinds void RemoveAllKeys(CLuaMain* pLuaMain); static bool IsMouse(const SScriptBindableKey* pKey); - void RemoveDeletedBinds(void); + void RemoveDeletedBinds(); protected: std::list m_List; diff --git a/Client/mods/deathmatch/logic/CServer.cpp b/Client/mods/deathmatch/logic/CServer.cpp index 2a8927e7b6e..5bcf131ea2b 100644 --- a/Client/mods/deathmatch/logic/CServer.cpp +++ b/Client/mods/deathmatch/logic/CServer.cpp @@ -31,7 +31,7 @@ std::list CServer::m_OutputQueue; static const SFixedArray szServerErrors = {"Server stopped", "Could not load network library", "Loading network library failed", "Error loading mod"}; -CServer::CServer(void) +CServer::CServer() { assert(!g_bIsStarted); @@ -45,7 +45,7 @@ CServer::CServer(void) m_strDLLFile = PathJoin(m_strServerRoot, SERVER_DLL_PATH); } -CServer::~CServer(void) +CServer::~CServer() { // Make sure the server is stopped Stop(); @@ -57,7 +57,7 @@ CServer::~CServer(void) } } -void CServer::DoPulse(void) +void CServer::DoPulse() { if (IsRunning()) { @@ -132,12 +132,12 @@ bool CServer::Start(const char* szConfig) return false; } -bool CServer::IsStarted(void) +bool CServer::IsStarted() { return g_bIsStarted; } -bool CServer::Stop(void) +bool CServer::Stop() { // Started? if (g_bIsStarted) @@ -234,7 +234,7 @@ DWORD WINAPI CServer::Thread_EntryPoint(LPVOID pThis) return reinterpret_cast(pThis)->Thread_Run(); } -unsigned long CServer::Thread_Run(void) +unsigned long CServer::Thread_Run() { // Enter critical section m_CriticalSection.Lock(); diff --git a/Client/mods/deathmatch/logic/CServer.h b/Client/mods/deathmatch/logic/CServer.h index 6c71917b92c..38f487febd1 100644 --- a/Client/mods/deathmatch/logic/CServer.h +++ b/Client/mods/deathmatch/logic/CServer.h @@ -18,27 +18,27 @@ class CServer { public: - CServer(void); - ~CServer(void); + CServer(); + ~CServer(); - void DoPulse(void); + void DoPulse(); bool Start(const char* szConfig); - bool Stop(void); - bool IsStarted(void); - bool IsRunning(void) { return m_pLibrary != NULL; }; - bool IsReady(void) { return m_bIsReady; }; + bool Stop(); + bool IsStarted(); + bool IsRunning() { return m_pLibrary != NULL; }; + bool IsReady() { return m_bIsReady; }; - int GetLastError(void) { return m_iLastError; }; + int GetLastError() { return m_iLastError; }; bool Send(const char* szString); - const std::string& GetPassword(void) { return m_strPassword; }; + const std::string& GetPassword() { return m_strPassword; }; void SetPassword(const char* szPassword) { m_strPassword = szPassword; }; private: static DWORD WINAPI Thread_EntryPoint(LPVOID pThis); - unsigned long Thread_Run(void); + unsigned long Thread_Run(); bool m_bIsReady; HANDLE m_hThread; diff --git a/Client/mods/deathmatch/logic/CServerIdManager.cpp b/Client/mods/deathmatch/logic/CServerIdManager.cpp index 84b3528f4e0..183e79f569d 100644 --- a/Client/mods/deathmatch/logic/CServerIdManager.cpp +++ b/Client/mods/deathmatch/logic/CServerIdManager.cpp @@ -56,15 +56,15 @@ class CServerIdManagerImpl : public CServerIdManager virtual SString GetConnectionPrivateDirectory(bool bPreviousVer); - CServerIdManagerImpl(void); - ~CServerIdManagerImpl(void); + CServerIdManagerImpl(); + ~CServerIdManagerImpl(); protected: void SaveServerIdMap(bool bWait = false); const CServerIdInfo& GetServerIdInfo(const SString& strServerId); - bool LoadServerIdMap(void); + bool LoadServerIdMap(); static DWORD StaticThreadProc(LPVOID lpdwThreadParam); - static void StaticSaveServerIdMap(void); + static void StaticSaveServerIdMap(); bool m_bListChanged; bool m_bClearedDefaultDirectory; @@ -96,7 +96,7 @@ CServerIdManager* CServerIdManager::GetSingleton() // // /////////////////////////////////////////////////////////////// -CServerIdManagerImpl::CServerIdManagerImpl(void) +CServerIdManagerImpl::CServerIdManagerImpl() { // Calc private dir root m_strServerIdLookupBaseDir = PathJoin(g_pClientGame->GetFileCacheRoot(), MTA_SERVERID_LOOKUP_DIR); @@ -119,7 +119,7 @@ CServerIdManagerImpl::CServerIdManagerImpl(void) // // /////////////////////////////////////////////////////////////// -CServerIdManagerImpl::~CServerIdManagerImpl(void) +CServerIdManagerImpl::~CServerIdManagerImpl() { } @@ -130,7 +130,7 @@ CServerIdManagerImpl::~CServerIdManagerImpl(void) // Load server id data from xml file // /////////////////////////////////////////////////////////////// -bool CServerIdManagerImpl::LoadServerIdMap(void) +bool CServerIdManagerImpl::LoadServerIdMap() { // Load config XML file CXMLFile* pConfigFile = g_pCore->GetXML()->CreateXML(PathJoin(g_pClientGame->GetFileCacheRoot(), MTA_SERVERID_LOOKUP_XML)); @@ -226,7 +226,7 @@ DWORD CServerIdManagerImpl::StaticThreadProc(LPVOID lpdwThreadParam) // // /////////////////////////////////////////////////////////////// -void CServerIdManagerImpl::StaticSaveServerIdMap(void) +void CServerIdManagerImpl::StaticSaveServerIdMap() { CXMLFile* pConfigFile = g_pCore->GetXML()->CreateXML(PathJoin(g_pClientGame->GetFileCacheRoot(), MTA_SERVERID_LOOKUP_XML)); if (!pConfigFile) diff --git a/Client/mods/deathmatch/logic/CServerIdManager.h b/Client/mods/deathmatch/logic/CServerIdManager.h index 314bb8cc6a0..4143254e7e7 100644 --- a/Client/mods/deathmatch/logic/CServerIdManager.h +++ b/Client/mods/deathmatch/logic/CServerIdManager.h @@ -12,8 +12,8 @@ class CServerIdManager { public: - virtual ~CServerIdManager(void) {} + virtual ~CServerIdManager() {} virtual SString GetConnectionPrivateDirectory(bool bPreviousVer = false) = 0; - static CServerIdManager* GetSingleton(void); + static CServerIdManager* GetSingleton(); }; diff --git a/Client/mods/deathmatch/logic/CSimulatedPlayPosition.h b/Client/mods/deathmatch/logic/CSimulatedPlayPosition.h index 137165a83c2..a347acd64a0 100644 --- a/Client/mods/deathmatch/logic/CSimulatedPlayPosition.h +++ b/Client/mods/deathmatch/logic/CSimulatedPlayPosition.h @@ -28,7 +28,7 @@ class CSimulatedPlayPosition public: /////////////////////////////////////////////////////// // Validity - bool IsValid(void) const { return m_bValid; } + bool IsValid() const { return m_bValid; } void SetValid(bool bValid) { m_bValid = bValid; } @@ -66,7 +66,7 @@ class CSimulatedPlayPosition /////////////////////////////////////////////////////// // Get the simulated play position - double GetPlayPositionNow(void) + double GetPlayPositionNow() { // If paused, then no time compensation is needed if (m_bPaused) @@ -91,7 +91,7 @@ class CSimulatedPlayPosition /////////////////////////////////////////////////////// // Check if play position has reached the end - bool IsFinished(void) + bool IsFinished() { if (!m_bLoop && m_dLength > 0) return GetPlayPositionNow() == m_dLength; diff --git a/Client/mods/deathmatch/logic/CSingularFileDownload.cpp b/Client/mods/deathmatch/logic/CSingularFileDownload.cpp index 86c8e2dc289..d8a61d09c6d 100644 --- a/Client/mods/deathmatch/logic/CSingularFileDownload.cpp +++ b/Client/mods/deathmatch/logic/CSingularFileDownload.cpp @@ -44,7 +44,7 @@ CSingularFileDownload::CSingularFileDownload(CResource* pResource, const char* s } } -CSingularFileDownload::~CSingularFileDownload(void) +CSingularFileDownload::~CSingularFileDownload() { } @@ -70,7 +70,7 @@ void CSingularFileDownload::CallFinished(bool bSuccess) SetComplete(); } -void CSingularFileDownload::Cancel(void) +void CSingularFileDownload::Cancel() { m_bBeingDeleted = true; m_pResource = NULL; @@ -78,12 +78,12 @@ void CSingularFileDownload::Cancel(void) // TODO: Cancel also in Net } -bool CSingularFileDownload::DoesClientAndServerChecksumMatch(void) +bool CSingularFileDownload::DoesClientAndServerChecksumMatch() { return (m_LastClientChecksum == m_ServerChecksum); } -CChecksum CSingularFileDownload::GenerateClientChecksum(void) +CChecksum CSingularFileDownload::GenerateClientChecksum() { m_LastClientChecksum = CChecksum::GenerateChecksumFromFile(m_strName); return m_LastClientChecksum; diff --git a/Client/mods/deathmatch/logic/CSingularFileDownload.h b/Client/mods/deathmatch/logic/CSingularFileDownload.h index 3e3b06a285d..330a305ce1d 100644 --- a/Client/mods/deathmatch/logic/CSingularFileDownload.h +++ b/Client/mods/deathmatch/logic/CSingularFileDownload.h @@ -25,24 +25,24 @@ class CSingularFileDownload { public: CSingularFileDownload(CResource* pResource, const char* szName, const char* szNameShort, SString strHTTPURL, CChecksum serverChecksum); - ~CSingularFileDownload(void); + ~CSingularFileDownload(); static void DownloadFinishedCallBack(const SHttpDownloadResult& result); - bool DoesClientAndServerChecksumMatch(void); + bool DoesClientAndServerChecksumMatch(); - const char* GetName(void) { return m_strName; }; - const char* GetShortName(void) { return m_strNameShort; }; + const char* GetName() { return m_strName; }; + const char* GetShortName() { return m_strNameShort; }; - CResource* GetResource(void) { return m_pResource; }; + CResource* GetResource() { return m_pResource; }; - void SetComplete(void) { m_bComplete = true; }; - bool GetComplete(void) { return m_bComplete; }; + void SetComplete() { m_bComplete = true; }; + bool GetComplete() { return m_bComplete; }; void CallFinished(bool bSuccess); - void Cancel(void); + void Cancel(); - CChecksum GenerateClientChecksum(void); + CChecksum GenerateClientChecksum(); protected: SString m_strName; diff --git a/Client/mods/deathmatch/logic/CSingularFileDownloadManager.cpp b/Client/mods/deathmatch/logic/CSingularFileDownloadManager.cpp index 11f2cb89e84..dd259c2a41a 100644 --- a/Client/mods/deathmatch/logic/CSingularFileDownloadManager.cpp +++ b/Client/mods/deathmatch/logic/CSingularFileDownloadManager.cpp @@ -12,11 +12,11 @@ #include using std::list; -CSingularFileDownloadManager::CSingularFileDownloadManager(void) +CSingularFileDownloadManager::CSingularFileDownloadManager() { } -CSingularFileDownloadManager::~CSingularFileDownloadManager(void) +CSingularFileDownloadManager::~CSingularFileDownloadManager() { // clear list ClearList(); @@ -40,7 +40,7 @@ void CSingularFileDownloadManager::CancelResourceDownloads(CResource* pResource) } } -void CSingularFileDownloadManager::ClearList(void) +void CSingularFileDownloadManager::ClearList() { list::const_iterator iter = m_Downloads.begin(); for (; iter != m_Downloads.end(); ++iter) @@ -50,7 +50,7 @@ void CSingularFileDownloadManager::ClearList(void) m_Downloads.clear(); } -bool CSingularFileDownloadManager::AllComplete(void) +bool CSingularFileDownloadManager::AllComplete() { list::const_iterator iter = m_Downloads.begin(); for (; iter != m_Downloads.end(); ++iter) diff --git a/Client/mods/deathmatch/logic/CSingularFileDownloadManager.h b/Client/mods/deathmatch/logic/CSingularFileDownloadManager.h index d35b0aa4d05..089b1745e1b 100644 --- a/Client/mods/deathmatch/logic/CSingularFileDownloadManager.h +++ b/Client/mods/deathmatch/logic/CSingularFileDownloadManager.h @@ -25,15 +25,15 @@ class CSingularFileDownloadManager { public: - CSingularFileDownloadManager(void); - ~CSingularFileDownloadManager(void); + CSingularFileDownloadManager(); + ~CSingularFileDownloadManager(); CSingularFileDownload* AddFile(CResource* pResource, const char* szName, const char* szNameShort, SString strHTTPURL, CChecksum checksum = CChecksum()); void CancelResourceDownloads(CResource* pResource); - void ClearList(void); + void ClearList(); - bool AllComplete(void); + bool AllComplete(); protected: std::list m_Downloads; diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp index def9223ae21..33e65d83b2f 100644 --- a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp +++ b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp @@ -78,7 +78,7 @@ CStaticFunctionDefinitions::CStaticFunctionDefinitions(CLuaManager* pLuaManager, m_pSoundManager = pManager->GetSoundManager(); } -CStaticFunctionDefinitions::~CStaticFunctionDefinitions(void) +CStaticFunctionDefinitions::~CStaticFunctionDefinitions() { } @@ -208,7 +208,7 @@ bool CStaticFunctionDefinitions::CancelEvent(bool bCancel) return true; } -bool CStaticFunctionDefinitions::WasEventCancelled(void) +bool CStaticFunctionDefinitions::WasEventCancelled() { return m_pEvents->WasEventCancelled(); } @@ -332,12 +332,12 @@ bool CStaticFunctionDefinitions::CreateTrayNotification(SString strText, eTrayIc return g_pCore->GetTrayIcon()->CreateTrayBallon(strText, eType, useSound); } -bool CStaticFunctionDefinitions::IsTrayNotificationEnabled(void) +bool CStaticFunctionDefinitions::IsTrayNotificationEnabled() { return g_pCore->GetCVars()->GetValue("allow_tray_notifications", true); } -CClientEntity* CStaticFunctionDefinitions::GetRootElement(void) +CClientEntity* CStaticFunctionDefinitions::GetRootElement() { return m_pRootEntity; } @@ -1515,7 +1515,7 @@ bool CStaticFunctionDefinitions::GetRadioChannel(unsigned char& ucChannel) return true; } -CClientPlayer* CStaticFunctionDefinitions::GetLocalPlayer(void) +CClientPlayer* CStaticFunctionDefinitions::GetLocalPlayer() { return m_pPlayerManager->GetLocalPlayer(); } @@ -4322,7 +4322,7 @@ bool CStaticFunctionDefinitions::CreateExplosion(CVector& vecPosition, unsigned return true; } -bool CStaticFunctionDefinitions::DetonateSatchels(void) +bool CStaticFunctionDefinitions::DetonateSatchels() { CClientPlayer* pLocalPlayer = GetLocalPlayer(); // does the local player exist and if so does he have any projectiles to destroy? @@ -4374,7 +4374,7 @@ bool CStaticFunctionDefinitions::IsAmbientSoundEnabled(eAmbientSoundType eType, return true; } -bool CStaticFunctionDefinitions::ResetAmbientSounds(void) +bool CStaticFunctionDefinitions::ResetAmbientSounds() { g_pGame->GetAudioEngine()->ResetAmbientSounds(); return true; @@ -4392,7 +4392,7 @@ bool CStaticFunctionDefinitions::IsWorldSoundEnabled(uint uiGroup, uint uiIndex, return true; } -bool CStaticFunctionDefinitions::ResetWorldSounds(void) +bool CStaticFunctionDefinitions::ResetWorldSounds() { g_pGame->GetAudioEngine()->ResetWorldSounds(); return true; @@ -4714,7 +4714,7 @@ bool CStaticFunctionDefinitions::GetCameraMatrix(CVector& vecPosition, CVector& return true; } -CClientEntity* CStaticFunctionDefinitions::GetCameraTarget(void) +CClientEntity* CStaticFunctionDefinitions::GetCameraTarget() { if (!m_pCamera->IsInFixedMode()) return m_pCamera->GetTargetEntity(); @@ -4889,7 +4889,7 @@ bool CStaticFunctionDefinitions::SetCursorAlpha(float fAlpha) return false; } -bool CStaticFunctionDefinitions::GUIGetInputEnabled(void) +bool CStaticFunctionDefinitions::GUIGetInputEnabled() { // can't inline because statics are defined in .cpp not .h return m_pGUI->GetGUIInputEnabled(); } @@ -4899,12 +4899,12 @@ void CStaticFunctionDefinitions::GUISetInputMode(eInputMode inputMode) m_pGUI->SetGUIInputMode(inputMode); } -eInputMode CStaticFunctionDefinitions::GUIGetInputMode(void) +eInputMode CStaticFunctionDefinitions::GUIGetInputMode() { return m_pGUI->GetGUIInputMode(); } -eCursorType CStaticFunctionDefinitions::GUIGetCursorType(void) +eCursorType CStaticFunctionDefinitions::GUIGetCursorType() { return m_pGUI->GetCursorType(); } @@ -6218,7 +6218,7 @@ bool CStaticFunctionDefinitions::SetAllElementWaterLevel(float fLevel, void* pCh return g_pClientGame->GetManager()->GetWaterManager()->SetAllElementWaterLevel(fLevel, pChangeSource); } -bool CStaticFunctionDefinitions::ResetWorldWaterLevel(void) +bool CStaticFunctionDefinitions::ResetWorldWaterLevel() { g_pClientGame->GetManager()->GetWaterManager()->ResetWorldWaterLevel(); return true; @@ -6441,7 +6441,7 @@ bool CStaticFunctionDefinitions::SetWindVelocity(float fX, float fY, float fZ) return true; } -bool CStaticFunctionDefinitions::RestoreWindVelocity(void) +bool CStaticFunctionDefinitions::RestoreWindVelocity() { g_pMultiplayer->RestoreWindVelocity(); return true; @@ -6504,7 +6504,7 @@ bool CStaticFunctionDefinitions::SetSkyGradient(unsigned char ucTopRed, unsigned return true; } -bool CStaticFunctionDefinitions::ResetSkyGradient(void) +bool CStaticFunctionDefinitions::ResetSkyGradient() { g_pMultiplayer->ResetSky(); return true; @@ -6522,7 +6522,7 @@ bool CStaticFunctionDefinitions::SetHeatHaze(const SHeatHazeSettings& settings) return true; } -bool CStaticFunctionDefinitions::ResetHeatHaze(void) +bool CStaticFunctionDefinitions::ResetHeatHaze() { g_pMultiplayer->ResetHeatHaze(); return true; @@ -6541,7 +6541,7 @@ bool CStaticFunctionDefinitions::SetWaterColor(float fWaterRed, float fWaterGree return true; } -bool CStaticFunctionDefinitions::ResetWaterColor(void) +bool CStaticFunctionDefinitions::ResetWaterColor() { g_pMultiplayer->ResetWater(); return true; @@ -6675,7 +6675,7 @@ bool CStaticFunctionDefinitions::SetBirdsEnabled(bool bEnabled) return true; } -bool CStaticFunctionDefinitions::GetBirdsEnabled(void) +bool CStaticFunctionDefinitions::GetBirdsEnabled() { return g_pClientGame->GetBirdsEnabled(); } diff --git a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h index 06876523117..1c82baf9d1a 100644 --- a/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h +++ b/Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h @@ -21,7 +21,7 @@ class CStaticFunctionDefinitions public: CStaticFunctionDefinitions(class CLuaManager* pLuaManager, CEvents* pEvents, CCoreInterface* pCore, CGame* pGame, CClientGame* pClientGame, CClientManager* pManager); - ~CStaticFunctionDefinitions(void); + ~CStaticFunctionDefinitions(); static bool AddEvent(CLuaMain& LuaMain, const char* szName, bool bAllowRemoteTrigger); static bool AddEventHandler(CLuaMain& LuaMain, const char* szName, CClientEntity& Entity, const CLuaFunctionRef& iLuaFunction, bool bPropagated, @@ -32,7 +32,7 @@ class CStaticFunctionDefinitions static bool TriggerLatentServerEvent(const char* szName, CClientEntity& CallWithEntity, CLuaArguments& Arguments, int bandwidth, CLuaMain* pLuaMain, ushort usResourceNetId); static bool CancelEvent(bool bCancel); - static bool WasEventCancelled(void); + static bool WasEventCancelled(); // Misc funcs static bool DownloadFile(CResource* pResource, const char* szFile, CChecksum checksum = CChecksum()); @@ -44,14 +44,14 @@ class CStaticFunctionDefinitions static bool SetClipboard(SString& strText); static bool GetClipboard(SString& strText); static bool SetWindowFlashing(bool flash, uint count); - static bool ClearChatBox(void); + static bool ClearChatBox(); // Notification funcs static bool CreateTrayNotification(SString strText, eTrayIconType eType, bool useSound); - static bool IsTrayNotificationEnabled(void); + static bool IsTrayNotificationEnabled(); // Element get funcs - static CClientEntity* GetRootElement(void); + static CClientEntity* GetRootElement(); static CClientEntity* GetElementByID(const char* szID, unsigned int uiIndex); static CClientEntity* GetElementByIndex(const char* szType, unsigned int uiIndex); static CClientEntity* GetElementChild(CClientEntity& Entity, unsigned int uiIndex); @@ -111,7 +111,7 @@ class CStaticFunctionDefinitions static bool GetRadioChannel(unsigned char& ucChannel); // Player get funcs - static CClientPlayer* GetLocalPlayer(void); + static CClientPlayer* GetLocalPlayer(); static CClientPlayer* GetPlayerFromName(const char* szNick); static bool GetPlayerMoney(long& lMoney); static bool GetPlayerWantedLevel(char& cWanted); @@ -321,7 +321,7 @@ class CStaticFunctionDefinitions // Explosion funcs static bool CreateExplosion(CVector& vecPosition, unsigned char ucType, bool bMakeSound, float fCamShake, bool bDamaging); - static bool DetonateSatchels(void); + static bool DetonateSatchels(); // Fire funcs static bool CreateFire(CVector& vecPosition, float fSize); @@ -346,10 +346,10 @@ class CStaticFunctionDefinitions static bool PlaySoundFrontEnd(unsigned char ucSound); static bool SetAmbientSoundEnabled(eAmbientSoundType eType, bool bMute); static bool IsAmbientSoundEnabled(eAmbientSoundType eType, bool& bOutMute); - static bool ResetAmbientSounds(void); + static bool ResetAmbientSounds(); static bool SetWorldSoundEnabled(uint uiGroup, uint uiIndex, bool bMute, bool bImmediate); static bool IsWorldSoundEnabled(uint uiGroup, uint uiIndex, bool& bOutMute); - static bool ResetWorldSounds(void); + static bool ResetWorldSounds(); static bool PlaySFX(CResource* pResource, eAudioLookupIndex containerIndex, int iBankIndex, int iAudioIndex, bool bLoop, CClientSound*& outSound); static bool PlaySFX3D(CResource* pResource, eAudioLookupIndex containerIndex, int iBankIndex, int iAudioIndex, const CVector& vecPosition, bool bLoop, CClientSound*& outSound); @@ -383,7 +383,7 @@ class CStaticFunctionDefinitions // Camera get funcs static bool GetCameraViewMode(unsigned short& ucMode); static bool GetCameraMatrix(CVector& vecPosition, CVector& vecLookAt, float& fRoll, float& fFOV); - static CClientEntity* GetCameraTarget(void); + static CClientEntity* GetCameraTarget(); static bool GetCameraInterior(unsigned char& ucInterior); // Camera set funcs @@ -404,10 +404,10 @@ class CStaticFunctionDefinitions static ID3DXFont* ResolveD3DXFont(eFontType fontType, CClientDxFont* pDxFontElement); // GUI funcs - static bool GUIGetInputEnabled(void); - static eInputMode GUIGetInputMode(void); + static bool GUIGetInputEnabled(); + static eInputMode GUIGetInputMode(); static void GUISetInputMode(eInputMode inputMode); - static eCursorType GUIGetCursorType(void); + static eCursorType GUIGetCursorType(); static CClientGUIElement* GUICreateWindow(CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, const char* szCaption, bool bRelative); static CClientGUIElement* GUICreateLabel(CLuaMain& LuaMain, const CVector2D& position, const CVector2D& size, const char* szCaption, bool bRelative, @@ -469,7 +469,7 @@ class CStaticFunctionDefinitions static void GUIScrollPaneSetHorizontalScrollPosition(CClientEntity& Element, float fProgress); static void GUIScrollPaneSetVerticalScrollPosition(CClientEntity& Element, float fProgress); - static inline const CVector2D GUIGetScreenSize(void) { return g_pCore->GetGUI()->GetResolution(); }; + static inline const CVector2D GUIGetScreenSize() { return g_pCore->GetGUI()->GetResolution(); }; static void GUIEditSetReadOnly(CClientEntity& Element, bool bFlag); static void GUIEditSetMasked(CClientEntity& Element, bool bFlag); @@ -567,7 +567,7 @@ class CStaticFunctionDefinitions static bool SetWorldWaterLevel(float fLevel, void* pChangeSource, bool bIncludeWorldNonSeaLevel); static bool SetPositionWaterLevel(const CVector& vecPosition, float fLevel, void* pChangeSource); static bool SetAllElementWaterLevel(float fLevel, void* pChangeSource); - static bool ResetWorldWaterLevel(void); + static bool ResetWorldWaterLevel(); static bool SetWaterVertexPosition(CClientWater* pWater, int iVertexIndex, CVector& vecPosition); static bool SetWaterDrawnLast(bool bEnabled); static bool IsWaterDrawnLast(bool& bOutEnabled); @@ -585,7 +585,7 @@ class CStaticFunctionDefinitions static bool GetGarageBoundingBox(unsigned char ucGarageID, float& fLeft, float& fRight, float& fFront, float& fBack); static bool IsWorldSpecialPropertyEnabled(const char* szPropName); static bool SetCloudsEnabled(bool bEnabled); - static bool GetCloudsEnabled(void); + static bool GetCloudsEnabled(); static bool GetTrafficLightState(unsigned char& ucState); static bool AreTrafficLightsLocked(bool& bLocked); static bool RemoveWorldBuilding(unsigned short usModelToRemove, float fDistance, float fX, float fY, float fZ, char cInterior, uint& uiOutAmount); @@ -597,13 +597,13 @@ class CStaticFunctionDefinitions unsigned char& ucBottomGreen, unsigned char& ucBottomBlue); static bool SetSkyGradient(unsigned char ucTopRed, unsigned char ucTopGreen, unsigned char ucTopBlue, unsigned char ucBottomRed, unsigned char ucBottomGreen, unsigned char ucBottomBlue); - static bool ResetSkyGradient(void); + static bool ResetSkyGradient(); static bool GetHeatHaze(SHeatHazeSettings& settings); static bool SetHeatHaze(const SHeatHazeSettings& settings); - static bool ResetHeatHaze(void); + static bool ResetHeatHaze(); static bool GetWaterColor(float& fWaterRed, float& fWaterGreen, float& fWaterBlue, float& fWaterAlpha); static bool SetWaterColor(float fWaterRed, float fWaterGreen, float fWaterBlue, float fWaterAlpha); - static bool ResetWaterColor(void); + static bool ResetWaterColor(); static bool SetWeather(unsigned char ucWeather); static bool SetWeatherBlended(unsigned char ucWeather); static bool SetGravity(float fGravity); @@ -617,14 +617,14 @@ class CStaticFunctionDefinitions static bool SetTrafficLightState(unsigned char ucState); static bool SetTrafficLightsLocked(bool bLocked); static bool SetWindVelocity(float fX, float fY, float fZ); - static bool RestoreWindVelocity(void); + static bool RestoreWindVelocity(); static bool GetWindVelocity(float& fX, float& fY, float& fZ); static bool SetAircraftMaxHeight(float fHeight); static bool SetAircraftMaxVelocity(float fVelocity); static bool SetOcclusionsEnabled(bool bEnabled); static bool CreateSWATRope(CVector vecPosition, DWORD dwDuration); static bool SetBirdsEnabled(bool bEnabled); - static bool GetBirdsEnabled(void); + static bool GetBirdsEnabled(); static bool SetMoonSize(int iSize); static bool SetFPSLimit(int iLimit); static bool GetFPSLimit(int& iLimit); diff --git a/Client/mods/deathmatch/logic/CSyncDebug.cpp b/Client/mods/deathmatch/logic/CSyncDebug.cpp index 3380fce29fb..59c3e0f8a77 100644 --- a/Client/mods/deathmatch/logic/CSyncDebug.cpp +++ b/Client/mods/deathmatch/logic/CSyncDebug.cpp @@ -34,7 +34,7 @@ CSyncDebug::CSyncDebug(CClientManager* pManager) m_usFakeLagPing = 0; } -CSyncDebug::~CSyncDebug(void) +CSyncDebug::~CSyncDebug() { } @@ -54,12 +54,12 @@ void CSyncDebug::Attach(CClientPlayer& Player) OnUpdate(); } -void CSyncDebug::Detach(void) +void CSyncDebug::Detach() { m_pPlayer = NULL; } -void CSyncDebug::OnPulse(void) +void CSyncDebug::OnPulse() { // Are we debugging some player? if (m_pPlayer) @@ -75,7 +75,7 @@ void CSyncDebug::OnPulse(void) } } -void CSyncDebug::OnDraw(void) +void CSyncDebug::OnDraw() { NetStatistics stats; g_pNet->GetNetworkStatistics(&stats); @@ -141,7 +141,7 @@ void CSyncDebug::OnDraw(void) m_pManager->GetDisplayManager()->DrawText2D(strBuffer, CVector(0.76f, 0.31f, 0), 1.0f, 0xFFFFFFFF); } -void CSyncDebug::OnUpdate(void) +void CSyncDebug::OnUpdate() { NetStatistics stats; g_pNet->GetNetworkStatistics(&stats); diff --git a/Client/mods/deathmatch/logic/CSyncDebug.h b/Client/mods/deathmatch/logic/CSyncDebug.h index c7eebec954c..83b3e225654 100644 --- a/Client/mods/deathmatch/logic/CSyncDebug.h +++ b/Client/mods/deathmatch/logic/CSyncDebug.h @@ -20,14 +20,14 @@ class CSyncDebug // Debugmode only interface #ifdef MTA_DEBUG CSyncDebug(CClientManager* pManager); - ~CSyncDebug(void); + ~CSyncDebug(); void Unreference(CClientPlayer& Player); void Attach(CClientPlayer& Player); - void Detach(void); + void Detach(); - void OnPulse(void); + void OnPulse(); #else CSyncDebug(CClientManager* pManager){}; @@ -35,9 +35,9 @@ class CSyncDebug void Unreference(CClientPlayer& Player){}; void Attach(CClientPlayer& Player){}; - void Detach(void){}; + void Detach(){}; - void OnPulse(void){}; + void OnPulse(){}; #endif @@ -45,8 +45,8 @@ class CSyncDebug // Debugmode only interface #ifdef MTA_DEBUG - void OnDraw(void); - void OnUpdate(void); + void OnDraw(); + void OnUpdate(); CClientManager* m_pManager; CClientPlayer* m_pPlayer; diff --git a/Client/mods/deathmatch/logic/CTransferBox.cpp b/Client/mods/deathmatch/logic/CTransferBox.cpp index 4c7afe25d2f..a0708320a9a 100644 --- a/Client/mods/deathmatch/logic/CTransferBox.cpp +++ b/Client/mods/deathmatch/logic/CTransferBox.cpp @@ -17,7 +17,7 @@ #define TRANSFERBOX_YSTART 20 #define TRANSFERBOX_SPACER 11 -CTransferBox::CTransferBox(void) +CTransferBox::CTransferBox() { CGUI* pGUI = g_pCore->GetGUI(); // Create our text for each transfer type @@ -80,7 +80,7 @@ CTransferBox::CTransferBox(void) m_dTotalSize = 0; } -CTransferBox::~CTransferBox(void) +CTransferBox::~CTransferBox() { for (unsigned int i = 0; i < TRANSFERBOX_FRAMES; i++) { @@ -95,13 +95,13 @@ CTransferBox::~CTransferBox(void) delete m_pProgress; } -void CTransferBox::Show(void) +void CTransferBox::Show() { m_pWindow->SetVisible(true); g_pCore->GetGUI()->SetTransferBoxVisible(true); } -void CTransferBox::Hide(void) +void CTransferBox::Hide() { m_pWindow->SetVisible(false); g_pCore->GetGUI()->SetTransferBoxVisible(false); @@ -123,7 +123,7 @@ void CTransferBox::SetInfo(double dDownloadSizeNow, CTransferBox::Type eTransfer m_pProgress->SetProgress(static_cast(dDownloadSizeNow / m_dTotalSize)); } -void CTransferBox::DoPulse(void) +void CTransferBox::DoPulse() { // animated icon mechanism if (m_AnimTimer.Get() > TRANSFERBOX_DELAY) diff --git a/Client/mods/deathmatch/logic/CTransferBox.h b/Client/mods/deathmatch/logic/CTransferBox.h index cbb7b843c45..ed4c4858477 100644 --- a/Client/mods/deathmatch/logic/CTransferBox.h +++ b/Client/mods/deathmatch/logic/CTransferBox.h @@ -27,19 +27,19 @@ class CTransferBox MAX_TYPES }; - CTransferBox(void); - virtual ~CTransferBox(void); + CTransferBox(); + virtual ~CTransferBox(); - void Show(void); - void Hide(void); + void Show(); + void Hide(); void SetInfo(double dDownloadSizeNow, CTransferBox::Type eTransferType = CTransferBox::NORMAL); - void DoPulse(void); + void DoPulse(); bool OnCancelClick(CGUIElement* pElement); - bool IsVisible(void) { return m_pWindow->IsVisible(); }; + bool IsVisible() { return m_pWindow->IsVisible(); }; void AddToTotalSize(double dSize) { m_dTotalSize += dSize; }; diff --git a/Client/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp b/Client/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp index 1dd432f5871..3df3f2eeb4e 100644 --- a/Client/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp +++ b/Client/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp @@ -24,7 +24,7 @@ CUnoccupiedVehicleSync::CUnoccupiedVehicleSync(CClientVehicleManager* pVehicleMa m_ulLastSyncTime = 0; } -CUnoccupiedVehicleSync::~CUnoccupiedVehicleSync(void) +CUnoccupiedVehicleSync::~CUnoccupiedVehicleSync() { } @@ -54,7 +54,7 @@ bool CUnoccupiedVehicleSync::ProcessPacket(unsigned char ucPacketID, NetBitStrea return false; } -void CUnoccupiedVehicleSync::DoPulse(void) +void CUnoccupiedVehicleSync::DoPulse() { // Check all our vehicles for damage UpdateDamageModels(); @@ -81,7 +81,7 @@ void CUnoccupiedVehicleSync::RemoveVehicle(CDeathmatchVehicle* pVehicle) pVehicle->SetIsSyncing(false); } -void CUnoccupiedVehicleSync::ClearVehicles(void) +void CUnoccupiedVehicleSync::ClearVehicles() { // Mark all vehicles as 'not syncing' list::const_iterator iter = m_List.begin(); @@ -212,7 +212,7 @@ void CUnoccupiedVehicleSync::Packet_UnoccupiedVehicleSync(NetBitStreamInterface& } } -void CUnoccupiedVehicleSync::UpdateDamageModels(void) +void CUnoccupiedVehicleSync::UpdateDamageModels() { // Got any items? if (m_List.size() > 0) @@ -226,7 +226,7 @@ void CUnoccupiedVehicleSync::UpdateDamageModels(void) } } -void CUnoccupiedVehicleSync::UpdateStates(void) +void CUnoccupiedVehicleSync::UpdateStates() { // Got any items? if (m_List.size() > 0) diff --git a/Client/mods/deathmatch/logic/CUnoccupiedVehicleSync.h b/Client/mods/deathmatch/logic/CUnoccupiedVehicleSync.h index a0ba18eb68e..f6dc0d1ec8c 100644 --- a/Client/mods/deathmatch/logic/CUnoccupiedVehicleSync.h +++ b/Client/mods/deathmatch/logic/CUnoccupiedVehicleSync.h @@ -18,17 +18,17 @@ class CUnoccupiedVehicleSync { public: CUnoccupiedVehicleSync(CClientVehicleManager* pVehicleManager); - ~CUnoccupiedVehicleSync(void); + ~CUnoccupiedVehicleSync(); bool ProcessPacket(unsigned char ucPacketID, NetBitStreamInterface& bitStream); - void DoPulse(void); + void DoPulse(); void AddVehicle(CDeathmatchVehicle* pVehicle); void RemoveVehicle(CDeathmatchVehicle* pVehicle); - void ClearVehicles(void); + void ClearVehicles(); - std::list::const_iterator IterBegin(void) { return m_List.begin(); }; - std::list::const_iterator IterEnd(void) { return m_List.end(); }; + std::list::const_iterator IterBegin() { return m_List.begin(); }; + std::list::const_iterator IterEnd() { return m_List.end(); }; bool Exists(CDeathmatchVehicle* pVehicle); @@ -37,8 +37,8 @@ class CUnoccupiedVehicleSync void Packet_UnoccupiedVehicleStopSync(NetBitStreamInterface& BitStream); void Packet_UnoccupiedVehicleSync(NetBitStreamInterface& BitStream); - void UpdateDamageModels(void); - void UpdateStates(void); + void UpdateDamageModels(); + void UpdateStates(); bool WriteVehicleInformation(NetBitStreamInterface* pBitStream, CDeathmatchVehicle* pVehicle); CClientVehicleManager* m_pVehicleManager; diff --git a/Client/mods/deathmatch/logic/CVehicleUpgrades.cpp b/Client/mods/deathmatch/logic/CVehicleUpgrades.cpp index 859299f0f85..8ba2dbf79cd 100644 --- a/Client/mods/deathmatch/logic/CVehicleUpgrades.cpp +++ b/Client/mods/deathmatch/logic/CVehicleUpgrades.cpp @@ -572,7 +572,7 @@ bool CVehicleUpgrades::AddUpgrade(unsigned short usUpgrade, bool bAddedLocally) return false; } -void CVehicleUpgrades::AddAllUpgrades(void) +void CVehicleUpgrades::AddAllUpgrades() { if (m_pVehicle) { @@ -671,7 +671,7 @@ unsigned short CVehicleUpgrades::GetSlotState(unsigned char ucSlot) return 0; } -void CVehicleUpgrades::ReAddAll(void) +void CVehicleUpgrades::ReAddAll() { unsigned char ucSlot = 0; for (; ucSlot < VEHICLE_UPGRADE_SLOTS; ucSlot++) diff --git a/Client/mods/deathmatch/logic/CVehicleUpgrades.h b/Client/mods/deathmatch/logic/CVehicleUpgrades.h index 04acf25ea41..85aa20610d1 100644 --- a/Client/mods/deathmatch/logic/CVehicleUpgrades.h +++ b/Client/mods/deathmatch/logic/CVehicleUpgrades.h @@ -34,15 +34,15 @@ class CVehicleUpgrades static bool GetSlotFromUpgrade(unsigned short usUpgrade, unsigned char& ucSlot); bool AddUpgrade(unsigned short usUpgrade, bool bAddedLocally); - void AddAllUpgrades(void); + void AddAllUpgrades(); void ForceAddUpgrade(unsigned short usUpgrade); bool HasUpgrade(unsigned short usUpgrade); bool RemoveUpgrade(unsigned short usUpgrade); unsigned short GetSlotState(unsigned char ucSlot); - const SSlotStates& GetSlotStates(void) { return m_SlotStates; } + const SSlotStates& GetSlotStates() { return m_SlotStates; } static const char* GetSlotName(unsigned char ucSlot); - void ReAddAll(void); + void ReAddAll(); void RemoveAll(bool bRipFromVehicle); void RestreamVehicleUpgrades(unsigned short usModel); diff --git a/Client/mods/deathmatch/logic/Utils.cpp b/Client/mods/deathmatch/logic/Utils.cpp index c5511278fbc..9740d76c025 100644 --- a/Client/mods/deathmatch/logic/Utils.cpp +++ b/Client/mods/deathmatch/logic/Utils.cpp @@ -214,12 +214,12 @@ void LongToDottedIP(unsigned long ulIP, char* szDottedIP) } } -float GetRandomFloat(void) +float GetRandomFloat() { return static_cast(rand()) / (static_cast(RAND_MAX) + 1.0f); } -double GetRandomDouble(void) +double GetRandomDouble() { return static_cast(rand()) / (static_cast(RAND_MAX) + 1.0); } diff --git a/Client/mods/deathmatch/logic/Utils.h b/Client/mods/deathmatch/logic/Utils.h index 75dbcfb4092..e1f207a5aa7 100644 --- a/Client/mods/deathmatch/logic/Utils.h +++ b/Client/mods/deathmatch/logic/Utils.h @@ -217,8 +217,8 @@ void RotateVector(CVector& vecLine, const CVector& vecRotation); void AttachedMatrix(const CMatrix& matrix, CMatrix& returnMatrix, const CVector& vecPosition, const CVector& vecRotation); unsigned int GetRandom(unsigned int uiLow, unsigned int uiHigh); -double GetRandomDouble(void); -float GetRandomFloat(void); +double GetRandomDouble(); +float GetRandomFloat(); SString GetDataUnit(unsigned long long ullInput); diff --git a/Client/mods/deathmatch/logic/lua/CLuaArgument.cpp b/Client/mods/deathmatch/logic/lua/CLuaArgument.cpp index b7caeafe177..3a5f50df3f6 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaArgument.cpp +++ b/Client/mods/deathmatch/logic/lua/CLuaArgument.cpp @@ -29,7 +29,7 @@ using namespace std; // Prevent the warning issued when doing unsigned short -> void* #pragma warning(disable:4312) -CLuaArgument::CLuaArgument(void) +CLuaArgument::CLuaArgument() { m_iType = LUA_TNIL; m_iIndex = -1; @@ -58,7 +58,7 @@ CLuaArgument::CLuaArgument(lua_State* luaVM, int iArgument, CFastHashMap* pKnownTables = NULL); CLuaArgument(NetBitStreamInterface& bitStream, std::vector* pKnownTables = NULL); CLuaArgument(lua_State* luaVM, int iArgument, CFastHashMap* pKnownTables = NULL); - ~CLuaArgument(void); + ~CLuaArgument(); const CLuaArgument& operator=(const CLuaArgument& Argument); bool operator==(const CLuaArgument& Argument); @@ -48,14 +48,14 @@ class CLuaArgument void Push(lua_State* luaVM, CFastHashMap* pKnownTables = NULL) const; - int GetType(void) const { return m_iType; }; - int GetIndex(void) const { return m_iIndex; }; + int GetType() const { return m_iType; }; + int GetIndex() const { return m_iIndex; }; - bool GetBoolean(void) const { return m_bBoolean; }; - lua_Number GetNumber(void) const { return m_Number; }; - const SString& GetString(void) { return m_strString; }; - void* GetUserData(void) const { return m_pUserData; }; - CClientEntity* GetElement(void) const; + bool GetBoolean() const { return m_bBoolean; }; + lua_Number GetNumber() const { return m_Number; }; + const SString& GetString() { return m_strString; }; + void* GetUserData() const { return m_pUserData; }; + CClientEntity* GetElement() const; bool ReadFromBitStream(NetBitStreamInterface& bitStream, std::vector* pKnownTables = NULL); bool WriteToBitStream(NetBitStreamInterface& bitStream, CFastHashMap* pKnownTables = NULL) const; @@ -82,5 +82,5 @@ class CLuaArgument void CopyRecursive(const CLuaArgument& Argument, CFastHashMap* pKnownTables = NULL); bool CompareRecursive(const CLuaArgument& Argument, std::set* pKnownTables = NULL); - void DeleteTableData(void); + void DeleteTableData(); }; diff --git a/Client/mods/deathmatch/logic/lua/CLuaArguments.cpp b/Client/mods/deathmatch/logic/lua/CLuaArguments.cpp index c0722de8193..50eee390c63 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaArguments.cpp +++ b/Client/mods/deathmatch/logic/lua/CLuaArguments.cpp @@ -314,7 +314,7 @@ bool CLuaArguments::CallGlobal(CLuaMain* pLuaMain, const char* szFunction, CLuaA return true; } -CLuaArgument* CLuaArguments::PushNil(void) +CLuaArgument* CLuaArguments::PushNil() { CLuaArgument* pArgument = new CLuaArgument; m_Arguments.push_back(pArgument); @@ -377,7 +377,7 @@ CLuaArgument* CLuaArguments::PushTable(CLuaArguments* table) } // Gets rid of all the arguments in the list -void CLuaArguments::DeleteArguments(void) +void CLuaArguments::DeleteArguments() { // Delete each item vector::iterator iter = m_Arguments.begin(); @@ -391,7 +391,7 @@ void CLuaArguments::DeleteArguments(void) } // Gets rid of the last argument in the list -void CLuaArguments::Pop(void) +void CLuaArguments::Pop() { // Delete the last element CLuaArgument* item = m_Arguments.back(); @@ -401,7 +401,7 @@ void CLuaArguments::Pop(void) m_Arguments.pop_back(); } -void CLuaArguments::ValidateTableKeys(void) +void CLuaArguments::ValidateTableKeys() { // Iterate over m_Arguments as pairs // If first is LUA_TNIL, then remove pair diff --git a/Client/mods/deathmatch/logic/lua/CLuaArguments.h b/Client/mods/deathmatch/logic/lua/CLuaArguments.h index 906f9c93720..a703974981e 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaArguments.h +++ b/Client/mods/deathmatch/logic/lua/CLuaArguments.h @@ -32,10 +32,10 @@ class CLuaArguments; class CLuaArguments { public: - CLuaArguments(void) {} + CLuaArguments() {} CLuaArguments(const CLuaArguments& Arguments, CFastHashMap* pKnownTables = NULL); CLuaArguments(NetBitStreamInterface& bitStream, std::vector* pKnownTables = NULL); - ~CLuaArguments(void) { DeleteArguments(); }; + ~CLuaArguments() { DeleteArguments(); }; void CopyRecursive(const CLuaArguments& Arguments, CFastHashMap* pKnownTables = NULL); @@ -52,7 +52,7 @@ class CLuaArguments void ReadTable(lua_State* luaVM, int iIndexBegin, CFastHashMap* pKnownTables = NULL); void PushAsTable(lua_State* luaVM, CFastHashMap* pKnownTables = NULL); - CLuaArgument* PushNil(void); + CLuaArgument* PushNil(); CLuaArgument* PushBoolean(bool bBool); CLuaArgument* PushNumber(double dNumber); CLuaArgument* PushString(const std::string& strString); @@ -61,12 +61,12 @@ class CLuaArguments CLuaArgument* PushResource(CResource* pResource); CLuaArgument* PushTable(CLuaArguments* table); - void DeleteArguments(void); - void Pop(void); + void DeleteArguments(); + void Pop(); bool ReadFromBitStream(NetBitStreamInterface& bitStream, std::vector* pKnownTables = NULL); bool WriteToBitStream(NetBitStreamInterface& bitStream, CFastHashMap* pKnownTables = NULL) const; - void ValidateTableKeys(void); + void ValidateTableKeys(); bool ReadFromJSONString(const char* szJSON); bool WriteToJSONString(std::string& strJSON, bool bSerialize = false, int flags = JSON_C_TO_STRING_PLAIN); json_object* WriteTableToJSONObject(bool bSerialize = false, CFastHashMap* pKnownTables = NULL); @@ -74,9 +74,9 @@ class CLuaArguments bool ReadFromJSONObject(json_object* object, std::vector* pKnownTables = NULL); bool ReadFromJSONArray(json_object* object, std::vector* pKnownTables = NULL); - unsigned int Count(void) const { return static_cast(m_Arguments.size()); }; - std::vector::const_iterator IterBegin(void) const { return m_Arguments.begin(); }; - std::vector::const_iterator IterEnd(void) const { return m_Arguments.end(); }; + unsigned int Count() const { return static_cast(m_Arguments.size()); }; + std::vector::const_iterator IterBegin() const { return m_Arguments.begin(); }; + std::vector::const_iterator IterEnd() const { return m_Arguments.end(); }; private: std::vector m_Arguments; diff --git a/Client/mods/deathmatch/logic/lua/CLuaCFunctions.cpp b/Client/mods/deathmatch/logic/lua/CLuaCFunctions.cpp index f49fbdd50b5..52ab12f4fb0 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaCFunctions.cpp +++ b/Client/mods/deathmatch/logic/lua/CLuaCFunctions.cpp @@ -133,7 +133,7 @@ void CLuaCFunctions::RegisterFunctionsWithVM(lua_State* luaVM) } } -void CLuaCFunctions::RemoveAllFunctions(void) +void CLuaCFunctions::RemoveAllFunctions() { // Delete all functions std::vector::const_iterator iter = m_sFunctions.begin(); diff --git a/Client/mods/deathmatch/logic/lua/CLuaCFunctions.h b/Client/mods/deathmatch/logic/lua/CLuaCFunctions.h index 05f3b4bef52..29f20f7a400 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaCFunctions.h +++ b/Client/mods/deathmatch/logic/lua/CLuaCFunctions.h @@ -20,13 +20,13 @@ class CLuaCFunction public: CLuaCFunction(const char* szName, lua_CFunction f, bool bRestricted); - lua_CFunction GetFunctionAddress(void) const { return m_Function; }; + lua_CFunction GetFunctionAddress() const { return m_Function; }; - const char* GetFunctionName(void) const { return m_strName.c_str(); }; + const char* GetFunctionName() const { return m_strName.c_str(); }; void SetFunctionName(const char* szName) { m_strName = szName ? szName : ""; }; - const SString& GetName(void) { return m_strName; } + const SString& GetName() { return m_strName; } - bool IsRestricted(void) { return m_bRestricted; }; + bool IsRestricted() { return m_bRestricted; }; private: lua_CFunction m_Function; @@ -49,5 +49,5 @@ class CLuaCFunctions static void RegisterFunctionsWithVM(lua_State* luaVM); - static void RemoveAllFunctions(void); + static void RemoveAllFunctions(); }; diff --git a/Client/mods/deathmatch/logic/lua/CLuaFunctionRef.cpp b/Client/mods/deathmatch/logic/lua/CLuaFunctionRef.cpp index 4fc75a54035..a415bdd8241 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaFunctionRef.cpp +++ b/Client/mods/deathmatch/logic/lua/CLuaFunctionRef.cpp @@ -85,7 +85,7 @@ void luaM_dec_use(lua_State* luaVM, int iFunction, const void* pFuncPtr) // CLuaFunctionRef implementation // -CLuaFunctionRef::CLuaFunctionRef(void) : m_ListNode(this) +CLuaFunctionRef::CLuaFunctionRef() : m_ListNode(this) { m_luaVM = NULL; m_iFunction = LUA_REFNIL; @@ -110,7 +110,7 @@ CLuaFunctionRef::CLuaFunctionRef(const CLuaFunctionRef& other) : m_ListNode(this luaM_inc_use(m_luaVM, m_iFunction, m_pFuncPtr); } -CLuaFunctionRef::~CLuaFunctionRef(void) +CLuaFunctionRef::~CLuaFunctionRef() { luaM_dec_use(m_luaVM, m_iFunction, m_pFuncPtr); dassert(ms_AllRefList.contains(this)); @@ -128,13 +128,13 @@ CLuaFunctionRef& CLuaFunctionRef::operator=(const CLuaFunctionRef& other) return *this; } -int CLuaFunctionRef::ToInt(void) const +int CLuaFunctionRef::ToInt() const { return m_iFunction; } // Returns null if VM has closed -lua_State* CLuaFunctionRef::GetLuaVM(void) const +lua_State* CLuaFunctionRef::GetLuaVM() const { return m_luaVM; } diff --git a/Client/mods/deathmatch/logic/lua/CLuaFunctionRef.h b/Client/mods/deathmatch/logic/lua/CLuaFunctionRef.h index 44678c5b8a2..1ce043a2501 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaFunctionRef.h +++ b/Client/mods/deathmatch/logic/lua/CLuaFunctionRef.h @@ -18,13 +18,13 @@ class CLuaFunctionRef { public: - CLuaFunctionRef(void); + CLuaFunctionRef(); CLuaFunctionRef(lua_State* luaVM, int iFunction, const void* pFuncPtr); CLuaFunctionRef(const CLuaFunctionRef& other); - ~CLuaFunctionRef(void); + ~CLuaFunctionRef(); CLuaFunctionRef& operator=(const CLuaFunctionRef& other); - int ToInt(void) const; - lua_State* GetLuaVM(void) const; + int ToInt() const; + lua_State* GetLuaVM() const; bool operator==(const CLuaFunctionRef& other) const; bool operator!=(const CLuaFunctionRef& other) const; static void RemoveLuaFunctionRefsForVM(lua_State* luaVM); diff --git a/Client/mods/deathmatch/logic/lua/CLuaMain.cpp b/Client/mods/deathmatch/logic/lua/CLuaMain.cpp index 7e01873a06b..433c4ecc932 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaMain.cpp +++ b/Client/mods/deathmatch/logic/lua/CLuaMain.cpp @@ -43,7 +43,7 @@ CLuaMain::CLuaMain(CLuaManager* pLuaManager, CResource* pResourceOwner, bool bEn CClientPerfStatLuaTiming::GetSingleton()->OnLuaMainCreate(this); } -CLuaMain::~CLuaMain(void) +CLuaMain::~CLuaMain() { g_pClientGame->GetRemoteCalls()->Remove(this); g_pClientGame->GetLatentTransferManager()->OnLuaMainDestroy(this); @@ -61,17 +61,17 @@ CLuaMain::~CLuaMain(void) CClientPerfStatLuaTiming::GetSingleton()->OnLuaMainDestroy(this); } -bool CLuaMain::BeingDeleted(void) +bool CLuaMain::BeingDeleted() { return m_bBeingDeleted; } -void CLuaMain::ResetInstructionCount(void) +void CLuaMain::ResetInstructionCount() { m_FunctionEnterTimer.Reset(); } -void CLuaMain::InitSecurity(void) +void CLuaMain::InitSecurity() { // Disable dangerous Lua Os library functions static const luaL_reg osfuncs[] = @@ -137,7 +137,7 @@ void CLuaMain::InitClasses(lua_State* luaVM) CLuaShared::AddClasses(luaVM); } -void CLuaMain::InitVM(void) +void CLuaMain::InitVM() { assert(!m_luaVM); @@ -316,11 +316,11 @@ bool CLuaMain::LoadScript(const char* szLUAScript) return true; } -void CLuaMain::Start(void) +void CLuaMain::Start() { } -void CLuaMain::UnloadScript(void) +void CLuaMain::UnloadScript() { // ACHTUNG: UNLOAD MODULES! @@ -350,7 +350,7 @@ void CLuaMain::UnloadScript(void) } } -void CLuaMain::DoPulse(void) +void CLuaMain::DoPulse() { m_pLuaTimerManager->DoPulse(this); } @@ -429,7 +429,7 @@ bool CLuaMain::SaveXML(CXMLNode* pRootNode) // // /////////////////////////////////////////////////////////////// -unsigned long CLuaMain::GetElementCount(void) const +unsigned long CLuaMain::GetElementCount() const { if (m_pResource && m_pResource->GetElementGroup()) return m_pResource->GetElementGroup()->GetCount(); diff --git a/Client/mods/deathmatch/logic/lua/CLuaMain.h b/Client/mods/deathmatch/logic/lua/CLuaMain.h index 4472e65c84f..10ad08ae97d 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaMain.h +++ b/Client/mods/deathmatch/logic/lua/CLuaMain.h @@ -38,48 +38,48 @@ class CLuaMain //: public CClient public: ZERO_ON_NEW CLuaMain(class CLuaManager* pLuaManager, CResource* pResourceOwner, bool bEnableOOP); - ~CLuaMain(void); + ~CLuaMain(); bool LoadScriptFromBuffer(const char* cpBuffer, unsigned int uiSize, const char* szFileName); bool LoadScript(const char* szLUAScript); - void UnloadScript(void); + void UnloadScript(); - void Start(void); + void Start(); - void DoPulse(void); + void DoPulse(); - const char* GetScriptName(void) const { return m_strScriptName; } + const char* GetScriptName() const { return m_strScriptName; } void SetScriptName(const char* szName) { m_strScriptName.AssignLeft(szName, MAX_SCRIPTNAME_LENGTH); } - lua_State* GetVM(void) { return m_luaVM; }; - CLuaTimerManager* GetTimerManager(void) const { return m_pLuaTimerManager; }; + lua_State* GetVM() { return m_luaVM; }; + CLuaTimerManager* GetTimerManager() const { return m_pLuaTimerManager; }; - bool BeingDeleted(void); - lua_State* GetVirtualMachine(void) const { return m_luaVM; }; + bool BeingDeleted(); + lua_State* GetVirtualMachine() const { return m_luaVM; }; - void ResetInstructionCount(void); + void ResetInstructionCount(); - class CResource* GetResource(void) { return m_pResource; } + class CResource* GetResource() { return m_pResource; } CXMLFile* CreateXML(const char* szFilename, bool bUseIDs = true, bool bReadOnly = false); void DestroyXML(CXMLFile* pFile); void DestroyXML(CXMLNode* pRootNode); bool SaveXML(CXMLNode* pRootNode); - unsigned long GetXMLFileCount(void) const { return m_XMLFiles.size(); }; - unsigned long GetTimerCount(void) const { return m_pLuaTimerManager ? m_pLuaTimerManager->GetTimerCount() : 0; }; - unsigned long GetElementCount(void) const; + unsigned long GetXMLFileCount() const { return m_XMLFiles.size(); }; + unsigned long GetTimerCount() const { return m_pLuaTimerManager ? m_pLuaTimerManager->GetTimerCount() : 0; }; + unsigned long GetElementCount() const; void InitClasses(lua_State* luaVM); - void InitVM(void); + void InitVM(); const SString& GetFunctionTag(int iLuaFunction); int PCall(lua_State* L, int nargs, int nresults, int errfunc); static int LuaLoadBuffer(lua_State* L, const char* buff, size_t sz, const char* name); static int OnUndump(const char* p, size_t n); - bool IsOOPEnabled(void) { return m_bEnableOOP; } + bool IsOOPEnabled() { return m_bEnableOOP; } private: - void InitSecurity(void); + void InitSecurity(); static void InstructionCountHook(lua_State* luaVM, lua_Debug* pDebug); diff --git a/Client/mods/deathmatch/logic/lua/CLuaManager.cpp b/Client/mods/deathmatch/logic/lua/CLuaManager.cpp index 7bf34178501..e84fe995ed2 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaManager.cpp +++ b/Client/mods/deathmatch/logic/lua/CLuaManager.cpp @@ -38,7 +38,7 @@ CLuaManager::CLuaManager(CClientGame* pClientGame) lua_registerUndumpHook(CLuaMain::OnUndump); } -CLuaManager::~CLuaManager(void) +CLuaManager::~CLuaManager() { // Delete all the VM's list::iterator iter; @@ -93,7 +93,7 @@ void CLuaManager::OnLuaMainCloseVM(CLuaMain* pLuaMain, lua_State* luaVM) MapRemove(m_VirtualMachineMap, pLuaMain->GetVirtualMachine()); } -void CLuaManager::ProcessPendingDeleteList(void) +void CLuaManager::ProcessPendingDeleteList() { while (!m_PendingDeleteList.empty()) { @@ -104,7 +104,7 @@ void CLuaManager::ProcessPendingDeleteList(void) } } -void CLuaManager::DoPulse(void) +void CLuaManager::DoPulse() { list::iterator iter = m_virtualMachines.begin(); for (; iter != m_virtualMachines.end(); ++iter) @@ -146,7 +146,7 @@ CLuaMain* CLuaManager::GetVirtualMachine(lua_State* luaVM) return NULL; } -void CLuaManager::LoadCFunctions(void) +void CLuaManager::LoadCFunctions() { std::map functions{ // ** BACKWARDS COMPATIBILITY FUNCS. SHOULD BE REMOVED BEFORE FINAL RELEASE! ** diff --git a/Client/mods/deathmatch/logic/lua/CLuaManager.h b/Client/mods/deathmatch/logic/lua/CLuaManager.h index adf6352f695..4cf637f5cd7 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaManager.h +++ b/Client/mods/deathmatch/logic/lua/CLuaManager.h @@ -25,7 +25,7 @@ class CLuaManager { public: CLuaManager(class CClientGame* pClientGame); - ~CLuaManager(void); + ~CLuaManager(); CLuaMain* CreateVirtualMachine(CResource* pResourceOwner, bool bEnableOOP); bool RemoveVirtualMachine(CLuaMain* vm); @@ -33,20 +33,20 @@ class CLuaManager void OnLuaMainOpenVM(CLuaMain* pLuaMain, lua_State* luaVM); void OnLuaMainCloseVM(CLuaMain* pLuaMain, lua_State* luaVM); - std::list::const_iterator IterBegin(void) { return m_virtualMachines.begin(); }; - std::list::const_iterator IterEnd(void) { return m_virtualMachines.end(); }; + std::list::const_iterator IterBegin() { return m_virtualMachines.begin(); }; + std::list::const_iterator IterEnd() { return m_virtualMachines.end(); }; - void DoPulse(void); + void DoPulse(); void AddToPendingDeleteList(lua_State* m_luaVM) { m_PendingDeleteList.push_back(m_luaVM); } - void ProcessPendingDeleteList(void); + void ProcessPendingDeleteList(); bool IsLuaVMValid(lua_State* luaVM) { return MapFindRef(m_VirtualMachineMap, luaVM) != nullptr; }; CClientGUIManager* m_pGUIManager; private: - void LoadCFunctions(void); + void LoadCFunctions(); CEvents* m_pEvents; CRegisteredCommands* m_pRegisteredCommands; diff --git a/Client/mods/deathmatch/logic/lua/CLuaTimer.cpp b/Client/mods/deathmatch/logic/lua/CLuaTimer.cpp index c8cd0ddd0eb..4c867908676 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaTimer.cpp +++ b/Client/mods/deathmatch/logic/lua/CLuaTimer.cpp @@ -19,12 +19,12 @@ CLuaTimer::CLuaTimer(const CLuaFunctionRef& iLuaFunction, const CLuaArguments& A m_Arguments = Arguments; } -CLuaTimer::~CLuaTimer(void) +CLuaTimer::~CLuaTimer() { RemoveScriptID(); } -void CLuaTimer::RemoveScriptID(void) +void CLuaTimer::RemoveScriptID() { if (m_uiScriptID != INVALID_ARRAY_ID) { @@ -58,7 +58,7 @@ void CLuaTimer::ExecuteTimer(CLuaMain* pLuaMain) } } -CTickCount CLuaTimer::GetTimeLeft(void) +CTickCount CLuaTimer::GetTimeLeft() { CTickCount llCurrentTime = CTickCount::Now(); CTickCount llTimeLeft = m_llStartTime + m_llDelay - llCurrentTime; diff --git a/Client/mods/deathmatch/logic/lua/CLuaTimer.h b/Client/mods/deathmatch/logic/lua/CLuaTimer.h index a7f04c0cd05..83938034428 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaTimer.h +++ b/Client/mods/deathmatch/logic/lua/CLuaTimer.h @@ -23,25 +23,25 @@ class CLuaTimer { public: CLuaTimer(const CLuaFunctionRef& iLuaFunction, const CLuaArguments& Arguments); - ~CLuaTimer(void); + ~CLuaTimer(); - void RemoveScriptID(void); + void RemoveScriptID(); - CTickCount GetStartTime(void) const { return m_llStartTime; }; + CTickCount GetStartTime() const { return m_llStartTime; }; void SetStartTime(CTickCount llStartTime) { m_llStartTime = llStartTime; }; - CTickCount GetDelay(void) const { return m_llDelay; }; + CTickCount GetDelay() const { return m_llDelay; }; void SetDelay(CTickCount llDelay) { m_llDelay = llDelay; }; - unsigned int GetRepeats(void) const { return m_uiRepeats; }; + unsigned int GetRepeats() const { return m_uiRepeats; }; void SetRepeats(unsigned int uiRepeats) { m_uiRepeats = uiRepeats; } void ExecuteTimer(class CLuaMain* pLuaMain); - CTickCount GetTimeLeft(void); + CTickCount GetTimeLeft(); - uint GetScriptID(void) const { return m_uiScriptID; } - const SLuaDebugInfo& GetLuaDebugInfo(void) { return m_LuaDebugInfo; } + uint GetScriptID() const { return m_uiScriptID; } + const SLuaDebugInfo& GetLuaDebugInfo() { return m_LuaDebugInfo; } void SetLuaDebugInfo(const SLuaDebugInfo& luaDebugInfo) { m_LuaDebugInfo = luaDebugInfo; } private: diff --git a/Client/mods/deathmatch/logic/lua/CLuaTimerManager.cpp b/Client/mods/deathmatch/logic/lua/CLuaTimerManager.cpp index a23c527120f..317de7f16d8 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaTimerManager.cpp +++ b/Client/mods/deathmatch/logic/lua/CLuaTimerManager.cpp @@ -92,7 +92,7 @@ void CLuaTimerManager::RemoveTimer(CLuaTimer* pLuaTimer) delete pLuaTimer; } -void CLuaTimerManager::RemoveAllTimers(void) +void CLuaTimerManager::RemoveAllTimers() { // Delete all the timers CFastList::const_iterator iter = m_TimerList.begin(); diff --git a/Client/mods/deathmatch/logic/lua/CLuaTimerManager.h b/Client/mods/deathmatch/logic/lua/CLuaTimerManager.h index 6481f362de1..5fb6ab77d63 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaTimerManager.h +++ b/Client/mods/deathmatch/logic/lua/CLuaTimerManager.h @@ -20,12 +20,12 @@ class CLuaTimerManager; class CLuaTimerManager { public: - CLuaTimerManager(void) + CLuaTimerManager() { m_pPendingDelete = NULL; m_pProcessingTimer = NULL; } - ~CLuaTimerManager(void) { RemoveAllTimers(); }; + ~CLuaTimerManager() { RemoveAllTimers(); }; void DoPulse(CLuaMain* pLuaMain); @@ -33,13 +33,13 @@ class CLuaTimerManager CLuaTimer* AddTimer(const CLuaFunctionRef& iLuaFunction, CTickCount llTimeDelay, unsigned int uiRepeats, const CLuaArguments& Arguments); void RemoveTimer(CLuaTimer* pLuaTimer); - void RemoveAllTimers(void); - unsigned long GetTimerCount(void) const { return m_TimerList.size(); } + void RemoveAllTimers(); + unsigned long GetTimerCount() const { return m_TimerList.size(); } void ResetTimer(CLuaTimer* pLuaTimer); - CFastList::const_iterator IterBegin(void) { return m_TimerList.begin(); } - CFastList::const_iterator IterEnd(void) { return m_TimerList.end(); } + CFastList::const_iterator IterBegin() { return m_TimerList.begin(); } + CFastList::const_iterator IterEnd() { return m_TimerList.end(); } private: CFastList m_TimerList; diff --git a/Client/mods/deathmatch/logic/lua/LuaCommon.h b/Client/mods/deathmatch/logic/lua/LuaCommon.h index 78e1122d19c..43ce92424e7 100644 --- a/Client/mods/deathmatch/logic/lua/LuaCommon.h +++ b/Client/mods/deathmatch/logic/lua/LuaCommon.h @@ -90,7 +90,7 @@ enum struct SLuaDebugInfo { - SLuaDebugInfo(void) : iLine(INVALID_LINE_NUMBER), infoType(DEBUG_INFO_NONE) {} + SLuaDebugInfo() : iLine(INVALID_LINE_NUMBER), infoType(DEBUG_INFO_NONE) {} SLuaDebugInfo(const SString& strFile, int iLine) : strFile(strFile), iLine(iLine), infoType(DEBUG_INFO_FILE_AND_LINE) {} SString strFile; SString strShortSrc; diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp index 2a55813e9e6..4f077b0f564 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaAudioDefs::LoadFunctions(void) +void CLuaAudioDefs::LoadFunctions() { std::map functions{ // Audio funcs diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.h index a464e1bf8fe..cd0aab7f7c1 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.h @@ -15,7 +15,7 @@ class CLuaAudioDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Audio funcs diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp index 3e253913c41..5e329a54fea 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaBlipDefs::LoadFunctions(void) +void CLuaBlipDefs::LoadFunctions() { std::map functions{ {"createBlip", CreateBlip}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.h index 2cbbd3a2c35..45c62397bb9 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.h @@ -15,7 +15,7 @@ class CLuaBlipDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(CreateBlip); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp index 1b0cebe11ed..d207b6af7fa 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaBrowserDefs::LoadFunctions(void) +void CLuaBrowserDefs::LoadFunctions() { // Define browser functions std::map functions{ diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.h index 3d0606197c3..d76e7be1bad 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.h @@ -15,7 +15,7 @@ class CLuaBrowserDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(CreateBrowser); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp index 10b58cb61a9..4cd3e836a37 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp @@ -12,7 +12,7 @@ #include "StdInc.h" -void CLuaCameraDefs::LoadFunctions(void) +void CLuaCameraDefs::LoadFunctions() { std::map functions{ // Cam get funcs diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.h index 3b28375675e..82a20cce0f2 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.h @@ -14,7 +14,7 @@ class CLuaCameraDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Cam get funcs diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp index 6c68ed5cc1b..a0624479e2b 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaColShapeDefs::LoadFunctions(void) +void CLuaColShapeDefs::LoadFunctions() { std::map functions{ {"createColCircle", CreateColCircle}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.h index a4c9b074e6e..195084cbb41 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.h @@ -15,7 +15,7 @@ class CLuaColShapeDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(CreateColCircle); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp index 58c7c57b7b1..4539ba36568 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp @@ -13,7 +13,7 @@ #define MIN_CLIENT_REQ_DXSETRENDERTARGET_CALL_RESTRICTIONS "1.3.0-9.04431" extern bool g_bAllowAspectRatioAdjustment; -void CLuaDrawingDefs::LoadFunctions(void) +void CLuaDrawingDefs::LoadFunctions() { std::map functions{ {"dxDrawLine", DxDrawLine}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.h index cec72046e95..cd0565b664c 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.h @@ -15,7 +15,7 @@ class CLuaDrawingDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(DxDrawLine); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp index 72dcd6c430e..1fae44c3efd 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaEffectDefs::LoadFunctions(void) +void CLuaEffectDefs::LoadFunctions() { std::map functions{ {"fxAddBlood", fxAddBlood}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.h index 3af839f23c4..e2f4c07fe15 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.h @@ -15,7 +15,7 @@ class CLuaEffectDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(fxAddBlood); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index 8592f8a5b1a..3d5ad9d81e1 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -14,7 +14,7 @@ using std::list; #define MIN_CLIENT_REQ_GETBOUNDINGBOX_OOP "1.5.5-9.13999" -void CLuaElementDefs::LoadFunctions(void) +void CLuaElementDefs::LoadFunctions() { std::map functions{ // Element get funcs diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h index f414784bac7..004f8c5a129 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h @@ -14,7 +14,7 @@ class CLuaElementDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Element get functions diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp index d23582d8ff0..d14088ee520 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaEngineDefs::LoadFunctions(void) +void CLuaEngineDefs::LoadFunctions() { std::map functions{ {"engineLoadTXD", EngineLoadTXD}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.h index 4e99d482ee4..4b0d6eccc80 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.h @@ -15,7 +15,7 @@ class CLuaEngineDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(EngineLoadDFF); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp index a15a539a15c..f9372154c90 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp @@ -10,7 +10,7 @@ #include "StdInc.h" #include "CLuaFireDefs.h" -void CLuaFireDefs::LoadFunctions(void) +void CLuaFireDefs::LoadFunctions() { std::map functions{ {"createFire", CreateFire}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.h index 6c624763465..22028e50568 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.h @@ -14,7 +14,7 @@ class CLuaFireDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); LUA_DECLARE(CreateFire); LUA_DECLARE(ExtinguishFire); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp index 634c7150af8..67aee6be350 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp @@ -34,7 +34,7 @@ static const SFixedArray g_chatboxLayoutC "text_scale" }}; -void CLuaGUIDefs::LoadFunctions(void) +void CLuaGUIDefs::LoadFunctions() { std::map functions{ {"guiGetInputEnabled", GUIGetInputEnabled}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.h index daea3399db8..c33df030777 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.h @@ -17,7 +17,7 @@ class CLuaGUIDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(GUIGetInputEnabled); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp index 517a1d4999d..620698cb247 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaMarkerDefs::LoadFunctions(void) +void CLuaMarkerDefs::LoadFunctions() { std::map functions{ {"createMarker", CreateMarker}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.h index 9ea53d611c1..d470a47268c 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.h @@ -15,7 +15,7 @@ class CLuaMarkerDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(CreateMarker); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp index 7f05e7a29b1..5e51ab06a77 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaObjectDefs::LoadFunctions(void) +void CLuaObjectDefs::LoadFunctions() { std::map functions{ // Object create/destroy funcs diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.h index 46be9014b92..05e0b73e1a5 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.h @@ -15,7 +15,7 @@ class CLuaObjectDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Object create funcs diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp index f29939b4ba1..826df1e0cd9 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp @@ -13,7 +13,7 @@ #define MIN_CLIENT_REQ_REMOVEPEDFROMVEHICLE_CLIENTSIDE "1.3.0-9.04482" #define MIN_CLIENT_REQ_WARPPEDINTOVEHICLE_CLIENTSIDE "1.3.0-9.04482" -void CLuaPedDefs::LoadFunctions(void) +void CLuaPedDefs::LoadFunctions() { std::map functions{ {"createPed", CreatePed}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.h index aedb671f2d5..b35107a8a97 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.h @@ -14,7 +14,7 @@ class CLuaPedDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(CreatePed); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp index 26a221c17c4..6d51620360f 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaPickupDefs::LoadFunctions(void) +void CLuaPickupDefs::LoadFunctions() { std::map functions{ {"createPickup", CreatePickup}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.h index f0e0ca8a59d..bbd5ca05129 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.h @@ -15,7 +15,7 @@ class CLuaPickupDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(CreatePickup); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp index 4e50ea0a70f..2fccd289943 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaPlayerDefs::LoadFunctions(void) +void CLuaPlayerDefs::LoadFunctions() { std::map functions{ // Player get funcs diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.h index 3b6c4d8266c..8a6bd31c34e 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.h @@ -15,7 +15,7 @@ class CLuaPlayerDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Player get diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp index d6f0e2e353b..d44e5bd0821 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaPointLightDefs::LoadFunctions(void) +void CLuaPointLightDefs::LoadFunctions() { std::map functions{ {"createLight", CreateLight}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.h index 106c55f788d..a412538b4c4 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.h @@ -15,7 +15,7 @@ class CLuaPointLightDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(CreateLight); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp index 787295c2446..5359762ee12 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaProjectileDefs::LoadFunctions(void) +void CLuaProjectileDefs::LoadFunctions() { std::map functions{ {"createProjectile", CreateProjectile}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.h index 1464b2d3d41..a9ef9c52bd3 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.h @@ -15,7 +15,7 @@ class CLuaProjectileDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(CreateProjectile); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp index e25503af34c..27711e59aa0 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp @@ -12,7 +12,7 @@ #include "StdInc.h" -void CLuaRadarAreaDefs::LoadFunctions(void) +void CLuaRadarAreaDefs::LoadFunctions() { std::map functions{ {"createRadarArea", CreateRadarArea}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.h index d4f984d339a..95738822d4c 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.h @@ -14,7 +14,7 @@ class CLuaRadarAreaDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(CreateRadarArea); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp index 945f8ed3440..db96a7b175f 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp @@ -12,7 +12,7 @@ #include "StdInc.h" using std::list; -void CLuaResourceDefs::LoadFunctions(void) +void CLuaResourceDefs::LoadFunctions() { std::map functions{ {"call", Call}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h index 99ad0041439..deb8fe9a901 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h @@ -15,7 +15,7 @@ class CLuaResourceDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(Call); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp index 19e083b5d93..29bb8647e91 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaSearchLightDefs::LoadFunctions(void) +void CLuaSearchLightDefs::LoadFunctions() { std::map functions{ {"createSearchLight", CreateSearchLight}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.h index bc329b28f6d..f023123d0ce 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.h @@ -15,7 +15,7 @@ class CLuaSearchLightDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(CreateSearchLight); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaTaskDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaTaskDefs.cpp index 833422e265c..04c177eb8ba 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaTaskDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaTaskDefs.cpp @@ -10,7 +10,7 @@ #include -void CLuaTaskDefs::LoadFunctions(void) +void CLuaTaskDefs::LoadFunctions() { // ChrML: Disabled for dp3 /* diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaTaskDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaTaskDefs.h index 48d7e6b6138..4dc1f34b90a 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaTaskDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaTaskDefs.h @@ -16,7 +16,7 @@ class CLuaTaskDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static int createTaskInstance(lua_State* luaVM); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp index d3f1068b8b7..dbb900892e0 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp @@ -12,7 +12,7 @@ #include "StdInc.h" using std::list; -void CLuaTeamDefs::LoadFunctions(void) +void CLuaTeamDefs::LoadFunctions() { std::map functions{ {"getTeamFromName", GetTeamFromName}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h index c0e39514243..815801bac8f 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h @@ -15,7 +15,7 @@ class CLuaTeamDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(GetTeamFromName); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp index 59dfcaa8418..6abfae7b9f0 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaTimerDefs::LoadFunctions(void) +void CLuaTimerDefs::LoadFunctions() { std::map functions{ {"setTimer", SetTimer}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.h index 27ffe9c2cc8..671a329b289 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.h @@ -15,7 +15,7 @@ class CLuaTimerDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(SetTimer); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp index 2e22106e67e..ea0fb9672e8 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp @@ -12,7 +12,7 @@ #include "StdInc.h" #define MIN_CLIENT_REQ_GETVEHICLECOMPONENT_OOP "1.5.5-9.11710" -void CLuaVehicleDefs::LoadFunctions(void) +void CLuaVehicleDefs::LoadFunctions() { std::map functions{ // Vehicle get funcs diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h index 6915b0471c6..9ce32ab02ea 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h @@ -15,7 +15,7 @@ class CLuaVehicleDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(CreateVehicle); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp index bf995bda542..8248ba8f101 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void CLuaWaterDefs::LoadFunctions(void) +void CLuaWaterDefs::LoadFunctions() { std::map functions{ {"createWater", CreateWater}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.h index 069d37a4ea5..8842f58316a 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.h @@ -15,7 +15,7 @@ class CLuaWaterDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(CreateWater); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp index 33d418748fb..bd3d00e0a2d 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp @@ -13,7 +13,7 @@ #define MIN_CLIENT_REQ_WEAPON_PROPERTY_FLAG "1.3.5-9.06139" -void CLuaWeaponDefs::LoadFunctions(void) +void CLuaWeaponDefs::LoadFunctions() { std::map functions{ {"getWeaponNameFromID", GetWeaponNameFromID}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.h index 0028a26e9b8..a1843a607b3 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.h @@ -15,7 +15,7 @@ class CLuaWeaponDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(GetWeaponNameFromID); diff --git a/Client/mods/deathmatch/logic/rpc/CAudioRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CAudioRPCs.cpp index 8dcde004e59..a39a45432ad 100644 --- a/Client/mods/deathmatch/logic/rpc/CAudioRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CAudioRPCs.cpp @@ -13,7 +13,7 @@ #include "CAudioRPCs.h" #include "net/SyncStructures.h" -void CAudioRPCs::LoadFunctions(void) +void CAudioRPCs::LoadFunctions() { AddHandler(PLAY_SOUND, PlaySound, "PlaySound"); } diff --git a/Client/mods/deathmatch/logic/rpc/CAudioRPCs.h b/Client/mods/deathmatch/logic/rpc/CAudioRPCs.h index b8d8c1a0e7e..d88c22c4cb3 100644 --- a/Client/mods/deathmatch/logic/rpc/CAudioRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CAudioRPCs.h @@ -16,7 +16,7 @@ class CAudioRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_RPC(PlaySound); diff --git a/Client/mods/deathmatch/logic/rpc/CBlipRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CBlipRPCs.cpp index db7c52b5c11..6fe564dc74b 100644 --- a/Client/mods/deathmatch/logic/rpc/CBlipRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CBlipRPCs.cpp @@ -13,7 +13,7 @@ #include "CBlipRPCs.h" #include "net/SyncStructures.h" -void CBlipRPCs::LoadFunctions(void) +void CBlipRPCs::LoadFunctions() { AddHandler(DESTROY_ALL_BLIPS, DestroyAllBlips, "DestroyAllBlips"); AddHandler(SET_BLIP_ICON, SetBlipIcon, "SetBlipIcon"); diff --git a/Client/mods/deathmatch/logic/rpc/CBlipRPCs.h b/Client/mods/deathmatch/logic/rpc/CBlipRPCs.h index 39ceeaeff4e..ad564b3fc35 100644 --- a/Client/mods/deathmatch/logic/rpc/CBlipRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CBlipRPCs.h @@ -16,7 +16,7 @@ class CBlipRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_RPC(DestroyAllBlips); DECLARE_ELEMENT_RPC(SetBlipIcon); diff --git a/Client/mods/deathmatch/logic/rpc/CCameraRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CCameraRPCs.cpp index 3526e06ed22..95e8be7ac2e 100644 --- a/Client/mods/deathmatch/logic/rpc/CCameraRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CCameraRPCs.cpp @@ -12,7 +12,7 @@ #include #include "CCameraRPCs.h" -void CCameraRPCs::LoadFunctions(void) +void CCameraRPCs::LoadFunctions() { AddHandler(SET_CAMERA_MATRIX, SetCameraMatrix, "SetCameraMatrix"); AddHandler(SET_CAMERA_TARGET, SetCameraTarget, "SetCameraTarget"); diff --git a/Client/mods/deathmatch/logic/rpc/CCameraRPCs.h b/Client/mods/deathmatch/logic/rpc/CCameraRPCs.h index 79aa83cb8ff..b455121ce44 100644 --- a/Client/mods/deathmatch/logic/rpc/CCameraRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CCameraRPCs.h @@ -16,7 +16,7 @@ class CCameraRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_RPC(SetCameraMatrix); DECLARE_RPC(SetCameraTarget); diff --git a/Client/mods/deathmatch/logic/rpc/CElementRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CElementRPCs.cpp index 5f12a0fc610..2e372cfb3ac 100644 --- a/Client/mods/deathmatch/logic/rpc/CElementRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CElementRPCs.cpp @@ -15,7 +15,7 @@ using std::list; -void CElementRPCs::LoadFunctions(void) +void CElementRPCs::LoadFunctions() { AddHandler(SET_ELEMENT_PARENT, SetElementParent, "SetElementParent"); AddHandler(SET_ELEMENT_DATA, SetElementData, "SetElementData"); diff --git a/Client/mods/deathmatch/logic/rpc/CElementRPCs.h b/Client/mods/deathmatch/logic/rpc/CElementRPCs.h index 07c8aa604e5..89db331bb0c 100644 --- a/Client/mods/deathmatch/logic/rpc/CElementRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CElementRPCs.h @@ -16,7 +16,7 @@ class CElementRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_ELEMENT_RPC(SetElementParent); DECLARE_ELEMENT_RPC(SetElementData); diff --git a/Client/mods/deathmatch/logic/rpc/CHandlingRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CHandlingRPCs.cpp index dc65dd17f12..806c951e354 100644 --- a/Client/mods/deathmatch/logic/rpc/CHandlingRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CHandlingRPCs.cpp @@ -13,7 +13,7 @@ #include "CHandlingRPCs.h" #include "net/SyncStructures.h" -void CHandlingRPCs::LoadFunctions(void) +void CHandlingRPCs::LoadFunctions() { AddHandler(SET_VEHICLE_HANDLING, SetVehicleHandling, "SetVehicleHandling"); AddHandler(SET_VEHICLE_HANDLING_PROPERTY, SetVehicleHandlingProperty, "SetVehicleHandlingProperty"); diff --git a/Client/mods/deathmatch/logic/rpc/CHandlingRPCs.h b/Client/mods/deathmatch/logic/rpc/CHandlingRPCs.h index e6f3451e964..e5ea565fb4d 100644 --- a/Client/mods/deathmatch/logic/rpc/CHandlingRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CHandlingRPCs.h @@ -16,7 +16,7 @@ class CHandlingRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_ELEMENT_RPC(SetVehicleHandling); DECLARE_ELEMENT_RPC(SetVehicleHandlingProperty); diff --git a/Client/mods/deathmatch/logic/rpc/CInputRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CInputRPCs.cpp index 21b8aaa167e..afb61750216 100644 --- a/Client/mods/deathmatch/logic/rpc/CInputRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CInputRPCs.cpp @@ -11,7 +11,7 @@ #include #include "CInputRPCs.h" -void CInputRPCs::LoadFunctions(void) +void CInputRPCs::LoadFunctions() { AddHandler(BIND_KEY, BindKey, "BindKey"); AddHandler(BIND_COMMAND, BindCommand, "BindCommand"); diff --git a/Client/mods/deathmatch/logic/rpc/CInputRPCs.h b/Client/mods/deathmatch/logic/rpc/CInputRPCs.h index a5f5078af67..3795a2579fb 100644 --- a/Client/mods/deathmatch/logic/rpc/CInputRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CInputRPCs.h @@ -16,7 +16,7 @@ class CInputRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_RPC(BindKey); DECLARE_RPC(UnbindKey); diff --git a/Client/mods/deathmatch/logic/rpc/CMarkerRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CMarkerRPCs.cpp index e8831e44a01..d842826d69c 100644 --- a/Client/mods/deathmatch/logic/rpc/CMarkerRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CMarkerRPCs.cpp @@ -12,7 +12,7 @@ #include #include "CMarkerRPCs.h" -void CMarkerRPCs::LoadFunctions(void) +void CMarkerRPCs::LoadFunctions() { AddHandler(SET_MARKER_TYPE, SetMarkerType, "SetMarkerType"); AddHandler(SET_MARKER_COLOR, SetMarkerColor, "SetMarkerColor"); diff --git a/Client/mods/deathmatch/logic/rpc/CMarkerRPCs.h b/Client/mods/deathmatch/logic/rpc/CMarkerRPCs.h index 4e1967d2370..18b61547eea 100644 --- a/Client/mods/deathmatch/logic/rpc/CMarkerRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CMarkerRPCs.h @@ -16,7 +16,7 @@ class CMarkerRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_ELEMENT_RPC(SetMarkerType); DECLARE_ELEMENT_RPC(SetMarkerColor); diff --git a/Client/mods/deathmatch/logic/rpc/CObjectRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CObjectRPCs.cpp index d78ccf520be..353179784ad 100644 --- a/Client/mods/deathmatch/logic/rpc/CObjectRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CObjectRPCs.cpp @@ -12,7 +12,7 @@ #include #include "CObjectRPCs.h" -void CObjectRPCs::LoadFunctions(void) +void CObjectRPCs::LoadFunctions() { AddHandler(DESTROY_ALL_OBJECTS, DestroyAllObjects, "DestroyAllObjects"); AddHandler(SET_OBJECT_ROTATION, SetObjectRotation, "SetObjectRotation"); diff --git a/Client/mods/deathmatch/logic/rpc/CObjectRPCs.h b/Client/mods/deathmatch/logic/rpc/CObjectRPCs.h index b861de6a145..24114e07bff 100644 --- a/Client/mods/deathmatch/logic/rpc/CObjectRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CObjectRPCs.h @@ -16,7 +16,7 @@ class CObjectRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_RPC(DestroyAllObjects); DECLARE_ELEMENT_RPC(SetModel); diff --git a/Client/mods/deathmatch/logic/rpc/COutputRPCs.cpp b/Client/mods/deathmatch/logic/rpc/COutputRPCs.cpp index 225cb76a347..21323bf587d 100644 --- a/Client/mods/deathmatch/logic/rpc/COutputRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/COutputRPCs.cpp @@ -12,7 +12,7 @@ #include #include "COutputRPCs.h" -void COutputRPCs::LoadFunctions(void) +void COutputRPCs::LoadFunctions() { AddHandler(TOGGLE_DEBUGGER, ToggleDebugger, "ToggleDebugger"); } diff --git a/Client/mods/deathmatch/logic/rpc/COutputRPCs.h b/Client/mods/deathmatch/logic/rpc/COutputRPCs.h index 4ff346e5dc5..114e6e128a6 100644 --- a/Client/mods/deathmatch/logic/rpc/COutputRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/COutputRPCs.h @@ -16,7 +16,7 @@ class COutputRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_RPC(ToggleDebugger); }; diff --git a/Client/mods/deathmatch/logic/rpc/CPedRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CPedRPCs.cpp index ccf4a29878a..5fe5bf12510 100644 --- a/Client/mods/deathmatch/logic/rpc/CPedRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CPedRPCs.cpp @@ -15,7 +15,7 @@ class CLuaArguments; -void CPedRPCs::LoadFunctions(void) +void CPedRPCs::LoadFunctions() { AddHandler(SET_PED_ARMOR, SetPedArmor, "SetPedArmor"); AddHandler(SET_PED_ROTATION, SetPedRotation, "SetPedRotation"); diff --git a/Client/mods/deathmatch/logic/rpc/CPedRPCs.h b/Client/mods/deathmatch/logic/rpc/CPedRPCs.h index 480a0ebdee5..157bf2c54ed 100644 --- a/Client/mods/deathmatch/logic/rpc/CPedRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CPedRPCs.h @@ -16,7 +16,7 @@ class CPedRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_ELEMENT_RPC(SetPedArmor); DECLARE_ELEMENT_RPC(SetPedRotation); diff --git a/Client/mods/deathmatch/logic/rpc/CPickupRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CPickupRPCs.cpp index cd9bd346308..1a634800ee5 100644 --- a/Client/mods/deathmatch/logic/rpc/CPickupRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CPickupRPCs.cpp @@ -12,7 +12,7 @@ #include #include "CPickupRPCs.h" -void CPickupRPCs::LoadFunctions(void) +void CPickupRPCs::LoadFunctions() { AddHandler(DESTROY_ALL_PICKUPS, DestroyAllPickups, "DestroyAllPickups"); AddHandler(SET_PICKUP_TYPE, SetPickupType, "SetPickupType"); diff --git a/Client/mods/deathmatch/logic/rpc/CPickupRPCs.h b/Client/mods/deathmatch/logic/rpc/CPickupRPCs.h index 98e6c081f45..fad0809222e 100644 --- a/Client/mods/deathmatch/logic/rpc/CPickupRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CPickupRPCs.h @@ -16,7 +16,7 @@ class CPickupRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_RPC(DestroyAllPickups); DECLARE_ELEMENT_RPC(SetPickupType); diff --git a/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.cpp index 70cadbe3eb6..00fde05d6aa 100644 --- a/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.cpp @@ -12,7 +12,7 @@ #include #include "CPlayerRPCs.h" -void CPlayerRPCs::LoadFunctions(void) +void CPlayerRPCs::LoadFunctions() { AddHandler(SET_PLAYER_MONEY, SetPlayerMoney, "SetPlayerMoney"); AddHandler(SHOW_PLAYER_HUD_COMPONENT, ShowPlayerHudComponent, "ShowPlayerHudComponent"); diff --git a/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.h b/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.h index 252ef593d86..f8735ad6182 100644 --- a/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CPlayerRPCs.h @@ -16,7 +16,7 @@ class CPlayerRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_RPC(SetPlayerMoney); DECLARE_RPC(ShowPlayerHudComponent); diff --git a/Client/mods/deathmatch/logic/rpc/CRPCFunctions.cpp b/Client/mods/deathmatch/logic/rpc/CRPCFunctions.cpp index 23b60fcade5..15fa5fb39b5 100644 --- a/Client/mods/deathmatch/logic/rpc/CRPCFunctions.cpp +++ b/Client/mods/deathmatch/logic/rpc/CRPCFunctions.cpp @@ -74,11 +74,11 @@ CRPCFunctions::CRPCFunctions(CClientGame* pClientGame) AddHandlers(); } -CRPCFunctions::~CRPCFunctions(void) +CRPCFunctions::~CRPCFunctions() { } -void CRPCFunctions::AddHandlers(void) +void CRPCFunctions::AddHandlers() { CAudioRPCs::LoadFunctions(); CBlipRPCs::LoadFunctions(); diff --git a/Client/mods/deathmatch/logic/rpc/CRPCFunctions.h b/Client/mods/deathmatch/logic/rpc/CRPCFunctions.h index 7c3fc0fa675..bbec84cbdef 100644 --- a/Client/mods/deathmatch/logic/rpc/CRPCFunctions.h +++ b/Client/mods/deathmatch/logic/rpc/CRPCFunctions.h @@ -36,9 +36,9 @@ class CRPCFunctions public: CRPCFunctions(class CClientGame* pClientGame); - virtual ~CRPCFunctions(void); + virtual ~CRPCFunctions(); - void AddHandlers(void); + void AddHandlers(); static void AddHandler(unsigned char ucID, pfnRPCHandler Callback, const char* szName = "unknown"); static void AddHandler(unsigned char ucID, pfnElementRPCHandler Callback, const char* szName = "unknown"); void ProcessPacket(unsigned char ucPacketID, class NetBitStreamInterface& bitStream); diff --git a/Client/mods/deathmatch/logic/rpc/CRadarRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CRadarRPCs.cpp index bf39706830e..a1cdc1fa1da 100644 --- a/Client/mods/deathmatch/logic/rpc/CRadarRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CRadarRPCs.cpp @@ -12,7 +12,7 @@ #include #include "CRadarRPCs.h" -void CRadarRPCs::LoadFunctions(void) +void CRadarRPCs::LoadFunctions() { AddHandler(DESTROY_ALL_RADAR_AREAS, DestroyAllRadarAreas, "DestroyAllRadarAreas"); AddHandler(SET_RADAR_AREA_SIZE, SetRadarAreaSize, "SetRadarAreaSize"); diff --git a/Client/mods/deathmatch/logic/rpc/CRadarRPCs.h b/Client/mods/deathmatch/logic/rpc/CRadarRPCs.h index 48df81b55e0..0395f4034e2 100644 --- a/Client/mods/deathmatch/logic/rpc/CRadarRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CRadarRPCs.h @@ -16,7 +16,7 @@ class CRadarRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_RPC(DestroyAllRadarAreas); DECLARE_ELEMENT_RPC(SetRadarAreaSize); diff --git a/Client/mods/deathmatch/logic/rpc/CTeamRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CTeamRPCs.cpp index f64f7dc95ae..5cf7f35ff0d 100644 --- a/Client/mods/deathmatch/logic/rpc/CTeamRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CTeamRPCs.cpp @@ -12,7 +12,7 @@ #include #include "CTeamRPCs.h" -void CTeamRPCs::LoadFunctions(void) +void CTeamRPCs::LoadFunctions() { AddHandler(SET_TEAM_NAME, SetTeamName, "SetTeamName"); AddHandler(SET_TEAM_COLOR, SetTeamColor, "SetTeamColor"); diff --git a/Client/mods/deathmatch/logic/rpc/CTeamRPCs.h b/Client/mods/deathmatch/logic/rpc/CTeamRPCs.h index 6ad03c32563..586fde75cae 100644 --- a/Client/mods/deathmatch/logic/rpc/CTeamRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CTeamRPCs.h @@ -16,7 +16,7 @@ class CTeamRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_ELEMENT_RPC(RemoveTeam); DECLARE_ELEMENT_RPC(SetTeamName); diff --git a/Client/mods/deathmatch/logic/rpc/CVehicleRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CVehicleRPCs.cpp index 7b6220263f6..f19a8dc856f 100644 --- a/Client/mods/deathmatch/logic/rpc/CVehicleRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CVehicleRPCs.cpp @@ -12,7 +12,7 @@ #include #include "CVehicleRPCs.h" -void CVehicleRPCs::LoadFunctions(void) +void CVehicleRPCs::LoadFunctions() { AddHandler(DESTROY_ALL_VEHICLES, DestroyAllVehicles, "DestroyAllVehicles"); AddHandler(FIX_VEHICLE, FixVehicle, "FixVehicle"); diff --git a/Client/mods/deathmatch/logic/rpc/CVehicleRPCs.h b/Client/mods/deathmatch/logic/rpc/CVehicleRPCs.h index f2bf308c2ba..4b35cea4cd8 100644 --- a/Client/mods/deathmatch/logic/rpc/CVehicleRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CVehicleRPCs.h @@ -16,7 +16,7 @@ class CVehicleRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_RPC(DestroyAllVehicles); DECLARE_ELEMENT_RPC(FixVehicle); diff --git a/Client/mods/deathmatch/logic/rpc/CWaterRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CWaterRPCs.cpp index c1dcc461ebb..8e28b13deff 100644 --- a/Client/mods/deathmatch/logic/rpc/CWaterRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CWaterRPCs.cpp @@ -12,7 +12,7 @@ #include #include "CWaterRPCs.h" -void CWaterRPCs::LoadFunctions(void) +void CWaterRPCs::LoadFunctions() { AddHandler(SET_WORLD_WATER_LEVEL, SetWorldWaterLevel, "SetWorldWaterLevel"); AddHandler(RESET_WORLD_WATER_LEVEL, ResetWorldWaterLevel, "ResetWorldWaterLevel"); diff --git a/Client/mods/deathmatch/logic/rpc/CWaterRPCs.h b/Client/mods/deathmatch/logic/rpc/CWaterRPCs.h index 3b5d9336dce..d547cbb9ebb 100644 --- a/Client/mods/deathmatch/logic/rpc/CWaterRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CWaterRPCs.h @@ -16,7 +16,7 @@ class CWaterRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_RPC(SetWorldWaterLevel); DECLARE_RPC(ResetWorldWaterLevel); diff --git a/Client/mods/deathmatch/logic/rpc/CWeaponRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CWeaponRPCs.cpp index 6dd0c1484e5..8b06600a7fb 100644 --- a/Client/mods/deathmatch/logic/rpc/CWeaponRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CWeaponRPCs.cpp @@ -13,7 +13,7 @@ #include "CWeaponRPCs.h" #include "net/SyncStructures.h" -void CWeaponRPCs::LoadFunctions(void) +void CWeaponRPCs::LoadFunctions() { AddHandler(GIVE_WEAPON, GiveWeapon, "GiveWeapon"); AddHandler(TAKE_WEAPON, TakeWeapon, "TakeWeapon"); diff --git a/Client/mods/deathmatch/logic/rpc/CWeaponRPCs.h b/Client/mods/deathmatch/logic/rpc/CWeaponRPCs.h index cb3f242dd49..522fa001312 100644 --- a/Client/mods/deathmatch/logic/rpc/CWeaponRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CWeaponRPCs.h @@ -16,7 +16,7 @@ class CWeaponRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_ELEMENT_RPC(GiveWeapon); DECLARE_ELEMENT_RPC(TakeWeapon); diff --git a/Client/mods/deathmatch/logic/rpc/CWorldRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CWorldRPCs.cpp index d30b5c195cd..8c3d94beaf8 100644 --- a/Client/mods/deathmatch/logic/rpc/CWorldRPCs.cpp +++ b/Client/mods/deathmatch/logic/rpc/CWorldRPCs.cpp @@ -12,7 +12,7 @@ #include #include "CWorldRPCs.h" -void CWorldRPCs::LoadFunctions(void) +void CWorldRPCs::LoadFunctions() { AddHandler(SET_TIME, SetTime, "SetTime"); AddHandler(SET_WEATHER, SetWeather, "SetWeather"); diff --git a/Client/mods/deathmatch/logic/rpc/CWorldRPCs.h b/Client/mods/deathmatch/logic/rpc/CWorldRPCs.h index 534d62ad77f..842f6006c52 100644 --- a/Client/mods/deathmatch/logic/rpc/CWorldRPCs.h +++ b/Client/mods/deathmatch/logic/rpc/CWorldRPCs.h @@ -16,7 +16,7 @@ class CWorldRPCs : public CRPCFunctions { public: - static void LoadFunctions(void); + static void LoadFunctions(); DECLARE_RPC(SetTime); DECLARE_RPC(SetWeather); diff --git a/Client/multiplayer_sa/CMultiplayerSA.cpp b/Client/multiplayer_sa/CMultiplayerSA.cpp index fd64e55fcdd..d64000bb6be 100644 --- a/Client/multiplayer_sa/CMultiplayerSA.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA.cpp @@ -780,7 +780,7 @@ void CMultiplayerSA::InitHooks() MemPut < BYTE > ( 0x62AEEC, 0x90 ); */ - // DISABLE CAERadioTrackManager::CheckForMissionStatsChanges(void) (special DJ banter) + // DISABLE CAERadioTrackManager::CheckForMissionStatsChanges() (special DJ banter) MemPut(0x4E8410, 0xC3); // DISABLE CPopulation__AddToPopulation @@ -1576,7 +1576,7 @@ void CMultiplayerSA::RemoveRemoteDataStorage(CPlayerPed* pPed) CRemoteDataSA::RemoveRemoteDataStorage(pPed); } -CPed* CMultiplayerSA::GetContextSwitchedPed(void) +CPed* CMultiplayerSA::GetContextSwitchedPed() { return pContextSwitchedPed; } @@ -1664,7 +1664,7 @@ void CMultiplayerSA::SetHeatHaze(const SHeatHazeSettings& settings) ApplyHeatHazeEnabled(); } -void CMultiplayerSA::ResetHeatHaze(void) +void CMultiplayerSA::ResetHeatHaze() { SHeatHazeSettings settings; settings.ucIntensity = 0x50; @@ -1689,7 +1689,7 @@ void CMultiplayerSA::SetHeatHazeEnabled(bool bEnabled) ApplyHeatHazeEnabled(); } -void CMultiplayerSA::ApplyHeatHazeEnabled(void) +void CMultiplayerSA::ApplyHeatHazeEnabled() { // Enable heat haze if user allows it or scripts have customized it if (m_bHeatHazeEnabled || m_bHeatHazeCustomized) @@ -1838,7 +1838,7 @@ void CMultiplayerSA::GetWindVelocity(float& fX, float& fY, float& fZ) fZ = *(float*)0xC813E8; } -void CMultiplayerSA::RestoreWindVelocity(void) +void CMultiplayerSA::RestoreWindVelocity() { MemPut(0x72C616, 0x1DD9); MemPut(0x72C616 + 2, 0x00C813E0); @@ -1890,7 +1890,7 @@ void CMultiplayerSA::RestoreFarClipDistance() } } -float CMultiplayerSA::GetNearClipDistance(void) +float CMultiplayerSA::GetNearClipDistance() { return m_fNearClipDistance; } @@ -1900,7 +1900,7 @@ void CMultiplayerSA::SetNearClipDistance(float fDistance) m_fNearClipDistance = Clamp(0.1f, fDistance, 20.f); } -void CMultiplayerSA::RestoreNearClipDistance(void) +void CMultiplayerSA::RestoreNearClipDistance() { m_fNearClipDistance = DEFAULT_NEAR_CLIP_DISTANCE; } @@ -2076,7 +2076,7 @@ void CMultiplayerSA::SetSkyColor(unsigned char TopRed, unsigned char TopGreen, u ucSkyGradientBottomB = BottomBlue; } -void CMultiplayerSA::ResetSky(void) +void CMultiplayerSA::ResetSky() { bUsingCustomSkyGradient = false; } @@ -2138,7 +2138,7 @@ void CMultiplayerSA::SetWaterColor(float fWaterRed, float fWaterGreen, float fWa MemPut(0x7051D7, 255 - (BYTE)fWaterAlpha); } -void CMultiplayerSA::ResetWater(void) +void CMultiplayerSA::ResetWater() { bUsingCustomWaterColor = false; MemPutFast(0x8D5140, 0x40404040); @@ -2147,7 +2147,7 @@ void CMultiplayerSA::ResetWater(void) MemPut(0x7051D7, 184); } -bool CMultiplayerSA::GetExplosionsDisabled(void) +bool CMultiplayerSA::GetExplosionsDisabled() { return m_bExplosionsDisabled; } @@ -2268,7 +2268,7 @@ void CMultiplayerSA::SetDrivebyAnimationHandler(DrivebyAnimationHandler* pHandle } // What we do here is check if the idle handler has been set -bool CMultiplayerSA::IsConnected(void) +bool CMultiplayerSA::IsConnected() { return m_pIdleHandler != NULL; } @@ -2662,7 +2662,7 @@ CVector vecExplosionLocation; DWORD explosionCreator = 0; DWORD explosionEntity = 0; -bool CallExplosionHandler(void) +bool CallExplosionHandler() { // Find out who the creator is CEntity* pExplosionCreator = NULL; @@ -3078,7 +3078,7 @@ void _declspec(naked) HOOK_CPed_IsPlayer() } } -void CRunningScript_Process(void) +void CRunningScript_Process() { if (!bHasProcessedScript) { @@ -3752,7 +3752,7 @@ void CMultiplayerSA::SetBulletFireHandler(BulletFireHandler* pHandler) m_pBulletFireHandler = pHandler; } -void CMultiplayerSA::Reset(void) +void CMultiplayerSA::Reset() { bHideRadar = false; m_pExplosionHandler = NULL; @@ -3898,7 +3898,7 @@ bool CMultiplayerSA::IsThermalVisionEnabled() return (*(BYTE*)0xC402B9 == 1); } -float CMultiplayerSA::GetGlobalGravity(void) +float CMultiplayerSA::GetGlobalGravity() { return fGlobalGravity; } @@ -3908,7 +3908,7 @@ void CMultiplayerSA::SetGlobalGravity(float fGravity) fGlobalGravity = fGravity; } -float CMultiplayerSA::GetLocalPlayerGravity(void) +float CMultiplayerSA::GetLocalPlayerGravity() { return fLocalPlayerGravity; } @@ -3947,7 +3947,7 @@ void CMultiplayerSA::SetLocalCameraRotation(float fRotation) fLocalPlayerCameraRotation = fRotation; } -bool CMultiplayerSA::IsCustomCameraRotationEnabled(void) +bool CMultiplayerSA::IsCustomCameraRotationEnabled() { return bCustomCameraRotation; } @@ -4734,7 +4734,7 @@ void _declspec(naked) HOOK_PreHUDRender() #if !ENABLE_VEHICLE_HEADLIGHT_COLOR // Dummy stub -void vehicle_lights_init(void) +void vehicle_lights_init() { } @@ -4769,7 +4769,7 @@ void HOOK_CVehicle_DoHeadLightEffect_2(); void HOOK_CVehicle_DoHeadLightReflectionTwin(); void HOOK_CVehicle_DoHeadLightReflectionSingle(); -void vehicle_lights_init(void) +void vehicle_lights_init() { HookInstall(HOOKPOS_CVehicle_DoVehicleLights, (DWORD)HOOK_CVehicle_DoVehicleLights, 8); HookInstall(HOOKPOS_CVehicle_DoHeadLightBeam_1, (DWORD)HOOK_CVehicle_DoHeadLightBeam_1, 6); @@ -5116,12 +5116,12 @@ void CMultiplayerSA::SetAltWaterOrderEnabled(bool bEnable) // // Notify core when rendering grass so we can do optimal things // -void CPlantMgr_Render_Pre(void) +void CPlantMgr_Render_Pre() { g_pCore->NotifyRenderingGrass(true); } -void CPlantMgr_Render_Post(void) +void CPlantMgr_Render_Post() { g_pCore->NotifyRenderingGrass(false); } @@ -5671,7 +5671,7 @@ void SetModelSuspensionLines(CVehicleSAInterface* pVehicleIntf, void* pSuspensio DWORD dwSuspensionChangedJump = 0x4185C0; bool bSuspensionChanged = false; CVehicleSAInterface* pSuspensionInterface = NULL; -bool CheckHasSuspensionChanged(void) +bool CheckHasSuspensionChanged() { // Make sure we have a valid suspension interface if (pSuspensionInterface) diff --git a/Client/multiplayer_sa/CMultiplayerSA.h b/Client/multiplayer_sa/CMultiplayerSA.h index 3ba1ce156fa..db034383c56 100644 --- a/Client/multiplayer_sa/CMultiplayerSA.h +++ b/Client/multiplayer_sa/CMultiplayerSA.h @@ -55,25 +55,25 @@ class CMultiplayerSA : public CMultiplayer CMultiplayerSA(); void InitHooks(); void InitHooks_CrashFixHacks(); - void Init_13(void); - void InitHooks_13(void); - void InitMemoryCopies_13(void); - void InitHooks_ClothesSpeedUp(void); - void InitHooks_FixBadAnimId(void); - void InitHooks_HookDestructors(void); - void InitHooks_RwResources(void); - void InitHooks_ClothesCache(void); - void InitHooks_Files(void); - void InitHooks_Weapons(void); + void Init_13(); + void InitHooks_13(); + void InitMemoryCopies_13(); + void InitHooks_ClothesSpeedUp(); + void InitHooks_FixBadAnimId(); + void InitHooks_HookDestructors(); + void InitHooks_RwResources(); + void InitHooks_ClothesCache(); + void InitHooks_Files(); + void InitHooks_Weapons(); void InitHooks_Peds(); void InitHooks_VehicleCollision(); - void InitHooks_Rendering(void); - void InitHooks_LicensePlate(void); - void InitHooks_VehicleLights(void); - void InitHooks_VehicleDamage(void); + void InitHooks_Rendering(); + void InitHooks_LicensePlate(); + void InitHooks_VehicleLights(); + void InitHooks_VehicleDamage(); void InitHooks_VehicleWeapons(); - void InitHooks_Direct3D(void); - void InitHooks_FixLineOfSightArgs(void); + void InitHooks_Direct3D(); + void InitHooks_FixLineOfSightArgs(); CRemoteDataStorage* CreateRemoteDataStorage(); void DestroyRemoteDataStorage(CRemoteDataStorage* pData); void AddRemoteDataStorage(CPlayerPed* pPed, CRemoteDataStorage* pData); @@ -83,7 +83,7 @@ class CMultiplayerSA : public CMultiplayer void InitializeAnimationHooks(bool bIsHostSmotra); - CPed* GetContextSwitchedPed(void); + CPed* GetContextSwitchedPed(); CPopulationMP* GetPopulationMP() { return Population; } void PreventLeavingVehicles(); @@ -147,9 +147,9 @@ class CMultiplayerSA : public CMultiplayer unsigned char BottomBlue); void SetHeatHaze(const SHeatHazeSettings& settings); void GetHeatHaze(SHeatHazeSettings& settings); - void ResetHeatHaze(void); + void ResetHeatHaze(); void SetHeatHazeEnabled(bool bEnabled); - void ApplyHeatHazeEnabled(void); + void ApplyHeatHazeEnabled(); void ResetSky(); bool HasWaterColor(); void GetWaterColor(float& fWaterRed, float& fWaterGreen, float& fWaterBlue, float& fWaterAlpha); @@ -163,16 +163,16 @@ class CMultiplayerSA : public CMultiplayer void SetInteriorFurnitureEnabled(char cRoomId, bool bEnabled); void SetWindVelocity(float fX, float fY, float fZ); void GetWindVelocity(float& fX, float& fY, float& fZ); - void RestoreWindVelocity(void); - float GetFarClipDistance(void); + void RestoreWindVelocity(); + float GetFarClipDistance(); void SetFarClipDistance(float fDistance); - void RestoreFarClipDistance(void); - float GetNearClipDistance(void); + void RestoreFarClipDistance(); + float GetNearClipDistance(); void SetNearClipDistance(float fDistance); - void RestoreNearClipDistance(void); - float GetFogDistance(void); + void RestoreNearClipDistance(); + float GetFogDistance(); void SetFogDistance(float fDistance); - void RestoreFogDistance(void); + void RestoreFogDistance(); void GetSunColor(unsigned char& ucCoreRed, unsigned char& ucCoreGreen, unsigned char& ucCoreBlue, unsigned char& ucCoronaRed, unsigned char& ucCoronaGreen, unsigned char& ucCoronaBlue); void SetSunColor(unsigned char ucCoreRed, unsigned char ucCoreGreen, unsigned char ucCoreBlue, unsigned char ucCoronaRed, unsigned char ucCoronaGreen, @@ -247,17 +247,17 @@ class CMultiplayerSA : public CMultiplayer CLimits* GetLimits() { return &m_limits; } void SetSuspensionEnabled(bool bEnabled); - bool IsSuspensionEnabled(void) { return m_bSuspensionEnabled; }; + bool IsSuspensionEnabled() { return m_bSuspensionEnabled; }; - virtual void FlushClothesCache(void); + virtual void FlushClothesCache(); virtual void SetFastClothesLoading(EFastClothesLoading fastClothesLoading); virtual void SetLODSystemEnabled(bool bEnable); virtual void SetAltWaterOrderEnabled(bool bEnable); - float GetAircraftMaxHeight(void) { return m_fAircraftMaxHeight; }; + float GetAircraftMaxHeight() { return m_fAircraftMaxHeight; }; void SetAircraftMaxHeight(float fHeight) { m_fAircraftMaxHeight = fHeight; }; - float GetAircraftMaxVelocity(void) { return m_fAircraftMaxVelocity; }; + float GetAircraftMaxVelocity() { return m_fAircraftMaxVelocity; }; void SetAircraftMaxVelocity(float fVelocity) { m_fAircraftMaxVelocity = fVelocity; @@ -267,8 +267,8 @@ class CMultiplayerSA : public CMultiplayer void SetAutomaticVehicleStartupOnPedEnter(bool bSet); void SetPedTargetingMarkerEnabled(bool bEnable); - bool IsPedTargetingMarkerEnabled(void); - bool IsConnected(void); + bool IsPedTargetingMarkerEnabled(); + bool IsConnected(); virtual void GetRwResourceStats(SRwResourceStats& outStats); virtual void GetClothesCacheStats(SClothesCacheStats& outStats); diff --git a/Client/multiplayer_sa/CMultiplayerSA_1.3.cpp b/Client/multiplayer_sa/CMultiplayerSA_1.3.cpp index b05eea84de4..01510a65429 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_1.3.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_1.3.cpp @@ -141,13 +141,13 @@ void HOOK_CBoat_ApplyDamage(); void HOOK_CProjectile_FixTearGasCrash(); void HOOK_CProjectile_FixExplosionLocation(); -void CMultiplayerSA::Init_13(void) +void CMultiplayerSA::Init_13() { InitHooks_13(); InitMemoryCopies_13(); } -void CMultiplayerSA::InitHooks_13(void) +void CMultiplayerSA::InitHooks_13() { // HookInstalls go here HookInstall(HOOKPOS_CEventHitByWaterCannon, (DWORD)HOOK_CEventHitByWaterCannon, 9); @@ -210,7 +210,7 @@ void CMultiplayerSA::InitHooks_13(void) InitHooks_Rendering(); } -void CMultiplayerSA::InitMemoryCopies_13(void) +void CMultiplayerSA::InitMemoryCopies_13() { // Memory based fixes go here // MemSet ( (void*)0x6AB35A, 0x90, 12 ); // Ignore some retarded R* if statement that checks if the model is the buffalo and jumps the siren code even @@ -1474,7 +1474,7 @@ void CMultiplayerSA::SetPedTargetingMarkerEnabled(bool bEnable) } } -bool CMultiplayerSA::IsPedTargetingMarkerEnabled(void) +bool CMultiplayerSA::IsPedTargetingMarkerEnabled() { uint32 dwFunc = FUNC_CPed__RenderTargetMarker; return *(uint8*)dwFunc != 0xC3; diff --git a/Client/multiplayer_sa/CMultiplayerSA_ClothesCache.cpp b/Client/multiplayer_sa/CMultiplayerSA_ClothesCache.cpp index f175a627f35..ff6c19c219d 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_ClothesCache.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_ClothesCache.cpp @@ -120,7 +120,7 @@ class CClumpStore // Constructor // /////////////////////////////////////// - CClumpStore(void) + CClumpStore() { memset(&m_Stats, 0, sizeof(m_Stats)); m_uiMaxSize = 4; @@ -133,7 +133,7 @@ class CClumpStore // Check if any clumps have become unused outside of the cache // ////////////////////////////////////////////////////////////// - uint GetNumCached(void) + uint GetNumCached() { uint uiNumCached = 0; for (std::vector::iterator iter = savedClumpList.begin(); iter != savedClumpList.end(); ++iter) @@ -208,7 +208,7 @@ class CClumpStore // 256MB streaming = 32 MB for clothes // /////////////////////////////////////// - void UpdateCacheSize(void) + void UpdateCacheSize() { int iStreamingMemoryAvailableKB = *(int*)0x08A5A80; @@ -222,7 +222,7 @@ class CClumpStore // Remove clothes that have been unused the longest // /////////////////////////////////////// - bool RemoveOldestUnused(void) + bool RemoveOldestUnused() { uint uiBestAge = -1; std::vector::iterator uiBestIndex; @@ -304,7 +304,7 @@ CClumpStore ms_clumpStore; // Stop using old cached clumps // //////////////////////////////////////////////// -void CMultiplayerSA::FlushClothesCache(void) +void CMultiplayerSA::FlushClothesCache() { ms_clumpStore.m_iCacheRevision++; } @@ -407,7 +407,7 @@ void CMultiplayerSA::GetClothesCacheStats(SClothesCacheStats& outStats) // Setup hooks for ClothesCache // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_ClothesCache(void) +void CMultiplayerSA::InitHooks_ClothesCache() { EZHookInstall(CClothesBuilderCreateSkinnedClump); InitRwFunctions(pGameInterface->GetGameVersion()); diff --git a/Client/multiplayer_sa/CMultiplayerSA_ClothesMemFix.cpp b/Client/multiplayer_sa/CMultiplayerSA_ClothesMemFix.cpp index 96c8788d8b1..ff1d567adb3 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_ClothesMemFix.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_ClothesMemFix.cpp @@ -48,7 +48,7 @@ void CPedModelInfo_SetClump(CBaseModelInfoSAInterface* pModelInfo, RwObject* pSa // ////////////////////////////////////////////////////////////////////////////////////////// RwObject* pSavedModel0RwObject = NULL; -void OnMy_CClothesDeleteRwObject(void) +void OnMy_CClothesDeleteRwObject() { assert(!pSavedModel0RwObject); ushort usModelID = 0; @@ -72,7 +72,7 @@ void _declspec(naked) HOOK_CClothesDeleteRwObject() // Do original code and continue mov ecx, esi // Skip deletion - //call dword ptr [edx+20h] //; 004C6C50 ; void CPedModelInfo::DeleteRwObject(void) + //call dword ptr [edx+20h] //; 004C6C50 ; void CPedModelInfo::DeleteRwObject() jmp RETURN_CClothesDeleteRwObject } } @@ -82,7 +82,7 @@ void _declspec(naked) HOOK_CClothesDeleteRwObject() // Hook to restore pRwObject of model 0 // ////////////////////////////////////////////////////////////////////////////////////////// -void OnMy_PostCPedDress(void) +void OnMy_PostCPedDress() { ushort usModelID = 0; CBaseModelInfoSAInterface* pModelInfo = ((CBaseModelInfoSAInterface**)ARRAY_ModelInfo)[usModelID]; diff --git a/Client/multiplayer_sa/CMultiplayerSA_ClothesSpeedUp.cpp b/Client/multiplayer_sa/CMultiplayerSA_ClothesSpeedUp.cpp index 512f3e322be..741425bc924 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_ClothesSpeedUp.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_ClothesSpeedUp.cpp @@ -58,7 +58,7 @@ void CMultiplayerSA::SetFastClothesLoading(EFastClothesLoading fastClothesLoadin // Skip loading the directory data from player.img if it has already been loaded. // Speeds up clothes a bit, but is only part of a solution - The actual files from inside player.img are still loaded each time // -bool _cdecl IsPlayerImgDirLoaded(void) +bool _cdecl IsPlayerImgDirLoaded() { // When player.img dir is loaded, it looks this this: // 0x00BC12C0 00bbcdc8 00000226 @@ -263,7 +263,7 @@ void _declspec(naked) HOOK_CStreamingLoadRequestedModels() // Setup hooks for ClothesSpeedUp // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_ClothesSpeedUp(void) +void CMultiplayerSA::InitHooks_ClothesSpeedUp() { EZHookInstall(CStreamingLoadRequestedModels); EZHookInstall(LoadingPlayerImgDir); diff --git a/Client/multiplayer_sa/CMultiplayerSA_CrashFixHacks.cpp b/Client/multiplayer_sa/CMultiplayerSA_CrashFixHacks.cpp index 05fd93d364a..02cadb502dc 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_CrashFixHacks.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_CrashFixHacks.cpp @@ -1088,7 +1088,7 @@ void OnMY_CVehicle_AddUpgrade_Pre(CVehicleSAInterface* pVehicle, int iUpgradeId, SetApplicationSetting("diagnostics", "gta-upgrade-fail", argMap.ToString()); } -void OnMY_CVehicle_AddUpgrade_Post(void) +void OnMY_CVehicle_AddUpgrade_Post() { SetApplicationSetting("diagnostics", "gta-upgrade-fail", ""); } @@ -1189,12 +1189,12 @@ void _declspec(naked) HOOK_ResetFurnitureObjectCounter() // Record when volumetric shadows are being rendered so we can disable them if a crash occurs. // ////////////////////////////////////////////////////////////////////////////////////////// -void OnMY_CVolumetricShadowMgr_Render_Pre(void) +void OnMY_CVolumetricShadowMgr_Render_Pre() { OnEnterCrashZone(1); } -void OnMY_CVolumetricShadowMgr_Render_Post(void) +void OnMY_CVolumetricShadowMgr_Render_Post() { OnEnterCrashZone(0); } @@ -1235,12 +1235,12 @@ void _declspec(naked) HOOK_CVolumetricShadowMgr_Render() // Record when volumetric shadows are being updated so we can disable them if a crash occurs. // ////////////////////////////////////////////////////////////////////////////////////////// -void OnMY_CVolumetricShadowMgr_Update_Pre(void) +void OnMY_CVolumetricShadowMgr_Update_Pre() { OnEnterCrashZone(2); } -void OnMY_CVolumetricShadowMgr_Update_Post(void) +void OnMY_CVolumetricShadowMgr_Update_Post() { OnEnterCrashZone(0); } @@ -1454,7 +1454,7 @@ void _declspec(naked) HOOK_RwMatrixMultiply() // Setup hooks for CrashFixHacks // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_CrashFixHacks(void) +void CMultiplayerSA::InitHooks_CrashFixHacks() { EZHookInstall(CrashFix_Misc1); EZHookInstall(CrashFix_Misc2); diff --git a/Client/multiplayer_sa/CMultiplayerSA_Direct3D.cpp b/Client/multiplayer_sa/CMultiplayerSA_Direct3D.cpp index 59da538bd8a..16ad621bb6d 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_Direct3D.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_Direct3D.cpp @@ -149,7 +149,7 @@ void _declspec(naked) HOOK_PostCreateDevice() // Setup hook // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_Direct3D(void) +void CMultiplayerSA::InitHooks_Direct3D() { EZHookInstall(PreCreateDevice); EZHookInstall(PostCreateDevice); diff --git a/Client/multiplayer_sa/CMultiplayerSA_Files.cpp b/Client/multiplayer_sa/CMultiplayerSA_Files.cpp index 4a563a9dc7a..5ce71518f1b 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_Files.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_Files.cpp @@ -124,7 +124,7 @@ void _declspec(naked) HOOK_Rtl_fclose() // Setup hooks // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_Files(void) +void CMultiplayerSA::InitHooks_Files() { EZHookInstall(Rtl_fopen); EZHookInstall(Rtl_fclose); diff --git a/Client/multiplayer_sa/CMultiplayerSA_FixBadAnimId.cpp b/Client/multiplayer_sa/CMultiplayerSA_FixBadAnimId.cpp index 22fe8d8984c..378072f2777 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_FixBadAnimId.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_FixBadAnimId.cpp @@ -158,7 +158,7 @@ void _declspec(naked) HOOK_GetAnimHierarchyFromSkinClump() // Setup hooks // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_FixBadAnimId(void) +void CMultiplayerSA::InitHooks_FixBadAnimId() { EZHookInstall(GetAnimHierarchyFromSkinClump); } diff --git a/Client/multiplayer_sa/CMultiplayerSA_FixLineOfSightArgs.cpp b/Client/multiplayer_sa/CMultiplayerSA_FixLineOfSightArgs.cpp index cc32a4d7936..378272667f5 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_FixLineOfSightArgs.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_FixLineOfSightArgs.cpp @@ -106,7 +106,7 @@ void _declspec(naked) HOOK_CWorld_GetIsLineOfSightClear() // Setup hooks // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_FixLineOfSightArgs(void) +void CMultiplayerSA::InitHooks_FixLineOfSightArgs() { EZHookInstall(CWorld_ProcessLineOfSight); EZHookInstall(CWorld_GetIsLineOfSightClear); diff --git a/Client/multiplayer_sa/CMultiplayerSA_HookDestructors.cpp b/Client/multiplayer_sa/CMultiplayerSA_HookDestructors.cpp index 87afd4093ff..a55c45afb4c 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_HookDestructors.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_HookDestructors.cpp @@ -553,7 +553,7 @@ void CMultiplayerSA::SetGameModelRemoveHandler(GameModelRemoveHandler* pHandler) // Setup hooks for HookDestructors // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_HookDestructors(void) +void CMultiplayerSA::InitHooks_HookDestructors() { EZHookInstall(CObjectDestructor); EZHookInstall(CVehicleDestructor); diff --git a/Client/multiplayer_sa/CMultiplayerSA_LicensePlate.cpp b/Client/multiplayer_sa/CMultiplayerSA_LicensePlate.cpp index 40062b51e5c..9d584908d3b 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_LicensePlate.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_LicensePlate.cpp @@ -185,7 +185,7 @@ void OnMY_CVehicleModelInfo_SetCarCustomPlate(CVehicleModelInfoSAInterface* pVeh info.plateMaterialList.clear(); } -void OnMY_CVehicleModelInfo_SetCarCustomPlate_Post(void) +void OnMY_CVehicleModelInfo_SetCarCustomPlate_Post() { // Done ms_pProcessingVehicleModelInfo = NULL; @@ -270,7 +270,7 @@ void _declspec(naked) HOOK_CCustomCarPlateMgr_CreatePlateTexture() // Setup hooks // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_LicensePlate(void) +void CMultiplayerSA::InitHooks_LicensePlate() { EZHookInstall(CAutomobile_CustomCarPlate_BeforeRenderingStart); EZHookInstall(CAutomobile_CustomCarPlate_AfterRenderingStop); diff --git a/Client/multiplayer_sa/CMultiplayerSA_ObjectLODSystem.cpp b/Client/multiplayer_sa/CMultiplayerSA_ObjectLODSystem.cpp index 1951d655bf3..ab876223de4 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_ObjectLODSystem.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_ObjectLODSystem.cpp @@ -23,7 +23,7 @@ namespace void SetGlobalDrawDistanceScale(float fValue) { MemPut(0x858FD8, 300.f * fValue); } - float GetDrawDistanceSetting(void) { return *(float*)0xB6F118; } + float GetDrawDistanceSetting() { return *(float*)0xB6F118; } float CalculateLowLodFadeAlpha(CBaseModelInfoSAInterface* pModelInfo, float fDist) { diff --git a/Client/multiplayer_sa/CMultiplayerSA_Rendering.cpp b/Client/multiplayer_sa/CMultiplayerSA_Rendering.cpp index c4055073966..82daae6ae24 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_Rendering.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_Rendering.cpp @@ -100,7 +100,7 @@ void OnMY_CEntity_Render_Pre(CEntitySAInterface* pEntity) CallGameEntityRenderHandler(ms_Rendering); } -void OnMY_CEntity_Render_Post(void) +void OnMY_CEntity_Render_Post() { if (ms_Rendering) { @@ -236,7 +236,7 @@ void _declspec(naked) HOOK_CVisibilityPlugins_RenderWeaponPedsForPC_Mid() // End of all ped weapon rendering // ////////////////////////////////////////////////////////////////////////////////////////// -void OnMY_CVisibilityPlugins_RenderWeaponPedsForPC_End(void) +void OnMY_CVisibilityPlugins_RenderWeaponPedsForPC_End() { CallGameEntityRenderHandler(NULL); } @@ -312,7 +312,7 @@ void _declspec(naked) HOOK_Check_NoOfVisibleEntities() // WinLoop // ////////////////////////////////////////////////////////////////////////////////////////// -void OnMY_WinLoop(void) +void OnMY_WinLoop() { if (ms_bIsMinimizedAndNotConnected) Sleep(10); @@ -392,7 +392,7 @@ void OnMY_psGrabScreen_GetRect(HWND hWnd, LPRECT pRect) pRect->right = std::max(pRect->right, pRect->left + 1); } -bool OnMY_psGrabScreen_ShouldUseRect(void) +bool OnMY_psGrabScreen_ShouldUseRect() { bool bWindowed; g_pCore->GetCVars()->Get("display_windowed", bWindowed); @@ -437,7 +437,7 @@ void _declspec(naked) HOOK_psGrabScreen() // This is the first thing drawn by GTA // ////////////////////////////////////////////////////////////////////////////////////////// -void OnMY_CClouds_RenderSkyPolys(void) +void OnMY_CClouds_RenderSkyPolys() { if (pPreRenderSkyHandlerHandler) pPreRenderSkyHandlerHandler(); @@ -641,7 +641,7 @@ void CMultiplayerSA::SetMirrorsEnabled(bool bEnabled) // Setup hook // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_Rendering(void) +void CMultiplayerSA::InitHooks_Rendering() { EZHookInstall(CallIdle); EZHookInstall(CEntity_Render); diff --git a/Client/multiplayer_sa/CMultiplayerSA_RwResources.cpp b/Client/multiplayer_sa/CMultiplayerSA_RwResources.cpp index effedf55355..53a7e6f6727 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_RwResources.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_RwResources.cpp @@ -279,7 +279,7 @@ void CMultiplayerSA::GetRwResourceStats(SRwResourceStats& outStats) // Setup hooks for RwResources // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_RwResources(void) +void CMultiplayerSA::InitHooks_RwResources() { memset(&ms_Stats, 0, sizeof(ms_Stats)); diff --git a/Client/multiplayer_sa/CMultiplayerSA_VehicleDamage.cpp b/Client/multiplayer_sa/CMultiplayerSA_VehicleDamage.cpp index c9eef201160..02ea5c40743 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_VehicleDamage.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_VehicleDamage.cpp @@ -437,7 +437,7 @@ void CMultiplayerSA::SetVehicleDamageHandler(VehicleDamageHandler* pHandler) // Setup hooks // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_VehicleDamage(void) +void CMultiplayerSA::InitHooks_VehicleDamage() { EZHookInstallChecked(CVehicle_InflictDamage); EZHookInstallChecked(CAutomobile_BurstTyre); diff --git a/Client/multiplayer_sa/CMultiplayerSA_VehicleLights.cpp b/Client/multiplayer_sa/CMultiplayerSA_VehicleLights.cpp index 5150705ab28..2f3153a3612 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_VehicleLights.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_VehicleLights.cpp @@ -87,7 +87,7 @@ void _declspec(naked) HOOK_CVehicle_DoTailLightEffect_Mid2() // Setup hooks // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_VehicleLights(void) +void CMultiplayerSA::InitHooks_VehicleLights() { EZHookInstallChecked(CVehicle_DoTailLightEffect_Mid); EZHookInstallChecked(CVehicle_DoTailLightEffect_Mid2); diff --git a/Client/multiplayer_sa/CMultiplayerSA_VehicleWeapons.cpp b/Client/multiplayer_sa/CMultiplayerSA_VehicleWeapons.cpp index 72d5edbd03f..e6c7afec211 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_VehicleWeapons.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_VehicleWeapons.cpp @@ -81,7 +81,7 @@ static void _declspec(naked) HOOK_CWaterCannon__Render() // Setup hooks for vehicle weapon related events // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_VehicleWeapons(void) +void CMultiplayerSA::InitHooks_VehicleWeapons() { EZHookInstall(CWaterCannon__Render); } diff --git a/Client/multiplayer_sa/CMultiplayerSA_Weapons.cpp b/Client/multiplayer_sa/CMultiplayerSA_Weapons.cpp index 05a655e3fc4..63cc6f1c7bb 100644 --- a/Client/multiplayer_sa/CMultiplayerSA_Weapons.cpp +++ b/Client/multiplayer_sa/CMultiplayerSA_Weapons.cpp @@ -89,7 +89,7 @@ void _declspec(naked) HOOK_CWeapon_GenerateDamageEvent() DWORD RETURN_CShotInfo_Update = 0x739E66; // Clear all shotinfos -void ResetShotInfoArray(void) +void ResetShotInfoArray() { CFlameShotInfo* pInfo = (CFlameShotInfo*)ARRAY_CFlameShotInfo; memset(pInfo, 0, sizeof(CFlameShotInfo)); @@ -102,7 +102,7 @@ void ResetShotInfoArray(void) #pragma warning( push ) #pragma warning( disable : 4731 ) // warning C4731: 'Call_CShotInfo_Update' : frame pointer register 'ebp' modified by inline assembly code -void Call_CShotInfo_Update(void) +void Call_CShotInfo_Update() { _asm { @@ -120,7 +120,7 @@ void Call_CShotInfo_Update(void) #pragma warning( pop ) // Our code for when CShotInfo_Update is called -void OnMY_CShotInfo_Update(void) +void OnMY_CShotInfo_Update() { if (!pMultiplayer->IsConnected()) { @@ -182,7 +182,7 @@ int OnMY_Fx_AddBulletImpact(int iType) #define HOOKSIZE_Fx_AddBulletImpact 5 DWORD RETURN_Fx_AddBulletImpact = 0x049F3ED; -void _declspec(naked) HOOK_Fx_AddBulletImpact(void) +void _declspec(naked) HOOK_Fx_AddBulletImpact() { _asm { @@ -206,7 +206,7 @@ void _declspec(naked) HOOK_Fx_AddBulletImpact(void) // Setup hooks // ////////////////////////////////////////////////////////////////////////////////////////// -void CMultiplayerSA::InitHooks_Weapons(void) +void CMultiplayerSA::InitHooks_Weapons() { EZHookInstall(CWeapon_GenerateDamageEvent); EZHookInstall(CShotInfo_Update); diff --git a/Client/multiplayer_sa/COffsets.cpp b/Client/multiplayer_sa/COffsets.cpp index f75505c67f6..bda502aa4dc 100644 --- a/Client/multiplayer_sa/COffsets.cpp +++ b/Client/multiplayer_sa/COffsets.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -void COffsetsMP::Initialize10EU(void) +void COffsetsMP::Initialize10EU() { InitializeCommon10(); @@ -19,7 +19,7 @@ void COffsetsMP::Initialize10EU(void) CMultiplayerSA::ADDR_GotFocus = 0x74804E; } -void COffsetsMP::Initialize10US(void) +void COffsetsMP::Initialize10US() { InitializeCommon10(); @@ -27,7 +27,7 @@ void COffsetsMP::Initialize10US(void) CMultiplayerSA::ADDR_GotFocus = 0x748054; } -void COffsetsMP::Initialize11(void) +void COffsetsMP::Initialize11() { CMultiplayerSA::HOOKPOS_FindPlayerCoors = 0x56E4B0; // 1.01 CMultiplayerSA::HOOKPOS_FindPlayerCentreOfWorld = 0x56E250; @@ -45,12 +45,12 @@ void COffsetsMP::Initialize11(void) CMultiplayerSA::FUNC_CPlayerInfoBase = 0xB7CD98; } -void COffsetsMP::Initialize20(void) +void COffsetsMP::Initialize20() { // TODO } -void COffsetsMP::InitializeCommon10(void) +void COffsetsMP::InitializeCommon10() { CMultiplayerSA::HOOKPOS_FindPlayerCoors = 0x56E010; CMultiplayerSA::HOOKPOS_FindPlayerCentreOfWorld = 0x56E250; diff --git a/Client/multiplayer_sa/COffsets.h b/Client/multiplayer_sa/COffsets.h index 930b4acdb7e..8ab2a402fbb 100644 --- a/Client/multiplayer_sa/COffsets.h +++ b/Client/multiplayer_sa/COffsets.h @@ -14,11 +14,11 @@ class COffsetsMP { public: - static void Initialize10EU(void); - static void Initialize10US(void); - static void Initialize11(void); - static void Initialize20(void); + static void Initialize10EU(); + static void Initialize10US(); + static void Initialize11(); + static void Initialize20(); private: - static void InitializeCommon10(void); + static void InitializeCommon10(); }; diff --git a/Client/multiplayer_sa/multiplayer_keysync.cpp b/Client/multiplayer_sa/multiplayer_keysync.cpp index 80845aba506..340c81f8f12 100644 --- a/Client/multiplayer_sa/multiplayer_keysync.cpp +++ b/Client/multiplayer_sa/multiplayer_keysync.cpp @@ -79,7 +79,7 @@ VOID InitKeysyncHooks() } extern CPed* pContextSwitchedPed; -void PostContextSwitch(void) +void PostContextSwitch() { // Prevent the game making remote player's weapons get switched by the local player's MemPutFast(0x60D850, 0x56); diff --git a/Client/multiplayer_sa/multiplayer_shotsync.cpp b/Client/multiplayer_sa/multiplayer_shotsync.cpp index 2163262a088..7e201058d41 100644 --- a/Client/multiplayer_sa/multiplayer_shotsync.cpp +++ b/Client/multiplayer_sa/multiplayer_shotsync.cpp @@ -81,8 +81,8 @@ CPools* m_pools = 0; #define VAR_CWorld_IncludeCarTyres 0xb7cd70 // Used for CWorld_ProcessLineOfSight -void InitFireInstantHit_MidHooks(void); -void InitFireSniper_MidHooks(void); +void InitFireInstantHit_MidHooks(); +void InitFireSniper_MidHooks(); VOID InitShotsyncHooks() { @@ -225,7 +225,7 @@ bool WriteTargetDataForPed(CPedSAInterface* pPed, DWORD vecTargetPos, CVector* o return true; } -void Event_PostFire(void) +void Event_PostFire() { SClientEntity* pPedClientEntity = m_pools->GetPed((DWORD*)pShootingPed); CPed* pTargetingPed = pPedClientEntity ? pPedClientEntity->pEntity : nullptr; @@ -237,7 +237,7 @@ void Event_PostFire(void) bWeaponFire = false; } -static void Event_BulletImpact(void) +static void Event_BulletImpact() { if (m_pBulletImpactHandler) { @@ -1279,7 +1279,7 @@ VOID InitFireSniper_MidHooks() // Called when a remote player fires a bullet // ////////////////////////////////////////////////////////////////////////////////////////// -void HandleRemoteInstantHit(void) +void HandleRemoteInstantHit() { SClientEntity* pPedClientEntity = m_pools->GetPed((DWORD*)pShootingPed); CPed* pTargetingPed = pPedClientEntity ? pPedClientEntity->pEntity : nullptr; @@ -1305,7 +1305,7 @@ void HandleRemoteInstantHit(void) } } -void _cdecl DoFireInstantHitPokes(void) +void _cdecl DoFireInstantHitPokes() { MemPutFast(VAR_CWorld_IncludeCarTyres, 1); } diff --git a/Client/sdk/CSingleton.h b/Client/sdk/CSingleton.h index 531b1a1d879..6dc2cda0b6f 100644 --- a/Client/sdk/CSingleton.h +++ b/Client/sdk/CSingleton.h @@ -29,19 +29,19 @@ class CSingleton static T* m_pSingleton; public: - CSingleton(void) + CSingleton() { assert(!m_pSingleton); m_pSingleton = static_cast(this); } - ~CSingleton(void) { m_pSingleton = 0; } + ~CSingleton() { m_pSingleton = 0; } - static T& GetSingleton(void) + static T& GetSingleton() { assert(m_pSingleton); return (*m_pSingleton); } - static T* GetSingletonPtr(void) { return m_pSingleton; } + static T* GetSingletonPtr() { return m_pSingleton; } }; diff --git a/Client/sdk/core/CClientBase.h b/Client/sdk/core/CClientBase.h index 38977fb15a4..b252df55469 100644 --- a/Client/sdk/core/CClientBase.h +++ b/Client/sdk/core/CClientBase.h @@ -18,12 +18,12 @@ class CClientBase { public: virtual int ClientInitialize(const char* szArguments, CCoreInterface* pCoreInterface) = 0; - virtual void ClientShutdown(void) = 0; + virtual void ClientShutdown() = 0; - virtual void PreFrameExecutionHandler(void) = 0; + virtual void PreFrameExecutionHandler() = 0; virtual void PreHUDRenderExecutionHandler(bool bDidUnminimize, bool bDidRecreateRenderTargets) = 0; - virtual void PostFrameExecutionHandler(void) = 0; - virtual void IdleHandler(void) = 0; + virtual void PostFrameExecutionHandler() = 0; + virtual void IdleHandler() = 0; virtual void RestreamModel(unsigned short usModel) = 0; virtual bool WebsiteRequestResultHandler(const std::unordered_set& newPages) = 0; diff --git a/Client/sdk/core/CCommandsInterface.h b/Client/sdk/core/CCommandsInterface.h index 1fdb8d9d844..c1e50c2e6b1 100644 --- a/Client/sdk/core/CCommandsInterface.h +++ b/Client/sdk/core/CCommandsInterface.h @@ -37,19 +37,19 @@ class CCommandsInterface virtual void Add(const char* szCommand, const char* szDescription, PFNCOMMANDHANDLER pfnHandler, bool bModCommand = false, bool bAllowScriptedBind = false) = 0; - virtual unsigned int Count(void) = 0; + virtual unsigned int Count() = 0; virtual bool Exists(const char* szCommand) = 0; virtual bool Execute(const char* szCommandLine) = 0; virtual bool Execute(const char* szCommand, const char* szParameters, bool bHandleRemotely = false, bool bIsScriptedBind = false) = 0; virtual void Delete(const char* szCommand) = 0; - virtual void DeleteAll(void) = 0; + virtual void DeleteAll() = 0; virtual void SetExecuteHandler(pfnExecuteCommandHandler pfnHandler) = 0; - virtual pfnExecuteCommandHandler GetExecuteHandler(void) = 0; + virtual pfnExecuteCommandHandler GetExecuteHandler() = 0; virtual COMMANDENTRY* Get(const char* szCommand, bool bCheckIfMod = false, bool bModCommand = false) = 0; - virtual std::list::iterator IterBegin(void) = 0; - virtual std::list::iterator IterEnd(void) = 0; + virtual std::list::iterator IterBegin() = 0; + virtual std::list::iterator IterEnd() = 0; }; diff --git a/Client/sdk/core/CConsoleInterface.h b/Client/sdk/core/CConsoleInterface.h index c68e5f68aff..7a0dce0a1ed 100644 --- a/Client/sdk/core/CConsoleInterface.h +++ b/Client/sdk/core/CConsoleInterface.h @@ -18,15 +18,15 @@ class CConsoleInterface virtual void Print(const char* szText) = 0; virtual void Printf(const char* szFormat, ...) = 0; - virtual void Clear(void) = 0; + virtual void Clear() = 0; - virtual bool IsEnabled(void) = 0; + virtual bool IsEnabled() = 0; virtual void SetEnabled(bool bEnabled) = 0; - virtual bool IsVisible(void) = 0; + virtual bool IsVisible() = 0; virtual void SetVisible(bool bVisible) = 0; - virtual void Show(void) = 0; - virtual void Hide(void) = 0; - virtual bool IsInputActive(void) = 0; - virtual void ActivateInput(void) = 0; + virtual void Show() = 0; + virtual void Hide() = 0; + virtual bool IsInputActive() = 0; + virtual void ActivateInput() = 0; }; diff --git a/Client/sdk/core/CCoreInterface.h b/Client/sdk/core/CCoreInterface.h index cb31bafc2b8..d4bb58e425a 100644 --- a/Client/sdk/core/CCoreInterface.h +++ b/Client/sdk/core/CCoreInterface.h @@ -58,53 +58,53 @@ class CCoreInterface public: // Note: Always leave this on the top as the client must use this to verify // correct MTA version before trying to use any other interface funcs. - virtual eCoreVersion GetVersion(void) = 0; - - virtual CConsoleInterface* GetConsole(void) = 0; - virtual CCommandsInterface* GetCommands(void) = 0; - virtual CGame* GetGame(void) = 0; - virtual CGraphicsInterface* GetGraphics(void) = 0; - virtual CGUI* GetGUI(void) = 0; - virtual CModManagerInterface* GetModManager(void) = 0; - virtual CMultiplayer* GetMultiplayer(void) = 0; - virtual CNet* GetNetwork(void) = 0; - virtual CXML* GetXML(void) = 0; - virtual CKeyBindsInterface* GetKeyBinds(void) = 0; - virtual CXMLNode* GetConfig(void) = 0; - virtual CCVarsInterface* GetCVars(void) = 0; - virtual CLocalizationInterface* GetLocalization(void) = 0; - virtual CWebCoreInterface* GetWebCore(void) = 0; - virtual CTrayIconInterface* GetTrayIcon(void) = 0; + virtual eCoreVersion GetVersion() = 0; + + virtual CConsoleInterface* GetConsole() = 0; + virtual CCommandsInterface* GetCommands() = 0; + virtual CGame* GetGame() = 0; + virtual CGraphicsInterface* GetGraphics() = 0; + virtual CGUI* GetGUI() = 0; + virtual CModManagerInterface* GetModManager() = 0; + virtual CMultiplayer* GetMultiplayer() = 0; + virtual CNet* GetNetwork() = 0; + virtual CXML* GetXML() = 0; + virtual CKeyBindsInterface* GetKeyBinds() = 0; + virtual CXMLNode* GetConfig() = 0; + virtual CCVarsInterface* GetCVars() = 0; + virtual CLocalizationInterface* GetLocalization() = 0; + virtual CWebCoreInterface* GetWebCore() = 0; + virtual CTrayIconInterface* GetTrayIcon() = 0; // Temporary functions for r1 virtual void DebugEcho(const char* szText) = 0; virtual void DebugPrintf(const char* szFormat, ...) = 0; virtual void SetDebugVisible(bool bVisible) = 0; - virtual bool IsDebugVisible(void) = 0; + virtual bool IsDebugVisible() = 0; virtual void DebugEchoColor(const char* szText, unsigned char R, unsigned char G, unsigned char B) = 0; virtual void DebugPrintfColor(const char* szFormat, unsigned char R, unsigned char G, unsigned char B, ...) = 0; - virtual void DebugClear(void) = 0; + virtual void DebugClear() = 0; virtual void ChatEcho(const char* szText, bool bColorCoded = false) = 0; virtual void ChatEchoColor(const char* szText, unsigned char R, unsigned char G, unsigned char B, bool bColorCoded = false) = 0; virtual void ChatPrintf(const char* szFormat, bool bColorCoded, ...) = 0; virtual void ChatPrintfColor(const char* szFormat, bool bColorCoded, unsigned char R, unsigned char G, unsigned char B, ...) = 0; virtual void SetChatVisible(bool bVisible) = 0; - virtual bool IsChatVisible(void) = 0; - virtual void TakeScreenShot(void) = 0; + virtual bool IsChatVisible() = 0; + virtual void TakeScreenShot() = 0; virtual void EnableChatInput(char* szCommand, DWORD dwColor) = 0; - virtual bool IsChatInputEnabled(void) = 0; - virtual bool IsSettingsVisible(void) = 0; - virtual bool IsMenuVisible(void) = 0; - virtual bool IsCursorForcedVisible(void) = 0; - virtual bool IsCursorControlsToggled(void) = 0; + virtual bool IsChatInputEnabled() = 0; + virtual bool IsSettingsVisible() = 0; + virtual bool IsMenuVisible() = 0; + virtual bool IsCursorForcedVisible() = 0; + virtual bool IsCursorControlsToggled() = 0; virtual void CallSetCursorPos(int X, int Y) = 0; virtual void SetConnected(bool bConnected) = 0; virtual void SetOfflineMod(bool bOffline) = 0; virtual void ApplyHooks3(bool bEnable) = 0; - virtual bool IsWebCoreLoaded(void) = 0; + virtual bool IsWebCoreLoaded() = 0; - virtual bool IsConnected(void) = 0; + virtual bool IsConnected() = 0; virtual bool Reconnect(const char* szHost, unsigned short usPort, const char* szPassword, bool bSave = true) = 0; virtual const char* GetModInstallRoot(const char* szModName) = 0; @@ -118,42 +118,42 @@ class CCoreInterface virtual void RemoveMessageBox(bool bNextFrame = false) = 0; virtual void ShowErrorMessageBox(const SString& strTitle, SString strMessage, const SString& strTroubleLink = "") = 0; virtual void ShowNetErrorMessageBox(const SString& strTitle, SString strMessage, SString strTroubleLink = "", bool bLinkRequiresErrorCode = false) = 0; - virtual void HideMainMenu(void) = 0; - virtual HWND GetHookedWindow(void) = 0; - virtual bool IsFocused(void) = 0; - virtual bool IsWindowMinimized(void) = 0; + virtual void HideMainMenu() = 0; + virtual HWND GetHookedWindow() = 0; + virtual bool IsFocused() = 0; + virtual bool IsWindowMinimized() = 0; virtual void SaveConfig(bool bWaitUntilFinished = false) = 0; - virtual void UpdateRecentlyPlayed(void) = 0; + virtual void UpdateRecentlyPlayed() = 0; virtual void SwitchRenderWindow(HWND hWnd, HWND hWndInput) = 0; virtual void SetCenterCursor(bool bEnabled) = 0; - virtual bool IsTimingCheckpoints(void) = 0; + virtual bool IsTimingCheckpoints() = 0; virtual void OnTimingCheckpoint(const char* szTag) = 0; virtual void OnTimingDetail(const char* szTag) = 0; virtual void Quit(bool bInstantly = true) = 0; virtual void InitiateUpdate(const char* szType, const char* szData, const char* szHost) = 0; virtual bool IsOptionalUpdateInfoRequired(const char* szHost) = 0; - virtual void InitiateDataFilesFix(void) = 0; + virtual void InitiateDataFilesFix() = 0; - virtual uint GetFrameRateLimit(void) = 0; + virtual uint GetFrameRateLimit() = 0; virtual void RecalculateFrameRateLimit(uint uiServerFrameRateLimit = -1, bool bLogToConsole = true) = 0; virtual void ApplyFrameRateLimit(uint uiOverrideRate = -1) = 0; - virtual void EnsureFrameRateLimitApplied(void) = 0; + virtual void EnsureFrameRateLimitApplied() = 0; virtual void SetClientScriptFrameRateLimit(uint uiClientScriptFrameRateLimit) = 0; - virtual void OnPreFxRender(void) = 0; - virtual void OnPreHUDRender(void) = 0; - virtual uint GetMinStreamingMemory(void) = 0; - virtual uint GetMaxStreamingMemory(void) = 0; + virtual void OnPreFxRender() = 0; + virtual void OnPreHUDRender() = 0; + virtual uint GetMinStreamingMemory() = 0; + virtual uint GetMaxStreamingMemory() = 0; virtual void OnCrashAverted(uint uiId) = 0; virtual void OnEnterCrashZone(uint uiId) = 0; virtual void LogEvent(uint uiDebugId, const char* szType, const char* szContext, const char* szBody, uint uiAddReportLogId = 0) = 0; virtual bool GetDebugIdEnabled(uint uiDebugId) = 0; - virtual EDiagnosticDebugType GetDiagnosticDebug(void) = 0; + virtual EDiagnosticDebugType GetDiagnosticDebug() = 0; virtual void SetDiagnosticDebug(EDiagnosticDebugType value) = 0; - virtual CModelCacheManager* GetModelCacheManager(void) = 0; + virtual CModelCacheManager* GetModelCacheManager() = 0; virtual void AddModelToPersistentCache(ushort usModelId) = 0; virtual void UpdateDummyProgress(int iValue = -1, const char* szType = "") = 0; virtual void SetDummyProgressUpdateAlways(bool bAlways) = 0; @@ -162,17 +162,17 @@ class CCoreInterface D3DPRESENT_PARAMETERS* pPresentationParameters) = 0; virtual HRESULT OnPostCreateDevice(HRESULT hResult, IDirect3D9* pDirect3D, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DDevice9** ppReturnedDeviceInterface) = 0; - virtual bool GetDeviceSelectionEnabled(void) = 0; + virtual bool GetDeviceSelectionEnabled() = 0; virtual bool GetRequiredDisplayResolution(int& iOutWidth, int& iOutHeight, int& iOutColorBits, int& iOutAdapterIndex, bool& bOutAllowUnsafeResolutions) = 0; virtual void NotifyRenderingGrass(bool bIsRenderingGrass) = 0; - virtual bool GetRightSizeTxdEnabled(void) = 0; - virtual const char* GetProductRegistryPath(void) = 0; - virtual const char* GetProductCommonDataDir(void) = 0; - virtual const char* GetProductVersion(void) = 0; + virtual bool GetRightSizeTxdEnabled() = 0; + virtual const char* GetProductRegistryPath() = 0; + virtual const char* GetProductCommonDataDir() = 0; + virtual const char* GetProductVersion() = 0; virtual void SetFakeLagCommandEnabled(bool bEnabled) = 0; - virtual SString GetBlueCopyrightString(void) = 0; + virtual SString GetBlueCopyrightString() = 0; virtual bool ClearChat() = 0; - virtual void OnGameTimerUpdate(void) = 0; + virtual void OnGameTimerUpdate() = 0; virtual bool IsHostSmotraServer() = 0; }; @@ -180,5 +180,5 @@ class CCoreInterface class CClientTime { public: - static unsigned long GetTime(void) { return GetTickCount32(); } + static unsigned long GetTime() { return GetTickCount32(); } }; diff --git a/Client/sdk/core/CExceptionInformation.h b/Client/sdk/core/CExceptionInformation.h index 99f8642c3c4..fd4ef8e9832 100644 --- a/Client/sdk/core/CExceptionInformation.h +++ b/Client/sdk/core/CExceptionInformation.h @@ -14,26 +14,26 @@ class CExceptionInformation { public: - virtual ~CExceptionInformation(void) {} - virtual unsigned int GetCode(void) = 0; - virtual const char* GetModulePathName(void) = 0; - virtual const char* GetModuleBaseName(void) = 0; - virtual uint GetAddressModuleOffset(void) = 0; + virtual ~CExceptionInformation() {} + virtual unsigned int GetCode() = 0; + virtual const char* GetModulePathName() = 0; + virtual const char* GetModuleBaseName() = 0; + virtual uint GetAddressModuleOffset() = 0; - virtual unsigned long GetEAX(void) = 0; - virtual unsigned long GetEBX(void) = 0; - virtual unsigned long GetECX(void) = 0; - virtual unsigned long GetEDX(void) = 0; - virtual unsigned long GetESI(void) = 0; - virtual unsigned long GetEDI(void) = 0; - virtual unsigned long GetEBP(void) = 0; - virtual unsigned long GetESP(void) = 0; - virtual unsigned long GetEIP(void) = 0; - virtual unsigned long GetCS(void) = 0; - virtual unsigned long GetDS(void) = 0; - virtual unsigned long GetES(void) = 0; - virtual unsigned long GetFS(void) = 0; - virtual unsigned long GetGS(void) = 0; - virtual unsigned long GetSS(void) = 0; - virtual unsigned long GetEFlags(void) = 0; + virtual unsigned long GetEAX() = 0; + virtual unsigned long GetEBX() = 0; + virtual unsigned long GetECX() = 0; + virtual unsigned long GetEDX() = 0; + virtual unsigned long GetESI() = 0; + virtual unsigned long GetEDI() = 0; + virtual unsigned long GetEBP() = 0; + virtual unsigned long GetESP() = 0; + virtual unsigned long GetEIP() = 0; + virtual unsigned long GetCS() = 0; + virtual unsigned long GetDS() = 0; + virtual unsigned long GetES() = 0; + virtual unsigned long GetFS() = 0; + virtual unsigned long GetGS() = 0; + virtual unsigned long GetSS() = 0; + virtual unsigned long GetEFlags() = 0; }; diff --git a/Client/sdk/core/CGraphicsInterface.h b/Client/sdk/core/CGraphicsInterface.h index 687b33c7423..30b69bcfaf2 100644 --- a/Client/sdk/core/CGraphicsInterface.h +++ b/Client/sdk/core/CGraphicsInterface.h @@ -91,7 +91,7 @@ using EBlendMode::EBlendModeType; class CGraphicsInterface { public: - virtual IDirect3DDevice9* GetDevice(void) = 0; + virtual IDirect3DDevice9* GetDevice() = 0; virtual void CalcWorldCoors(CVector* vecScreen, CVector* vecWorld) = 0; virtual void CalcScreenCoors(CVector* vecWorld, CVector* vecScreen) = 0; @@ -104,14 +104,14 @@ class CGraphicsInterface virtual void DrawRectangle(float fX, float fY, float fWidth, float fHeight, unsigned long ulColor, bool bSubPixelPositioning = false) = 0; virtual void SetBlendMode(EBlendModeType blendMode) = 0; - virtual EBlendModeType GetBlendMode(void) = 0; + virtual EBlendModeType GetBlendMode() = 0; - virtual unsigned int GetViewportWidth(void) = 0; - virtual unsigned int GetViewportHeight(void) = 0; + virtual unsigned int GetViewportWidth() = 0; + virtual unsigned int GetViewportHeight() = 0; virtual void SetAspectRatioAdjustmentEnabled(bool bEnabled, float fSourceRatio = 4 / 3.f) = 0; - virtual bool IsAspectRatioAdjustmentEnabled(void) = 0; - virtual float GetAspectRatioAdjustmentSourceRatio(void) = 0; + virtual bool IsAspectRatioAdjustmentEnabled() = 0; + virtual float GetAspectRatioAdjustmentSourceRatio() = 0; virtual void SetAspectRatioAdjustmentSuspended(bool bSuspended) = 0; virtual float ConvertPositionForAspectRatio(float fY) = 0; virtual void ConvertSideForAspectRatio(float* pfY, float* pfHeight) = 0; @@ -159,15 +159,15 @@ class CGraphicsInterface virtual bool IsValidPrimitiveSize (int iNumVertives, D3DPRIMITIVETYPE eType) = 0; // Subsystems - virtual CRenderItemManagerInterface* GetRenderItemManager(void) = 0; - virtual CScreenGrabberInterface* GetScreenGrabber(void) = 0; - virtual CPixelsManagerInterface* GetPixelsManager(void) = 0; + virtual CRenderItemManagerInterface* GetRenderItemManager() = 0; + virtual CScreenGrabberInterface* GetScreenGrabber() = 0; + virtual CPixelsManagerInterface* GetPixelsManager() = 0; // Transition between GTA and MTA controlled rendering - virtual void EnteringMTARenderZone(void) = 0; - virtual void LeavingMTARenderZone(void) = 0; - virtual void MaybeEnteringMTARenderZone(void) = 0; - virtual void MaybeLeavingMTARenderZone(void) = 0; + virtual void EnteringMTARenderZone() = 0; + virtual void LeavingMTARenderZone() = 0; + virtual void MaybeEnteringMTARenderZone() = 0; + virtual void MaybeLeavingMTARenderZone() = 0; // Texture data manipulation virtual bool ResizeTextureData(const void* pData, uint uiDataPitch, uint uiWidth, uint uiHeight, uint d3dFormat, uint uiNewWidth, uint uiNewHeight, diff --git a/Client/sdk/core/CKeyBindsInterface.h b/Client/sdk/core/CKeyBindsInterface.h index 459035b4d99..65d6aa098a0 100644 --- a/Client/sdk/core/CKeyBindsInterface.h +++ b/Client/sdk/core/CKeyBindsInterface.h @@ -72,18 +72,18 @@ enum eKeyBindType class CKeyBind { public: - CKeyBind(void) : boundKey(NULL), beingDeleted(false) { bActive = true; } + CKeyBind() : boundKey(NULL), beingDeleted(false) { bActive = true; } const SBindableKey* boundKey; bool beingDeleted; bool bActive; - bool IsBeingDeleted(void) { return beingDeleted; } - virtual eKeyBindType GetType(void) = 0; + bool IsBeingDeleted() { return beingDeleted; } + virtual eKeyBindType GetType() = 0; }; class CKeyBindWithState : public CKeyBind { public: - CKeyBindWithState(void) { bState = false; } + CKeyBindWithState() { bState = false; } bool bState; bool bHitState; }; @@ -91,7 +91,7 @@ class CKeyBindWithState : public CKeyBind class CCommandBind : public CKeyBindWithState { public: - CCommandBind(void) + CCommandBind() { szCommand = NULL; szArguments = NULL; @@ -100,7 +100,7 @@ class CCommandBind : public CKeyBindWithState ; bIsReplacingScriptKey = false; } - ~CCommandBind(void) + ~CCommandBind() { delete[] szCommand; if (szArguments) @@ -108,7 +108,7 @@ class CCommandBind : public CKeyBindWithState if (szResource) delete[] szResource; } - eKeyBindType GetType(void) { return KEY_BIND_COMMAND; } + eKeyBindType GetType() { return KEY_BIND_COMMAND; } char* szCommand; char* szArguments; char* szResource; @@ -120,7 +120,7 @@ class CCommandBind : public CKeyBindWithState class CKeyFunctionBind : public CKeyBindWithState { public: - eKeyBindType GetType(void) { return KEY_BIND_FUNCTION; } + eKeyBindType GetType() { return KEY_BIND_FUNCTION; } KeyFunctionBindHandler Handler; bool bIgnoreGUI; }; @@ -128,7 +128,7 @@ class CKeyFunctionBind : public CKeyBindWithState class CControlFunctionBind : public CKeyBindWithState { public: - eKeyBindType GetType(void) { return KEY_BIND_CONTROL_FUNCTION; } + eKeyBindType GetType() { return KEY_BIND_CONTROL_FUNCTION; } SBindableGTAControl* control; ControlFunctionBindHandler Handler; }; @@ -136,7 +136,7 @@ class CControlFunctionBind : public CKeyBindWithState class CGTAControlBind : public CKeyBind { public: - eKeyBindType GetType(void) { return KEY_BIND_GTA_CONTROL; } + eKeyBindType GetType() { return KEY_BIND_GTA_CONTROL; } SBindableGTAControl* control; bool bState; bool bEnabled; @@ -150,11 +150,11 @@ class CKeyBindsInterface // Basic funcs virtual void Add(CKeyBind* pKeyBind) = 0; virtual void Remove(CKeyBind* pKeyBind) = 0; - virtual void Clear(void) = 0; + virtual void Clear() = 0; virtual bool Call(CKeyBind* pKeyBind) = 0; - virtual std::list::const_iterator IterBegin(void) = 0; - virtual std::list::const_iterator IterEnd(void) = 0; + virtual std::list::const_iterator IterBegin() = 0; + virtual std::list::const_iterator IterEnd() = 0; // Command-bind funcs virtual bool AddCommand(const char* szKey, const char* szCommand, const char* szArguments, bool bState, const char* szResource = NULL, @@ -178,7 +178,7 @@ class CKeyBindsInterface virtual bool AddGTAControl(const SBindableKey* pKey, SBindableGTAControl* pControl) = 0; virtual bool RemoveGTAControl(const char* szKey, const char* szControl) = 0; virtual bool RemoveAllGTAControls(const char* szKey) = 0; - virtual bool RemoveAllGTAControls(void) = 0; + virtual bool RemoveAllGTAControls() = 0; virtual bool GTAControlExists(const char* szKey, const char* szControl) = 0; virtual bool GTAControlExists(const SBindableKey* pKey, SBindableGTAControl* pControl) = 0; virtual void CallGTAControlBind(CGTAControlBind* pBind, bool bState) = 0; @@ -196,7 +196,7 @@ class CKeyBindsInterface virtual bool RemoveFunction(const char* szKey, KeyFunctionBindHandler Handler, bool bCheckState = false, bool bState = true) = 0; virtual bool RemoveFunction(const SBindableKey* pKey, KeyFunctionBindHandler Handler, bool bCheckState = false, bool bState = true) = 0; virtual bool RemoveAllFunctions(KeyFunctionBindHandler Handler) = 0; - virtual bool RemoveAllFunctions(void) = 0; + virtual bool RemoveAllFunctions() = 0; virtual bool FunctionExists(const char* szKey, KeyFunctionBindHandler Handler, bool bCheckState = false, bool bState = true) = 0; virtual bool FunctionExists(const SBindableKey* pKey, KeyFunctionBindHandler Handler, bool bCheckState = false, bool bState = true) = 0; @@ -206,7 +206,7 @@ class CKeyBindsInterface virtual bool RemoveControlFunction(const char* szControl, ControlFunctionBindHandler Handler, bool bCheckState = false, bool bState = true) = 0; virtual bool RemoveControlFunction(SBindableGTAControl* pControl, ControlFunctionBindHandler Handler, bool bCheckState = false, bool bState = true) = 0; virtual bool RemoveAllControlFunctions(ControlFunctionBindHandler Handler) = 0; - virtual bool RemoveAllControlFunctions(void) = 0; + virtual bool RemoveAllControlFunctions() = 0; virtual bool ControlFunctionExists(const char* szControl, ControlFunctionBindHandler Handler, bool bCheckState = false, bool bState = true) = 0; virtual bool ControlFunctionExists(SBindableGTAControl* pControl, ControlFunctionBindHandler Handler, bool bCheckState = false, bool bState = true) = 0; @@ -229,15 +229,15 @@ class CKeyBindsInterface virtual void SetAllBindStates(bool bState, eKeyBindType onlyType = KEY_BIND_UNDEFINED) = 0; virtual unsigned int Count(eKeyBindType bindType) = 0; - virtual void DoPreFramePulse(void) = 0; - virtual void DoPostFramePulse(void) = 0; + virtual void DoPreFramePulse() = 0; + virtual void DoPostFramePulse() = 0; virtual bool LoadFromXML(class CXMLNode* pMainNode) = 0; virtual bool SaveToXML(class CXMLNode* pMainNode) = 0; - virtual void LoadDefaultBinds(void) = 0; + virtual void LoadDefaultBinds() = 0; // virtual void LoadDefaultControls ( void ) = 0; virtual void LoadDefaultCommands(bool bForce) = 0; - virtual void LoadControlsFromGTA(void) = 0; + virtual void LoadControlsFromGTA() = 0; virtual void BindCommand(const char* szCmdLine) = 0; virtual void UnbindCommand(const char* szCmdLine) = 0; diff --git a/Client/sdk/core/CLocalizationInterface.h b/Client/sdk/core/CLocalizationInterface.h index 0393896d210..b7d41ef3ca3 100644 --- a/Client/sdk/core/CLocalizationInterface.h +++ b/Client/sdk/core/CLocalizationInterface.h @@ -29,9 +29,9 @@ class CLocalizationInterface virtual SString TranslatePlural(const SString& strSingular, const SString& strPlural, int iNum) = 0; virtual SString TranslatePluralWithContext(const SString& strContext, const SString& strSingular, const SString& strPlural, int iNum) = 0; - virtual std::vector GetAvailableLocales(void) = 0; - virtual bool IsLocalized(void) = 0; - virtual SString GetLanguageDirectory(void) = 0; - virtual SString GetLanguageCode(void) = 0; - virtual SString GetLanguageName(void) = 0; + virtual std::vector GetAvailableLocales() = 0; + virtual bool IsLocalized() = 0; + virtual SString GetLanguageDirectory() = 0; + virtual SString GetLanguageCode() = 0; + virtual SString GetLanguageName() = 0; }; diff --git a/Client/sdk/core/CModManagerInterface.h b/Client/sdk/core/CModManagerInterface.h index 07231eaeb73..89906414497 100644 --- a/Client/sdk/core/CModManagerInterface.h +++ b/Client/sdk/core/CModManagerInterface.h @@ -18,8 +18,8 @@ class CModManagerInterface public: virtual void RequestLoad(const char* szModName, const char* szArguments) = 0; virtual void RequestLoadDefault(const char* szArguments) = 0; - virtual void RequestUnload(void) = 0; + virtual void RequestUnload() = 0; - virtual bool IsLoaded(void) = 0; - virtual CClientBase* GetCurrentMod(void) = 0; + virtual bool IsLoaded() = 0; + virtual CClientBase* GetCurrentMod() = 0; }; diff --git a/Client/sdk/core/CPixelsManagerInterface.h b/Client/sdk/core/CPixelsManagerInterface.h index 66d8ecaaa09..590d4ff1d51 100644 --- a/Client/sdk/core/CPixelsManagerInterface.h +++ b/Client/sdk/core/CPixelsManagerInterface.h @@ -29,11 +29,11 @@ using EPixelsFormat::EPixelsFormatType; class CPixels { public: - ~CPixels(void) { dassert(externalData.pData == NULL || buffer.GetSize() == 0); } + ~CPixels() { dassert(externalData.pData == NULL || buffer.GetSize() == 0); } - char* GetData(void) { return externalData.pData ? externalData.pData : buffer.GetData(); } - const char* GetData(void) const { return externalData.pData ? externalData.pData : buffer.GetData(); } - uint GetSize(void) const { return externalData.pData ? externalData.uiSize : buffer.GetSize(); } + char* GetData() { return externalData.pData ? externalData.pData : buffer.GetData(); } + const char* GetData() const { return externalData.pData ? externalData.pData : buffer.GetData(); } + uint GetSize() const { return externalData.pData ? externalData.uiSize : buffer.GetSize(); } void SetSize(uint uiSize) { @@ -60,7 +60,7 @@ class CPixels class CPixelsManagerInterface { public: - virtual ~CPixelsManagerInterface(void) {} + virtual ~CPixelsManagerInterface() {} virtual void OnDeviceCreate(IDirect3DDevice9* pDevice) = 0; virtual bool IsPixels(const CPixels& pixels) = 0; virtual bool GetTexturePixels(IDirect3DBaseTexture9* pD3DTexture, CPixels& outPixels, const RECT* pRect = NULL, uint uiSurfaceIndex = 0) = 0; @@ -72,4 +72,4 @@ class CPixelsManagerInterface virtual bool SetPixelColor(CPixels& pixels, uint uiPosX, uint uiPosY, const SColor color) = 0; }; -CPixelsManagerInterface* NewPixelsManager(void); +CPixelsManagerInterface* NewPixelsManager(); diff --git a/Client/sdk/core/CRenderItemManagerInterface.h b/Client/sdk/core/CRenderItemManagerInterface.h index 233c372d793..6f7e55c2d8a 100644 --- a/Client/sdk/core/CRenderItemManagerInterface.h +++ b/Client/sdk/core/CRenderItemManagerInterface.h @@ -139,10 +139,10 @@ struct SDxStatus class CRenderItemManagerInterface { public: - virtual ~CRenderItemManagerInterface(void) {} + virtual ~CRenderItemManagerInterface() {} // CRenderItemManagerInterface - virtual void DoPulse(void) = 0; + virtual void DoPulse() = 0; virtual CDxFontItem* CreateDxFont(const SString& strFullFilePath, uint uiSize, bool bBold, DWORD ulQuality = DEFAULT_QUALITY) = 0; virtual CGuiFontItem* CreateGuiFont(const SString& strFullFilePath, const SString& strFontName, uint uiSize) = 0; virtual CTextureItem* CreateTexture(const SString& strFullFilePath, const CPixels* pPixels = NULL, bool bMipMaps = true, uint uiSizeX = RDEFAULT, @@ -155,9 +155,9 @@ class CRenderItemManagerInterface virtual CWebBrowserItem* CreateWebBrowser(uint uiSizeX, uint uiSizeY) = 0; virtual bool SetRenderTarget(CRenderTargetItem* pItem, bool bClear) = 0; virtual void EnableSetRenderTargetOldVer(bool bEnable) = 0; - virtual bool IsSetRenderTargetEnabledOldVer(void) = 0; - virtual bool RestoreDefaultRenderTarget(void) = 0; - virtual void UpdateBackBufferCopy(void) = 0; + virtual bool IsSetRenderTargetEnabledOldVer() = 0; + virtual bool RestoreDefaultRenderTarget() = 0; + virtual void UpdateBackBufferCopy() = 0; virtual void UpdateScreenSource(CScreenSourceItem* pScreenSourceItem, bool bResampleNow) = 0; virtual SShaderItemLayers* GetAppliedShaderForD3DData(CD3DDUMMY* pD3DData) = 0; virtual bool ApplyShaderItemToWorldTexture(CShaderItem* pShaderItem, const SString& strTextureNameMatch, CClientEntityBase* pClientEntity, @@ -165,15 +165,15 @@ class CRenderItemManagerInterface virtual bool RemoveShaderItemFromWorldTexture(CShaderItem* pShaderItem, const SString& strTextureNameMatch, CClientEntityBase* pClientEntity) = 0; virtual void RemoveClientEntityRefs(CClientEntityBase* pClientEntity) = 0; virtual void GetVisibleTextureNames(std::vector& outNameList, const SString& strTextureNameMatch, ushort usModelID) = 0; - virtual eDxTestMode GetTestMode(void) = 0; + virtual eDxTestMode GetTestMode() = 0; virtual void SetTestMode(eDxTestMode testMode) = 0; virtual void GetDxStatus(SDxStatus& outStatus) = 0; - virtual CEffectCloner* GetEffectCloner(void) = 0; - virtual void PreDrawWorld(void) = 0; + virtual CEffectCloner* GetEffectCloner() = 0; + virtual void PreDrawWorld() = 0; virtual void SetDepthBufferFormat(ERenderFormat depthBufferFormat) = 0; - virtual ERenderFormat GetDepthBufferFormat(void) = 0; - virtual void SaveReadableDepthBuffer(void) = 0; - virtual void FlushNonAARenderTarget(void) = 0; + virtual ERenderFormat GetDepthBufferFormat() = 0; + virtual void SaveReadableDepthBuffer() = 0; + virtual void FlushNonAARenderTarget() = 0; virtual void HandleStretchRect(IDirect3DSurface9* pSourceSurface, CONST RECT* pSourceRect, IDirect3DSurface9* pDestSurface, CONST RECT* pDestRect, int Filter) = 0; }; @@ -241,18 +241,18 @@ enum eRenderItemClassTypes class CRenderItem { DECLARE_BASE_CLASS(CRenderItem) - CRenderItem(void) : ClassInit(this) {} - virtual ~CRenderItem(void); + CRenderItem() : ClassInit(this) {} + virtual ~CRenderItem(); virtual void PostConstruct(CRenderItemManager* pManager, bool bIncludeInMemoryStats = true); - virtual void PreDestruct(void); - virtual void Release(void); - virtual void AddRef(void); - virtual bool IsValid(void) = 0; - virtual void OnLostDevice(void) = 0; - virtual void OnResetDevice(void) = 0; - int GetVideoMemoryKBUsed(void) { return m_iMemoryKBUsed; } - int GetRevision(void) { return m_iRevision; } - bool GetIncludeInMemoryStats(void) { return m_bIncludeInMemoryStats; } + virtual void PreDestruct(); + virtual void Release(); + virtual void AddRef(); + virtual bool IsValid() = 0; + virtual void OnLostDevice() = 0; + virtual void OnResetDevice() = 0; + int GetVideoMemoryKBUsed() { return m_iMemoryKBUsed; } + int GetRevision() { return m_iRevision; } + bool GetIncludeInMemoryStats() { return m_bIncludeInMemoryStats; } CRenderItemManager* m_pManager; IDirect3DDevice9* m_pDevice; @@ -270,14 +270,14 @@ class CRenderItem class CDxFontItem : public CRenderItem { DECLARE_CLASS(CDxFontItem, CRenderItem) - CDxFontItem(void) : ClassInit(this) {} + CDxFontItem() : ClassInit(this) {} virtual void PostConstruct(CRenderItemManager* pManager, const SString& strFullFilePath, uint uiSize, bool bBold, DWORD ulQuality = DEFAULT_QUALITY); - virtual void PreDestruct(void); - virtual bool IsValid(void); - virtual void OnLostDevice(void); - virtual void OnResetDevice(void); + virtual void PreDestruct(); + virtual bool IsValid(); + virtual void OnLostDevice(); + virtual void OnResetDevice(); void CreateUnderlyingData(uint uiSize, bool bBold, DWORD ulQuality = DEFAULT_QUALITY); - void ReleaseUnderlyingData(void); + void ReleaseUnderlyingData(); SString m_strFullFilePath; ID3DXFont* m_pFntNormal; @@ -291,14 +291,14 @@ class CDxFontItem : public CRenderItem class CGuiFontItem : public CRenderItem { DECLARE_CLASS(CGuiFontItem, CRenderItem) - CGuiFontItem(void) : ClassInit(this) {} + CGuiFontItem() : ClassInit(this) {} virtual void PostConstruct(CRenderItemManager* pManager, const SString& strFullFilePath, const SString& strFontName, uint uiSize); - virtual void PreDestruct(void); - virtual bool IsValid(void); - virtual void OnLostDevice(void); - virtual void OnResetDevice(void); + virtual void PreDestruct(); + virtual bool IsValid(); + virtual void OnLostDevice(); + virtual void OnResetDevice(); void CreateUnderlyingData(const SString& strFullFilePath, const SString& strFontName, uint uiSize); - void ReleaseUnderlyingData(void); + void ReleaseUnderlyingData(); SString m_strCEGUIFontName; CGUIFont* m_pFntCEGUI; @@ -312,16 +312,16 @@ class CGuiFontItem : public CRenderItem class CEffectWrap : public CRenderItem { DECLARE_CLASS(CEffectWrap, CRenderItem) - CEffectWrap(void) : ClassInit(this) {} + CEffectWrap() : ClassInit(this) {} virtual void PostConstruct(CRenderItemManager* pManager, CEffectTemplate* pEffectTemplate); - virtual void PreDestruct(void); - virtual bool IsValid(void); - virtual void OnLostDevice(void); - virtual void OnResetDevice(void); + virtual void PreDestruct(); + virtual bool IsValid(); + virtual void OnLostDevice(); + virtual void OnResetDevice(); HRESULT Begin(UINT* pPasses, DWORD Flags, bool bWorldRender = true); - HRESULT End(void); - bool ApplyCommonHandles(void); - bool ApplyMappedHandles(void); + HRESULT End(); + bool ApplyCommonHandles(); + bool ApplyMappedHandles(); CEffectTemplate* m_pEffectTemplate; ID3DXEffect* m_pD3DEffect; @@ -335,7 +335,7 @@ class CEffectWrap : public CRenderItem class CMaterialItem : public CRenderItem { DECLARE_CLASS(CMaterialItem, CRenderItem) - CMaterialItem(void) : ClassInit(this), m_TextureAddress(TADDRESS_WRAP), m_uiBorderColor(0) {} + CMaterialItem() : ClassInit(this), m_TextureAddress(TADDRESS_WRAP), m_uiBorderColor(0) {} uint m_uiSizeX; uint m_uiSizeY; @@ -351,23 +351,23 @@ class CMaterialItem : public CRenderItem class CShaderItem : public CMaterialItem { DECLARE_CLASS(CShaderItem, CMaterialItem) - CShaderItem(void) : ClassInit(this) {} + CShaderItem() : ClassInit(this) {} virtual void PostConstruct(CRenderItemManager* pManager, const SString& strFile, const SString& strRootPath, bool bIsRawData, SString& strOutStatus, float fPriority, float fMaxDistance, bool bLayered, bool bDebug, int iTypeMask); - virtual void PreDestruct(void); - virtual bool IsValid(void); - virtual void OnLostDevice(void); - virtual void OnResetDevice(void); + virtual void PreDestruct(); + virtual bool IsValid(); + virtual void OnLostDevice(); + virtual void OnResetDevice(); void CreateUnderlyingData(const SString& strFile, const SString& strRootPath, bool bIsRawData, SString& strOutStatus, bool bDebug); - void ReleaseUnderlyingData(void); + void ReleaseUnderlyingData(); virtual bool SetValue(const SString& strName, CTextureItem* pTextureItem); virtual bool SetValue(const SString& strName, bool bValue); virtual bool SetValue(const SString& strName, const float* pfValues, uint uiCount); - void MaybeRenewShaderInstance(void); - void RenewShaderInstance(void); + void MaybeRenewShaderInstance(); + void RenewShaderInstance(); virtual void SetTessellation(uint uiTessellationX, uint uiTessellationY); virtual void SetTransform(const SShaderTransform& transform); - virtual bool GetUsesVertexShader(void); + virtual bool GetUsesVertexShader(); CEffectWrap* m_pEffectWrap; float m_fPriority; @@ -390,14 +390,14 @@ class CShaderItem : public CMaterialItem class CShaderInstance : public CMaterialItem { DECLARE_CLASS(CShaderInstance, CMaterialItem) - CShaderInstance(void) : ClassInit(this) {} + CShaderInstance() : ClassInit(this) {} virtual void PostConstruct(CRenderItemManager* pManager, CShaderItem* pShaderItem); - virtual void PreDestruct(void); - virtual bool IsValid(void); - virtual void OnLostDevice(void); - virtual void OnResetDevice(void); + virtual void PreDestruct(); + virtual bool IsValid(); + virtual void OnLostDevice(); + virtual void OnResetDevice(); void CreateUnderlyingData(CShaderItem* pShaderItem); - void ReleaseUnderlyingData(void); + void ReleaseUnderlyingData(); void SetTextureValue(D3DXHANDLE hHandle, CTextureItem* pTextureItem); void SetBoolValue(D3DXHANDLE hHandle, bool pTextureItem); @@ -406,7 +406,7 @@ class CShaderInstance : public CMaterialItem bool CmpBoolValue(D3DXHANDLE hHandle, bool pTextureItem); bool CmpFloatsValue(D3DXHANDLE hHandle, const float* pfValues, uint uiCount); SShaderValue* GetParam(D3DXHANDLE hHandle); - void ApplyShaderParameters(void); + void ApplyShaderParameters(); CEffectWrap* m_pEffectWrap; uint m_uiTessellationX; @@ -426,7 +426,7 @@ class CShaderInstance : public CMaterialItem class CTextureItem : public CMaterialItem { DECLARE_CLASS(CTextureItem, CMaterialItem) - CTextureItem(void) : ClassInit(this) {} + CTextureItem() : ClassInit(this) {} IDirect3DBaseTexture9* m_pD3DTexture; uint m_uiSurfaceSizeX; @@ -441,18 +441,18 @@ class CTextureItem : public CMaterialItem class CFileTextureItem : public CTextureItem { DECLARE_CLASS(CFileTextureItem, CTextureItem) - CFileTextureItem(void) : ClassInit(this) {} + CFileTextureItem() : ClassInit(this) {} virtual void PostConstruct(CRenderItemManager* pManager, const SString& strFilename, const CPixels* pPixels, bool bMipMaps = true, uint uiSizeX = RDEFAULT, uint uiSizeY = RDEFAULT, ERenderFormat format = RFORMAT_UNKNOWN, ETextureAddress textureAddress = TADDRESS_WRAP, ETextureType textureType = TTYPE_TEXTURE, uint uiVolumeDepth = 1); - virtual void PreDestruct(void); - virtual bool IsValid(void); - virtual void OnLostDevice(void); - virtual void OnResetDevice(void); + virtual void PreDestruct(); + virtual bool IsValid(); + virtual void OnLostDevice(); + virtual void OnResetDevice(); void CreateUnderlyingData(const SString& strFilename, bool bMipMaps, uint uiSizeX, uint uiSizeY, ERenderFormat format); void CreateUnderlyingData(const CPixels* pPixels, bool bMipMaps, ERenderFormat format); void CreateUnderlyingData(bool bMipMaps, uint uiSizeX, uint uiSizeY, ERenderFormat format, ETextureType textureType, uint uiVolumeDepth); - void ReleaseUnderlyingData(void); + void ReleaseUnderlyingData(); uint m_uiVolumeDepth; ETextureType m_TextureType; @@ -466,14 +466,14 @@ class CFileTextureItem : public CTextureItem class CRenderTargetItem : public CTextureItem { DECLARE_CLASS(CRenderTargetItem, CTextureItem) - CRenderTargetItem(void) : ClassInit(this) {} + CRenderTargetItem() : ClassInit(this) {} virtual void PostConstruct(CRenderItemManager* pManager, uint uiSizeX, uint uiSizeY, bool bWithAlphaChannel, bool bIncludeInMemoryStats); - virtual void PreDestruct(void); - virtual bool IsValid(void); - virtual void OnLostDevice(void); - virtual void OnResetDevice(void); - void CreateUnderlyingData(void); - void ReleaseUnderlyingData(void); + virtual void PreDestruct(); + virtual bool IsValid(); + virtual void OnLostDevice(); + virtual void OnResetDevice(); + void CreateUnderlyingData(); + void ReleaseUnderlyingData(); bool ReadPixels(CBuffer& outBuffer, SString& strOutError); bool m_bWithAlphaChannel; @@ -490,14 +490,14 @@ class CRenderTargetItem : public CTextureItem class CScreenSourceItem : public CTextureItem { DECLARE_CLASS(CScreenSourceItem, CTextureItem) - CScreenSourceItem(void) : ClassInit(this) {} + CScreenSourceItem() : ClassInit(this) {} virtual void PostConstruct(CRenderItemManager* pRenderItemManager, uint uiSizeX, uint uiSizeY); - virtual void PreDestruct(void); - virtual bool IsValid(void); - virtual void OnLostDevice(void); - virtual void OnResetDevice(void); - void CreateUnderlyingData(void); - void ReleaseUnderlyingData(void); + virtual void PreDestruct(); + virtual bool IsValid(); + virtual void OnLostDevice(); + virtual void OnResetDevice(); + void CreateUnderlyingData(); + void ReleaseUnderlyingData(); IDirect3DSurface9* m_pD3DRenderTargetSurface; uint m_uiRevision; @@ -511,14 +511,14 @@ class CScreenSourceItem : public CTextureItem class CWebBrowserItem : public CTextureItem { DECLARE_CLASS(CWebBrowserItem, CTextureItem) - CWebBrowserItem(void) : ClassInit(this) {} + CWebBrowserItem() : ClassInit(this) {} virtual void PostConstruct(CRenderItemManager* pRenderItemManager, uint uiSizeX, uint uiSizeY); - virtual void PreDestruct(void); - virtual bool IsValid(void); - virtual void OnLostDevice(void); - virtual void OnResetDevice(void); - void CreateUnderlyingData(void); - void ReleaseUnderlyingData(void); + virtual void PreDestruct(); + virtual bool IsValid(); + virtual void OnLostDevice(); + virtual void OnResetDevice(); + void CreateUnderlyingData(); + void ReleaseUnderlyingData(); virtual void Resize(const CVector2D& size); IDirect3DSurface9* m_pD3DRenderTargetSurface; diff --git a/Client/sdk/core/CScreenGrabberInterface.h b/Client/sdk/core/CScreenGrabberInterface.h index 78f2ef283e6..21ed6fcb2c7 100644 --- a/Client/sdk/core/CScreenGrabberInterface.h +++ b/Client/sdk/core/CScreenGrabberInterface.h @@ -19,17 +19,17 @@ class CScreenGrabberInterface public: ZERO_ON_NEW - virtual ~CScreenGrabberInterface(void) {} + virtual ~CScreenGrabberInterface() {} // CScreenGrabberInterface virtual void OnDeviceCreate(IDirect3DDevice9* pDevice) = 0; - virtual void OnLostDevice(void) = 0; - virtual void OnResetDevice(void) = 0; - virtual void DoPulse(void) = 0; + virtual void OnLostDevice() = 0; + virtual void OnResetDevice() = 0; + virtual void DoPulse() = 0; virtual void QueueScreenShot(uint uiSizeX, uint uiSizeY, uint uiQuality, PFN_SCREENSHOT_CALLBACK pfnScreenShotCallback) = 0; - virtual void ClearScreenShotQueue(void) = 0; + virtual void ClearScreenShotQueue() = 0; virtual bool GetBackBufferPixels(uint uiSizeX, uint uiSizeY, CBuffer& buffer, SString& strOutError) = 0; - virtual bool IsQueueEmpty(void) = 0; + virtual bool IsQueueEmpty() = 0; }; -CScreenGrabberInterface* NewScreenGrabber(void); +CScreenGrabberInterface* NewScreenGrabber(); diff --git a/Client/sdk/core/CSetCursorPosHookInterface.h b/Client/sdk/core/CSetCursorPosHookInterface.h index 28013c661a4..57a95c6850c 100644 --- a/Client/sdk/core/CSetCursorPosHookInterface.h +++ b/Client/sdk/core/CSetCursorPosHookInterface.h @@ -14,12 +14,12 @@ class CSetCursorPosHookInterface { public: - virtual void ApplyHook(void) = 0; - virtual void RemoveHook(void) = 0; + virtual void ApplyHook() = 0; + virtual void RemoveHook() = 0; - virtual void DisableSetCursorPos(void) = 0; - virtual void EnableSetCursorPos(void) = 0; - virtual bool IsSetCursorPosEnabled(void) = 0; + virtual void DisableSetCursorPos() = 0; + virtual void EnableSetCursorPos() = 0; + virtual bool IsSetCursorPosEnabled() = 0; virtual BOOL CallSetCursorPos(int X, int Y) = 0; }; diff --git a/Client/sdk/core/CTrayIconInterface.h b/Client/sdk/core/CTrayIconInterface.h index f64ae66b4b3..0873b2974ad 100644 --- a/Client/sdk/core/CTrayIconInterface.h +++ b/Client/sdk/core/CTrayIconInterface.h @@ -21,8 +21,8 @@ enum eTrayIconType class CTrayIconInterface { public: - virtual bool DoesTrayIconExist(void) = 0; - virtual bool CreateTrayIcon(void) = 0; - virtual void DestroyTrayIcon(void) = 0; + virtual bool DoesTrayIconExist() = 0; + virtual bool CreateTrayIcon() = 0; + virtual void DestroyTrayIcon() = 0; virtual bool CreateTrayBallon(SString strText, eTrayIconType trayIconType, bool useSound) = 0; }; diff --git a/Client/sdk/core/CWebCoreInterface.h b/Client/sdk/core/CWebCoreInterface.h index 58c0cc39bba..24c57de7a26 100644 --- a/Client/sdk/core/CWebCoreInterface.h +++ b/Client/sdk/core/CWebCoreInterface.h @@ -54,7 +54,7 @@ class CWebCoreInterface virtual void DestroyWebView(CWebViewInterface* pWebView) = 0; virtual void DoPulse() = 0; - virtual void AddEventToEventQueue(std::function func, CWebView* pWebView, const SString& name) = 0; + virtual void AddEventToEventQueue(std::function func, CWebView* pWebView, const SString& name) = 0; virtual void RemoveWebViewEvents(CWebView* pWebView) = 0; virtual void DoEventQueuePulse() = 0; diff --git a/Client/sdk/game/C3DMarker.h b/Client/sdk/game/C3DMarker.h index e197ac791ac..9772b9d8a23 100644 --- a/Client/sdk/game/C3DMarker.h +++ b/Client/sdk/game/C3DMarker.h @@ -23,7 +23,7 @@ class CMatrix; class C3DMarker { public: - virtual ~C3DMarker(void){}; + virtual ~C3DMarker(){}; virtual void GetMatrix(CMatrix* pMatrix) = 0; virtual void SetMatrix(CMatrix* pMatrix) = 0; diff --git a/Client/sdk/game/CAERadioTrackManager.h b/Client/sdk/game/CAERadioTrackManager.h index ed852932969..bb561f3c132 100644 --- a/Client/sdk/game/CAERadioTrackManager.h +++ b/Client/sdk/game/CAERadioTrackManager.h @@ -16,11 +16,11 @@ class CAERadioTrackManager { public: - virtual BYTE GetCurrentRadioStationID(void) = 0; - virtual BYTE IsVehicleRadioActive(void) = 0; + virtual BYTE GetCurrentRadioStationID() = 0; + virtual BYTE IsVehicleRadioActive() = 0; virtual char* GetRadioStationName(BYTE bStationID) = 0; - virtual BOOL IsRadioOn(void) = 0; + virtual BOOL IsRadioOn() = 0; virtual VOID SetBassSetting(DWORD dwBass) = 0; - virtual VOID Reset(void) = 0; + virtual VOID Reset() = 0; virtual VOID StartRadio(BYTE bStationID, BYTE bUnknown) = 0; }; diff --git a/Client/sdk/game/CAEVehicleAudioEntity.h b/Client/sdk/game/CAEVehicleAudioEntity.h index e1e5d2b327d..a2b9f4dba4c 100644 --- a/Client/sdk/game/CAEVehicleAudioEntity.h +++ b/Client/sdk/game/CAEVehicleAudioEntity.h @@ -29,7 +29,7 @@ enum eVehicleAudioType class CAEVehicleAudioEntity { public: - virtual void JustGotInVehicleAsDriver(void) = 0; - virtual void JustGotOutOfVehicleAsDriver(void) = 0; - virtual void TurnOnRadioForVehicle(void) = 0; + virtual void JustGotInVehicleAsDriver() = 0; + virtual void JustGotOutOfVehicleAsDriver() = 0; + virtual void TurnOnRadioForVehicle() = 0; }; diff --git a/Client/sdk/game/CAnimBlendAssocGroup.h b/Client/sdk/game/CAnimBlendAssocGroup.h index 3d975a77fd3..460b01a6102 100644 --- a/Client/sdk/game/CAnimBlendAssocGroup.h +++ b/Client/sdk/game/CAnimBlendAssocGroup.h @@ -23,12 +23,12 @@ class CAnimBlendAssocGroup public: virtual CAnimBlendAssociationSAInterface* CopyAnimation(unsigned int AnimID) = 0; virtual void InitEmptyAssociations(RpClump* pClump) = 0; - virtual bool IsCreated(void) = 0; - virtual int GetNumAnimations(void) = 0; - virtual CAnimBlock* GetAnimBlock(void) = 0; + virtual bool IsCreated() = 0; + virtual int GetNumAnimations() = 0; + virtual CAnimBlock* GetAnimBlock() = 0; virtual CAnimBlendStaticAssociation* GetAnimation(unsigned int ID) = 0; - virtual AssocGroupId GetGroupID(void) = 0; + virtual AssocGroupId GetGroupID() = 0; virtual void CreateAssociations(const char* szBlockName) = 0; - virtual bool IsLoaded(void) = 0; + virtual bool IsLoaded() = 0; virtual void SetIDOffset(int iOffset) = 0; }; diff --git a/Client/sdk/game/CAnimBlendSequence.h b/Client/sdk/game/CAnimBlendSequence.h index f9b628ecc7f..3d7e181739a 100644 --- a/Client/sdk/game/CAnimBlendSequence.h +++ b/Client/sdk/game/CAnimBlendSequence.h @@ -14,16 +14,16 @@ class CAnimBlendSequence { public: - virtual void Initialize(void) = 0; + virtual void Initialize() = 0; virtual void SetName(const char* szName) = 0; virtual void SetBoneTag(int32_t i32BoneID) = 0; virtual void SetKeyFrames(size_t cKeyFrames, bool bRoot, bool bCompressed, void* pKeyFrames) = 0; virtual void* GetKeyFrame(size_t iFrame, uint32_t u32FrameSizeInBytes) = 0; - virtual uint32_t GetHash(void) = 0; - virtual uint16_t GetBoneTag(void) = 0; - virtual BYTE* GetKeyFrames(void) = 0; - virtual unsigned short GetKeyFramesCount(void) = 0; - virtual bool IsBigChunkForAllSequences(void) = 0; + virtual uint32_t GetHash() = 0; + virtual uint16_t GetBoneTag() = 0; + virtual BYTE* GetKeyFrames() = 0; + virtual unsigned short GetKeyFramesCount() = 0; + virtual bool IsBigChunkForAllSequences() = 0; virtual void CopySequenceProperties(CAnimBlendSequenceSAInterface* pAnimSequenceInterface) = 0; - virtual CAnimBlendSequenceSAInterface* GetInterface(void) = 0; + virtual CAnimBlendSequenceSAInterface* GetInterface() = 0; }; diff --git a/Client/sdk/game/CAnimBlock.h b/Client/sdk/game/CAnimBlock.h index 9feb24f2216..52d0810b47e 100644 --- a/Client/sdk/game/CAnimBlock.h +++ b/Client/sdk/game/CAnimBlock.h @@ -23,14 +23,14 @@ class CAnimBlendHierarchySAInterface; class CAnimBlock { public: - virtual CAnimBlockSAInterface* GetInterface(void) = 0; - virtual char* GetName(void) = 0; - virtual int GetIndex(void) = 0; - virtual void AddRef(void) = 0; - virtual unsigned short GetRefs(void) = 0; - virtual bool IsLoaded(void) = 0; - virtual int GetIDOffset(void) = 0; - virtual size_t GetAnimationCount(void) = 0; + virtual CAnimBlockSAInterface* GetInterface() = 0; + virtual char* GetName() = 0; + virtual int GetIndex() = 0; + virtual void AddRef() = 0; + virtual unsigned short GetRefs() = 0; + virtual bool IsLoaded() = 0; + virtual int GetIDOffset() = 0; + virtual size_t GetAnimationCount() = 0; virtual void Request(EModelRequestType requestType, bool bAllowBlockingFail = false) = 0; virtual CAnimBlendHierarchySAInterface* GetAnimationHierarchyInterface(size_t iAnimation) = 0; }; diff --git a/Client/sdk/game/CAnimManager.h b/Client/sdk/game/CAnimManager.h index d171c267a72..9390511415d 100644 --- a/Client/sdk/game/CAnimManager.h +++ b/Client/sdk/game/CAnimManager.h @@ -49,12 +49,12 @@ class CAnimManager typedef std::unique_ptr AnimBlendAssoc_type; typedef std::unique_ptr StaticAssocIntface_type; - virtual void Initialize(void) = 0; - virtual void Shutdown(void) = 0; + virtual void Initialize() = 0; + virtual void Shutdown() = 0; - virtual int GetNumAnimations(void) = 0; - virtual int GetNumAnimBlocks(void) = 0; - virtual int GetNumAnimAssocDefinitions(void) = 0; + virtual int GetNumAnimations() = 0; + virtual int GetNumAnimBlocks() = 0; + virtual int GetNumAnimAssocDefinitions() = 0; virtual std::unique_ptr GetAnimation(int ID) = 0; virtual std::unique_ptr GetAnimation(const char* szName, CAnimBlock* pBlock) = 0; @@ -88,8 +88,8 @@ class CAnimManager virtual AnimAssocDefinition* AddAnimAssocDefinition(const char* szBlockName, const char* szAnimName, AssocGroupId animGroup, AnimationId animID, AnimDescriptor* pDescriptor) = 0; - virtual void ReadAnimAssociationDefinitions(void) = 0; - virtual void CreateAnimAssocGroups(void) = 0; + virtual void ReadAnimAssociationDefinitions() = 0; + virtual void CreateAnimAssocGroups() = 0; virtual void UncompressAnimation(CAnimBlendHierarchy* pHierarchy) = 0; virtual void RemoveFromUncompressedCache(CAnimBlendHierarchy* pHierarchy) = 0; @@ -97,8 +97,8 @@ class CAnimManager virtual void LoadAnimFile(const char* szFile) = 0; virtual void LoadAnimFile(RwStream* pStream, bool b1, const char* sz1) = 0; - virtual void LoadAnimFiles(void) = 0; - virtual void RemoveLastAnimFile(void) = 0; + virtual void LoadAnimFiles() = 0; + virtual void RemoveLastAnimFile() = 0; virtual BYTE* AllocateKeyFramesMemory(uint32_t u32BytesToAllocate) = 0; virtual void FreeKeyFramesMemory(void* pKeyFrames) = 0; @@ -123,12 +123,12 @@ class CAnimManager // MTA members, but use this strictly for custom animations only virtual std::unique_ptr GetCustomAnimBlendHierarchy(CAnimBlendHierarchySAInterface* pInterface) = 0; virtual std::unique_ptr GetCustomAnimBlendSequence(CAnimBlendSequenceSAInterface* pInterface) = 0; - virtual std::unique_ptr GetCustomAnimBlendHierarchy(void) = 0; - virtual std::unique_ptr GetCustomAnimBlendSequence(void) = 0; + virtual std::unique_ptr GetCustomAnimBlendHierarchy() = 0; + virtual std::unique_ptr GetCustomAnimBlendSequence() = 0; virtual void DeleteCustomAnimHierarchyInterface(CAnimBlendHierarchySAInterface* pInterface) = 0; virtual void DeleteCustomAnimSequenceInterface(CAnimBlendSequenceSAInterface* pInterface) = 0; virtual bool isGateWayAnimationHierarchy(CAnimBlendHierarchySAInterface* pInterface) = 0; - virtual const SString& GetGateWayBlockName(void) = 0; - virtual const SString& GetGateWayAnimationName(void) = 0; + virtual const SString& GetGateWayBlockName() = 0; + virtual const SString& GetGateWayAnimationName() = 0; }; diff --git a/Client/sdk/game/CAudioEngine.h b/Client/sdk/game/CAudioEngine.h index a455852cd4f..7a8483a2bc2 100644 --- a/Client/sdk/game/CAudioEngine.h +++ b/Client/sdk/game/CAudioEngine.h @@ -60,15 +60,15 @@ class CAudioEngine virtual VOID SetMissionAudioPosition(CVector* position, int slot = 1) = 0; virtual bool PlayLoadedMissionAudio(int slot = 1) = 0; virtual VOID PauseAllSound(bool bPaused) = 0; - virtual VOID StopRadio(void) = 0; + virtual VOID StopRadio() = 0; virtual VOID StartRadio(unsigned int station) = 0; virtual void PauseAmbientSounds(bool bPaused) = 0; virtual VOID SetAmbientSoundEnabled(eAmbientSoundType eType, bool bEnabled) = 0; virtual bool IsAmbientSoundEnabled(eAmbientSoundType eType) = 0; - virtual void ResetAmbientSounds(void) = 0; + virtual void ResetAmbientSounds() = 0; virtual VOID SetWorldSoundEnabled(uint uiGroup, uint uiIndex, bool bEnabled, bool bForceCancel) = 0; virtual bool IsWorldSoundEnabled(uint uiGroup, uint uiIndex) = 0; - virtual void ResetWorldSounds(void) = 0; + virtual void ResetWorldSounds() = 0; virtual void SetWorldSoundHandler(WorldSoundHandler* pHandler) = 0; virtual void ReportBulletHit(CEntity* pEntity, unsigned char ucSurfaceType, CVector* pvecPosition, float f_2) = 0; virtual void ReportWeaponEvent(int iEvent, eWeaponType weaponType, CPhysical* pPhysical) = 0; diff --git a/Client/sdk/game/CAutomobile.h b/Client/sdk/game/CAutomobile.h index e4d48f20e18..a5040a233f5 100644 --- a/Client/sdk/game/CAutomobile.h +++ b/Client/sdk/game/CAutomobile.h @@ -19,39 +19,39 @@ class CAutomobile : public virtual CVehicle { public: - virtual ~CAutomobile(void){}; + virtual ~CAutomobile(){}; virtual bool BurstTyre(DWORD dwTyreID) = 0; - virtual bool BreakTowLink(void) = 0; + virtual bool BreakTowLink() = 0; virtual void BlowUpCar(CEntity* pEntity) = 0; - virtual void BlowUpCarsInPath(void) = 0; - virtual void CloseAllDoors(void) = 0; - virtual void CloseBoot(void) = 0; + virtual void BlowUpCarsInPath() = 0; + virtual void CloseAllDoors() = 0; + virtual void CloseBoot() = 0; virtual float FindWheelWidth(bool bUnknown) = 0; // virtual void Fix ( void ) = 0; virtual void FixDoor(int iCarNodeIndex, eDoorsSA Door) = 0; virtual int FixPanel(int iCarNodeIndex, ePanelsSA Panel) = 0; - virtual bool GetAllWheelsOffGround(void) = 0; - virtual float GetCarPitch(void) = 0; - virtual float GetCarRoll(void) = 0; + virtual bool GetAllWheelsOffGround() = 0; + virtual float GetCarPitch() = 0; + virtual float GetCarRoll() = 0; virtual void GetComponentWorldPosition(int iComponentID, CVector* pVector) = 0; // virtual float GetHeightAboveRoad ( void ) = 0; /* TODO */ - virtual DWORD GetNumContactWheels(void) = 0; - virtual float GetRearHeightAboveRoad(void) = 0; + virtual DWORD GetNumContactWheels() = 0; + virtual float GetRearHeightAboveRoad() = 0; virtual bool IsComponentPresent(int iComponentID) = 0; virtual bool IsDoorClosed(eDoorsSA Door) = 0; virtual bool IsDoorFullyOpen(eDoorsSA Door) = 0; virtual bool IsDoorMissing(eDoorsSA Door) = 0; virtual bool IsDoorReady(eDoorsSA Door) = 0; - virtual bool IsInAir(void) = 0; - virtual bool IsOpenTopCar(void) = 0; + virtual bool IsInAir() = 0; + virtual bool IsOpenTopCar() = 0; // virtual void PlaceOnRoadProperly ( void ) = 0; - virtual void PlayCarHorn(void) = 0; - virtual void PopBoot(void) = 0; - virtual void PopBootUsingPhysics(void) = 0; + virtual void PlayCarHorn() = 0; + virtual void PopBoot() = 0; + virtual void PopBootUsingPhysics() = 0; virtual void PopDoor(int iCarNodeIndex, eDoorsSA Door, bool bUnknown) = 0; virtual void PopPanel(int iCarNodeIndex, ePanelsSA Panel, bool bFallOffFast) = 0; - virtual void ResetSuspension(void) = 0; + virtual void ResetSuspension() = 0; virtual void SetRandomDamage(bool bUnknown) = 0; virtual void SetTaxiLight(bool bState) = 0; virtual void SetTotalDamage(bool bUnknown) = 0; diff --git a/Client/sdk/game/CBike.h b/Client/sdk/game/CBike.h index 2a461820b85..af5ca7be389 100644 --- a/Client/sdk/game/CBike.h +++ b/Client/sdk/game/CBike.h @@ -16,7 +16,7 @@ class CBike : public virtual CVehicle { public: - virtual ~CBike(void){}; + virtual ~CBike(){}; // virtual void PlaceOnRoadProperly ( void )=0; }; diff --git a/Client/sdk/game/CBmx.h b/Client/sdk/game/CBmx.h index bf8329d4ed1..f72d18264ba 100644 --- a/Client/sdk/game/CBmx.h +++ b/Client/sdk/game/CBmx.h @@ -16,5 +16,5 @@ class CBmx : public virtual CVehicle { public: - virtual ~CBmx(void){}; + virtual ~CBmx(){}; }; diff --git a/Client/sdk/game/CBoat.h b/Client/sdk/game/CBoat.h index 7cca4429c94..e0fd6cded8f 100644 --- a/Client/sdk/game/CBoat.h +++ b/Client/sdk/game/CBoat.h @@ -16,5 +16,5 @@ class CBoat : public virtual CVehicle { public: - virtual ~CBoat(void){}; + virtual ~CBoat(){}; }; diff --git a/Client/sdk/game/CBuilding.h b/Client/sdk/game/CBuilding.h index 7dced3e3926..6792aae1dd6 100644 --- a/Client/sdk/game/CBuilding.h +++ b/Client/sdk/game/CBuilding.h @@ -16,5 +16,5 @@ class CBuilding : public virtual CEntity { public: - virtual ~CBuilding(void){}; + virtual ~CBuilding(){}; }; diff --git a/Client/sdk/game/CCamera.h b/Client/sdk/game/CCamera.h index 9368c5eb9c6..84a7d9b692b 100644 --- a/Client/sdk/game/CCamera.h +++ b/Client/sdk/game/CCamera.h @@ -116,7 +116,7 @@ class CCamera virtual VOID SetMatrix(CMatrix* matrix) = 0; virtual VOID SetCamPositionForFixedMode(CVector* vecPosition, CVector* vecUpOffset) = 0; virtual VOID Find3rdPersonCamTargetVector(FLOAT fDistance, CVector* vecGunMuzzle, CVector* vecSource, CVector* vecTarget) = 0; - virtual float Find3rdPersonQuickAimPitch(void) = 0; + virtual float Find3rdPersonQuickAimPitch() = 0; virtual BYTE GetActiveCam() = 0; virtual CCam* GetCam(BYTE bCameraID) = 0; virtual VOID SetWidescreen(BOOL bWidescreen) = 0; @@ -126,17 +126,17 @@ class CCamera virtual bool TryToStartNewCamMode(DWORD dwCamMode) = 0; virtual bool ConeCastCollisionResolve(CVector* pPos, CVector* pLookAt, CVector* pDest, float rad, float minDist, float* pDist) = 0; virtual void VectorTrackLinear(CVector* pTo, CVector* pFrom, float time, bool bSmoothEnds) = 0; - virtual bool IsFading(void) = 0; - virtual int GetFadingDirection(void) = 0; + virtual bool IsFading() = 0; + virtual int GetFadingDirection() = 0; virtual void Fade(float fFadeOutTime, int iOutOrIn) = 0; virtual void SetFadeColor(unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue) = 0; - virtual float GetCameraRotation(void) = 0; - virtual RwMatrix* GetLTM(void) = 0; - virtual CEntity* GetTargetEntity(void) = 0; + virtual float GetCameraRotation() = 0; + virtual RwMatrix* GetLTM() = 0; + virtual CEntity* GetTargetEntity() = 0; virtual void SetCameraClip(bool bObjects, bool bVehicles) = 0; virtual void GetCameraClip(bool& bObjects, bool& bVehicles) = 0; virtual VOID SetCameraViewMode(BYTE dwCamMode) = 0; - virtual BYTE GetCameraViewMode(void) = 0; + virtual BYTE GetCameraViewMode() = 0; virtual void SetShakeForce(float fShakeForce) = 0; - virtual float GetShakeForce(void) = 0; + virtual float GetShakeForce() = 0; }; diff --git a/Client/sdk/game/CCivilianPed.h b/Client/sdk/game/CCivilianPed.h index 8f96fb1a00b..6a7da195648 100644 --- a/Client/sdk/game/CCivilianPed.h +++ b/Client/sdk/game/CCivilianPed.h @@ -16,5 +16,5 @@ class CCivilianPed : public virtual CPed { public: - virtual ~CCivilianPed(void){}; + virtual ~CCivilianPed(){}; }; diff --git a/Client/sdk/game/CColModel.h b/Client/sdk/game/CColModel.h index e8ae595d933..fe2ef8bd9ee 100644 --- a/Client/sdk/game/CColModel.h +++ b/Client/sdk/game/CColModel.h @@ -16,6 +16,6 @@ class CColModelSAInterface; class CColModel { public: - virtual CColModelSAInterface* GetInterface(void) = 0; - virtual void Destroy(void) = 0; + virtual CColModelSAInterface* GetInterface() = 0; + virtual void Destroy() = 0; }; diff --git a/Client/sdk/game/CColPoint.h b/Client/sdk/game/CColPoint.h index f78d1211f5e..c8de21fb372 100644 --- a/Client/sdk/game/CColPoint.h +++ b/Client/sdk/game/CColPoint.h @@ -201,9 +201,9 @@ struct EColSurface }; // Enum in a byte - EColSurface(void) {} + EColSurface() {} EColSurface(EColSurfaceValue newValue) { m_ucValue = newValue; } - operator uchar(void) const { return m_ucValue; } + operator uchar() const { return m_ucValue; } uchar m_ucValue; }; typedef EColSurface::EColSurfaceValue EColSurfaceValue; @@ -221,36 +221,36 @@ C_ASSERT(sizeof(CColLighting) == 1); class CColPoint { public: - virtual ~CColPoint(void){}; + virtual ~CColPoint(){}; - virtual CColPointSAInterface* GetInterface(void) = 0; - virtual const CVector& GetPosition(void) = 0; + virtual CColPointSAInterface* GetInterface() = 0; + virtual const CVector& GetPosition() = 0; virtual void SetPosition(const CVector& vecPosition) = 0; - virtual const CVector& GetNormal(void) = 0; + virtual const CVector& GetNormal() = 0; virtual void SetNormal(const CVector& vecNormal) = 0; - virtual EColSurface GetSurfaceTypeA(void) = 0; - virtual EColSurface GetSurfaceTypeB(void) = 0; + virtual EColSurface GetSurfaceTypeA() = 0; + virtual EColSurface GetSurfaceTypeB() = 0; virtual void SetSurfaceTypeA(EColSurface surfaceType) = 0; virtual void SetSurfaceTypeB(EColSurface surfaceType) = 0; - virtual BYTE GetPieceTypeA(void) = 0; - virtual BYTE GetPieceTypeB(void) = 0; + virtual BYTE GetPieceTypeA() = 0; + virtual BYTE GetPieceTypeB() = 0; virtual void SetPieceTypeA(BYTE ucPieceType) = 0; virtual void SetPieceTypeB(BYTE ucPieceType) = 0; - virtual CColLighting GetLightingA(void) = 0; - virtual CColLighting GetLightingB(void) = 0; + virtual CColLighting GetLightingA() = 0; + virtual CColLighting GetLightingB() = 0; virtual void SetLightingA(CColLighting lighting) = 0; virtual void SetLightingB(CColLighting lighting) = 0; - virtual float GetDepth(void) = 0; + virtual float GetDepth() = 0; virtual void SetDepth(float fDepth) = 0; - virtual void Destroy(void) = 0; - virtual float GetLightingForTimeOfDay(void) = 0; + virtual void Destroy() = 0; + virtual float GetLightingForTimeOfDay() = 0; }; diff --git a/Client/sdk/game/CControllerConfigManager.h b/Client/sdk/game/CControllerConfigManager.h index ff2834bd36f..58814efdb97 100644 --- a/Client/sdk/game/CControllerConfigManager.h +++ b/Client/sdk/game/CControllerConfigManager.h @@ -202,8 +202,8 @@ class CControllerConfigManager virtual void SetFlyWithMouse(bool bFlyWithMouse) = 0; virtual void SetSteerWithMouse(bool bSteerWithMouse) = 0; virtual void SuspendSteerAndFlyWithMouse(bool bSuspend) = 0; - virtual float GetVerticalAimSensitivity(void) = 0; + virtual float GetVerticalAimSensitivity() = 0; virtual void SetVerticalAimSensitivity(float fSensitivity) = 0; - virtual float GetVerticalAimSensitivityRawValue(void) = 0; + virtual float GetVerticalAimSensitivityRawValue() = 0; virtual void SetVerticalAimSensitivityRawValue(float fRawValue) = 0; }; diff --git a/Client/sdk/game/CDamageManager.h b/Client/sdk/game/CDamageManager.h index abc48083c2c..87b50c67702 100644 --- a/Client/sdk/game/CDamageManager.h +++ b/Client/sdk/game/CDamageManager.h @@ -127,18 +127,18 @@ enum eLights class CDamageManager { public: - virtual BYTE GetEngineStatus(void) = 0; + virtual BYTE GetEngineStatus() = 0; virtual VOID SetEngineStatus(BYTE bEngineState) = 0; virtual BYTE GetDoorStatus(eDoors bDoor) = 0; virtual VOID SetDoorStatus(eDoors bDoor, BYTE bDoorStatus) = 0; virtual BYTE GetWheelStatus(eWheelPosition bTire) = 0; virtual VOID SetWheelStatus(eWheelPosition bTire, BYTE bTireStatus) = 0; virtual BYTE GetPanelStatus(BYTE bPanel) = 0; - virtual unsigned long GetPanelStatus(void) = 0; + virtual unsigned long GetPanelStatus() = 0; virtual VOID SetPanelStatus(BYTE bPanel, BYTE bPanelStatus) = 0; virtual void SetPanelStatus(unsigned long ulStatus) = 0; virtual BYTE GetLightStatus(BYTE bLight) = 0; - virtual unsigned char GetLightStatus(void) = 0; + virtual unsigned char GetLightStatus() = 0; virtual VOID SetLightStatus(BYTE bLight, BYTE bLightStatus) = 0; virtual void SetLightStatus(unsigned char ucStatus) = 0; virtual BYTE GetAeroplaneCompStatus(BYTE CompID) = 0; diff --git a/Client/sdk/game/CEntity.h b/Client/sdk/game/CEntity.h index e9ebd039899..727fdc5a9e5 100644 --- a/Client/sdk/game/CEntity.h +++ b/Client/sdk/game/CEntity.h @@ -50,18 +50,18 @@ enum eEntityStatus class CEntity { public: - virtual ~CEntity(void){}; + virtual ~CEntity(){}; // virtual VOID SetModelAlpha ( int iAlpha )=0; virtual class CEntitySAInterface* GetInterface() = 0; virtual VOID SetPosition(float fX, float fY, float fZ) = 0; virtual VOID SetPosition(CVector* vecPosition) = 0; virtual VOID Teleport(float fX, float fY, float fZ) = 0; - virtual VOID ProcessControl(void) = 0; + virtual VOID ProcessControl() = 0; virtual VOID SetupLighting() = 0; virtual VOID Render() = 0; virtual VOID SetOrientation(float fX, float fY, float fZ) = 0; - virtual VOID FixBoatOrientation(void) = 0; + virtual VOID FixBoatOrientation() = 0; virtual CVector* GetPosition() = 0; virtual CMatrix* GetMatrix(CMatrix* matrix) = 0; virtual VOID SetMatrix(CMatrix* matrix) = 0; @@ -73,20 +73,20 @@ class CEntity virtual bool IsOnScreen() = 0; virtual bool IsFullyVisible() = 0; virtual void SetUnderwater(bool bUnderwater) = 0; - virtual bool GetUnderwater(void) = 0; + virtual bool GetUnderwater() = 0; virtual RwFrame* GetFrameFromId(int id) = 0; virtual RwMatrix* GetLTMFromId(int id) = 0; virtual RpClump* GetRpClump() = 0; - virtual bool IsVisible(void) = 0; + virtual bool IsVisible() = 0; virtual void SetVisible(bool bVisible) = 0; virtual VOID SetDoNotRemoveFromGameWhenDeleted(bool bDoNotRemoveFromGame) = 0; virtual VOID SetUsesCollision(BOOL bUsesCollision) = 0; - virtual BOOL IsBackfaceCulled(VOID) = 0; + virtual BOOL IsBackfaceCulled() = 0; virtual VOID SetBackfaceCulled(BOOL bBackfaceCulled) = 0; - virtual BOOL IsStatic(VOID) = 0; + virtual BOOL IsStatic() = 0; virtual VOID SetStatic(BOOL bStatic) = 0; virtual VOID SetAlpha(DWORD dwAlpha) = 0; @@ -94,14 +94,14 @@ class CEntity virtual VOID MatrixConvertToEulerAngles(float* fX, float* fY, float* fZ, int iUnknown) = 0; virtual bool IsPlayingAnimation(char* szAnimName) = 0; - virtual void* GetStoredPointer(void) = 0; + virtual void* GetStoredPointer() = 0; virtual void SetStoredPointer(void* pPointer) = 0; - virtual BYTE GetAreaCode(void) = 0; + virtual BYTE GetAreaCode() = 0; virtual void SetAreaCode(BYTE areaCode) = 0; - virtual bool IsStaticWaitingForCollision(void) = 0; + virtual bool IsStaticWaitingForCollision() = 0; virtual void SetStaticWaitingForCollision(bool bStatic) = 0; - virtual unsigned long GetArrayID(void) = 0; + virtual unsigned long GetArrayID() = 0; }; diff --git a/Client/sdk/game/CEvent.h b/Client/sdk/game/CEvent.h index df8c62f8640..f60287c4d62 100644 --- a/Client/sdk/game/CEvent.h +++ b/Client/sdk/game/CEvent.h @@ -16,5 +16,5 @@ class CEventSAInterface; class CEvent { public: - virtual CEventSAInterface* GetInterface(void) = 0; + virtual CEventSAInterface* GetInterface() = 0; }; diff --git a/Client/sdk/game/CEventDamage.h b/Client/sdk/game/CEventDamage.h index 7c0dc07830d..67c5a01075a 100644 --- a/Client/sdk/game/CEventDamage.h +++ b/Client/sdk/game/CEventDamage.h @@ -33,31 +33,31 @@ using EDamageReason::EDamageReasonType; class CEventDamage { public: - virtual void Destroy(void) = 0; + virtual void Destroy() = 0; // Flag accessors - virtual bool DidPedFallDown(void) = 0; - virtual bool WasStealthAttack(void) = 0; + virtual bool DidPedFallDown() = 0; + virtual bool WasStealthAttack() = 0; - virtual void MakePedFallDown(void) = 0; + virtual void MakePedFallDown() = 0; - virtual DWORD GetDamageTime(void) = 0; - virtual eWeaponType GetWeaponUsed(void) = 0; - virtual ePedPieceTypes GetPedPieceType(void) = 0; - virtual char GetDirection(void) = 0; + virtual DWORD GetDamageTime() = 0; + virtual eWeaponType GetWeaponUsed() = 0; + virtual ePedPieceTypes GetPedPieceType() = 0; + virtual char GetDirection() = 0; - virtual CEntity* GetInflictingEntity(void) = 0; - virtual CPedDamageResponse* GetDamageResponse(void) = 0; + virtual CEntity* GetInflictingEntity() = 0; + virtual CPedDamageResponse* GetDamageResponse() = 0; - virtual bool HasKilledPed(void) = 0; - virtual float GetDamageApplied(void) = 0; - virtual AssocGroupId GetAnimGroup(void) = 0; - virtual AnimationId GetAnimId(void) = 0; - virtual bool GetAnimAdded(void) = 0; + virtual bool HasKilledPed() = 0; + virtual float GetDamageApplied() = 0; + virtual AssocGroupId GetAnimGroup() = 0; + virtual AnimationId GetAnimId() = 0; + virtual bool GetAnimAdded() = 0; virtual void ComputeDeathAnim(CPed* pPed, bool bUnk) = 0; virtual void ComputeDamageAnim(CPed* pPed, bool bUnk) = 0; virtual bool AffectsPed(CPed* pPed) = 0; virtual void SetDamageReason(EDamageReasonType damageReason) = 0; - virtual EDamageReasonType GetDamageReason(void) = 0; + virtual EDamageReasonType GetDamageReason() = 0; }; diff --git a/Client/sdk/game/CEventGunShot.h b/Client/sdk/game/CEventGunShot.h index ba1adf8c254..b39739825d6 100644 --- a/Client/sdk/game/CEventGunShot.h +++ b/Client/sdk/game/CEventGunShot.h @@ -16,7 +16,7 @@ class CEventGunShotSAInterface; class CEventGunShot { public: - virtual CEventGunShotSAInterface* GetInterface(void) = 0; + virtual CEventGunShotSAInterface* GetInterface() = 0; virtual void Destroy(bool bDestroyInterface) = 0; }; diff --git a/Client/sdk/game/CExplosion.h b/Client/sdk/game/CExplosion.h index b7d59c326fe..836a2539aad 100644 --- a/Client/sdk/game/CExplosion.h +++ b/Client/sdk/game/CExplosion.h @@ -34,18 +34,18 @@ enum eExplosionType class CExplosion { public: - virtual eExplosionType GetExplosionType(void) = 0; - virtual CVector* GetExplosionPosition(void) = 0; + virtual eExplosionType GetExplosionType() = 0; + virtual CVector* GetExplosionPosition() = 0; virtual void SetExplosionPosition(const CVector* vecPosition) = 0; - virtual CEntity* GetExplosionCreator(void) = 0; - virtual CEntity* GetExplodingEntity(void) = 0; - virtual float GetExplosionForce(void) = 0; + virtual CEntity* GetExplosionCreator() = 0; + virtual CEntity* GetExplodingEntity() = 0; + virtual float GetExplosionForce() = 0; virtual void SetExplosionForce(float fForce) = 0; virtual void SetSilent(bool bSilent) = 0; - virtual unsigned long GetActivationTimer(void) = 0; + virtual unsigned long GetActivationTimer() = 0; virtual void SetActivationTimer(unsigned long ulActivationTime) = 0; - virtual DWORD GetExpiryTime(void) = 0; + virtual DWORD GetExpiryTime() = 0; virtual void SetExpiryTime(DWORD dwExpiryTime) = 0; - virtual float GetExplosionRadius(void) = 0; + virtual float GetExplosionRadius() = 0; virtual void SetExplosionRadius(float fRadius) = 0; }; diff --git a/Client/sdk/game/CExplosionManager.h b/Client/sdk/game/CExplosionManager.h index 92147998c3a..9448fcf8eab 100644 --- a/Client/sdk/game/CExplosionManager.h +++ b/Client/sdk/game/CExplosionManager.h @@ -22,7 +22,7 @@ class CExplosionManager virtual CExplosion* AddExplosion(CEntity* pExplodingEntity, CEntity* pOwner, eExplosionType explosionType, CVector& vecPosition, unsigned int uiActivationDelay = 0, bool bMakeSound = true, float fCamShake = -1.0f, bool bNoDamage = false) = 0; virtual VOID RemoveAllExplosionsInArea(CVector* vecPosition, FLOAT fRadius) = 0; - virtual VOID RemoveAllExplosions(void) = 0; + virtual VOID RemoveAllExplosions() = 0; virtual CExplosion* GetExplosion(DWORD ID) = 0; - virtual CExplosion* FindFreeExplosion(void) = 0; + virtual CExplosion* FindFreeExplosion() = 0; }; diff --git a/Client/sdk/game/CFxSystem.h b/Client/sdk/game/CFxSystem.h index 174b5ec5a09..0c57a34f7d1 100644 --- a/Client/sdk/game/CFxSystem.h +++ b/Client/sdk/game/CFxSystem.h @@ -29,7 +29,7 @@ class CFxSystem virtual void SetMatrix(const CMatrix& matrix) = 0; virtual void SetDrawDistance(float fDrawDistance) = 0; - virtual float GetDrawDistance(void) = 0; + virtual float GetDrawDistance() = 0; - virtual void* GetInterface(void) = 0; + virtual void* GetInterface() = 0; }; diff --git a/Client/sdk/game/CGame.h b/Client/sdk/game/CGame.h index c1e2c5adfd6..554f183d48a 100644 --- a/Client/sdk/game/CGame.h +++ b/Client/sdk/game/CGame.h @@ -14,7 +14,7 @@ // use this to check if you're using SA or VC headers #define GTA_SA -typedef void(InRenderer)(void); +typedef void(InRenderer)(); #include "Common.h" @@ -85,7 +85,7 @@ typedef void(InRenderer)(void); enum eEntityType; typedef bool(PreWeaponFireHandler)(class CPlayerPed* pPlayer, bool bStopIfUsingBulletSync); -typedef void(PostWeaponFireHandler)(void); +typedef void(PostWeaponFireHandler)(); typedef void(TaskSimpleBeHitHandler)(class CPedSAInterface* pPedAttacker, ePedPieceTypes hitBodyPart, int hitBodySide, int weaponId); enum eGameVersion @@ -184,33 +184,33 @@ class __declspec(novtable) CGame virtual VOID TakeScreenshot(char* szFileName) = 0; virtual DWORD* GetMemoryValue(DWORD dwOffset) = 0; virtual void SetTimeScale(float fTimeScale) = 0; - virtual float GetFPS(void) = 0; - virtual float GetTimeStep(void) = 0; - virtual float GetOldTimeStep(void) = 0; - virtual float GetTimeScale(void) = 0; + virtual float GetFPS() = 0; + virtual float GetTimeStep() = 0; + virtual float GetOldTimeStep() = 0; + virtual float GetTimeScale() = 0; - virtual void Initialize(void) = 0; - virtual void Reset(void) = 0; - virtual void Terminate(void) = 0; + virtual void Initialize() = 0; + virtual void Reset() = 0; + virtual void Terminate() = 0; virtual BOOL InitLocalPlayer(class CClientPed* pClientPed) = 0; - virtual float GetGravity(void) = 0; + virtual float GetGravity() = 0; virtual void SetGravity(float fGravity) = 0; - virtual float GetGameSpeed(void) = 0; + virtual float GetGameSpeed() = 0; virtual void SetGameSpeed(float fSpeed) = 0; - virtual unsigned long GetMinuteDuration(void) = 0; + virtual unsigned long GetMinuteDuration() = 0; virtual void SetMinuteDuration(unsigned long ulDelay) = 0; - virtual unsigned char GetBlurLevel(void) = 0; + virtual unsigned char GetBlurLevel() = 0; virtual void SetBlurLevel(unsigned char ucLevel) = 0; virtual void SetJetpackWeaponEnabled(eWeaponType weaponType, bool bEnabled); virtual bool GetJetpackWeaponEnabled(eWeaponType weaponType); - virtual eGameVersion GetGameVersion(void) = 0; + virtual eGameVersion GetGameVersion() = 0; virtual bool IsCheatEnabled(const char* szCheatName) = 0; virtual bool SetCheatEnabled(const char* szCheatName, bool bEnable) = 0; @@ -222,7 +222,7 @@ class __declspec(novtable) CGame virtual bool IsMoonEasterEggEnabled() = 0; virtual void SetMoonEasterEggEnabled(bool bEnable) = 0; - virtual CWeapon* CreateWeapon(void) = 0; + virtual CWeapon* CreateWeapon() = 0; virtual CWeaponStat* CreateWeaponStat(eWeaponType weaponType, eWeaponSkill weaponSkill) = 0; virtual bool VerifySADataFileNames() = 0; @@ -233,14 +233,14 @@ class __declspec(novtable) CGame virtual void SuspendASyncLoading(bool bSuspend, uint uiAutoUnsuspendDelay = 0) = 0; virtual bool IsASyncLoadingEnabled(bool bIgnoreSuspend = false) = 0; - virtual bool HasCreditScreenFadedOut(void) = 0; - virtual void FlushPendingRestreamIPL(void) = 0; - virtual void ResetModelLodDistances(void) = 0; - virtual void ResetAlphaTransparencies(void) = 0; - virtual void DisableVSync(void) = 0; + virtual bool HasCreditScreenFadedOut() = 0; + virtual void FlushPendingRestreamIPL() = 0; + virtual void ResetModelLodDistances() = 0; + virtual void ResetAlphaTransparencies() = 0; + virtual void DisableVSync() = 0; virtual void OnPedContextChange(CPed* pPedContext) = 0; - virtual CPed* GetPedContext(void) = 0; + virtual CPed* GetPedContext() = 0; virtual void GetShaderReplacementStats(SShaderReplacementStats& outStats) = 0; diff --git a/Client/sdk/game/CHandlingEntry.h b/Client/sdk/game/CHandlingEntry.h index f32b4320b74..d931ad6bfcc 100644 --- a/Client/sdk/game/CHandlingEntry.h +++ b/Client/sdk/game/CHandlingEntry.h @@ -88,57 +88,57 @@ class CHandlingEntry }; // Destructor - virtual ~CHandlingEntry(void){}; + virtual ~CHandlingEntry(){}; // Use this to copy data from an another handling class to this virtual void Assign(const CHandlingEntry* pData) = 0; // Get functions - virtual float GetMass(void) const = 0; - virtual float GetTurnMass(void) const = 0; - virtual float GetDragCoeff(void) const = 0; - virtual const CVector& GetCenterOfMass(void) const = 0; - - virtual unsigned int GetPercentSubmerged(void) const = 0; - virtual float GetTractionMultiplier(void) const = 0; - - virtual eDriveType GetCarDriveType(void) const = 0; - virtual eEngineType GetCarEngineType(void) const = 0; - virtual unsigned char GetNumberOfGears(void) const = 0; - - virtual float GetEngineAcceleration(void) const = 0; - virtual float GetEngineInertia(void) const = 0; - virtual float GetMaxVelocity(void) const = 0; - - virtual float GetBrakeDeceleration(void) const = 0; - virtual float GetBrakeBias(void) const = 0; - virtual bool GetABS(void) const = 0; - - virtual float GetSteeringLock(void) const = 0; - virtual float GetTractionLoss(void) const = 0; - virtual float GetTractionBias(void) const = 0; - - virtual float GetSuspensionForceLevel(void) const = 0; - virtual float GetSuspensionDamping(void) const = 0; - virtual float GetSuspensionHighSpeedDamping(void) const = 0; - virtual float GetSuspensionUpperLimit(void) const = 0; - virtual float GetSuspensionLowerLimit(void) const = 0; - virtual float GetSuspensionFrontRearBias(void) const = 0; - virtual float GetSuspensionAntiDiveMultiplier(void) const = 0; - - virtual float GetCollisionDamageMultiplier(void) const = 0; - - virtual unsigned int GetHandlingFlags(void) const = 0; - virtual unsigned int GetModelFlags(void) const = 0; - virtual float GetSeatOffsetDistance(void) const = 0; - virtual unsigned int GetMonetary(void) const = 0; - - virtual eLightType GetHeadLight(void) const = 0; - virtual eLightType GetTailLight(void) const = 0; - virtual unsigned char GetAnimGroup(void) const = 0; - - virtual eVehicleTypes GetModel(void) const = 0; - virtual bool HasSuspensionChanged(void) const = 0; + virtual float GetMass() const = 0; + virtual float GetTurnMass() const = 0; + virtual float GetDragCoeff() const = 0; + virtual const CVector& GetCenterOfMass() const = 0; + + virtual unsigned int GetPercentSubmerged() const = 0; + virtual float GetTractionMultiplier() const = 0; + + virtual eDriveType GetCarDriveType() const = 0; + virtual eEngineType GetCarEngineType() const = 0; + virtual unsigned char GetNumberOfGears() const = 0; + + virtual float GetEngineAcceleration() const = 0; + virtual float GetEngineInertia() const = 0; + virtual float GetMaxVelocity() const = 0; + + virtual float GetBrakeDeceleration() const = 0; + virtual float GetBrakeBias() const = 0; + virtual bool GetABS() const = 0; + + virtual float GetSteeringLock() const = 0; + virtual float GetTractionLoss() const = 0; + virtual float GetTractionBias() const = 0; + + virtual float GetSuspensionForceLevel() const = 0; + virtual float GetSuspensionDamping() const = 0; + virtual float GetSuspensionHighSpeedDamping() const = 0; + virtual float GetSuspensionUpperLimit() const = 0; + virtual float GetSuspensionLowerLimit() const = 0; + virtual float GetSuspensionFrontRearBias() const = 0; + virtual float GetSuspensionAntiDiveMultiplier() const = 0; + + virtual float GetCollisionDamageMultiplier() const = 0; + + virtual unsigned int GetHandlingFlags() const = 0; + virtual unsigned int GetModelFlags() const = 0; + virtual float GetSeatOffsetDistance() const = 0; + virtual unsigned int GetMonetary() const = 0; + + virtual eLightType GetHeadLight() const = 0; + virtual eLightType GetTailLight() const = 0; + virtual unsigned char GetAnimGroup() const = 0; + + virtual eVehicleTypes GetModel() const = 0; + virtual bool HasSuspensionChanged() const = 0; // Set functions virtual void SetMass(float fMass) = 0; diff --git a/Client/sdk/game/CHandlingManager.h b/Client/sdk/game/CHandlingManager.h index 60e25e0dbaf..d049a6cb130 100644 --- a/Client/sdk/game/CHandlingManager.h +++ b/Client/sdk/game/CHandlingManager.h @@ -16,10 +16,10 @@ class CHandlingManager { public: - virtual CHandlingEntry* CreateHandlingData(void) = 0; + virtual CHandlingEntry* CreateHandlingData() = 0; virtual const CHandlingEntry* GetOriginalHandlingData(enum eVehicleTypes eModel) = 0; virtual eHandlingProperty GetPropertyEnumFromName(std::string strName) = 0; - virtual void RemoveChangedVehicle(void) = 0; + virtual void RemoveChangedVehicle() = 0; virtual void CheckSuspensionChanges(CHandlingEntry* pEntry) = 0; }; diff --git a/Client/sdk/game/CHud.h b/Client/sdk/game/CHud.h index 036ac49380a..d4cfe82cd22 100644 --- a/Client/sdk/game/CHud.h +++ b/Client/sdk/game/CHud.h @@ -41,7 +41,7 @@ class CHud virtual VOID SetHelpMessage(char* szMessage) = 0; virtual VOID SetBigMessage(char* szBigMessage) = 0; virtual VOID Disable(bool bDisabled) = 0; - virtual bool IsDisabled(void) = 0; + virtual bool IsDisabled() = 0; // virtual VOID DrawBarChart ( float fX, float fY, DWORD dwWidth, DWORD dwHeight, float fPercentage, DWORD dwForeColor, DWORD dwBorderColor // )=0; virtual bool CalcScreenCoors(CVector* vecPosition1, CVector* vecPosition2, float* fX, float* fY, bool bSetting1, bool bSetting2) = 0; @@ -52,5 +52,5 @@ class CHud virtual void SetComponentVisible(eHudComponent component, bool bVisible) = 0; virtual bool IsComponentVisible(eHudComponent component) = 0; virtual void AdjustComponents(float fAspectRatio) = 0; - virtual void ResetComponentAdjustment(void) = 0; + virtual void ResetComponentAdjustment() = 0; }; diff --git a/Client/sdk/game/CModelInfo.h b/Client/sdk/game/CModelInfo.h index 9096e07eb0a..afd09775863 100644 --- a/Client/sdk/game/CModelInfo.h +++ b/Client/sdk/game/CModelInfo.h @@ -99,7 +99,7 @@ struct SVehicleSupportedUpgrades class CModelInfo { public: - virtual class CBaseModelInfoSAInterface* GetInterface(void) = 0; + virtual class CBaseModelInfoSAInterface* GetInterface() = 0; virtual DWORD GetModel() = 0; virtual BOOL IsBoat() = 0; @@ -131,7 +131,7 @@ class CModelInfo virtual void ModelAddRef(EModelRequestType requestType, const char* szTag /* = NULL*/) = 0; virtual void RemoveRef(bool bRemoveExtraGTARef = false) = 0; virtual int GetRefCount() = 0; - virtual bool ForceUnload(void) = 0; + virtual bool ForceUnload() = 0; virtual float GetDistanceFromCentreOfMassToBaseOfModel() = 0; @@ -143,8 +143,8 @@ class CModelInfo virtual short GetAvailableVehicleMod(unsigned short usSlot) = 0; virtual bool IsUpgradeAvailable(eVehicleUpgradePosn posn) = 0; virtual void SetCustomCarPlateText(const char* szText) = 0; - virtual unsigned int GetNumRemaps(void) = 0; - virtual void* GetVehicleSuspensionData(void) = 0; + virtual unsigned int GetNumRemaps() = 0; + virtual void* GetVehicleSuspensionData() = 0; virtual void* SetVehicleSuspensionData(void* pSuspensionLines) = 0; virtual CVector GetVehicleExhaustFumesPosition() = 0; virtual void SetVehicleExhaustFumesPosition(const CVector& position) = 0; @@ -162,14 +162,14 @@ class CModelInfo // Custom collision related functions virtual void SetCustomModel(RpClump* pClump) = 0; - virtual void RestoreOriginalModel(void) = 0; + virtual void RestoreOriginalModel() = 0; virtual void SetColModel(CColModel* pColModel) = 0; - virtual void RestoreColModel(void) = 0; + virtual void RestoreColModel() = 0; // Call this to make sure the custom vehicle models are being used after a load. - virtual void MakeCustomModel(void) = 0; - virtual RwObject* GetRwObject(void) = 0; + virtual void MakeCustomModel() = 0; + virtual RwObject* GetRwObject() = 0; - virtual SVehicleSupportedUpgrades GetVehicleSupportedUpgrades(void) = 0; - virtual void ResetSupportedUpgrades(void) = 0; + virtual SVehicleSupportedUpgrades GetVehicleSupportedUpgrades() = 0; + virtual void ResetSupportedUpgrades() = 0; }; diff --git a/Client/sdk/game/CObject.h b/Client/sdk/game/CObject.h index a5552ddbd53..ea58c9caa3a 100644 --- a/Client/sdk/game/CObject.h +++ b/Client/sdk/game/CObject.h @@ -20,14 +20,14 @@ class CObjectSAInterface; class CObject : public virtual CPhysical { public: - virtual ~CObject(void){}; + virtual ~CObject(){}; - virtual CObjectSAInterface* GetObjectInterface(void) = 0; + virtual CObjectSAInterface* GetObjectInterface() = 0; - virtual void Explode(void) = 0; - virtual void Break(void) = 0; + virtual void Explode() = 0; + virtual void Break() = 0; virtual void SetHealth(float fHealth) = 0; - virtual float GetHealth(void) = 0; + virtual float GetHealth() = 0; virtual void SetModelIndex(unsigned long ulModel) = 0; virtual void SetAlpha(unsigned char ucAlpha) = 0; diff --git a/Client/sdk/game/CPad.h b/Client/sdk/game/CPad.h index a745e6b6bc3..03dd8fa354b 100644 --- a/Client/sdk/game/CPad.h +++ b/Client/sdk/game/CPad.h @@ -60,11 +60,11 @@ class CPad virtual VOID SetLastControllerState(CControllerState* ControllerState) = 0; virtual VOID Restore() = 0; virtual VOID Store() = 0; - virtual bool IsEnabled(void) = 0; + virtual bool IsEnabled() = 0; virtual VOID Disable(bool bDisable) = 0; - virtual VOID Clear(void) = 0; + virtual VOID Clear() = 0; virtual VOID SetHornHistoryValue(bool value) = 0; - virtual long GetAverageWeapon(void) = 0; + virtual long GetAverageWeapon() = 0; virtual void SetLastTimeTouched(DWORD dwTime) = 0; virtual uint GetDrunkInputDelay() = 0; virtual void SetDrunkInputDelay(uint inputDelay) = 0; diff --git a/Client/sdk/game/CPed.h b/Client/sdk/game/CPed.h index a8f4174ef85..cf04c3f3cf9 100644 --- a/Client/sdk/game/CPed.h +++ b/Client/sdk/game/CPed.h @@ -171,19 +171,19 @@ using EPedWeaponAudioEvent::EPedWeaponAudioEventType; class CPed : public virtual CPhysical { public: - virtual ~CPed(void){}; + virtual ~CPed(){}; - virtual class CPedSAInterface* GetPedInterface(void) = 0; + virtual class CPedSAInterface* GetPedInterface() = 0; virtual void AttachPedToBike(CEntity* entity, CVector* vector, unsigned short sUnk, FLOAT fUnk, FLOAT fUnk2, eWeaponType weaponType) = 0; - virtual void DetachPedFromEntity(void) = 0; + virtual void DetachPedFromEntity() = 0; virtual bool CanSeeEntity(CEntity* entity, FLOAT fDistance) = 0; virtual CVehicle* GetVehicle() = 0; virtual void Respawn(CVector* position, bool bCameraCut) = 0; virtual void SetModelIndex(unsigned long ulModel) = 0; - virtual void RemoveGeometryRef(void) = 0; + virtual void RemoveGeometryRef() = 0; virtual FLOAT GetHealth() = 0; virtual void SetHealth(float fHealth) = 0; @@ -195,7 +195,7 @@ class CPed : public virtual CPhysical virtual CWeapon* GiveWeapon(eWeaponType weaponType, unsigned int uiAmmo, eWeaponSkill weaponSkill) = 0; virtual CWeapon* GetWeapon(eWeaponSlot weaponSlot) = 0; virtual CWeapon* GetWeapon(eWeaponType weaponType) = 0; - virtual void ClearWeapons(void) = 0; + virtual void ClearWeapons() = 0; virtual void RemoveWeaponModel(int iModel) = 0; virtual void ClearWeapon(eWeaponType weaponType) = 0; @@ -215,47 +215,47 @@ class CPed : public virtual CPhysical virtual CVector* GetBonePosition(eBone bone, CVector* vecPosition) = 0; virtual CVector* GetTransformedBonePosition(eBone bone, CVector* vecPosition) = 0; - virtual bool IsDucking(void) = 0; + virtual bool IsDucking() = 0; virtual void SetDucking(bool bDuck) = 0; - virtual bool IsInWater(void) = 0; - virtual int GetCantBeKnockedOffBike(void) = 0; + virtual bool IsInWater() = 0; + virtual int GetCantBeKnockedOffBike() = 0; virtual void SetCantBeKnockedOffBike(int iCantBeKnockedOffBike) = 0; virtual void QuitEnteringCar(CVehicle* vehicle, int iSeat, bool bUnknown) = 0; - virtual bool IsWearingGoggles(void) = 0; + virtual bool IsWearingGoggles() = 0; virtual void SetGogglesState(bool bIsWearingThem) = 0; virtual void SetClothesTextureAndModel(const char* szModel, const char* szModelLocationName, int iTexture) = 0; - virtual void RebuildPlayer(void) = 0; + virtual void RebuildPlayer() = 0; - virtual eFightingStyle GetFightingStyle(void) = 0; + virtual eFightingStyle GetFightingStyle() = 0; virtual void SetFightingStyle(eFightingStyle style, BYTE bStyleExtra) = 0; - virtual CEntity* GetContactEntity(void) = 0; + virtual CEntity* GetContactEntity() = 0; - virtual unsigned char GetRunState(void) = 0; + virtual unsigned char GetRunState() = 0; - virtual CEntity* GetTargetedEntity(void) = 0; + virtual CEntity* GetTargetedEntity() = 0; virtual void SetTargetedEntity(CEntity* pEntity) = 0; - virtual bool GetCanBeShotInVehicle(void) = 0; - virtual bool GetTestForShotInVehicle(void) = 0; + virtual bool GetCanBeShotInVehicle() = 0; + virtual bool GetTestForShotInVehicle() = 0; virtual void SetCanBeShotInVehicle(bool bShot) = 0; virtual void SetTestForShotInVehicle(bool bTest) = 0; - virtual BYTE GetOccupiedSeat(void) = 0; + virtual BYTE GetOccupiedSeat() = 0; virtual void SetOccupiedSeat(BYTE seat) = 0; virtual void RemoveBodyPart(int i, char c) = 0; virtual void SetFootBlood(unsigned int uiFootBlood) = 0; - virtual unsigned int GetFootBlood(void) = 0; + virtual unsigned int GetFootBlood() = 0; - virtual bool IsOnFire(void) = 0; + virtual bool IsOnFire() = 0; virtual void SetOnFire(bool bOnFire) = 0; - virtual bool GetStayInSamePlace(void) = 0; + virtual bool GetStayInSamePlace() = 0; virtual void SetStayInSamePlace(bool bStay) = 0; virtual void GetVoice(short* psVoiceType, short* psVoiceID) = 0; @@ -263,9 +263,9 @@ class CPed : public virtual CPhysical virtual void SetVoice(short sVoiceType, short sVoiceID) = 0; virtual void SetVoice(const char* szVoiceType, const char* szVoice) = 0; - virtual CWeaponStat* GetCurrentWeaponStat(void) = 0; - virtual float GetCurrentWeaponRange(void) = 0; + virtual CWeaponStat* GetCurrentWeaponStat() = 0; + virtual float GetCurrentWeaponRange() = 0; virtual void AddWeaponAudioEvent(EPedWeaponAudioEventType audioEventType) = 0; - virtual int GetCustomMoveAnim(void) = 0; + virtual int GetCustomMoveAnim() = 0; }; diff --git a/Client/sdk/game/CPedDamageResponse.h b/Client/sdk/game/CPedDamageResponse.h index 0fd6187efe6..6ede1b48d54 100644 --- a/Client/sdk/game/CPedDamageResponse.h +++ b/Client/sdk/game/CPedDamageResponse.h @@ -16,6 +16,6 @@ class CPedDamageResponseSAInterface; class CPedDamageResponse { public: - virtual CPedDamageResponseSAInterface* GetInterface(void) = 0; + virtual CPedDamageResponseSAInterface* GetInterface() = 0; virtual void Calculate(CEntity* pEntity, float fDamage, eWeaponType weaponType, ePedPieceTypes bodyPart, bool b_1, bool bSpeak) = 0; }; diff --git a/Client/sdk/game/CPedIntelligence.h b/Client/sdk/game/CPedIntelligence.h index 111afb8ae89..5372e8e6f40 100644 --- a/Client/sdk/game/CPedIntelligence.h +++ b/Client/sdk/game/CPedIntelligence.h @@ -20,10 +20,10 @@ class CPed; class CPedIntelligence { public: - virtual CTaskManager* GetTaskManager(void) = 0; - virtual bool IsRespondingToEvent(void) = 0; - virtual int GetCurrentEventType(void) = 0; - virtual CEvent* GetCurrentEvent(void) = 0; - virtual CVehicleScanner* GetVehicleScanner(void) = 0; + virtual CTaskManager* GetTaskManager() = 0; + virtual bool IsRespondingToEvent() = 0; + virtual int GetCurrentEventType() = 0; + virtual CEvent* GetCurrentEvent() = 0; + virtual CVehicleScanner* GetVehicleScanner() = 0; virtual bool TestForStealthKill(CPed* pPed, bool bUnk) = 0; }; diff --git a/Client/sdk/game/CPedSound.h b/Client/sdk/game/CPedSound.h index 0d8c6ed96f4..6cf2cf263ef 100644 --- a/Client/sdk/game/CPedSound.h +++ b/Client/sdk/game/CPedSound.h @@ -16,14 +16,14 @@ class CPedSoundSAInterface; class CPedSound { public: - virtual CPedSoundSAInterface* GetInterface(void) = 0; + virtual CPedSoundSAInterface* GetInterface() = 0; - virtual short GetVoiceTypeID(void) = 0; - virtual short GetVoiceID(void) = 0; + virtual short GetVoiceTypeID() = 0; + virtual short GetVoiceID() = 0; virtual void SetVoiceTypeID(short sVoiceType) = 0; virtual void SetVoiceID(short sVoiceID) = 0; - virtual bool IsSpeechDisabled(void) = 0; - virtual void EnablePedSpeech(void) = 0; + virtual bool IsSpeechDisabled() = 0; + virtual void EnablePedSpeech() = 0; virtual void DisablePedSpeech(bool bStopCurrent) = 0; }; diff --git a/Client/sdk/game/CPhysical.h b/Client/sdk/game/CPhysical.h index 1f586d6c2da..31051d5bc6a 100644 --- a/Client/sdk/game/CPhysical.h +++ b/Client/sdk/game/CPhysical.h @@ -16,42 +16,42 @@ class CPhysical : public virtual CEntity { public: - virtual ~CPhysical(void){}; + virtual ~CPhysical(){}; virtual CVector* GetMoveSpeed(CVector* vecMoveSpeed) = 0; virtual CVector* GetTurnSpeed(CVector* vecTurnSpeed) = 0; virtual void SetMoveSpeed(CVector* vecMoveSpeed) = 0; virtual void SetTurnSpeed(CVector* vecTurnSpeed) = 0; - virtual float GetMass(void) = 0; + virtual float GetMass() = 0; virtual void SetMass(float fMass) = 0; - virtual float GetTurnMass(void) = 0; + virtual float GetTurnMass() = 0; virtual void SetTurnMass(float fTurnMass) = 0; - virtual float GetAirResistance(void) = 0; + virtual float GetAirResistance() = 0; virtual void SetAirResistance(float fAirResistance) = 0; - virtual float GetElasticity(void) = 0; + virtual float GetElasticity() = 0; virtual void SetElasticity(float fElasticity) = 0; - virtual float GetBuoyancyConstant(void) = 0; + virtual float GetBuoyancyConstant() = 0; virtual void SetBuoyancyConstant(float fBuoyancyConstant) = 0; virtual void GetCenterOfMass(CVector& vecCenterOfMass) = 0; virtual void SetCenterOfMass(CVector& vecCenterOfMass) = 0; - virtual void ProcessCollision(void) = 0; - virtual void AddToMovingList(void) = 0; + virtual void ProcessCollision() = 0; + virtual void AddToMovingList() = 0; - virtual float GetDamageImpulseMagnitude(void) = 0; + virtual float GetDamageImpulseMagnitude() = 0; virtual void SetDamageImpulseMagnitude(float fMagnitude) = 0; - virtual CEntity* GetDamageEntity(void) = 0; + virtual CEntity* GetDamageEntity() = 0; virtual void SetDamageEntity(CEntity* pEntity) = 0; - virtual void ResetLastDamage(void) = 0; + virtual void ResetLastDamage() = 0; - virtual CEntity* GetAttachedEntity(void) = 0; + virtual CEntity* GetAttachedEntity() = 0; virtual void AttachEntityToEntity(CPhysical& Entity, const CVector& vecPosition, const CVector& vecRotation) = 0; virtual void DetachEntityFromEntity(float fUnkX, float fUnkY, float fUnkZ, bool bUnk) = 0; virtual void GetAttachedOffsets(CVector& vecPosition, CVector& vecRotation) = 0; virtual void SetAttachedOffsets(CVector& vecPosition, CVector& vecRotation) = 0; - virtual float GetLighting(void) = 0; + virtual float GetLighting() = 0; virtual void SetLighting(float fLighting) = 0; virtual void SetFrozen(bool bFrozen) = 0; diff --git a/Client/sdk/game/CPlane.h b/Client/sdk/game/CPlane.h index c84dccb4130..5df1c6bad75 100644 --- a/Client/sdk/game/CPlane.h +++ b/Client/sdk/game/CPlane.h @@ -16,5 +16,5 @@ class CPlane : public virtual CVehicle { public: - virtual ~CPlane(void){}; + virtual ~CPlane(){}; }; diff --git a/Client/sdk/game/CPlayerInfo.h b/Client/sdk/game/CPlayerInfo.h index bcd164d728a..4dd8ddf99b2 100644 --- a/Client/sdk/game/CPlayerInfo.h +++ b/Client/sdk/game/CPlayerInfo.h @@ -18,36 +18,36 @@ class CPlayerInfo { public: - virtual long GetPlayerMoney(void) = 0; + virtual long GetPlayerMoney() = 0; virtual void SetPlayerMoney(long lMoney, bool bInstant = false) = 0; - virtual void GivePlayerParachute(void) = 0; + virtual void GivePlayerParachute() = 0; virtual void StreamParachuteWeapon(bool bAllowParachute) = 0; - virtual short GetLastTimeEaten(void) = 0; + virtual short GetLastTimeEaten() = 0; virtual void SetLastTimeEaten(short sTime) = 0; - virtual CWanted* GetWanted(void) = 0; - virtual float GetFPSMoveHeading(void) = 0; + virtual CWanted* GetWanted() = 0; + virtual float GetFPSMoveHeading() = 0; virtual void GetCrossHair(bool& bActivated, float& fTargetX, float& fTargetY) = 0; - virtual bool GetDoesNotGetTired(void) = 0; + virtual bool GetDoesNotGetTired() = 0; virtual void SetDoesNotGetTired(bool bDoesNotGetTired) = 0; virtual CVehicle* GivePlayerRemoteControlledCar(eVehicleTypes vehicletype) = 0; - virtual DWORD GetLastTimeBigGunFired(void) = 0; + virtual DWORD GetLastTimeBigGunFired() = 0; virtual void SetLastTimeBigGunFired(DWORD dwTime) = 0; virtual byte GetCamDrunkLevel() = 0; virtual void SetCamDrunkLevel(byte level) = 0; - virtual DWORD GetCarTwoWheelCounter(void) = 0; - virtual float GetCarTwoWheelDist(void) = 0; - virtual DWORD GetCarLess3WheelCounter(void) = 0; - virtual DWORD GetBikeRearWheelCounter(void) = 0; - virtual float GetBikeRearWheelDist(void) = 0; - virtual DWORD GetBikeFrontWheelCounter(void) = 0; - virtual float GetBikeFrontWheelDist(void) = 0; + virtual DWORD GetCarTwoWheelCounter() = 0; + virtual float GetCarTwoWheelDist() = 0; + virtual DWORD GetCarLess3WheelCounter() = 0; + virtual DWORD GetBikeRearWheelCounter() = 0; + virtual float GetBikeRearWheelDist() = 0; + virtual DWORD GetBikeFrontWheelCounter() = 0; + virtual float GetBikeFrontWheelDist() = 0; }; diff --git a/Client/sdk/game/CPlayerPed.h b/Client/sdk/game/CPlayerPed.h index 7b94de8b22a..eec0af7af9c 100644 --- a/Client/sdk/game/CPlayerPed.h +++ b/Client/sdk/game/CPlayerPed.h @@ -17,15 +17,15 @@ class CPlayerPed : public virtual CPed { public: - virtual ~CPlayerPed(void){}; + virtual ~CPlayerPed(){}; - virtual CWanted* GetWanted(void) = 0; + virtual CWanted* GetWanted() = 0; - virtual float GetSprintEnergy(void) = 0; + virtual float GetSprintEnergy() = 0; virtual void SetSprintEnergy(float fSprintEnergy) = 0; - virtual void SetInitialState(void) = 0; + virtual void SetInitialState() = 0; - virtual eMoveAnim GetMoveAnim(void) = 0; + virtual eMoveAnim GetMoveAnim() = 0; virtual void SetMoveAnim(eMoveAnim iAnimGroup) = 0; }; diff --git a/Client/sdk/game/CProjectile.h b/Client/sdk/game/CProjectile.h index 4d83e2cc2fa..7767c2c326f 100644 --- a/Client/sdk/game/CProjectile.h +++ b/Client/sdk/game/CProjectile.h @@ -16,7 +16,7 @@ class CProjectile : public virtual CObject { public: - virtual ~CProjectile(void){}; + virtual ~CProjectile(){}; virtual void Destroy(bool bBlow) = 0; virtual void SetProjectileInfo(class CProjectileInfo* pProjectileInfo) = 0; diff --git a/Client/sdk/game/CProjectileInfo.h b/Client/sdk/game/CProjectileInfo.h index 5dd5bbf8043..55651830d64 100644 --- a/Client/sdk/game/CProjectileInfo.h +++ b/Client/sdk/game/CProjectileInfo.h @@ -25,11 +25,11 @@ class CProjectileInfo virtual CProjectileInfo* GetProjectileInfo(DWORD Index) = 0; virtual void RemoveAllProjectiles() = 0; - virtual CEntity* GetTarget(void) = 0; + virtual CEntity* GetTarget() = 0; virtual void SetTarget(CEntity* pEntity) = 0; - virtual bool IsActive(void) = 0; + virtual bool IsActive() = 0; virtual void SetCounter(DWORD dwCounter) = 0; - virtual DWORD GetCounter(void) = 0; + virtual DWORD GetCounter() = 0; }; diff --git a/Client/sdk/game/CQuadBike.h b/Client/sdk/game/CQuadBike.h index 93c1d3fe8fa..ae213356cce 100644 --- a/Client/sdk/game/CQuadBike.h +++ b/Client/sdk/game/CQuadBike.h @@ -16,5 +16,5 @@ class CQuadBike : public virtual CVehicle { public: - virtual ~CQuadBike(void){}; + virtual ~CQuadBike(){}; }; diff --git a/Client/sdk/game/CRenderWare.h b/Client/sdk/game/CRenderWare.h index 11a1e01fee4..d5f8ea36b72 100644 --- a/Client/sdk/game/CRenderWare.h +++ b/Client/sdk/game/CRenderWare.h @@ -38,7 +38,7 @@ struct SReplacementTextures // Shader layers to render struct SShaderItemLayers { - SShaderItemLayers(void) : pBase(NULL), bUsesVertexShader(false) {} + SShaderItemLayers() : pBase(NULL), bUsesVertexShader(false) {} CShaderItem* pBase; std::vector layerList; bool bUsesVertexShader; @@ -68,7 +68,7 @@ class CRenderWare virtual void ModelInfoTXDRemoveTextures(SReplacementTextures* pReplacementTextures) = 0; virtual void ClothesAddReplacementTxd(char* pFileData, ushort usFileId) = 0; virtual void ClothesRemoveReplacementTxd(char* pFileData) = 0; - virtual bool HasClothesReplacementChanged(void) = 0; + virtual bool HasClothesReplacementChanged() = 0; virtual RwTexDictionary* ReadTXD(const SString& strFilename, const CBuffer& fileData) = 0; virtual RpClump* ReadDFF(const SString& strFilename, const CBuffer& fileData, unsigned short usModelID, bool bLoadEmbeddedCollisions) = 0; virtual CColModel* ReadCOL(const CBuffer& fileData) = 0; @@ -86,7 +86,7 @@ class CRenderWare virtual void ReplaceWeaponModel(RpClump* pNew, unsigned short usModelID) = 0; virtual void ReplacePedModel(RpClump* pNew, unsigned short usModelID) = 0; virtual bool ReplacePartModels(RpClump* pClump, RpAtomicContainer* pAtomics, unsigned int uiAtomics, const char* szName) = 0; - virtual void PulseWorldTextureWatch(void) = 0; + virtual void PulseWorldTextureWatch() = 0; virtual void GetModelTextureNames(std::vector& outNameList, ushort usModelID) = 0; virtual const char* GetTextureName(CD3DDUMMY* pD3DData) = 0; diff --git a/Client/sdk/game/CSettings.h b/Client/sdk/game/CSettings.h index 4c6a6dc0171..abf7d94bcab 100644 --- a/Client/sdk/game/CSettings.h +++ b/Client/sdk/game/CSettings.h @@ -90,79 +90,79 @@ enum eRadarMode class CGameSettings { public: - virtual bool IsWideScreenEnabled(void) = 0; + virtual bool IsWideScreenEnabled() = 0; virtual void SetWideScreenEnabled(bool bEnabled) = 0; - virtual unsigned int GetNumVideoModes(void) = 0; + virtual unsigned int GetNumVideoModes() = 0; virtual VideoMode* GetVideoModeInfo(VideoMode* modeInfo, unsigned int modeIndex) = 0; - virtual unsigned int GetCurrentVideoMode(void) = 0; + virtual unsigned int GetCurrentVideoMode() = 0; virtual void SetCurrentVideoMode(unsigned int modeIndex, bool bOnRestart) = 0; - virtual unsigned int GetNumAdapters(void) = 0; - virtual unsigned int GetCurrentAdapter(void) = 0; - virtual bool HasUnsafeResolutions(void) = 0; + virtual unsigned int GetNumAdapters() = 0; + virtual unsigned int GetCurrentAdapter() = 0; + virtual bool HasUnsafeResolutions() = 0; virtual bool IsUnsafeResolution(int iWidth, int iHeight) = 0; virtual void SetAdapter(unsigned int uiAdapterIndex) = 0; - virtual unsigned char GetRadioVolume(void) = 0; + virtual unsigned char GetRadioVolume() = 0; virtual void SetRadioVolume(unsigned char ucVolume) = 0; - virtual unsigned char GetSFXVolume(void) = 0; + virtual unsigned char GetSFXVolume() = 0; virtual void SetSFXVolume(unsigned char ucVolume) = 0; - virtual unsigned int GetUsertrackMode(void) = 0; + virtual unsigned int GetUsertrackMode() = 0; virtual void SetUsertrackMode(unsigned int uiMode) = 0; - virtual bool IsUsertrackAutoScan(void) = 0; + virtual bool IsUsertrackAutoScan() = 0; virtual void SetUsertrackAutoScan(bool bEnable) = 0; - virtual bool IsRadioEqualizerEnabled(void) = 0; + virtual bool IsRadioEqualizerEnabled() = 0; virtual void SetRadioEqualizerEnabled(bool bEnable) = 0; - virtual bool IsRadioAutotuneEnabled(void) = 0; + virtual bool IsRadioAutotuneEnabled() = 0; virtual void SetRadioAutotuneEnabled(bool bEnable) = 0; - virtual float GetDrawDistance(void) = 0; + virtual float GetDrawDistance() = 0; virtual void SetDrawDistance(float fDrawDistance) = 0; - virtual unsigned int GetBrightness(void) = 0; + virtual unsigned int GetBrightness() = 0; virtual void SetBrightness(unsigned int uiBrightness) = 0; - virtual unsigned int GetFXQuality(void) = 0; + virtual unsigned int GetFXQuality() = 0; virtual void SetFXQuality(unsigned int fxQualityId) = 0; - virtual float GetMouseSensitivity(void) = 0; + virtual float GetMouseSensitivity() = 0; virtual void SetMouseSensitivity(float fSensitivity) = 0; - virtual unsigned int GetAntiAliasing(void) = 0; + virtual unsigned int GetAntiAliasing() = 0; virtual void SetAntiAliasing(unsigned int uiAntiAliasing, bool bOnRestart) = 0; - virtual bool IsMipMappingEnabled(void) = 0; + virtual bool IsMipMappingEnabled() = 0; virtual void SetMipMappingEnabled(bool bEnable) = 0; - virtual bool IsVolumetricShadowsEnabled(void) = 0; + virtual bool IsVolumetricShadowsEnabled() = 0; virtual void SetVolumetricShadowsEnabled(bool bEnable) = 0; virtual void SetVolumetricShadowsSuspended(bool bSuspended) = 0; - virtual float GetAspectRatioValue(void) = 0; - virtual eAspectRatio GetAspectRatio(void) = 0; + virtual float GetAspectRatioValue() = 0; + virtual eAspectRatio GetAspectRatio() = 0; virtual void SetAspectRatio(eAspectRatio aspectRatio, bool bAdjustmentEnabled = true) = 0; - virtual bool IsGrassEnabled(void) = 0; + virtual bool IsGrassEnabled() = 0; virtual void SetGrassEnabled(bool bEnable) = 0; - virtual eRadarMode GetRadarMode(void) = 0; + virtual eRadarMode GetRadarMode() = 0; virtual void SetRadarMode(eRadarMode hudMode) = 0; - virtual void UpdateFieldOfViewFromSettings(void) = 0; - virtual void ResetFieldOfViewFromScript(void) = 0; + virtual void UpdateFieldOfViewFromSettings() = 0; + virtual void ResetFieldOfViewFromScript() = 0; virtual void SetFieldOfViewPlayer(float fAngle, bool bFromScript) = 0; virtual void SetFieldOfViewVehicle(float fAngle, bool bFromScript) = 0; virtual void SetFieldOfViewVehicleMax(float fAngle, bool bFromScript) = 0; - virtual float GetFieldOfViewPlayer(void) = 0; - virtual float GetFieldOfViewVehicle(void) = 0; - virtual float GetFieldOfViewVehicleMax(void) = 0; + virtual float GetFieldOfViewPlayer() = 0; + virtual float GetFieldOfViewVehicle() = 0; + virtual float GetFieldOfViewVehicleMax() = 0; virtual void SetVehiclesLODDistance(float fVehiclesLODDistance, float fTrainsPlanesLODDistance) = 0; - virtual void ResetVehiclesLODDistance(void) = 0; + virtual void ResetVehiclesLODDistance() = 0; virtual void GetVehiclesLODDistance(float& fVehiclesLODDistance, float& fTrainsPlanesLODDistance) = 0; virtual void SetPedsLODDistance(float fPedsLODDistance) = 0; - virtual void ResetPedsLODDistance(void) = 0; - virtual float GetPedsLODDistance(void) = 0; + virtual void ResetPedsLODDistance() = 0; + virtual float GetPedsLODDistance() = 0; - virtual void Save(void) = 0; + virtual void Save() = 0; }; diff --git a/Client/sdk/game/CTasks.h b/Client/sdk/game/CTasks.h index 3e8f9e51314..395e55a095f 100644 --- a/Client/sdk/game/CTasks.h +++ b/Client/sdk/game/CTasks.h @@ -33,8 +33,8 @@ enum eClimbHeights class CTasks { public: - virtual CTaskSimplePlayerOnFoot* CreateTaskSimplePlayerOnFoot(void) = 0; - virtual CTaskComplexFacial* CreateTaskComplexFacial(void) = 0; + virtual CTaskSimplePlayerOnFoot* CreateTaskSimplePlayerOnFoot() = 0; + virtual CTaskComplexFacial* CreateTaskComplexFacial() = 0; virtual CTaskSimpleCarSetPedInAsDriver* CreateTaskSimpleCarSetPedInAsDriver(CVehicle* pVehicle) = 0; virtual CTaskSimpleCarSetPedInAsPassenger* CreateTaskSimpleCarSetPedInAsPassenger(CVehicle* pVehicle, int iTargetDoor) = 0; diff --git a/Client/sdk/game/CTrailer.h b/Client/sdk/game/CTrailer.h index b52889bd2b4..0d1d5acf5bb 100644 --- a/Client/sdk/game/CTrailer.h +++ b/Client/sdk/game/CTrailer.h @@ -16,5 +16,5 @@ class CTrailer : public virtual CVehicle { public: - virtual ~CTrailer(void){}; + virtual ~CTrailer(){}; }; diff --git a/Client/sdk/game/CVehicle.h b/Client/sdk/game/CVehicle.h index 5f2d4bbe22a..2b82e66ea87 100644 --- a/Client/sdk/game/CVehicle.h +++ b/Client/sdk/game/CVehicle.h @@ -91,7 +91,7 @@ class CVehicle : public virtual CPhysical virtual float GetDistanceToCarriage(CVehicle* pCarriage) = 0; virtual void AttachTrainCarriage(CVehicle* pCarriage) = 0; virtual void DetachTrainCarriage(CVehicle* pCarriage) = 0; - virtual bool IsChainEngine(void) = 0; + virtual bool IsChainEngine() = 0; virtual void SetIsChainEngine(bool bChainEngine = true) = 0; virtual bool IsDerailed() = 0; @@ -104,7 +104,7 @@ class CVehicle : public virtual CPhysical virtual void SetTrainDirection(bool bDirection) = 0; virtual BYTE GetRailTrack() = 0; virtual void SetRailTrack(BYTE ucTrackID) = 0; - virtual float GetTrainPosition(void) = 0; + virtual float GetTrainPosition() = 0; virtual void SetTrainPosition(float fPosition, bool bRecalcOnRailDistance = true) = 0; virtual bool CanPedEnterCar() = 0; @@ -259,45 +259,45 @@ class CVehicle : public virtual CPhysical virtual void GetGravity(CVector* pvecGravity) const = 0; virtual void SetGravity(const CVector* pvecGravity) = 0; - virtual SColor GetHeadLightColor(void) = 0; + virtual SColor GetHeadLightColor() = 0; virtual void SetHeadLightColor(const SColor color) = 0; virtual CObject* SpawnFlyingComponent(int i_1, unsigned int ui_2) = 0; virtual void SetWheelVisibility(eWheelPosition wheel, bool bVisible) = 0; virtual CVector GetWheelPosition(eWheelPosition wheel) = 0; - virtual bool IsHeliSearchLightVisible(void) = 0; + virtual bool IsHeliSearchLightVisible() = 0; virtual void SetHeliSearchLightVisible(bool bVisible) = 0; - virtual CColModel* GetSpecialColModel(void) = 0; + virtual CColModel* GetSpecialColModel() = 0; virtual bool UpdateMovingCollision(float fAngle) = 0; - virtual void RecalculateHandling(void) = 0; + virtual void RecalculateHandling() = 0; - virtual void* GetPrivateSuspensionLines(void) = 0; + virtual void* GetPrivateSuspensionLines() = 0; - virtual bool DoesVehicleHaveSirens(void) = 0; + virtual bool DoesVehicleHaveSirens() = 0; - virtual void RemoveVehicleSirens(void) = 0; + virtual void RemoveVehicleSirens() = 0; virtual void GiveVehicleSirens(unsigned char ucSirenType, unsigned char ucSirenCount) = 0; virtual void SetVehicleSirenMinimumAlpha(unsigned char ucSirenID, DWORD dwPercentage) = 0; virtual void SetVehicleSirenPosition(unsigned char ucSirenID, CVector vecPos) = 0; virtual void GetVehicleSirenPosition(unsigned char ucSirenID, CVector& vecPos) = 0; - virtual unsigned char GetVehicleSirenCount(void) = 0; - virtual unsigned char GetVehicleSirenType(void) = 0; + virtual unsigned char GetVehicleSirenCount() = 0; + virtual unsigned char GetVehicleSirenType() = 0; virtual DWORD GetVehicleSirenMinimumAlpha(unsigned char ucSirenID) = 0; virtual SColor GetVehicleSirenColour(unsigned char ucSirenCount) = 0; virtual void SetVehicleSirenColour(unsigned char ucSirenID, SColor tVehicleSirenColour) = 0; virtual void SetVehicleCurrentSirenID(unsigned char ucCurrentSirenID) = 0; - virtual unsigned char GetVehicleCurrentSirenID(void) = 0; - virtual unsigned char GetSirenRandomiser(void) = 0; + virtual unsigned char GetVehicleCurrentSirenID() = 0; + virtual unsigned char GetSirenRandomiser() = 0; virtual void SetSirenRandomiser(unsigned char ucSirenRandomiser) = 0; virtual void SetPointLightColour(SColor tPointLightColour) = 0; - virtual SColor GetPointLightColour(void) = 0; - virtual bool IsSiren360EffectEnabled(void) = 0; - virtual bool IsSirenLOSCheckEnabled(void) = 0; - virtual bool IsSirenRandomiserEnabled(void) = 0; - virtual bool IsSirenSilentEffectEnabled(void) = 0; + virtual SColor GetPointLightColour() = 0; + virtual bool IsSiren360EffectEnabled() = 0; + virtual bool IsSirenLOSCheckEnabled() = 0; + virtual bool IsSirenRandomiserEnabled() = 0; + virtual bool IsSirenSilentEffectEnabled() = 0; virtual void SetVehicleFlags(bool bEnable360, bool bEnableRandomiser, bool bEnableLOSCheck, bool bEnableSilent) = 0; virtual bool SetComponentRotation(const SString& vehicleComponent, const CVector& vecRotation) = 0; virtual bool GetComponentRotation(const SString& vehicleComponent, CVector& vecRotation) = 0; @@ -311,9 +311,9 @@ class CVehicle : public virtual CPhysical virtual bool GetComponentParentToRootMatrix(const SString& vehicleComponent, CMatrix& matOutParentToRoot) = 0; virtual bool SetComponentVisible(const SString& vehicleComponent, bool bVisible) = 0; virtual bool GetComponentVisible(const SString& vehicleComponent, bool& bVisible) = 0; - virtual std::map& GetComponentMap(void) = 0; - virtual void UpdateLandingGearPosition(void) = 0; + virtual std::map& GetComponentMap() = 0; + virtual void UpdateLandingGearPosition() = 0; virtual bool SetPlateText(const SString& strText) = 0; virtual bool SetWindowOpenFlagState(unsigned char ucWindow, bool bState) = 0; - virtual CAEVehicleAudioEntity* GetVehicleAudioEntity(void) = 0; + virtual CAEVehicleAudioEntity* GetVehicleAudioEntity() = 0; }; diff --git a/Client/sdk/game/CWanted.h b/Client/sdk/game/CWanted.h index 4430f05554e..9d1ac562ea2 100644 --- a/Client/sdk/game/CWanted.h +++ b/Client/sdk/game/CWanted.h @@ -18,7 +18,7 @@ class CWanted public: virtual void SetMaximumWantedLevel(DWORD dwWantedLevel) = 0; virtual void SetWantedLevel(DWORD dwWantedLevel) = 0; - virtual char GetWantedLevel(void) = 0; + virtual char GetWantedLevel() = 0; virtual void SetWantedLevelNoDrop(DWORD dwWantedLevel) = 0; virtual void SetWantedLevelNoFlash(DWORD dwWantedLevel) = 0; }; diff --git a/Client/sdk/game/CWaterManager.h b/Client/sdk/game/CWaterManager.h index 0e3d441b705..da5aca39116 100644 --- a/Client/sdk/game/CWaterManager.h +++ b/Client/sdk/game/CWaterManager.h @@ -24,12 +24,12 @@ class CWaterManager virtual bool SetWorldWaterLevel(float fLevel, void* pChangeSource, bool bIncludeWorldNonSeaLevel) = 0; virtual bool SetPositionWaterLevel(const CVector& vecPosition, float fLevel, void* pChangeSource) = 0; virtual bool SetPolyWaterLevel(CWaterPoly* pPoly, float fLevel, void* pChangeSource) = 0; - virtual void ResetWorldWaterLevel(void) = 0; + virtual void ResetWorldWaterLevel() = 0; virtual float GetWaveLevel() = 0; virtual void SetWaveLevel(float fWaveLevel) = 0; virtual void SetWaterDrawnLast(bool bEnable) = 0; - virtual bool IsWaterDrawnLast(void) = 0; + virtual bool IsWaterDrawnLast() = 0; virtual bool TestLineAgainstWater(const CVector& vecStart, const CVector& vecEnd, CVector* vecCollision) = 0; diff --git a/Client/sdk/game/CWeapon.h b/Client/sdk/game/CWeapon.h index aec0977db24..a4ab66751dc 100644 --- a/Client/sdk/game/CWeapon.h +++ b/Client/sdk/game/CWeapon.h @@ -40,7 +40,7 @@ class CWeapon virtual VOID SetAsCurrentWeapon() = 0; virtual CWeaponInfo* GetInfo(eWeaponSkill skill) = 0; virtual void Remove() = 0; - virtual void Destroy(void) = 0; + virtual void Destroy() = 0; virtual void Initialize(eWeaponType type, unsigned int uiAmmo, CPed* pPed) = 0; virtual void Update(CPed* pPed) = 0; virtual bool Fire(CEntity* pFiringEntity, CVector* pvecOrigin, CVector* pvecOffset, CEntity* pTargetEntity, CVector* pvec_1, CVector* pvec2) = 0; diff --git a/Client/sdk/game/CWeaponInfo.h b/Client/sdk/game/CWeaponInfo.h index 28a65a79ecd..6477a57df36 100644 --- a/Client/sdk/game/CWeaponInfo.h +++ b/Client/sdk/game/CWeaponInfo.h @@ -194,85 +194,85 @@ enum eWeaponModel class CWeaponInfo { public: - virtual eWeaponModel GetModel(void) = 0; - virtual eWeaponModel GetModel2(void) = 0; + virtual eWeaponModel GetModel() = 0; + virtual eWeaponModel GetModel2() = 0; - virtual float GetWeaponRange(void) = 0; + virtual float GetWeaponRange() = 0; virtual void SetWeaponRange(float fRange) = 0; - virtual float GetTargetRange(void) = 0; + virtual float GetTargetRange() = 0; virtual void SetTargetRange(float fRange) = 0; - virtual CVector* GetFireOffset(void) = 0; + virtual CVector* GetFireOffset() = 0; virtual void SetFireOffset(CVector* vecFireOffset) = 0; - virtual short GetDamagePerHit(void) = 0; + virtual short GetDamagePerHit() = 0; virtual void SetDamagePerHit(short sDamagePerHit) = 0; - virtual float GetAccuracy(void) = 0; + virtual float GetAccuracy() = 0; virtual void SetAccuracy(float fAccuracy) = 0; - virtual short GetMaximumClipAmmo(void) = 0; + virtual short GetMaximumClipAmmo() = 0; virtual void SetMaximumClipAmmo(short sAccuracy) = 0; - virtual float GetMoveSpeed(void) = 0; + virtual float GetMoveSpeed() = 0; virtual void SetMoveSpeed(float fMoveSpeed) = 0; // projectile/areaeffect only - virtual float GetFiringSpeed(void) = 0; + virtual float GetFiringSpeed() = 0; virtual void SetFiringSpeed(float fFiringSpeed) = 0; // area effect only - virtual float GetRadius(void) = 0; + virtual float GetRadius() = 0; virtual void SetRadius(float fRadius) = 0; - virtual float GetLifeSpan(void) = 0; + virtual float GetLifeSpan() = 0; virtual void SetLifeSpan(float fLifeSpan) = 0; - virtual float GetSpread(void) = 0; + virtual float GetSpread() = 0; virtual void SetSpread(float fSpread) = 0; - virtual float GetAnimBreakoutTime(void) = 0; + virtual float GetAnimBreakoutTime() = 0; virtual void SetAnimBreakoutTime(float fBreakoutTime) = 0; - virtual eWeaponSlot GetSlot(void) = 0; + virtual eWeaponSlot GetSlot() = 0; virtual void SetSlot(eWeaponSlot dwSlot) = 0; - virtual eWeaponSkill GetSkill(void) = 0; + virtual eWeaponSkill GetSkill() = 0; virtual void SetSkill(eWeaponSkill weaponSkill) = 0; - virtual float GetRequiredStatLevel(void) = 0; + virtual float GetRequiredStatLevel() = 0; virtual void SetRequiredStatLevel(float fStatLevel) = 0; virtual void SetFlags(int flags) = 0; virtual void SetFlag(DWORD flag) = 0; virtual void ClearFlag(DWORD flag) = 0; virtual bool IsFlagSet(DWORD flag) = 0; - virtual short GetFlags(void) = 0; + virtual short GetFlags() = 0; - virtual DWORD GetAnimGroup(void) = 0; + virtual DWORD GetAnimGroup() = 0; virtual void SetAnimGroup(DWORD dwAnimGroup) = 0; - virtual eFireType GetFireType(void) = 0; + virtual eFireType GetFireType() = 0; - virtual float GetWeaponAnimLoopStart(void) = 0; + virtual float GetWeaponAnimLoopStart() = 0; - virtual float GetWeaponAnimLoopStop(void) = 0; + virtual float GetWeaponAnimLoopStop() = 0; - virtual float GetWeaponAnimLoopFireTime(void) = 0; + virtual float GetWeaponAnimLoopFireTime() = 0; virtual void SetWeaponAnimLoopFireTime(float animFireTime) = 0; - virtual float GetWeaponAnim2LoopStart(void) = 0; + virtual float GetWeaponAnim2LoopStart() = 0; - virtual float GetWeaponAnim2LoopStop(void) = 0; + virtual float GetWeaponAnim2LoopStop() = 0; - virtual float GetWeaponAnim2LoopFireTime(void) = 0; + virtual float GetWeaponAnim2LoopFireTime() = 0; - virtual float GetWeaponAnimBreakoutTime(void) = 0; + virtual float GetWeaponAnimBreakoutTime() = 0; - virtual float GetWeaponRadius(void) = 0; + virtual float GetWeaponRadius() = 0; - virtual short GetAimOffsetIndex(void) = 0; - virtual BYTE GetDefaultCombo(void) = 0; - virtual BYTE GetCombosAvailable(void) = 0; + virtual short GetAimOffsetIndex() = 0; + virtual BYTE GetDefaultCombo() = 0; + virtual BYTE GetCombosAvailable() = 0; }; diff --git a/Client/sdk/game/CWeaponStat.h b/Client/sdk/game/CWeaponStat.h index 040de71022a..c8b1a075f34 100644 --- a/Client/sdk/game/CWeaponStat.h +++ b/Client/sdk/game/CWeaponStat.h @@ -14,8 +14,8 @@ class CWeaponStat { public: - virtual eWeaponType GetWeaponType(void) = 0; - virtual eWeaponSkill GetWeaponSkillLevel(void) = 0; + virtual eWeaponType GetWeaponType() = 0; + virtual eWeaponSkill GetWeaponSkillLevel() = 0; virtual void SetWeaponType(eWeaponType weaponType) = 0; virtual void SetWeaponSkillLevel(eWeaponSkill skillLevel) = 0; @@ -30,103 +30,103 @@ class CWeaponStat // For initialization only virtual void SetFlags(int iFlags) = 0; virtual bool IsFlagSet(DWORD flag) = 0; - virtual int GetFlags(void) = 0; + virtual int GetFlags() = 0; - virtual eWeaponModel GetModel(void) = 0; + virtual eWeaponModel GetModel() = 0; virtual void SetModel(int iModel) = 0; - virtual eWeaponModel GetModel2(void) = 0; + virtual eWeaponModel GetModel2() = 0; virtual void SetModel2(int iModel) = 0; - virtual float GetWeaponRange(void) = 0; + virtual float GetWeaponRange() = 0; virtual void SetWeaponRange(float fRange) = 0; - virtual float GetTargetRange(void) = 0; + virtual float GetTargetRange() = 0; virtual void SetTargetRange(float fRange) = 0; - virtual CVector* GetFireOffset(void) = 0; + virtual CVector* GetFireOffset() = 0; virtual void SetFireOffset(CVector* vecFireOffset) = 0; - virtual short GetDamagePerHit(void) = 0; + virtual short GetDamagePerHit() = 0; virtual void SetDamagePerHit(short sDamagePerHit) = 0; - virtual float GetAccuracy(void) = 0; + virtual float GetAccuracy() = 0; virtual void SetAccuracy(float fAccuracy) = 0; - virtual short GetMaximumClipAmmo(void) = 0; + virtual short GetMaximumClipAmmo() = 0; virtual void SetMaximumClipAmmo(short sAccuracy) = 0; - virtual float GetMoveSpeed(void) = 0; + virtual float GetMoveSpeed() = 0; virtual void SetMoveSpeed(float fMoveSpeed) = 0; // projectile/areaeffect only - virtual float GetFiringSpeed(void) = 0; + virtual float GetFiringSpeed() = 0; virtual void SetFiringSpeed(float fFiringSpeed) = 0; // area effect only - virtual float GetRadius(void) = 0; + virtual float GetRadius() = 0; virtual void SetRadius(float fRadius) = 0; - virtual float GetLifeSpan(void) = 0; + virtual float GetLifeSpan() = 0; virtual void SetLifeSpan(float fLifeSpan) = 0; - virtual float GetSpread(void) = 0; + virtual float GetSpread() = 0; virtual void SetSpread(float fSpread) = 0; - virtual float GetAnimBreakoutTime(void) = 0; + virtual float GetAnimBreakoutTime() = 0; virtual void SetAnimBreakoutTime(float fBreakoutTime) = 0; - virtual eWeaponSlot GetSlot(void) = 0; + virtual eWeaponSlot GetSlot() = 0; virtual void SetSlot(eWeaponSlot dwSlot) = 0; - virtual eWeaponSkill GetSkill(void) = 0; + virtual eWeaponSkill GetSkill() = 0; virtual void SetSkill(eWeaponSkill weaponSkill) = 0; - virtual float GetRequiredStatLevel(void) = 0; + virtual float GetRequiredStatLevel() = 0; virtual void SetRequiredStatLevel(float fStatLevel) = 0; virtual void SetRequiredStatLevel(int iStatLevel) = 0; - virtual DWORD GetAnimGroup(void) = 0; + virtual DWORD GetAnimGroup() = 0; virtual void SetAnimGroup(DWORD dwAnimGroup) = 0; - virtual eFireType GetFireType(void) = 0; + virtual eFireType GetFireType() = 0; virtual void SetFireType(eFireType type) = 0; // Floats - virtual float GetWeaponAnimLoopStart(void) = 0; + virtual float GetWeaponAnimLoopStart() = 0; virtual void SetWeaponAnimLoopStart(float animLoopStart) = 0; - virtual float GetWeaponAnimLoopStop(void) = 0; + virtual float GetWeaponAnimLoopStop() = 0; virtual void SetWeaponAnimLoopStop(float animLoopEnd) = 0; - virtual float GetWeaponAnimLoopFireTime(void) = 0; + virtual float GetWeaponAnimLoopFireTime() = 0; virtual void SetWeaponAnimLoopFireTime(float animFireTime) = 0; - virtual float GetWeaponAnim2LoopStart(void) = 0; + virtual float GetWeaponAnim2LoopStart() = 0; virtual void SetWeaponAnim2LoopStart(float anim2LoopStart) = 0; - virtual float GetWeaponAnim2LoopStop(void) = 0; + virtual float GetWeaponAnim2LoopStop() = 0; virtual void SetWeaponAnim2LoopStop(float anim2LoopEnd) = 0; - virtual float GetWeaponAnim2LoopFireTime(void) = 0; + virtual float GetWeaponAnim2LoopFireTime() = 0; virtual void SetWeaponAnim2LoopFireTime(float anim2FireTime) = 0; - virtual float GetWeaponAnimBreakoutTime(void) = 0; + virtual float GetWeaponAnimBreakoutTime() = 0; virtual void SetWeaponAnimBreakoutTime(float animBreakoutTime) = 0; - virtual float GetWeaponSpeed(void) = 0; + virtual float GetWeaponSpeed() = 0; virtual void SetWeaponSpeed(float fSpeed) = 0; - virtual float GetWeaponRadius(void) = 0; + virtual float GetWeaponRadius() = 0; virtual void SetWeaponRadius(float fRadius) = 0; // Ints - virtual short GetAimOffsetIndex(void) = 0; + virtual short GetAimOffsetIndex() = 0; virtual void SetAimOffsetIndex(short sIndex) = 0; - virtual BYTE GetDefaultCombo(void) = 0; + virtual BYTE GetDefaultCombo() = 0; virtual void SetDefaultCombo(BYTE defaultCombo) = 0; - virtual BYTE GetCombosAvailable(void) = 0; + virtual BYTE GetCombosAvailable() = 0; virtual void SetCombosAvailable(BYTE nCombosAvailable) = 0; }; diff --git a/Client/sdk/game/CWeaponStatManager.h b/Client/sdk/game/CWeaponStatManager.h index 847f6c7b93b..f0f79243e98 100644 --- a/Client/sdk/game/CWeaponStatManager.h +++ b/Client/sdk/game/CWeaponStatManager.h @@ -18,8 +18,8 @@ class CWeaponStatManager virtual CWeaponStat* GetWeaponStats(eWeaponType type, eWeaponSkill skill = WEAPONSKILL_STD) = 0; virtual CWeaponStat* GetWeaponStatsFromSkillLevel(eWeaponType type, float fSkillLevel) = 0; virtual CWeaponStat* GetOriginalWeaponStats(eWeaponType type, eWeaponSkill skill = WEAPONSKILL_STD) = 0; - virtual void Init(void) = 0; - virtual void ResetLists(void) = 0; + virtual void Init() = 0; + virtual void ResetLists() = 0; virtual bool LoadDefault(CWeaponStat* pDest, eWeaponType weaponType, eWeaponSkill skill = WEAPONSKILL_STD) = 0; virtual void CreateWeaponStat(CWeaponInfo* pInterface, eWeaponType weaponType, eWeaponSkill weaponSkill) = 0; virtual CWeaponStat* CreateWeaponStatUnlisted(eWeaponType weaponType, eWeaponSkill weaponSkill) = 0; diff --git a/Client/sdk/game/CWeather.h b/Client/sdk/game/CWeather.h index 9130dda9c7e..1f0f96c23d2 100644 --- a/Client/sdk/game/CWeather.h +++ b/Client/sdk/game/CWeather.h @@ -16,17 +16,17 @@ class CWeather { public: - virtual unsigned char Get(void) = 0; + virtual unsigned char Get() = 0; virtual void Set(unsigned char primary, unsigned char secondary) = 0; virtual void SetPrimary(unsigned char weather) = 0; virtual void SetSecondary(unsigned char weather) = 0; virtual void ForceWeather(unsigned char weather) = 0; virtual void ForceWeatherNow(unsigned char weather) = 0; - virtual void Release(void) = 0; + virtual void Release() = 0; - virtual bool IsRaining(void) = 0; - virtual float GetAmountOfRain(void) = 0; + virtual bool IsRaining() = 0; + virtual float GetAmountOfRain() = 0; virtual void SetAmountOfRain(float fAmount) = 0; - virtual void ResetAmountOfRain(void) = 0; + virtual void ResetAmountOfRain() = 0; }; diff --git a/Client/sdk/game/CWorld.h b/Client/sdk/game/CWorld.h index 8d03f067cd3..878437a4755 100644 --- a/Client/sdk/game/CWorld.h +++ b/Client/sdk/game/CWorld.h @@ -16,7 +16,7 @@ struct SLineOfSightFlags { - SLineOfSightFlags(void) + SLineOfSightFlags() : bCheckBuildings(true), bCheckVehicles(true), bCheckPeds(true), @@ -41,7 +41,7 @@ struct SLineOfSightFlags struct SLineOfSightBuildingResult { - SLineOfSightBuildingResult(void) : bValid(false) {} + SLineOfSightBuildingResult() : bValid(false) {} bool bValid; ushort usModelID; ushort usLODModelID; @@ -165,16 +165,16 @@ class CWorld virtual void LoadMapAroundPoint(CVector* vecPosition, float fRadius) = 0; virtual bool IsLineOfSightClear(const CVector* vecStart, const CVector* vecEnd, const SLineOfSightFlags flags = SLineOfSightFlags()) = 0; virtual bool HasCollisionBeenLoaded(CVector* vecPosition) = 0; - virtual DWORD GetCurrentArea(void) = 0; + virtual DWORD GetCurrentArea() = 0; virtual void SetCurrentArea(DWORD dwArea) = 0; virtual void SetJetpackMaxHeight(float fHeight) = 0; - virtual float GetJetpackMaxHeight(void) = 0; + virtual float GetJetpackMaxHeight() = 0; virtual void SetAircraftMaxHeight(float fHeight) = 0; - virtual float GetAircraftMaxHeight(void) = 0; + virtual float GetAircraftMaxHeight() = 0; virtual void SetAircraftMaxVelocity(float fVelocity) = 0; - virtual float GetAircraftMaxVelocity(void) = 0; + virtual float GetAircraftMaxVelocity() = 0; virtual void SetOcclusionsEnabled(bool bEnabled) = 0; - virtual bool GetOcclusionsEnabled(void) = 0; + virtual bool GetOcclusionsEnabled() = 0; virtual void FindWorldPositionForRailTrackPosition(float fRailTrackPosition, int iTrackId, CVector* pOutVecPosition) = 0; virtual int FindClosestRailTrackNode(const CVector& vecPosition, uchar& ucOutTrackId, float& fOutRailDistance) = 0; diff --git a/Client/sdk/game/Task.h b/Client/sdk/game/Task.h index 021516c47ba..3fd7cf6f0ab 100644 --- a/Client/sdk/game/Task.h +++ b/Client/sdk/game/Task.h @@ -28,7 +28,7 @@ class CEvent; class CTask { public: - virtual ~CTask(void){}; + virtual ~CTask(){}; virtual CTask* Clone() = 0; virtual void SetParent(CTask* pParent) = 0; @@ -39,8 +39,8 @@ class CTask virtual void StopTimer(const CEvent* pEvent) = 0; virtual bool MakeAbortable(CPed* pPed, const int iPriority, const CEvent* pEvent) = 0; virtual const char* GetTaskName() = 0; - virtual class CTaskSAInterface* GetInterface(void) = 0; - virtual bool IsValid(void) = 0; + virtual class CTaskSAInterface* GetInterface() = 0; + virtual bool IsValid() = 0; virtual void SetAsPedTask(CPed* pPed, const int iTaskPriority, const bool bForceNewTask = false) = 0; virtual void SetAsSecondaryPedTask(CPed* pPed, const int iType) = 0; @@ -51,7 +51,7 @@ class CTask class CTaskSimple : public virtual CTask { public: - virtual ~CTaskSimple(void){}; + virtual ~CTaskSimple(){}; virtual bool ProcessPed(CPed* pPed) = 0; virtual bool SetPedPosition(CPed* pPed) = 0; @@ -60,7 +60,7 @@ class CTaskSimple : public virtual CTask class CTaskComplex : public virtual CTask { public: - virtual ~CTaskComplex(void){}; + virtual ~CTaskComplex(){}; virtual void SetSubTask(CTask* pSubTask) = 0; virtual CTask* CreateNextSubTask(CPed* pPed) = 0; diff --git a/Client/sdk/game/TaskAttack.h b/Client/sdk/game/TaskAttack.h index 63cec96bc25..c66edccf2e4 100644 --- a/Client/sdk/game/TaskAttack.h +++ b/Client/sdk/game/TaskAttack.h @@ -16,7 +16,7 @@ class CTaskSimpleGangDriveBy : public virtual CTaskSimple { public: - virtual ~CTaskSimpleGangDriveBy(void){}; + virtual ~CTaskSimpleGangDriveBy(){}; }; enum eGunCommand @@ -36,7 +36,7 @@ class CVector2D; class CTaskSimpleUseGun : public virtual CTaskSimple { public: - virtual ~CTaskSimpleUseGun(void){}; + virtual ~CTaskSimpleUseGun(){}; virtual bool ControlGun(CPed* pPed, CEntity* pTargetEntity, char nCommand) = 0; virtual bool ControlGunMove(CVector2D* pMoveVec) = 0; @@ -46,5 +46,5 @@ class CTaskSimpleUseGun : public virtual CTaskSimple class CTaskSimpleFight : public virtual CTaskSimple { public: - virtual ~CTaskSimpleFight(void){}; + virtual ~CTaskSimpleFight(){}; }; diff --git a/Client/sdk/game/TaskBasic.h b/Client/sdk/game/TaskBasic.h index d07f3e83756..a8f5faba489 100644 --- a/Client/sdk/game/TaskBasic.h +++ b/Client/sdk/game/TaskBasic.h @@ -16,49 +16,49 @@ class CTaskComplexUseMobilePhone : public virtual CTaskComplex { public: - virtual ~CTaskComplexUseMobilePhone(void){}; + virtual ~CTaskComplexUseMobilePhone(){}; }; class CTaskSimpleAnim : public virtual CTaskSimple { public: - virtual ~CTaskSimpleAnim(void){}; + virtual ~CTaskSimpleAnim(){}; }; class CTaskSimpleRunAnim : public virtual CTaskSimpleAnim { public: - virtual ~CTaskSimpleRunAnim(void){}; + virtual ~CTaskSimpleRunAnim(){}; }; class CTaskSimpleRunNamedAnim : public virtual CTaskSimpleAnim { public: - virtual ~CTaskSimpleRunNamedAnim(void){}; + virtual ~CTaskSimpleRunNamedAnim(){}; }; class CTaskComplexDie : public virtual CTaskComplex { public: - virtual ~CTaskComplexDie(void){}; + virtual ~CTaskComplexDie(){}; }; class CTaskSimpleStealthKill : public virtual CTaskSimple { public: - virtual ~CTaskSimpleStealthKill(void){}; + virtual ~CTaskSimpleStealthKill(){}; }; class CTaskSimpleDead : public virtual CTaskSimple { public: - virtual ~CTaskSimpleDead(void){}; + virtual ~CTaskSimpleDead(){}; }; class CTaskSimpleBeHit : public virtual CTaskSimple { public: - virtual ~CTaskSimpleBeHit(void){}; + virtual ~CTaskSimpleBeHit(){}; }; enum eSunbatherType @@ -73,7 +73,7 @@ enum eSunbatherType class CTaskComplexSunbathe : public virtual CTaskComplex { public: - virtual ~CTaskComplexSunbathe(void){}; + virtual ~CTaskComplexSunbathe(){}; virtual void SetEndTime(DWORD dwTime) = 0; }; @@ -83,7 +83,7 @@ class CTaskComplexSunbathe : public virtual CTaskComplex class CTaskSimplePlayerOnFoot : public virtual CTaskSimple { public: - virtual ~CTaskSimplePlayerOnFoot(void){}; + virtual ~CTaskSimplePlayerOnFoot(){}; }; //////////////////// @@ -92,5 +92,5 @@ class CTaskSimplePlayerOnFoot : public virtual CTaskSimple class CTaskComplexFacial : public virtual CTaskComplex { public: - virtual ~CTaskComplexFacial(void){}; + virtual ~CTaskComplexFacial(){}; }; diff --git a/Client/sdk/game/TaskCar.h b/Client/sdk/game/TaskCar.h index 4ceebfbfbf7..c321937d8e4 100644 --- a/Client/sdk/game/TaskCar.h +++ b/Client/sdk/game/TaskCar.h @@ -24,7 +24,7 @@ enum class CTaskComplexEnterCar : public virtual CTaskComplex { public: - virtual ~CTaskComplexEnterCar(void){}; + virtual ~CTaskComplexEnterCar(){}; virtual int GetTargetDoor() = 0; virtual void SetTargetDoor(int iDoor) = 0; @@ -34,25 +34,25 @@ class CTaskComplexEnterCar : public virtual CTaskComplex class CTaskComplexEnterCarAsDriver : public virtual CTaskComplexEnterCar { public: - virtual ~CTaskComplexEnterCarAsDriver(void){}; + virtual ~CTaskComplexEnterCarAsDriver(){}; }; class CTaskComplexEnterCarAsPassenger : public virtual CTaskComplexEnterCar { public: - virtual ~CTaskComplexEnterCarAsPassenger(void){}; + virtual ~CTaskComplexEnterCarAsPassenger(){}; }; class CTaskComplexEnterBoatAsDriver : public virtual CTaskComplex { public: - virtual ~CTaskComplexEnterBoatAsDriver(void){}; + virtual ~CTaskComplexEnterBoatAsDriver(){}; }; class CTaskComplexLeaveCar : public virtual CTaskComplex { public: - virtual ~CTaskComplexLeaveCar(void){}; + virtual ~CTaskComplexLeaveCar(){}; virtual int GetTargetDoor() = 0; }; diff --git a/Client/sdk/game/TaskCarAccessories.h b/Client/sdk/game/TaskCarAccessories.h index 2d98c99ca90..242b6c67440 100644 --- a/Client/sdk/game/TaskCarAccessories.h +++ b/Client/sdk/game/TaskCarAccessories.h @@ -16,7 +16,7 @@ class CTaskSimpleCarSetPedInAsDriver : public virtual CTaskSimple { public: - virtual ~CTaskSimpleCarSetPedInAsDriver(void){}; + virtual ~CTaskSimpleCarSetPedInAsDriver(){}; virtual void SetIsWarpingPedIntoCar() = 0; virtual void SetDoorFlagsToClear(const unsigned char nDoorFlagsToClear) = 0; @@ -26,7 +26,7 @@ class CTaskSimpleCarSetPedInAsDriver : public virtual CTaskSimple class CTaskSimpleCarSetPedOut : public virtual CTaskSimple { public: - virtual ~CTaskSimpleCarSetPedOut(void){}; + virtual ~CTaskSimpleCarSetPedOut(){}; virtual void SetIsWarpingPedOutOfCar() = 0; virtual void SetKnockedOffBike() = 0; @@ -38,7 +38,7 @@ class CTaskSimpleCarSetPedOut : public virtual CTaskSimple class CTaskSimpleCarSetPedInAsPassenger : public virtual CTaskSimple { public: - virtual ~CTaskSimpleCarSetPedInAsPassenger(void){}; + virtual ~CTaskSimpleCarSetPedInAsPassenger(){}; virtual void SetIsWarpingPedIntoCar() = 0; virtual void SetDoorFlagsToClear(const unsigned char nDoorFlagsToClear) = 0; diff --git a/Client/sdk/game/TaskGoTo.h b/Client/sdk/game/TaskGoTo.h index fdfa6a5d591..0b5bec4ec5b 100644 --- a/Client/sdk/game/TaskGoTo.h +++ b/Client/sdk/game/TaskGoTo.h @@ -31,7 +31,7 @@ enum class CTaskComplexWander : public virtual CTaskComplex { public: - virtual ~CTaskComplexWander(void){}; + virtual ~CTaskComplexWander(){}; virtual CNodeAddress* GetNextNode() = 0; virtual CNodeAddress* GetLastNode() = 0; @@ -42,5 +42,5 @@ class CTaskComplexWander : public virtual CTaskComplex class CTaskComplexWanderStandard : public virtual CTaskComplexWander { public: - virtual ~CTaskComplexWanderStandard(void){}; + virtual ~CTaskComplexWanderStandard(){}; }; diff --git a/Client/sdk/game/TaskIK.h b/Client/sdk/game/TaskIK.h index 8b0ef768ee8..789d32edfde 100644 --- a/Client/sdk/game/TaskIK.h +++ b/Client/sdk/game/TaskIK.h @@ -18,19 +18,19 @@ class CTaskSimpleIKChain : public virtual CTaskSimple { public: - virtual ~CTaskSimpleIKChain(void){}; + virtual ~CTaskSimpleIKChain(){}; }; class CTaskSimpleIKLookAt : public virtual CTaskSimpleIKChain { public: - virtual ~CTaskSimpleIKLookAt(void){}; + virtual ~CTaskSimpleIKLookAt(){}; }; class CTaskSimpleIKManager : public virtual CTaskSimple { public: - virtual ~CTaskSimpleIKManager(void){}; + virtual ~CTaskSimpleIKManager(){}; virtual int AddIKChainTask(CTaskSimpleIKChain* pIKChainTask, int slotID = -1) = 0; virtual void RemoveIKChainTask(int slotID) = 0; @@ -42,5 +42,5 @@ class CTaskSimpleIKManager : public virtual CTaskSimple class CTaskSimpleTriggerLookAt : public virtual CTaskSimple { public: - virtual ~CTaskSimpleTriggerLookAt(void){}; + virtual ~CTaskSimpleTriggerLookAt(){}; }; diff --git a/Client/sdk/game/TaskJumpFall.h b/Client/sdk/game/TaskJumpFall.h index 0de86721042..f91fb4c3c8f 100644 --- a/Client/sdk/game/TaskJumpFall.h +++ b/Client/sdk/game/TaskJumpFall.h @@ -16,11 +16,11 @@ class CTaskSimpleClimb : public virtual CTaskSimple { public: - virtual ~CTaskSimpleClimb(void){}; + virtual ~CTaskSimpleClimb(){}; }; class CTaskSimpleJetPack : public virtual CTaskSimple { public: - virtual ~CTaskSimpleJetPack(void){}; + virtual ~CTaskSimpleJetPack(){}; }; diff --git a/Client/sdk/game/TaskPhysicalResponse.h b/Client/sdk/game/TaskPhysicalResponse.h index 34c39d160aa..8d1f2abc793 100644 --- a/Client/sdk/game/TaskPhysicalResponse.h +++ b/Client/sdk/game/TaskPhysicalResponse.h @@ -16,13 +16,13 @@ class CTaskSimpleChoking : public virtual CTaskSimple { public: - virtual ~CTaskSimpleChoking(void){}; + virtual ~CTaskSimpleChoking(){}; - virtual CPed* GetAttacker(void) = 0; - virtual unsigned int GetTimeRemaining(void) = 0; - virtual unsigned int GetTimeStarted(void) = 0; - virtual bool IsTeargas(void) = 0; - virtual bool IsFinished(void) = 0; + virtual CPed* GetAttacker() = 0; + virtual unsigned int GetTimeRemaining() = 0; + virtual unsigned int GetTimeStarted() = 0; + virtual bool IsTeargas() = 0; + virtual bool IsFinished() = 0; virtual void UpdateChoke(CPed* pPed, CPed* pAttacker, bool bIsTearGas) = 0; }; diff --git a/Client/sdk/game/TaskSecondary.h b/Client/sdk/game/TaskSecondary.h index 9f7005f1cb8..b8532e9ddce 100644 --- a/Client/sdk/game/TaskSecondary.h +++ b/Client/sdk/game/TaskSecondary.h @@ -25,5 +25,5 @@ enum eDuckControlTypes class CTaskSimpleDuck : public virtual CTaskSimple { public: - virtual ~CTaskSimpleDuck(void){}; + virtual ~CTaskSimpleDuck(){}; }; diff --git a/Client/sdk/gui/CGUI.h b/Client/sdk/gui/CGUI.h index aa6a6107c74..5346760af24 100644 --- a/Client/sdk/gui/CGUI.h +++ b/Client/sdk/gui/CGUI.h @@ -53,20 +53,20 @@ class CGUI virtual void SetSkin(const char* szName) = 0; virtual void SetBidiEnabled(bool bEnabled) = 0; - virtual void Draw(void) = 0; - virtual void Invalidate(void) = 0; - virtual void Restore(void) = 0; + virtual void Draw() = 0; + virtual void Invalidate() = 0; + virtual void Restore() = 0; - virtual void DrawMouseCursor(void) = 0; + virtual void DrawMouseCursor() = 0; virtual void ProcessMouseInput(CGUIMouseInput eMouseInput, unsigned long ulX = 0, unsigned long ulY = 0, CGUIMouseButton eMouseButton = NoButton) = 0; virtual void ProcessKeyboardInput(unsigned long ulKey, bool bIsDown) = 0; virtual void ProcessCharacter(unsigned long ulCharacter) = 0; // - virtual bool GetGUIInputEnabled(void) = 0; + virtual bool GetGUIInputEnabled() = 0; virtual void SetGUIInputMode(eInputMode a_eMode) = 0; - virtual eInputMode GetGUIInputMode(void) = 0; + virtual eInputMode GetGUIInputMode() = 0; // virtual CGUIMessageBox* CreateMessageBox(const char* szTitle, const char* szMessage, unsigned int uiFlags) = 0; @@ -98,15 +98,15 @@ class CGUI virtual CGUIStaticImage* CreateStaticImage(CGUIElement* pParent) = 0; virtual CGUIStaticImage* CreateStaticImage(CGUITab* pParent) = 0; virtual CGUIStaticImage* CreateStaticImage(CGUIGridList* pParent) = 0; - virtual CGUIStaticImage* CreateStaticImage(void) = 0; + virtual CGUIStaticImage* CreateStaticImage() = 0; virtual CGUITabPanel* CreateTabPanel(CGUIElement* pParent) = 0; virtual CGUITabPanel* CreateTabPanel(CGUITab* pParent) = 0; - virtual CGUITabPanel* CreateTabPanel(void) = 0; + virtual CGUITabPanel* CreateTabPanel() = 0; virtual CGUIScrollPane* CreateScrollPane(CGUIElement* pParent) = 0; virtual CGUIScrollPane* CreateScrollPane(CGUITab* pParent) = 0; - virtual CGUIScrollPane* CreateScrollPane(void) = 0; + virtual CGUIScrollPane* CreateScrollPane() = 0; virtual CGUIScrollBar* CreateScrollBar(bool bHorizontal, CGUIElement* pParent = NULL) = 0; virtual CGUIScrollBar* CreateScrollBar(bool bHorizontal, CGUITab* pParent = NULL) = 0; @@ -121,22 +121,22 @@ class CGUI virtual CGUIWindow* CreateWnd(CGUIElement* pParent = NULL, const char* szCaption = "") = 0; virtual CGUIFont* CreateFnt(const char* szFontName, const char* szFontFile, unsigned int uSize = 8, unsigned int uFlags = 0, bool bAutoScale = false) = 0; - virtual CGUITexture* CreateTexture(void) = 0; + virtual CGUITexture* CreateTexture() = 0; virtual void SetCursorEnabled(bool bEnabled) = 0; - virtual bool IsCursorEnabled(void) = 0; + virtual bool IsCursorEnabled() = 0; virtual void SetCursorAlpha(float fAlpha, bool bOnlyCurrentServer = false) = 0; - virtual float GetCurrentServerCursorAlpha(void) = 0; - virtual eCursorType GetCursorType(void) = 0; + virtual float GetCurrentServerCursorAlpha() = 0; + virtual eCursorType GetCursorType() = 0; - virtual CVector2D GetResolution(void) = 0; + virtual CVector2D GetResolution() = 0; virtual void SetResolution(float fWidth, float fHeight) = 0; - virtual CGUIFont* GetDefaultFont(void) = 0; - virtual CGUIFont* GetSmallFont(void) = 0; - virtual CGUIFont* GetBoldFont(void) = 0; - virtual CGUIFont* GetClearFont(void) = 0; - virtual CGUIFont* GetSansFont(void) = 0; + virtual CGUIFont* GetDefaultFont() = 0; + virtual CGUIFont* GetSmallFont() = 0; + virtual CGUIFont* GetBoldFont() = 0; + virtual CGUIFont* GetClearFont() = 0; + virtual CGUIFont* GetSansFont() = 0; virtual bool IsFontPresent(const char* szFont) = 0; virtual float GetTextExtent(const char* szText, const char* szFont = "default-normal") = 0; @@ -162,12 +162,12 @@ class CGUI virtual void SelectInputHandlers(eInputChannel channel) = 0; virtual void ClearInputHandlers(eInputChannel channel) = 0; - virtual void ClearSystemKeys(void) = 0; + virtual void ClearSystemKeys() = 0; - virtual bool IsTransferBoxVisible(void) = 0; + virtual bool IsTransferBoxVisible() = 0; virtual void SetTransferBoxVisible(bool bVisible) = 0; - virtual void CleanDeadPool(void) = 0; + virtual void CleanDeadPool() = 0; virtual CGUIWindow* LoadLayout(CGUIElement* pParent, const SString& strFilename) = 0; virtual bool LoadImageset(const SString& strFilename) = 0; diff --git a/Client/sdk/gui/CGUIButton.h b/Client/sdk/gui/CGUIButton.h index 227a8982d68..d5868675514 100644 --- a/Client/sdk/gui/CGUIButton.h +++ b/Client/sdk/gui/CGUIButton.h @@ -17,5 +17,5 @@ class CGUIButton : public CGUIElement { public: - virtual ~CGUIButton(void){}; + virtual ~CGUIButton(){}; }; diff --git a/Client/sdk/gui/CGUICallback.h b/Client/sdk/gui/CGUICallback.h index d6a6f5f3424..9f6498a59e5 100644 --- a/Client/sdk/gui/CGUICallback.h +++ b/Client/sdk/gui/CGUICallback.h @@ -64,7 +64,7 @@ class CGUICallback { public: // Default constructor - CGUICallback(void) { memset(m_Callback, 0, sizeof(m_Callback)); } + CGUICallback() { memset(m_Callback, 0, sizeof(m_Callback)); } // Construct from a static function pointer CGUICallback(Ret (*pF)(Arguments)) diff --git a/Client/sdk/gui/CGUICheckBox.h b/Client/sdk/gui/CGUICheckBox.h index 38955091690..69dcbbba6f7 100644 --- a/Client/sdk/gui/CGUICheckBox.h +++ b/Client/sdk/gui/CGUICheckBox.h @@ -17,8 +17,8 @@ class CGUICheckBox : public CGUIElement { public: - virtual ~CGUICheckBox(void){}; + virtual ~CGUICheckBox(){}; virtual void SetSelected(bool bSelected) = 0; - virtual bool GetSelected(void) = 0; + virtual bool GetSelected() = 0; }; diff --git a/Client/sdk/gui/CGUIComboBox.h b/Client/sdk/gui/CGUIComboBox.h index f575fcdda7c..fd38e1d66f8 100644 --- a/Client/sdk/gui/CGUIComboBox.h +++ b/Client/sdk/gui/CGUIComboBox.h @@ -17,24 +17,24 @@ class CGUIComboBox : public CGUIElement { public: - virtual ~CGUIComboBox(void){}; + virtual ~CGUIComboBox(){}; virtual void SetReadOnly(bool bRead) = 0; virtual CGUIListItem* AddItem(const char* szText) = 0; virtual CGUIListItem* AddItem(CGUIStaticImage* pImage) = 0; virtual bool RemoveItem(int index) = 0; virtual CGUIListItem* GetItemByIndex(int index) = 0; - virtual CGUIListItem* GetSelectedItem(void) = 0; - virtual int GetSelectedItemIndex(void) = 0; - virtual size_t GetItemCount(void) = 0; + virtual CGUIListItem* GetSelectedItem() = 0; + virtual int GetSelectedItemIndex() = 0; + virtual size_t GetItemCount() = 0; virtual const char* GetItemText(int index) = 0; virtual bool SetItemText(int index, const char* szText) = 0; virtual bool SetSelectedItemByIndex(int index) = 0; virtual int GetItemIndex(CGUIListItem* pItem) = 0; - virtual void Clear(void) = 0; + virtual void Clear() = 0; virtual void SetSelectionHandler(GUI_CALLBACK Callback) = 0; virtual void SetDropListRemoveHandler(GUI_CALLBACK Callback) = 0; - virtual void ShowDropList(void) = 0; - virtual void HideDropList(void) = 0; - virtual bool IsOpen(void) = 0; + virtual void ShowDropList() = 0; + virtual void HideDropList() = 0; + virtual bool IsOpen() = 0; }; diff --git a/Client/sdk/gui/CGUIEdit.h b/Client/sdk/gui/CGUIEdit.h index 7973c021da1..8b9bc8807ec 100644 --- a/Client/sdk/gui/CGUIEdit.h +++ b/Client/sdk/gui/CGUIEdit.h @@ -17,25 +17,25 @@ class CGUIEdit : public CGUIElement { public: - virtual ~CGUIEdit(void){}; + virtual ~CGUIEdit(){}; virtual void SetReadOnly(bool bReadOnly) = 0; - virtual bool IsReadOnly(void) = 0; + virtual bool IsReadOnly() = 0; virtual void SetMasked(bool bMasked) = 0; - virtual bool IsMasked(void) = 0; + virtual bool IsMasked() = 0; virtual void SetMaxLength(unsigned int uiMaxLength) = 0; - virtual unsigned int GetMaxLength(void) = 0; + virtual unsigned int GetMaxLength() = 0; virtual void SetSelection(unsigned int uiStart, unsigned int uiEnd) = 0; - virtual unsigned int GetSelectionStart(void) = 0; - virtual unsigned int GetSelectionEnd(void) = 0; - virtual unsigned int GetSelectionLength(void) = 0; + virtual unsigned int GetSelectionStart() = 0; + virtual unsigned int GetSelectionEnd() = 0; + virtual unsigned int GetSelectionLength() = 0; virtual void SetCaretIndex(unsigned int uiIndex) = 0; - virtual void SetCaretAtStart(void) = 0; - virtual void SetCaretAtEnd(void) = 0; - virtual unsigned int GetCaretIndex(void) = 0; + virtual void SetCaretAtStart() = 0; + virtual void SetCaretAtEnd() = 0; + virtual unsigned int GetCaretIndex() = 0; virtual void SetTextAcceptedHandler(GUI_CALLBACK Callback) = 0; virtual void SetTextChangedHandler(GUI_CALLBACK Callback) = 0; diff --git a/Client/sdk/gui/CGUIElement.h b/Client/sdk/gui/CGUIElement.h index 049928751f2..aa59197f859 100644 --- a/Client/sdk/gui/CGUIElement.h +++ b/Client/sdk/gui/CGUIElement.h @@ -41,18 +41,18 @@ enum eCGUIType class CGUIElement { public: - virtual ~CGUIElement(void){}; + virtual ~CGUIElement(){}; virtual void SetVisible(bool bVisible) = 0; - virtual bool IsVisible(void) = 0; + virtual bool IsVisible() = 0; virtual void SetEnabled(bool bEnabled) = 0; - virtual bool IsEnabled(void) = 0; + virtual bool IsEnabled() = 0; virtual void SetZOrderingEnabled(bool bZOrderingEnabled) = 0; - virtual bool IsZOrderingEnabled(void) = 0; + virtual bool IsZOrderingEnabled() = 0; - virtual void BringToFront(void) = 0; - virtual void MoveToBack(void) = 0; + virtual void BringToFront() = 0; + virtual void MoveToBack() = 0; virtual void SetPosition(const CVector2D& vecPosition, bool bRelative = false) = 0; virtual CVector2D GetPosition(bool bRelative = false) = 0; @@ -71,33 +71,33 @@ class CGUIElement virtual std::string GetProperty(const char* szProperty) = 0; virtual void SetMinimumSize(const CVector2D& vecSize) = 0; - virtual CVector2D GetMinimumSize(void) = 0; + virtual CVector2D GetMinimumSize() = 0; virtual void GetMinimumSize(CVector2D& vecSize) = 0; virtual void SetMaximumSize(const CVector2D& vecSize) = 0; - virtual CVector2D GetMaximumSize(void) = 0; + virtual CVector2D GetMaximumSize() = 0; virtual void GetMaximumSize(CVector2D& vecSize) = 0; virtual void SetText(const char* Text) = 0; - virtual std::string GetText(void) = 0; + virtual std::string GetText() = 0; virtual bool SetFont(const char* szFontName) = 0; - virtual std::string GetFont(void) = 0; + virtual std::string GetFont() = 0; virtual void SetAlpha(float fAlpha) = 0; - virtual float GetAlpha(void) = 0; - virtual float GetEffectiveAlpha(void) = 0; + virtual float GetAlpha() = 0; + virtual float GetEffectiveAlpha() = 0; virtual void SetInheritsAlpha(bool bInheritsAlpha) = 0; - virtual bool GetInheritsAlpha(void) = 0; + virtual bool GetInheritsAlpha() = 0; - virtual void Activate(void) = 0; - virtual void Deactivate(void) = 0; - virtual bool IsActive(void) = 0; + virtual void Activate() = 0; + virtual void Deactivate() = 0; + virtual bool IsActive() = 0; virtual void SetAlwaysOnTop(bool bAlwaysOnTop) = 0; - virtual bool IsAlwaysOnTop(void) = 0; + virtual bool IsAlwaysOnTop() = 0; - virtual void ForceRedraw(void) = 0; + virtual void ForceRedraw() = 0; virtual CRect2D AbsoluteToRelative(const CRect2D& Rect) = 0; virtual CVector2D AbsoluteToRelative(const CVector2D& Vector) = 0; @@ -106,15 +106,15 @@ class CGUIElement virtual CVector2D RelativeToAbsolute(const CVector2D& Vector) = 0; virtual void SetParent(CGUIElement* pParent) = 0; - virtual CGUIElement* GetParent(void) = 0; + virtual CGUIElement* GetParent() = 0; virtual void SetUserData(void* pData) = 0; - virtual void* GetUserData(void) = 0; + virtual void* GetUserData() = 0; - virtual eCGUIType GetType(void) = 0; + virtual eCGUIType GetType() = 0; - virtual CGUIPropertyIter GetPropertiesBegin(void) = 0; - virtual CGUIPropertyIter GetPropertiesEnd(void) = 0; + virtual CGUIPropertyIter GetPropertiesBegin() = 0; + virtual CGUIPropertyIter GetPropertiesEnd() = 0; virtual void SetMovedHandler(GUI_CALLBACK Callback) = 0; virtual void SetSizedHandler(GUI_CALLBACK Callback) = 0; @@ -129,9 +129,9 @@ class CGUIElement virtual void SetKeyDownHandler(const GUI_CALLBACK_KEY& Callback) = 0; virtual void SetEnterKeyHandler(GUI_CALLBACK Callback) = 0; - virtual bool Event_OnClick(void) = 0; - virtual bool Event_OnDoubleClick(void) = 0; - virtual bool Event_OnMouseEnter(void) = 0; - virtual bool Event_OnMouseLeave(void) = 0; - virtual bool Event_OnMouseButtonDown(void) = 0; + virtual bool Event_OnClick() = 0; + virtual bool Event_OnDoubleClick() = 0; + virtual bool Event_OnMouseEnter() = 0; + virtual bool Event_OnMouseLeave() = 0; + virtual bool Event_OnMouseButtonDown() = 0; }; diff --git a/Client/sdk/gui/CGUIFont.h b/Client/sdk/gui/CGUIFont.h index 2ed92023d57..159b91d69a4 100644 --- a/Client/sdk/gui/CGUIFont.h +++ b/Client/sdk/gui/CGUIFont.h @@ -16,12 +16,12 @@ class CGUIFont { public: - virtual ~CGUIFont(void){}; + virtual ~CGUIFont(){}; virtual void SetAntiAliasingEnabled(bool bAntialiased) = 0; - virtual bool IsAntiAliasingEnabled(void) = 0; + virtual bool IsAntiAliasingEnabled() = 0; virtual void SetAutoScalingEnabled(bool bAutoScaled) = 0; - virtual bool IsAutoScalingEnabled(void) = 0; + virtual bool IsAutoScalingEnabled() = 0; virtual void SetNativeResolution(int iX, int iY) = 0; diff --git a/Client/sdk/gui/CGUIGridList.h b/Client/sdk/gui/CGUIGridList.h index 5e8b80c5bfe..65dc54ef53f 100644 --- a/Client/sdk/gui/CGUIGridList.h +++ b/Client/sdk/gui/CGUIGridList.h @@ -50,7 +50,7 @@ using SortDirections::SortDirection; class CGUIGridList : public CGUIElement { public: - virtual ~CGUIGridList(void){}; + virtual ~CGUIGridList(){}; virtual unsigned int AddColumn(const char* szTitle, float fWidth) = 0; virtual void RemoveColumn(unsigned int uiColumn) = 0; @@ -61,13 +61,13 @@ class CGUIGridList : public CGUIElement virtual const char* GetColumnTitle(int hColumn) = 0; virtual void SetSelectionMode(SelectionMode mode) = 0; - virtual SelectionMode GetSelectionMode(void) = 0; + virtual SelectionMode GetSelectionMode() = 0; - virtual void ForceUpdate(void) = 0; + virtual void ForceUpdate() = 0; virtual int AddRow(bool bFast = false, std::vector >* m_items = NULL) = 0; virtual void RemoveRow(int iRow) = 0; virtual int InsertRowAfter(int iRow, std::vector >* m_items = NULL) = 0; - virtual void Clear(void) = 0; + virtual void Clear() = 0; virtual CGUIListItem* GetItem(int iRow, int hColumn) = 0; virtual const char* GetItemText(int iRow, int hColumn) = 0; virtual int SetItemText(int iRow, int hColumn, const char* szText, bool bNumber = false, bool bSection = false, bool bFast = false, @@ -81,11 +81,11 @@ class CGUIGridList : public CGUIElement virtual void SetHorizontalScrollBar(bool bEnabled) = 0; virtual void SetVerticalScrollBar(bool bEnabled) = 0; virtual void SetSortingEnabled(bool bEnabled) = 0; - virtual bool IsSortingEnabled(void) = 0; + virtual bool IsSortingEnabled() = 0; virtual void SetItemImage(int iRow, int hColumn, CGUIStaticImage* pImage) = 0; - virtual float GetHorizontalScrollPosition(void) = 0; - virtual float GetVerticalScrollPosition(void) = 0; + virtual float GetHorizontalScrollPosition() = 0; + virtual float GetVerticalScrollPosition() = 0; virtual void SetHorizontalScrollPosition(float fPosition) = 0; virtual void SetVerticalScrollPosition(float fPosition) = 0; @@ -93,13 +93,13 @@ class CGUIGridList : public CGUIElement virtual int GetItemColumnIndex(CGUIListItem* pItem) = 0; virtual int GetItemRowIndex(CGUIListItem* pItem) = 0; virtual void GetVisibleRowRange(int& iFirst, int& iLast) = 0; - virtual int GetSelectedCount(void) = 0; - virtual CGUIListItem* GetSelectedItem(void) = 0; + virtual int GetSelectedCount() = 0; + virtual CGUIListItem* GetSelectedItem() = 0; virtual CGUIListItem* GetNextSelectedItem(CGUIListItem* pItem) = 0; - virtual int GetSelectedItemRow(void) = 0; - virtual int GetSelectedItemColumn(void) = 0; - virtual int GetRowCount(void) = 0; - virtual int GetColumnCount(void) = 0; + virtual int GetSelectedItemRow() = 0; + virtual int GetSelectedItemColumn() = 0; + virtual int GetRowCount() = 0; + virtual int GetColumnCount() = 0; virtual void Sort(unsigned int uiColumn, SortDirection direction) = 0; virtual void GetSort(unsigned int& uiColumn, SortDirection& direction) = 0; diff --git a/Client/sdk/gui/CGUILabel.h b/Client/sdk/gui/CGUILabel.h index 9745547d28e..a2803fd6b2f 100644 --- a/Client/sdk/gui/CGUILabel.h +++ b/Client/sdk/gui/CGUILabel.h @@ -16,24 +16,24 @@ class CGUILabel : public CGUIElement { public: - virtual ~CGUILabel(void){}; + virtual ~CGUILabel(){}; virtual void SetText(const char* Text) = 0; virtual void SetVerticalAlign(CGUIVerticalAlign eAlign) = 0; - virtual CGUIVerticalAlign GetVerticalAlign(void) = 0; + virtual CGUIVerticalAlign GetVerticalAlign() = 0; virtual void SetHorizontalAlign(CGUIHorizontalAlign eAlign) = 0; - virtual CGUIHorizontalAlign GetHorizontalAlign(void) = 0; + virtual CGUIHorizontalAlign GetHorizontalAlign() = 0; virtual void SetTextColor(CGUIColor Color) = 0; virtual void SetTextColor(unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue) = 0; - virtual CGUIColor GetTextColor(void) = 0; + virtual CGUIColor GetTextColor() = 0; virtual void GetTextColor(unsigned char& ucRed, unsigned char& ucGreen, unsigned char& ucBlue) = 0; virtual void SetFrameEnabled(bool bFrameEnabled) = 0; - virtual bool IsFrameEnabled(void) = 0; + virtual bool IsFrameEnabled() = 0; virtual float GetCharacterWidth(int iCharIndex) = 0; - virtual float GetFontHeight(void) = 0; - virtual float GetTextExtent(void) = 0; + virtual float GetFontHeight() = 0; + virtual float GetTextExtent() = 0; }; diff --git a/Client/sdk/gui/CGUIListItem.h b/Client/sdk/gui/CGUIListItem.h index 3bc857e4907..a14cca4c2ef 100644 --- a/Client/sdk/gui/CGUIListItem.h +++ b/Client/sdk/gui/CGUIListItem.h @@ -17,12 +17,12 @@ class CGUIListItem { public: - virtual ~CGUIListItem(void){}; + virtual ~CGUIListItem(){}; - virtual std::string GetText(void) const = 0; + virtual std::string GetText() const = 0; virtual void SetText(const char* pszText, const char* pszSortText = NULL) = 0; - virtual void* GetData(void) const = 0; + virtual void* GetData() const = 0; virtual void SetData(void* pData, CGUICallback deleteDataCallback = NULL) = 0; virtual void SetData(const char* pszData) = 0; @@ -30,7 +30,7 @@ class CGUIListItem virtual void SetFont(const char* szFontName) = 0; virtual void SetImage(CGUIStaticImage* Image) = 0; - virtual bool GetSelectedState(void) = 0; + virtual bool GetSelectedState() = 0; virtual void SetSelectedState(bool bState) = 0; virtual bool GetColor(unsigned char& ucRed, unsigned char& ucGreen, unsigned char& ucBlue, unsigned char& ucAlpha) = 0; diff --git a/Client/sdk/gui/CGUIMemo.h b/Client/sdk/gui/CGUIMemo.h index 56bd7489a8d..cb6409c35ac 100644 --- a/Client/sdk/gui/CGUIMemo.h +++ b/Client/sdk/gui/CGUIMemo.h @@ -17,26 +17,26 @@ class CGUIMemo : public CGUIElement { public: - virtual ~CGUIMemo(void){}; + virtual ~CGUIMemo(){}; virtual void SetReadOnly(bool bReadOnly) = 0; - virtual bool IsReadOnly(void) = 0; + virtual bool IsReadOnly() = 0; - virtual unsigned int GetCaretIndex(void) = 0; + virtual unsigned int GetCaretIndex() = 0; virtual void SetCaretIndex(unsigned int uiIndex) = 0; - virtual float GetVerticalScrollPosition(void) = 0; + virtual float GetVerticalScrollPosition() = 0; virtual void SetVerticalScrollPosition(float fPosition) = 0; - virtual float GetMaxVerticalScrollPosition(void) = 0; - virtual float GetScrollbarDocumentSize(void) = 0; - virtual float GetScrollbarPageSize(void) = 0; + virtual float GetMaxVerticalScrollPosition() = 0; + virtual float GetScrollbarDocumentSize() = 0; + virtual float GetScrollbarPageSize() = 0; virtual void SetSelection(unsigned int uiStart, unsigned int uiEnd) = 0; - virtual unsigned int GetSelectionStart(void) = 0; - virtual unsigned int GetSelectionEnd(void) = 0; - virtual unsigned int GetSelectionLength(void) = 0; + virtual unsigned int GetSelectionStart() = 0; + virtual unsigned int GetSelectionEnd() = 0; + virtual unsigned int GetSelectionLength() = 0; - virtual void EnsureCaratIsVisible(void) = 0; + virtual void EnsureCaratIsVisible() = 0; virtual void SetTextChangedHandler(const GUI_CALLBACK& Callback) = 0; }; diff --git a/Client/sdk/gui/CGUIMessageBox.h b/Client/sdk/gui/CGUIMessageBox.h index 8f2d6cc6856..8d0e1ee34e0 100644 --- a/Client/sdk/gui/CGUIMessageBox.h +++ b/Client/sdk/gui/CGUIMessageBox.h @@ -18,15 +18,15 @@ class CGUIMessageBox { public: - virtual ~CGUIMessageBox(void){}; + virtual ~CGUIMessageBox(){}; virtual void SetAutoDestroy(bool bAutoDestroy) = 0; - virtual bool GetAutoDestroy(void) = 0; + virtual bool GetAutoDestroy() = 0; virtual void SetVisible(bool bVisible) = 0; - virtual bool IsVisible(void) = 0; + virtual bool IsVisible() = 0; virtual void SetClickHandler(GUI_CALLBACK Callback) = 0; - virtual CGUIWindow* GetWindow(void) = 0; + virtual CGUIWindow* GetWindow() = 0; }; diff --git a/Client/sdk/gui/CGUIProgressBar.h b/Client/sdk/gui/CGUIProgressBar.h index c002b8f39c7..b1e01eaec85 100644 --- a/Client/sdk/gui/CGUIProgressBar.h +++ b/Client/sdk/gui/CGUIProgressBar.h @@ -17,8 +17,8 @@ class CGUIProgressBar : public CGUIElement { public: - virtual ~CGUIProgressBar(void){}; + virtual ~CGUIProgressBar(){}; virtual void SetProgress(float fProgress) = 0; - virtual float GetProgress(void) = 0; + virtual float GetProgress() = 0; }; diff --git a/Client/sdk/gui/CGUIRadioButton.h b/Client/sdk/gui/CGUIRadioButton.h index 62a0fe4f21d..b33593e41bc 100644 --- a/Client/sdk/gui/CGUIRadioButton.h +++ b/Client/sdk/gui/CGUIRadioButton.h @@ -17,8 +17,8 @@ class CGUIRadioButton : public CGUIElement { public: - virtual ~CGUIRadioButton(void){}; + virtual ~CGUIRadioButton(){}; virtual void SetSelected(bool bSelected) = 0; - virtual bool GetSelected(void) = 0; + virtual bool GetSelected() = 0; }; diff --git a/Client/sdk/gui/CGUIScrollBar.h b/Client/sdk/gui/CGUIScrollBar.h index b5370939cb1..f52033da81d 100644 --- a/Client/sdk/gui/CGUIScrollBar.h +++ b/Client/sdk/gui/CGUIScrollBar.h @@ -17,10 +17,10 @@ class CGUIScrollBar : public CGUIElement { public: - virtual ~CGUIScrollBar(void){}; + virtual ~CGUIScrollBar(){}; virtual void SetOnScrollHandler(const GUI_CALLBACK& Callback) = 0; virtual void SetScrollPosition(float fPosition) = 0; - virtual float GetScrollPosition(void) = 0; + virtual float GetScrollPosition() = 0; }; diff --git a/Client/sdk/gui/CGUIScrollPane.h b/Client/sdk/gui/CGUIScrollPane.h index d62de3ae4f5..91fd0a9f4d7 100644 --- a/Client/sdk/gui/CGUIScrollPane.h +++ b/Client/sdk/gui/CGUIScrollPane.h @@ -16,19 +16,19 @@ class CGUIScrollPane : public CGUIElement { public: - virtual ~CGUIScrollPane(void){}; + virtual ~CGUIScrollPane(){}; virtual void SetHorizontalScrollBar(bool bEnabled) = 0; virtual void SetVerticalScrollBar(bool bEnabled) = 0; virtual void SetHorizontalScrollPosition(float fPosition) = 0; - virtual float GetHorizontalScrollPosition(void) = 0; + virtual float GetHorizontalScrollPosition() = 0; virtual void SetVerticalScrollPosition(float fPosition) = 0; - virtual float GetVerticalScrollPosition(void) = 0; + virtual float GetVerticalScrollPosition() = 0; virtual void SetHorizontalScrollStepSize(float fPosition) = 0; - virtual float GetHorizontalScrollStepSize(void) = 0; + virtual float GetHorizontalScrollStepSize() = 0; virtual void SetVerticalScrollStepSize(float fPosition) = 0; - virtual float GetVerticalScrollStepSize(void) = 0; + virtual float GetVerticalScrollStepSize() = 0; }; diff --git a/Client/sdk/gui/CGUISize.h b/Client/sdk/gui/CGUISize.h index 1effab2295a..1a7906ba6cd 100644 --- a/Client/sdk/gui/CGUISize.h +++ b/Client/sdk/gui/CGUISize.h @@ -14,7 +14,7 @@ class CGUISize { public: - CGUISize(void) {} + CGUISize() {} CGUISize(float width, float height) : fWidth(width), fHeight(height) {} bool operator==(const CGUISize& other) const; diff --git a/Client/sdk/gui/CGUIStaticImage.h b/Client/sdk/gui/CGUIStaticImage.h index 5e8c5447895..7ace4681278 100644 --- a/Client/sdk/gui/CGUIStaticImage.h +++ b/Client/sdk/gui/CGUIStaticImage.h @@ -17,15 +17,15 @@ class CGUIStaticImage : public CGUIElement { public: - virtual ~CGUIStaticImage(void){}; + virtual ~CGUIStaticImage(){}; virtual bool LoadFromFile(const char* szFilename) = 0; virtual bool LoadFromTexture(CGUITexture* pTexture) = 0; - virtual void Clear(void) = 0; + virtual void Clear() = 0; virtual bool GetNativeSize(CVector2D& vecSize) = 0; virtual void SetFrameEnabled(bool bFrameEnabled) = 0; - virtual bool IsFrameEnabled(void) = 0; + virtual bool IsFrameEnabled() = 0; - virtual void Render(void) = 0; + virtual void Render() = 0; }; diff --git a/Client/sdk/gui/CGUITab.h b/Client/sdk/gui/CGUITab.h index beb08775fe4..2596eb8d378 100644 --- a/Client/sdk/gui/CGUITab.h +++ b/Client/sdk/gui/CGUITab.h @@ -16,7 +16,7 @@ class CGUITab : public CGUIElement { public: - virtual ~CGUITab(void){}; + virtual ~CGUITab(){}; virtual void SetCaption(const char* szCaption) = 0; }; diff --git a/Client/sdk/gui/CGUITabPanel.h b/Client/sdk/gui/CGUITabPanel.h index 513767e02ae..0405d0394c3 100644 --- a/Client/sdk/gui/CGUITabPanel.h +++ b/Client/sdk/gui/CGUITabPanel.h @@ -17,18 +17,18 @@ class CGUITabPanel : public CGUIElement { public: - virtual ~CGUITabPanel(void){}; + virtual ~CGUITabPanel(){}; virtual CGUITab* CreateTab(const char* szCaption) = 0; virtual void DeleteTab(CGUITab* pTab) = 0; - virtual CGUITab* GetSelectedTab(void) = 0; + virtual CGUITab* GetSelectedTab() = 0; virtual void SetSelectedTab(CGUITab* pTab) = 0; virtual void SetSelectedIndex(unsigned int uiIndex) = 0; - virtual unsigned int GetSelectedIndex(void) = 0; + virtual unsigned int GetSelectedIndex() = 0; - virtual unsigned int GetTabCount(void) = 0; + virtual unsigned int GetTabCount() = 0; virtual void SetSelectionHandler(GUI_CALLBACK Callback) = 0; diff --git a/Client/sdk/gui/CGUITexture.h b/Client/sdk/gui/CGUITexture.h index 4bc562b7e84..d190d7572ea 100644 --- a/Client/sdk/gui/CGUITexture.h +++ b/Client/sdk/gui/CGUITexture.h @@ -18,12 +18,12 @@ struct IDirect3DTexture9; class CGUITexture { public: - virtual ~CGUITexture(void){}; + virtual ~CGUITexture(){}; virtual bool LoadFromFile(const char* szFilename) = 0; virtual void LoadFromMemory(const void* pBuffer, unsigned int uiWidth, unsigned int uiHeight) = 0; - virtual void Clear(void) = 0; + virtual void Clear() = 0; - virtual IDirect3DTexture9* GetD3DTexture(void) = 0; + virtual IDirect3DTexture9* GetD3DTexture() = 0; virtual void CreateTexture(unsigned int width, unsigned int height) = 0; }; diff --git a/Client/sdk/gui/CGUITypes.h b/Client/sdk/gui/CGUITypes.h index f23ad03b44f..97d8bf65299 100644 --- a/Client/sdk/gui/CGUITypes.h +++ b/Client/sdk/gui/CGUITypes.h @@ -71,7 +71,7 @@ enum CGUIHorizontalAlign class CGUIColor { public: - CGUIColor(void) + CGUIColor() { R = 0; G = 0; diff --git a/Client/sdk/gui/CGUIWindow.h b/Client/sdk/gui/CGUIWindow.h index 56248584806..ab0b5d8758a 100644 --- a/Client/sdk/gui/CGUIWindow.h +++ b/Client/sdk/gui/CGUIWindow.h @@ -16,18 +16,18 @@ class CGUIWindow : public CGUIElement { public: - virtual ~CGUIWindow(void){}; + virtual ~CGUIWindow(){}; virtual void SetMovable(bool bMovable) = 0; - virtual bool IsMovable(void) = 0; + virtual bool IsMovable() = 0; virtual void SetSizingEnabled(bool bResizeEnabled) = 0; - virtual bool IsSizingEnabled(void) = 0; + virtual bool IsSizingEnabled() = 0; virtual void SetFrameEnabled(bool bFrameEnabled) = 0; - virtual bool IsFrameEnabled(void) = 0; + virtual bool IsFrameEnabled() = 0; virtual void SetCloseButtonEnabled(bool bCloseButtonEnabled) = 0; - virtual bool IsCloseButtonEnabled(void) = 0; + virtual bool IsCloseButtonEnabled() = 0; virtual void SetTitlebarEnabled(bool bTitlebarEnabled) = 0; - virtual bool IsTitlebarEnabled(void) = 0; + virtual bool IsTitlebarEnabled() = 0; virtual void SetCloseClickHandler(GUI_CALLBACK Callback) = 0; }; diff --git a/Client/sdk/multiplayer/CMultiplayer.h b/Client/sdk/multiplayer/CMultiplayer.h index 6b24ecca18d..448e7cf353b 100644 --- a/Client/sdk/multiplayer/CMultiplayer.h +++ b/Client/sdk/multiplayer/CMultiplayer.h @@ -65,9 +65,9 @@ typedef unsigned long AnimationId; typedef bool(ExplosionHandler)(class CEntity* pExplodingEntity, class CEntity* pCreator, const CVector& vecPosition, enum eExplosionType ExplosionType); typedef void(PreContextSwitchHandler)(class CPlayerPed* pPlayer); -typedef void(PostContextSwitchHandler)(void); +typedef void(PostContextSwitchHandler)(); typedef bool(PreWeaponFireHandler)(class CPlayerPed* pPlayer, bool bStopIfUsingBulletSync); -typedef void(PostWeaponFireHandler)(void); +typedef void(PostWeaponFireHandler)(); typedef void(BulletImpactHandler)(class CPed* pInitiator, class CEntity* pVictim, const CVector* pvecStartPosition, const CVector* pvecEndPosition); typedef void(BulletFireHandler)(class CPed* pInitiator, const CVector* pvecStartPosition, const CVector* pvecEndPosition); typedef bool(DamageHandler)(class CPed* pDamagePed, class CEventDamage* pEvent); @@ -79,16 +79,16 @@ typedef void(ProjectileHandler)(class CEntity* owner, class CProjectile* project class CVector* origin, float fForce, class CVector* target, class CEntity* targetEntity); typedef bool(BreakTowLinkHandler)(class CVehicle* towingVehicle); typedef bool(ProcessCamHandler)(class CCam* pCam); -typedef void(DrawRadarAreasHandler)(void); -typedef void(Render3DStuffHandler)(void); -typedef void(PreRenderSkyHandler)(void); -typedef void(RenderHeliLightHandler)(void); +typedef void(DrawRadarAreasHandler)(); +typedef void(Render3DStuffHandler)(); +typedef void(PreRenderSkyHandler)(); +typedef void(RenderHeliLightHandler)(); typedef bool(ChokingHandler)(unsigned char ucWeaponType); -typedef void(PreWorldProcessHandler)(void); -typedef void(PostWorldProcessHandler)(void); -typedef void(IdleHandler)(void); -typedef void(PreFxRenderHandler)(void); -typedef void(PreHudRenderHandler)(void); +typedef void(PreWorldProcessHandler)(); +typedef void(PostWorldProcessHandler)(); +typedef void(IdleHandler)(); +typedef void(PreFxRenderHandler)(); +typedef void(PreHudRenderHandler)(); typedef CAnimBlendAssociationSAInterface*(AddAnimationHandler)(RpClump* pClump, AssocGroupId animGroup, AnimationId animID); typedef CAnimBlendAssociationSAInterface*(AddAnimationAndSyncHandler)(RpClump* pClump, CAnimBlendAssociationSAInterface* pAnimAssocToSyncWith, AssocGroupId animGroup, AnimationId animID); @@ -152,16 +152,16 @@ class CStatsData class CRemoteDataStorage { public: - virtual class CControllerState* CurrentControllerState(void) = 0; - virtual class CControllerState* LastControllerState(void) = 0; - virtual class CShotSyncData* ShotSyncData(void) = 0; - virtual class CStatsData* Stats(void) = 0; - virtual float GetCameraRotation(void) = 0; + virtual class CControllerState* CurrentControllerState() = 0; + virtual class CControllerState* LastControllerState() = 0; + virtual class CShotSyncData* ShotSyncData() = 0; + virtual class CStatsData* Stats() = 0; + virtual float GetCameraRotation() = 0; virtual void SetCameraRotation(float fCameraRotation) = 0; virtual void SetGravity(float fGravity) = 0; virtual void SetProcessPlayerWeapon(bool bProcess) = 0; - virtual CVector& GetAkimboTarget(void) = 0; - virtual bool GetAkimboTargetUp(void) = 0; + virtual CVector& GetAkimboTarget() = 0; + virtual bool GetAkimboTargetUp() = 0; virtual void SetAkimboTarget(const CVector& vecTarget) = 0; virtual void SetAkimboTargetUp(bool bUp) = 0; }; @@ -186,7 +186,7 @@ class CMultiplayer virtual CRemoteDataStorage* GetRemoteDataStorage(CPlayerPed* pPed) = 0; virtual void RemoveRemoteDataStorage(CPlayerPed* pPed) = 0; - virtual class CPed* GetContextSwitchedPed(void) = 0; + virtual class CPed* GetContextSwitchedPed() = 0; virtual class CPopulationMP* GetPopulationMP() = 0; virtual void PreventLeavingVehicles() = 0; @@ -249,12 +249,12 @@ class CMultiplayer virtual void ResetSky() = 0; virtual void SetHeatHaze(const SHeatHazeSettings& settings) = 0; virtual void GetHeatHaze(SHeatHazeSettings& settings) = 0; - virtual void ResetHeatHaze(void) = 0; + virtual void ResetHeatHaze() = 0; virtual void SetHeatHazeEnabled(bool bEnabled) = 0; virtual bool HasWaterColor() = 0; virtual void GetWaterColor(float& fWaterRed, float& fWaterGreen, float& fWaterBlue, float& fWaterAlpha) = 0; virtual void SetWaterColor(float fWaterRed, float fWaterGreen, float fWaterBlue, float fWaterAlpha) = 0; - virtual void ResetWater(void) = 0; + virtual void ResetWater() = 0; virtual void SetCloudsEnabled(bool bDisabled) = 0; virtual bool GetInteriorSoundsEnabled() = 0; virtual void SetInteriorSoundsEnabled(bool bEnabled) = 0; @@ -262,16 +262,16 @@ class CMultiplayer virtual void SetInteriorFurnitureEnabled(char cRoomId, bool bEnabled) = 0; virtual void SetWindVelocity(float fX, float fY, float fZ) = 0; virtual void GetWindVelocity(float& fX, float& fY, float& fZ) = 0; - virtual void RestoreWindVelocity(void) = 0; + virtual void RestoreWindVelocity() = 0; virtual void SetFarClipDistance(float fDistance) = 0; - virtual float GetFarClipDistance(void) = 0; - virtual void RestoreFarClipDistance(void) = 0; + virtual float GetFarClipDistance() = 0; + virtual void RestoreFarClipDistance() = 0; virtual void SetNearClipDistance(float fDistance) = 0; - virtual float GetNearClipDistance(void) = 0; - virtual void RestoreNearClipDistance(void) = 0; + virtual float GetNearClipDistance() = 0; + virtual void RestoreNearClipDistance() = 0; virtual void SetFogDistance(float fDistance) = 0; - virtual float GetFogDistance(void) = 0; - virtual void RestoreFogDistance(void) = 0; + virtual float GetFogDistance() = 0; + virtual void RestoreFogDistance() = 0; virtual void GetSunColor(unsigned char& ucCoreRed, unsigned char& ucCoreGreen, unsigned char& ucCoreBlue, unsigned char& ucCoronaRed, unsigned char& ucCoronaGreen, unsigned char& ucCoronaBlue) = 0; virtual void SetSunColor(unsigned char ucCoreRed, unsigned char ucCoreGreen, unsigned char ucCoreBlue, unsigned char ucCoronaRed, @@ -352,21 +352,21 @@ class CMultiplayer virtual bool IsSuspensionEnabled() = 0; virtual void SetSuspensionEnabled(bool bEnabled) = 0; - virtual void FlushClothesCache(void) = 0; + virtual void FlushClothesCache() = 0; virtual void SetFastClothesLoading(EFastClothesLoading fastClothesLoading) = 0; virtual void SetLODSystemEnabled(bool bEnable) = 0; virtual void SetAltWaterOrderEnabled(bool bEnable) = 0; - virtual float GetAircraftMaxHeight(void) = 0; + virtual float GetAircraftMaxHeight() = 0; virtual void SetAircraftMaxHeight(float fHeight) = 0; - virtual float GetAircraftMaxVelocity(void) = 0; + virtual float GetAircraftMaxVelocity() = 0; virtual void SetAircraftMaxVelocity(float fVelocity) = 0; virtual void SetAutomaticVehicleStartupOnPedEnter(bool bSet) = 0; virtual void SetPedTargetingMarkerEnabled(bool bEnabled) = 0; - virtual bool IsPedTargetingMarkerEnabled(void) = 0; + virtual bool IsPedTargetingMarkerEnabled() = 0; virtual void GetRwResourceStats(SRwResourceStats& outStats) = 0; virtual void GetClothesCacheStats(SClothesCacheStats& outStats) = 0; diff --git a/Client/sdk/net/CNet.h b/Client/sdk/net/CNet.h index 17880085f78..978b5c28dc3 100644 --- a/Client/sdk/net/CNet.h +++ b/Client/sdk/net/CNet.h @@ -49,12 +49,12 @@ struct SPacketStat class CBinaryFileInterface { public: - virtual ~CBinaryFileInterface(void) {} + virtual ~CBinaryFileInterface() {} virtual bool FOpen(const char* szFilename, const char* szMode, bool bValidate) = 0; - virtual void FClose(void) = 0; - virtual bool FEof(void) = 0; - virtual void FFlush(void) = 0; - virtual int FTell(void) = 0; + virtual void FClose() = 0; + virtual bool FEof() = 0; + virtual void FFlush() = 0; + virtual int FTell() = 0; virtual void FSeek(int iOffset, int iOrigin) = 0; virtual int FRead(void* pData, uint uiSize) = 0; virtual int FWrite(const void* pData, uint uiSize) = 0; @@ -70,18 +70,18 @@ class CNet }; virtual bool StartNetwork(const char* szServerHost, unsigned short usServerPort, bool bPacketTag = false) = 0; - virtual void StopNetwork(void) = 0; + virtual void StopNetwork() = 0; virtual void SetFakeLag(unsigned short usPacketLoss, unsigned short usMinExtraPing, unsigned short usExtraPingVariance, int iKBPSLimit) = 0; - virtual bool IsConnected(void) = 0; + virtual bool IsConnected() = 0; - virtual void DoPulse(void) = 0; - virtual void Shutdown(void) = 0; + virtual void DoPulse() = 0; + virtual void Shutdown() = 0; virtual void RegisterPacketHandler(PPACKETHANDLER pfnPacketHandler) = 0; - virtual NetBitStreamInterface* AllocateNetBitStream(void) = 0; + virtual NetBitStreamInterface* AllocateNetBitStream() = 0; virtual void DeallocateNetBitStream(NetBitStreamInterface* bitStream) = 0; virtual bool SendPacket(unsigned char ucPacketID, NetBitStreamInterface* bitStream, NetPacketPriority packetPriority, NetPacketReliability packetReliability, ePacketOrdering packetOrdering = PACKET_ORDERING_DEFAULT) = 0; @@ -90,30 +90,30 @@ class CNet virtual const char* GetConnectedServer(bool bIncludePort = false) = 0; virtual bool GetNetworkStatistics(NetStatistics* pDest) = 0; - virtual const SPacketStat* GetPacketStats(void) = 0; + virtual const SPacketStat* GetPacketStats() = 0; - virtual int GetPing(void) = 0; - virtual unsigned long GetTime(void) = 0; + virtual int GetPing() = 0; + virtual unsigned long GetTime() = 0; - virtual const char* GetLocalIP(void) = 0; + virtual const char* GetLocalIP() = 0; virtual void GetSerial(char* szSerial, size_t maxLength) = 0; - virtual unsigned char GetConnectionError(void) = 0; + virtual unsigned char GetConnectionError() = 0; virtual void SetConnectionError(unsigned char ucConnectionError) = 0; - virtual void Reset(void) = 0; + virtual void Reset() = 0; virtual CNetHTTPDownloadManagerInterface* GetHTTPDownloadManager(EDownloadModeType iMode) = 0; virtual void SetServerBitStreamVersion(unsigned short usServerBitStreamVersion) = 0; - virtual unsigned short GetServerBitStreamVersion(void) = 0; + virtual unsigned short GetServerBitStreamVersion() = 0; virtual void GetStatus(char* szStatus, size_t maxLength) = 0; - virtual unsigned short GetNetRev(void) = 0; - virtual unsigned short GetNetRel(void) = 0; + virtual unsigned short GetNetRev() = 0; + virtual unsigned short GetNetRel() = 0; - virtual const char* GetNextBuffer(void) = 0; - virtual const char* GetDiagnosticStatus(void) = 0; + virtual const char* GetNextBuffer() = 0; + virtual const char* GetDiagnosticStatus() = 0; virtual void UpdatePingStatus(const char* szStatus, ushort& usDataRef) = 0; virtual bool VerifySignature(const char* pData, unsigned long ulSize) = 0; @@ -124,13 +124,13 @@ class CNet virtual const char* GetCurrentServerId(bool bPreviousVer) = 0; virtual bool CheckFile(const char* szType, const char* szFilename, const void* pData = nullptr, size_t sizeData = 0) = 0; - virtual uint GetExtendedErrorCode(void) = 0; + virtual uint GetExtendedErrorCode() = 0; virtual void SetTimeoutTime(uint uiTimeoutTime) = 0; virtual bool ValidateBinaryFileName(const char* szFilename) = 0; - virtual CBinaryFileInterface* AllocateBinaryFile(void) = 0; + virtual CBinaryFileInterface* AllocateBinaryFile() = 0; virtual bool EncryptDumpfile(const char* szClearPathFilename, const char* szEncryptedPathFilename) = 0; virtual bool DeobfuscateScript(const char* cpInBuffer, uint uiInSize, const char** pcpOutBuffer, uint* puiOutSize, const char* szScriptName) = 0; - virtual void PostCrash(void) = 0; + virtual void PostCrash() = 0; virtual int SendTo(SOCKET s, const char* buf, int len, int flags, const struct sockaddr* to, int tolen) = 0; }; diff --git a/Server/core/CCrashHandler.cpp b/Server/core/CCrashHandler.cpp index 9bed123c95f..994746ff5b5 100644 --- a/Server/core/CCrashHandler.cpp +++ b/Server/core/CCrashHandler.cpp @@ -288,7 +288,7 @@ void CCrashHandler::DumpMiniDump(_EXCEPTION_POINTERS* pException, CExceptionInfo } } -void CCrashHandler::RunErrorTool(void) +void CCrashHandler::RunErrorTool() { } diff --git a/Server/core/CCrashHandler.h b/Server/core/CCrashHandler.h index 0f6e965a82d..c44753e172a 100644 --- a/Server/core/CCrashHandler.h +++ b/Server/core/CCrashHandler.h @@ -30,7 +30,7 @@ class CCrashHandler static long WINAPI HandleExceptionGlobal(_EXCEPTION_POINTERS* pException); static void DumpMiniDump(_EXCEPTION_POINTERS* pException, CExceptionInformation* pExceptionInformation); - static void RunErrorTool(void); + static void RunErrorTool(); #else diff --git a/Server/core/CCrashHandlerAPI.cpp b/Server/core/CCrashHandlerAPI.cpp index 89f7771d8f6..33acfe5bf86 100644 --- a/Server/core/CCrashHandlerAPI.cpp +++ b/Server/core/CCrashHandlerAPI.cpp @@ -107,10 +107,10 @@ LPCTSTR __stdcall InternalGetStackTraceString(DWORD dwOpts, EXCEPTION_POINTERS* BOOL InternalSymGetLineFromAddr(IN HANDLE hProcess, IN DWORD dwAddr, OUT PDWORD pdwDisplacement, OUT PIMAGEHLP_LINE Line); // Initializes the symbol engine if needed -void InitSymEng(void); +void InitSymEng(); // Cleans up the symbol engine if needed -void CleanupSymEng(void); +void CleanupSymEng(); /*////////////////////////////////////////////////////////////////////// Destructor Class @@ -122,8 +122,8 @@ void CleanupSymEng(void); class CleanUpCrashHandler { public: - CleanUpCrashHandler(void) {} - ~CleanUpCrashHandler(void) + CleanUpCrashHandler() {} + ~CleanUpCrashHandler() { // Are there any outstanding memory allocations? if (NULL != g_ahMod) @@ -237,7 +237,7 @@ BOOL __stdcall AddCrashHandlerLimitModule(HMODULE hMod) return (TRUE); } -UINT __stdcall GetLimitModuleCount(void) +UINT __stdcall GetLimitModuleCount() { return (g_uiModCount); } @@ -1001,7 +1001,7 @@ BOOL InternalSymGetLineFromAddr(IN HANDLE hProcess, IN DWORD dwAddr, OUT PDWORD } // Initializes the symbol engine if needed -void InitSymEng(void) +void InitSymEng() { if (FALSE == g_bSymEngInit) { @@ -1020,7 +1020,7 @@ void InitSymEng(void) } // Cleans up the symbol engine if needed -void CleanupSymEng(void) +void CleanupSymEng() { if (TRUE == g_bSymEngInit) { @@ -1037,7 +1037,7 @@ static BOOL g_bHasVersion = FALSE; // Indicates NT or 95/98. static BOOL g_bIsNT = TRUE; -BOOL __stdcall IsNT(void) +BOOL __stdcall IsNT() { if (TRUE == g_bHasVersion) { @@ -1262,7 +1262,7 @@ RETURNS : TRUE - Everything initialized properly. FALSE - There was a problem. ----------------------------------------------------------------------*/ -static BOOL InitPSAPI(void) +static BOOL InitPSAPI() { if (TRUE == g_bInitialized) { @@ -1510,7 +1510,7 @@ RETURNS : TRUE - Everything initialized properly. FALSE - There was a problem. ----------------------------------------------------------------------*/ -static BOOL InitTOOLHELP32(void) +static BOOL InitTOOLHELP32() { if (TRUE == g_bInitialized) { diff --git a/Server/core/CCrashHandlerAPI.h b/Server/core/CCrashHandlerAPI.h index e1ca8a511a0..57d3d009b0e 100644 --- a/Server/core/CCrashHandlerAPI.h +++ b/Server/core/CCrashHandlerAPI.h @@ -29,7 +29,7 @@ Copyright (c) 1997-2000 John Robbins -- All rights reserved. // The Win95 version of GetModuleBaseName. static DWORD __stdcall Win95GetModuleBaseName(HANDLE hProcess, HMODULE hModule, LPSTR lpBaseName, DWORD nSize); -BOOL __stdcall IsNT(void); +BOOL __stdcall IsNT(); DWORD __stdcall NTGetModuleBaseName(HANDLE hProcess, HMODULE hModule, LPTSTR lpBaseName, DWORD nSize); BOOL __stdcall NT4GetLoadedModules(DWORD dwPID, UINT uiCount, HMODULE* paModArray, LPDWORD pdwRealCount); BOOL __stdcall TLHELPGetLoadedModules(DWORD dwPID, UINT uiCount, HMODULE* paModArray, LPDWORD pdwRealCount); @@ -94,7 +94,7 @@ extern "C" The item count. This can be zero if not limiting modules have been added. ----------------------------------------------------------------------*/ - UINT BUGSUTIL_DLLINTERFACE __stdcall GetLimitModuleCount(void); + UINT BUGSUTIL_DLLINTERFACE __stdcall GetLimitModuleCount(); /*---------------------------------------------------------------------- FUNCTION : GetLimitModulesArray diff --git a/Server/core/CDynamicLibrary.cpp b/Server/core/CDynamicLibrary.cpp index 177f71a0733..28a1f9ed09a 100644 --- a/Server/core/CDynamicLibrary.cpp +++ b/Server/core/CDynamicLibrary.cpp @@ -17,13 +17,13 @@ #include #endif -CDynamicLibrary::CDynamicLibrary(void) +CDynamicLibrary::CDynamicLibrary() { // Init m_hModule = 0; } -CDynamicLibrary::~CDynamicLibrary(void) +CDynamicLibrary::~CDynamicLibrary() { // Make sure we unload Unload(); @@ -97,7 +97,7 @@ bool CDynamicLibrary::Load(const char* szFilename) return m_hModule != 0; } -void CDynamicLibrary::Unload(void) +void CDynamicLibrary::Unload() { // Got a module? if (m_hModule != 0) @@ -113,7 +113,7 @@ void CDynamicLibrary::Unload(void) } } -bool CDynamicLibrary::IsLoaded(void) +bool CDynamicLibrary::IsLoaded() { return m_hModule != 0; } diff --git a/Server/core/CDynamicLibrary.h b/Server/core/CDynamicLibrary.h index e1567160cec..81078c753b0 100644 --- a/Server/core/CDynamicLibrary.h +++ b/Server/core/CDynamicLibrary.h @@ -20,12 +20,12 @@ typedef void (*FuncPtr_t)(); class CDynamicLibrary { public: - CDynamicLibrary(void); - ~CDynamicLibrary(void); + CDynamicLibrary(); + ~CDynamicLibrary(); bool Load(const char* szFilename); - void Unload(void); - bool IsLoaded(void); + void Unload(); + bool IsLoaded(); FuncPtr_t GetProcedureAddress(const char* szProcName); bool CheckMtaVersion(const char* szLibName); diff --git a/Server/core/CExceptionInformation_Impl.cpp b/Server/core/CExceptionInformation_Impl.cpp index f287e9329b5..26f4bbfa93e 100644 --- a/Server/core/CExceptionInformation_Impl.cpp +++ b/Server/core/CExceptionInformation_Impl.cpp @@ -13,7 +13,7 @@ #define MAX_MODULE_PATH 512 -CExceptionInformation_Impl::CExceptionInformation_Impl(void) +CExceptionInformation_Impl::CExceptionInformation_Impl() { m_uiCode = 0; m_pAddress = NULL; @@ -38,7 +38,7 @@ CExceptionInformation_Impl::CExceptionInformation_Impl(void) m_ulEFlags = 0; } -CExceptionInformation_Impl::~CExceptionInformation_Impl(void) +CExceptionInformation_Impl::~CExceptionInformation_Impl() { if (m_szModulePathName) delete m_szModulePathName; diff --git a/Server/core/CExceptionInformation_Impl.h b/Server/core/CExceptionInformation_Impl.h index db3bcd275b1..fcb8a95f4b3 100644 --- a/Server/core/CExceptionInformation_Impl.h +++ b/Server/core/CExceptionInformation_Impl.h @@ -17,32 +17,32 @@ class CExceptionInformation_Impl : public CExceptionInformation { public: - CExceptionInformation_Impl(void); - ~CExceptionInformation_Impl(void); // {}; + CExceptionInformation_Impl(); + ~CExceptionInformation_Impl(); // {}; - unsigned int GetCode(void) { return m_uiCode; }; - void* GetAddress(void) { return m_pAddress; }; + unsigned int GetCode() { return m_uiCode; }; + void* GetAddress() { return m_pAddress; }; bool GetModule(char* szModuleName, int nOutputNameLength, void** ppModuleBaseAddress); - virtual const char* GetModulePathName(void) { return m_szModulePathName; }; - virtual const char* GetModuleBaseName(void) { return m_szModuleBaseName; }; - virtual uint GetAddressModuleOffset(void) { return m_uiAddressModuleOffset; }; + virtual const char* GetModulePathName() { return m_szModulePathName; }; + virtual const char* GetModuleBaseName() { return m_szModuleBaseName; }; + virtual uint GetAddressModuleOffset() { return m_uiAddressModuleOffset; }; - unsigned long GetEAX(void) { return m_ulEAX; }; - unsigned long GetEBX(void) { return m_ulEBX; }; - unsigned long GetECX(void) { return m_ulECX; }; - unsigned long GetEDX(void) { return m_ulEDX; }; - unsigned long GetESI(void) { return m_ulESI; }; - unsigned long GetEDI(void) { return m_ulEDI; }; - unsigned long GetEBP(void) { return m_ulEBP; }; - unsigned long GetESP(void) { return m_ulESP; }; - unsigned long GetEIP(void) { return m_ulEIP; }; - unsigned long GetCS(void) { return m_ulCS; }; - unsigned long GetDS(void) { return m_ulDS; }; - unsigned long GetES(void) { return m_ulES; }; - unsigned long GetFS(void) { return m_ulFS; }; - unsigned long GetGS(void) { return m_ulGS; }; - unsigned long GetSS(void) { return m_ulSS; }; - unsigned long GetEFlags(void) { return m_ulEFlags; }; + unsigned long GetEAX() { return m_ulEAX; }; + unsigned long GetEBX() { return m_ulEBX; }; + unsigned long GetECX() { return m_ulECX; }; + unsigned long GetEDX() { return m_ulEDX; }; + unsigned long GetESI() { return m_ulESI; }; + unsigned long GetEDI() { return m_ulEDI; }; + unsigned long GetEBP() { return m_ulEBP; }; + unsigned long GetESP() { return m_ulESP; }; + unsigned long GetEIP() { return m_ulEIP; }; + unsigned long GetCS() { return m_ulCS; }; + unsigned long GetDS() { return m_ulDS; }; + unsigned long GetES() { return m_ulES; }; + unsigned long GetFS() { return m_ulFS; }; + unsigned long GetGS() { return m_ulGS; }; + unsigned long GetSS() { return m_ulSS; }; + unsigned long GetEFlags() { return m_ulEFlags; }; void Set(unsigned int iCode, _EXCEPTION_POINTERS* pException); diff --git a/Server/core/CModManagerImpl.cpp b/Server/core/CModManagerImpl.cpp index b976c0feca0..a027e3f48e9 100644 --- a/Server/core/CModManagerImpl.cpp +++ b/Server/core/CModManagerImpl.cpp @@ -23,7 +23,7 @@ CModManagerImpl::CModManagerImpl(CServerImpl* pServer) m_pBase = NULL; } -CModManagerImpl::~CModManagerImpl(void) +CModManagerImpl::~CModManagerImpl() { // Make sure the mod is unloaded Unload(); @@ -40,12 +40,12 @@ SString CModManagerImpl::GetAbsolutePath(const char* szRelative) return SString("%s/%s", m_strModPath.c_str(), szRelative); } -bool CModManagerImpl::IsModLoaded(void) +bool CModManagerImpl::IsModLoaded() { return m_pBase != NULL; } -CServerBase* CModManagerImpl::GetCurrentMod(void) +CServerBase* CModManagerImpl::GetCurrentMod() { return m_pBase; } @@ -135,7 +135,7 @@ void CModManagerImpl::Unload(bool bKeyPressBeforeTerm) } } -void CModManagerImpl::DoPulse(void) +void CModManagerImpl::DoPulse() { // Got a mod loaded? if (m_pBase) @@ -145,7 +145,7 @@ void CModManagerImpl::DoPulse(void) } } -bool CModManagerImpl::IsFinished(void) +bool CModManagerImpl::IsFinished() { if (m_pBase) { @@ -155,7 +155,7 @@ bool CModManagerImpl::IsFinished(void) return true; } -bool CModManagerImpl::PendingWorkToDo(void) +bool CModManagerImpl::PendingWorkToDo() { if (m_pBase) { diff --git a/Server/core/CModManagerImpl.h b/Server/core/CModManagerImpl.h index fbe43fb2776..5b0ba4477cf 100644 --- a/Server/core/CModManagerImpl.h +++ b/Server/core/CModManagerImpl.h @@ -25,18 +25,18 @@ class CModManagerImpl : public CModManager { public: CModManagerImpl(CServerImpl* pServer); - virtual ~CModManagerImpl(void); + virtual ~CModManagerImpl(); void SetServerPath(const char* szServerPath) { m_strServerPath = szServerPath; }; bool RequestLoad(const char* szModName); - const char* GetServerPath(void) { return m_strServerPath; }; - const char* GetModPath(void) { return m_strModPath; }; + const char* GetServerPath() { return m_strServerPath; }; + const char* GetModPath() { return m_strModPath; }; virtual SString GetAbsolutePath(const char* szRelative); - bool IsModLoaded(void); - CServerBase* GetCurrentMod(void); + bool IsModLoaded(); + CServerBase* GetCurrentMod(); bool Load(const char* szModName, int iArgumentCount, char* szArguments[]); void Unload(bool bKeyPressBeforeTerm = false); @@ -44,13 +44,13 @@ class CModManagerImpl : public CModManager void HandleInput(const char* szCommand); void GetTag(char* szInfoTag, int iInfoTag); - void DoPulse(void); + void DoPulse(); - bool IsFinished(void); + bool IsFinished(); - bool PendingWorkToDo(void); + bool PendingWorkToDo(); bool GetSleepIntervals(int& iSleepBusyMs, int& iSleepIdleMs, int& iLogicFpsLimit); - CDynamicLibrary& GetDynamicLibrary(void) { return m_Library; }; + CDynamicLibrary& GetDynamicLibrary() { return m_Library; }; private: CServerImpl* m_pServer; diff --git a/Server/core/CServerImpl.cpp b/Server/core/CServerImpl.cpp index 96374d5d73c..59ec863cd5a 100644 --- a/Server/core/CServerImpl.cpp +++ b/Server/core/CServerImpl.cpp @@ -39,7 +39,7 @@ bool g_bNoCrashHandler = false; bool g_bDaemonized = false; WINDOW* m_wndMenu = NULL; WINDOW* m_wndInput = NULL; -bool IsCursesActive(void) +bool IsCursesActive() { return m_wndInput != NULL; } @@ -48,7 +48,7 @@ bool IsCursesActive(void) #ifdef WIN32 CServerImpl::CServerImpl(CThreadCommandQueue* pThreadCommandQueue) #else -CServerImpl::CServerImpl(void) +CServerImpl::CServerImpl() #endif { #ifdef WIN32 @@ -74,23 +74,23 @@ CServerImpl::CServerImpl(void) m_pModManager = new CModManagerImpl(this); } -CServerImpl::~CServerImpl(void) +CServerImpl::~CServerImpl() { // Destroy our stuff delete m_pModManager; } -CNetServer* CServerImpl::GetNetwork(void) +CNetServer* CServerImpl::GetNetwork() { return m_pNetwork; } -CModManager* CServerImpl::GetModManager(void) +CModManager* CServerImpl::GetModManager() { return m_pModManager; } -CXML* CServerImpl::GetXML(void) +CXML* CServerImpl::GetXML() { return m_pXML; } @@ -131,7 +131,7 @@ void CServerImpl::Printf(const char* szFormat, ...) va_end(ap); } -bool CServerImpl::IsRequestingExit(void) +bool CServerImpl::IsRequestingExit() { #ifdef WIN32 m_pThreadCommandQueue->Process(m_bRequestedQuit, NULL); @@ -435,7 +435,7 @@ int CServerImpl::Run(int iArgumentCount, char* szArguments[]) return ERROR_NO_ERROR; } -void CServerImpl::MainLoop(void) +void CServerImpl::MainLoop() { #ifdef WIN32 timeBeginPeriod(1); // Change sleep resolution to 1ms @@ -491,7 +491,7 @@ void CServerImpl::MainLoop(void) // // Limit the pulses to avoid heavy CPU usage // -void CServerImpl::HandlePulseSleep(void) +void CServerImpl::HandlePulseSleep() { // Get settings int iSleepBusyMs; @@ -714,7 +714,7 @@ void CServerImpl::ShowInfoTag(char* szTag) #endif } -void CServerImpl::HandleInput(void) +void CServerImpl::HandleInput() { wint_t iStdIn = 0; @@ -983,7 +983,7 @@ void CServerImpl::SelectCommandHistoryEntry(uint uiEntry) #endif } -bool CServerImpl::ClearInput(void) +bool CServerImpl::ClearInput() { if (m_uiInputCount > 0) { @@ -1007,7 +1007,7 @@ bool CServerImpl::ClearInput(void) return false; } -bool CServerImpl::ResetInput(void) +bool CServerImpl::ResetInput() { if (m_uiInputCount > 0) { @@ -1145,7 +1145,7 @@ bool IsKeyPressed(int iKey) return false; } -void CServerImpl::DestroyWindow(void) +void CServerImpl::DestroyWindow() { #ifndef WIN32 if (!g_bSilent && !g_bNoCurses && m_wndInput) diff --git a/Server/core/CServerImpl.h b/Server/core/CServerImpl.h index 84850c57aaf..4855c978c6b 100644 --- a/Server/core/CServerImpl.h +++ b/Server/core/CServerImpl.h @@ -35,7 +35,7 @@ class CServerImpl; #define SERVER_RESET_RETURN 500 typedef CXML* (*InitXMLInterface)(const char* szSaveFlagDirectory); -typedef CNetServer* (*InitNetServerInterface)(void); +typedef CNetServer* (*InitNetServerInterface)(); #ifdef WIN32 typedef void(FClientFeedback)(const char* szText); @@ -48,25 +48,25 @@ class CServerImpl : public CServerInterface #ifdef WIN32 CServerImpl(CThreadCommandQueue* pThreadCommandQueue); #else - CServerImpl(void); + CServerImpl(); #endif - ~CServerImpl(void); + ~CServerImpl(); - CNetServer* GetNetwork(void); - CModManager* GetModManager(void); - CXML* GetXML(void); + CNetServer* GetNetwork(); + CModManager* GetModManager(); + CXML* GetXML(); - const char* GetServerModPath(void) { return m_strServerModPath; }; + const char* GetServerModPath() { return m_strServerModPath; }; SString GetAbsolutePath(const char* szRelative); void Printf(const char* szText, ...); - bool IsRequestingExit(void); + bool IsRequestingExit(); // Clears input buffer - bool ClearInput(void); + bool ClearInput(); // Prints current input buffer on a new line, clears the input buffer and resets history selection - bool ResetInput(void); + bool ResetInput(); int Run(int iArgumentCount, char* szArguments[]); #ifndef WIN32 @@ -76,17 +76,17 @@ class CServerImpl : public CServerInterface #endif private: - void MainLoop(void); + void MainLoop(); bool ParseArguments(int iArgumentCount, char* szArguments[]); void ShowInfoTag(char* szTag); - void HandleInput(void); + void HandleInput(); void SelectCommandHistoryEntry(uint uiEntry); - void HandlePulseSleep(void); + void HandlePulseSleep(); void ApplyFrameRateLimit(uint uiUseRate); - void DestroyWindow(void); + void DestroyWindow(); CDynamicLibrary m_NetworkLibrary; CDynamicLibrary m_XMLLibrary; diff --git a/Server/dbconmy/CDatabaseConnectionMySql.cpp b/Server/dbconmy/CDatabaseConnectionMySql.cpp index c26a1057bc4..a72667ef375 100644 --- a/Server/dbconmy/CDatabaseConnectionMySql.cpp +++ b/Server/dbconmy/CDatabaseConnectionMySql.cpp @@ -27,23 +27,23 @@ class CDatabaseConnectionMySql : public CDatabaseConnection ZERO_ON_NEW CDatabaseConnectionMySql(CDatabaseType* pManager, const SString& strHost, const SString& strUsername, const SString& strPassword, const SString& strOptions); - virtual ~CDatabaseConnectionMySql(void); + virtual ~CDatabaseConnectionMySql(); // CDatabaseConnection - virtual bool IsValid(void); - virtual const SString& GetLastErrorMessage(void); - virtual uint GetLastErrorCode(void); - virtual void AddRef(void); - virtual void Release(void); + virtual bool IsValid(); + virtual const SString& GetLastErrorMessage(); + virtual uint GetLastErrorCode(); + virtual void AddRef(); + virtual void Release(); virtual bool Query(const SString& strQuery, CRegistryResult& registryResult); - virtual void Flush(void); - virtual int GetShareCount(void) { return m_iRefCount; } + virtual void Flush(); + virtual int GetShareCount() { return m_iRefCount; } // CDatabaseConnectionMySql void SetLastError(uint uiCode, const SString& strMessage); bool QueryInternal(const SString& strQuery, CRegistryResult& registryResult); - void BeginAutomaticTransaction(void); - void EndAutomaticTransaction(void); + void BeginAutomaticTransaction(); + void EndAutomaticTransaction(); int ConvertToSqliteType(enum_field_types type); int m_iRefCount; @@ -128,7 +128,7 @@ CDatabaseConnectionMySql::CDatabaseConnectionMySql(CDatabaseType* pManager, cons // // /////////////////////////////////////////////////////////////// -CDatabaseConnectionMySql::~CDatabaseConnectionMySql(void) +CDatabaseConnectionMySql::~CDatabaseConnectionMySql() { Flush(); @@ -149,7 +149,7 @@ CDatabaseConnectionMySql::~CDatabaseConnectionMySql(void) // // /////////////////////////////////////////////////////////////// -void CDatabaseConnectionMySql::AddRef(void) +void CDatabaseConnectionMySql::AddRef() { m_iRefCount++; } @@ -161,7 +161,7 @@ void CDatabaseConnectionMySql::AddRef(void) // // /////////////////////////////////////////////////////////////// -void CDatabaseConnectionMySql::Release(void) +void CDatabaseConnectionMySql::Release() { if (--m_iRefCount > 0) { @@ -180,7 +180,7 @@ void CDatabaseConnectionMySql::Release(void) // Returns false if connection created all wrong // /////////////////////////////////////////////////////////////// -bool CDatabaseConnectionMySql::IsValid(void) +bool CDatabaseConnectionMySql::IsValid() { return m_bOpened; } @@ -192,7 +192,7 @@ bool CDatabaseConnectionMySql::IsValid(void) // Only valid when IsValid() or Query() returns false // /////////////////////////////////////////////////////////////// -const SString& CDatabaseConnectionMySql::GetLastErrorMessage(void) +const SString& CDatabaseConnectionMySql::GetLastErrorMessage() { return m_strLastErrorMessage; } @@ -204,7 +204,7 @@ const SString& CDatabaseConnectionMySql::GetLastErrorMessage(void) // Only valid when IsValid() or Query() returns false // /////////////////////////////////////////////////////////////// -uint CDatabaseConnectionMySql::GetLastErrorCode(void) +uint CDatabaseConnectionMySql::GetLastErrorCode() { return m_uiLastErrorCode; } @@ -355,7 +355,7 @@ bool CDatabaseConnectionMySql::QueryInternal(const SString& strQuery, CRegistryR // // /////////////////////////////////////////////////////////////// -void CDatabaseConnectionMySql::BeginAutomaticTransaction(void) +void CDatabaseConnectionMySql::BeginAutomaticTransaction() { if (m_bInAutomaticTransaction) { @@ -379,7 +379,7 @@ void CDatabaseConnectionMySql::BeginAutomaticTransaction(void) // // /////////////////////////////////////////////////////////////// -void CDatabaseConnectionMySql::EndAutomaticTransaction(void) +void CDatabaseConnectionMySql::EndAutomaticTransaction() { if (m_bInAutomaticTransaction) { @@ -396,7 +396,7 @@ void CDatabaseConnectionMySql::EndAutomaticTransaction(void) // Flush caches // /////////////////////////////////////////////////////////////// -void CDatabaseConnectionMySql::Flush(void) +void CDatabaseConnectionMySql::Flush() { EndAutomaticTransaction(); } diff --git a/Server/launcher/CDynamicLibrary.cpp b/Server/launcher/CDynamicLibrary.cpp index 4000281177f..33290893f73 100644 --- a/Server/launcher/CDynamicLibrary.cpp +++ b/Server/launcher/CDynamicLibrary.cpp @@ -15,13 +15,13 @@ #include #include "CDynamicLibrary.h" -CDynamicLibrary::CDynamicLibrary(void) +CDynamicLibrary::CDynamicLibrary() { // Init m_hModule = 0; } -CDynamicLibrary::~CDynamicLibrary(void) +CDynamicLibrary::~CDynamicLibrary() { // Make sure we unload Unload(); @@ -49,7 +49,7 @@ bool CDynamicLibrary::Load(const char* szFilename) return m_hModule != 0; } -void CDynamicLibrary::Unload(void) +void CDynamicLibrary::Unload() { // Got a module? if (m_hModule != 0) @@ -65,7 +65,7 @@ void CDynamicLibrary::Unload(void) } } -bool CDynamicLibrary::IsLoaded(void) +bool CDynamicLibrary::IsLoaded() { return m_hModule != 0; } diff --git a/Server/launcher/CDynamicLibrary.h b/Server/launcher/CDynamicLibrary.h index 406eca18974..41096cf02b2 100644 --- a/Server/launcher/CDynamicLibrary.h +++ b/Server/launcher/CDynamicLibrary.h @@ -20,12 +20,12 @@ class CDynamicLibrary { public: - CDynamicLibrary(void); - ~CDynamicLibrary(void); + CDynamicLibrary(); + ~CDynamicLibrary(); bool Load(const char* szFilename); - void Unload(void); - bool IsLoaded(void); + void Unload(); + bool IsLoaded(); void* GetProcedureAddress(const char* szProcName); diff --git a/Server/mods/deathmatch/CServer.cpp b/Server/mods/deathmatch/CServer.cpp index 5d1aadfb393..aeb0dd9edf7 100644 --- a/Server/mods/deathmatch/CServer.cpp +++ b/Server/mods/deathmatch/CServer.cpp @@ -23,14 +23,14 @@ CServerInterface* g_pServerInterface = NULL; CNetServer* g_pNetServer = NULL; CNetServer* g_pRealNetServer = NULL; -CServer::CServer(void) +CServer::CServer() { // Init m_pServerInterface = NULL; m_pGame = NULL; } -CServer::~CServer(void) +CServer::~CServer() { } @@ -56,7 +56,7 @@ bool CServer::ServerStartup(int iArgumentCount, char* szArguments[]) return false; } -void CServer::ServerShutdown(void) +void CServer::ServerShutdown() { if (m_pGame) { @@ -103,7 +103,7 @@ bool CServer::IsFinished() return false; } -bool CServer::PendingWorkToDo(void) +bool CServer::PendingWorkToDo() { if (m_pGame && g_pNetServer) { diff --git a/Server/mods/deathmatch/CServer.h b/Server/mods/deathmatch/CServer.h index ac00504b292..ed9463944a7 100644 --- a/Server/mods/deathmatch/CServer.h +++ b/Server/mods/deathmatch/CServer.h @@ -16,20 +16,20 @@ class CServer : public CServerBase { public: - CServer(void); - virtual ~CServer(void); + CServer(); + virtual ~CServer(); void ServerInitialize(CServerInterface* pServerInterface); bool ServerStartup(int iArgumentCount, char* szArguments[]); - void ServerShutdown(void); + void ServerShutdown(); - void DoPulse(void); + void DoPulse(); void GetTag(char* szInfoTag, int iInfoTag); void HandleInput(char* szCommand); - bool IsFinished(void); - bool PendingWorkToDo(void); + bool IsFinished(); + bool PendingWorkToDo(); bool GetSleepIntervals(int& iSleepBusyMs, int& iSleepIdleMs, int& iLogicFpsLimit); private: diff --git a/Server/mods/deathmatch/logic/ASE.cpp b/Server/mods/deathmatch/logic/ASE.cpp index 5569ecf9802..dc1d4a9c5a1 100644 --- a/Server/mods/deathmatch/logic/ASE.cpp +++ b/Server/mods/deathmatch/logic/ASE.cpp @@ -56,7 +56,7 @@ ASE::ASE(CMainConfig* pMainConfig, CPlayerManager* pPlayerManager, unsigned shor m_strMtaAseVersion = MTA_DM_ASE_VERSION; } -ASE::~ASE(void) +ASE::~ASE() { _instance = NULL; ClearRules(); @@ -132,7 +132,7 @@ bool ASE::SetPortEnabled(bool bInternetEnabled, bool bLanEnabled) return true; } -void ASE::DoPulse(void) +void ASE::DoPulse() { if (m_SocketList.empty()) return; @@ -217,7 +217,7 @@ void ASE::DoPulse(void) // Protect against a flood of server queries. // Send cached version unless player count has changed, or last re-cache is older than m_lFullMinInterval -const std::string* ASE::QueryFullCached(void) +const std::string* ASE::QueryFullCached() { if (m_uiCurrentPlayerCount != m_uiFullLastPlayerCount || m_llCurrentTime - m_llFullLastTime > m_lFullMinInterval || m_strFullCached == "") { @@ -228,7 +228,7 @@ const std::string* ASE::QueryFullCached(void) return &m_strFullCached; } -std::string ASE::QueryFull(void) +std::string ASE::QueryFull() { std::stringstream reply; std::stringstream temp; @@ -328,7 +328,7 @@ std::string ASE::QueryFull(void) // Protect against a flood of server queries. // Send cached version unless player count has changed, or last re-cache is older than m_lLightMinInterval -const std::string* ASE::QueryXfireLightCached(void) +const std::string* ASE::QueryXfireLightCached() { if (m_uiCurrentPlayerCount != m_uiXfireLightLastPlayerCount || m_llCurrentTime - m_llXfireLightLastTime > m_lXfireLightMinInterval || m_strXfireLightCached == "") @@ -340,7 +340,7 @@ const std::string* ASE::QueryXfireLightCached(void) return &m_strXfireLightCached; } -std::string ASE::QueryXfireLight(void) +std::string ASE::QueryXfireLight() { std::stringstream reply; @@ -379,7 +379,7 @@ std::string ASE::QueryXfireLight(void) // Protect against a flood of server queries. // Send cached version unless player count has changed, or last re-cache is older than m_lLightMinInterval -const std::string* ASE::QueryLightCached(void) +const std::string* ASE::QueryLightCached() { if (m_uiCurrentPlayerCount != m_uiLightLastPlayerCount || m_llCurrentTime - m_llLightLastTime > m_lLightMinInterval || m_strLightCached == "") { @@ -390,7 +390,7 @@ const std::string* ASE::QueryLightCached(void) return &m_strLightCached; } -std::string ASE::QueryLight(void) +std::string ASE::QueryLight() { std::stringstream reply; @@ -487,7 +487,7 @@ std::string ASE::QueryLight(void) return reply.str(); } -CLanBroadcast* ASE::InitLan(void) +CLanBroadcast* ASE::InitLan() { return new CLanBroadcast(m_usPort); } @@ -591,7 +591,7 @@ bool ASE::RemoveRuleValue(const char* szKey) return false; } -void ASE::ClearRules(void) +void ASE::ClearRules() { list::iterator iter = m_Rules.begin(); for (; iter != m_Rules.end(); iter++) diff --git a/Server/mods/deathmatch/logic/ASE.h b/Server/mods/deathmatch/logic/ASE.h index 2f54881f65c..941bd114edb 100644 --- a/Server/mods/deathmatch/logic/ASE.h +++ b/Server/mods/deathmatch/logic/ASE.h @@ -47,43 +47,43 @@ class ASE public: ZERO_ON_NEW ASE(CMainConfig* pMainConfig, CPlayerManager* pPlayerManager, unsigned short usPort, const SString& strServerIPList); - ~ASE(void); + ~ASE(); - void DoPulse(void); + void DoPulse(); bool SetPortEnabled(bool bInternetEnabled, bool bLanEnabled); - static ASE* GetInstance(void) { return _instance; } + static ASE* GetInstance() { return _instance; } - unsigned long GetMasterServerQueryCount(void) { return m_ulMasterServerQueryCount; } - uint GetTotalQueryCount(void) { return m_uiNumQueriesTotal; } - uint GetQueriesPerMinute(void) { return m_uiNumQueriesPerMinute; } + unsigned long GetMasterServerQueryCount() { return m_ulMasterServerQueryCount; } + uint GetTotalQueryCount() { return m_uiNumQueriesTotal; } + uint GetQueriesPerMinute() { return m_uiNumQueriesPerMinute; } - CLanBroadcast* InitLan(void); + CLanBroadcast* InitLan(); - const char* GetGameType(void) { return m_strGameType.c_str(); } + const char* GetGameType() { return m_strGameType.c_str(); } void SetGameType(const char* szGameType); - const char* GetMapName(void) { return m_strMapName.c_str(); } + const char* GetMapName() { return m_strMapName.c_str(); } void SetMapName(const char* szMapName); - CMainConfig* GetMainConfig(void) { return m_pMainConfig; }; - CPlayerManager* GetPlayerManager(void) { return m_pPlayerManager; }; + CMainConfig* GetMainConfig() { return m_pMainConfig; }; + CPlayerManager* GetPlayerManager() { return m_pPlayerManager; }; const char* GetRuleValue(const char* szKey); void SetRuleValue(const char* szKey, const char* szValue); bool RemoveRuleValue(const char* szKey); - void ClearRules(void); + void ClearRules(); - list::iterator IterBegin(void) { return m_Rules.begin(); } - list::iterator IterEnd(void) { return m_Rules.end(); } + list::iterator IterBegin() { return m_Rules.begin(); } + list::iterator IterEnd() { return m_Rules.end(); } - std::string QueryLight(void); + std::string QueryLight(); private: - const std::string* QueryFullCached(void); - std::string QueryFull(void); - const std::string* QueryLightCached(void); - const std::string* QueryXfireLightCached(void); - std::string QueryXfireLight(void); + const std::string* QueryFullCached(); + std::string QueryFull(); + const std::string* QueryLightCached(); + const std::string* QueryXfireLightCached(); + std::string QueryXfireLight(); long long m_llCurrentTime; uint m_uiCurrentPlayerCount; @@ -144,9 +144,9 @@ class CASERule m_strKey = szKey; m_strValue = szValue; } - const char* GetKey(void) { return m_strKey.c_str(); } + const char* GetKey() { return m_strKey.c_str(); } void SetKey(const char* szKey) { m_strKey = szKey; } - const char* GetValue(void) { return m_strValue.c_str(); } + const char* GetValue() { return m_strValue.c_str(); } void SetValue(const char* szValue) { m_strValue = szValue; } private: diff --git a/Server/mods/deathmatch/logic/ASEQuerySDK.h b/Server/mods/deathmatch/logic/ASEQuerySDK.h index 88a16932fe6..ee83c65901c 100644 --- a/Server/mods/deathmatch/logic/ASEQuerySDK.h +++ b/Server/mods/deathmatch/logic/ASEQuerySDK.h @@ -29,7 +29,7 @@ Returns 0 on error, char *ASEQuery_error contains the error message. 2. The worker function -extern int ASEQuery_check(void); +extern int ASEQuery_check(); Ideally this should be called every millisecond. The simplest implementation would be to call this every "frame". Longer delays cause bigger ping @@ -40,9 +40,9 @@ Returns 0 on error, char *ASEQuery_error contains the error message. 3. Functions that the _game_ has to implement -void ASEQuery_wantstatus(void); -void ASEQuery_wantrules(void); -void ASEQuery_wantplayers(void); +void ASEQuery_wantstatus(); +void ASEQuery_wantrules(); +void ASEQuery_wantplayers(); These are called when the SDK needs information about the game state. In each of these functions, the game must call back to the SDK providing @@ -64,7 +64,7 @@ apply can be passed as NULL. 5. Shutting down -extern void ASEQuery_shutdown(void); +extern void ASEQuery_shutdown(); 6. How to link @@ -111,13 +111,13 @@ extern "C" { extern int ASEQuery_initialize(int hostport, int internet, char* address); - extern void ASEQuery_shutdown(void); + extern void ASEQuery_shutdown(); - extern int ASEQuery_check(void); + extern int ASEQuery_check(); - void ASEQuery_wantstatus(void); - void ASEQuery_wantrules(void); - void ASEQuery_wantplayers(void); + void ASEQuery_wantstatus(); + void ASEQuery_wantrules(); + void ASEQuery_wantplayers(); extern void ASEQuery_status(const char* hostname, const char* gametype, const char* mapname, const char* gamever, int password, int numplayers, int maxplayers); diff --git a/Server/mods/deathmatch/logic/CAccessControlList.cpp b/Server/mods/deathmatch/logic/CAccessControlList.cpp index 82450aeb35e..c417449b25a 100644 --- a/Server/mods/deathmatch/logic/CAccessControlList.cpp +++ b/Server/mods/deathmatch/logic/CAccessControlList.cpp @@ -18,7 +18,7 @@ CAccessControlList::CAccessControlList(const char* szACLName, CAccessControlList m_pACLManager = pACLManager; } -CAccessControlList::~CAccessControlList(void) +CAccessControlList::~CAccessControlList() { CIdArray::PushUniqueId(this, EIdClass::ACL, m_uiScriptID); list::iterator iter = m_Rights.begin(); @@ -106,12 +106,12 @@ void CAccessControlList::WriteToXMLNode(CXMLNode* pNode) } } -void CAccessControlList::OnChange(void) +void CAccessControlList::OnChange() { g_pGame->GetACLManager()->OnChange(); } -bool CAccessControlList::CanBeModifiedByScript(void) +bool CAccessControlList::CanBeModifiedByScript() { // If this isn't horrible, I don't know what is return !SStringX(GetName()).BeginsWith("autoACL_"); diff --git a/Server/mods/deathmatch/logic/CAccessControlList.h b/Server/mods/deathmatch/logic/CAccessControlList.h index 747f44b91c6..50f0b198c8f 100644 --- a/Server/mods/deathmatch/logic/CAccessControlList.h +++ b/Server/mods/deathmatch/logic/CAccessControlList.h @@ -23,9 +23,9 @@ class CAccessControlList { public: CAccessControlList(const char* szACLName, class CAccessControlListManager* pACLManager); - ~CAccessControlList(void); + ~CAccessControlList(); - const char* GetName(void) { return m_strACLName; }; + const char* GetName() { return m_strACLName; }; CAccessControlListRight* AddRight(const char* szRightName, CAccessControlListRight::ERightType eRightType, bool bAccess); CAccessControlListRight* GetRight(const char* szRightName, CAccessControlListRight::ERightType eRightType); @@ -33,14 +33,14 @@ class CAccessControlList void WriteToXMLNode(CXMLNode* pNode); - list::const_iterator IterBegin(void) { return m_Rights.begin(); }; - list::const_iterator IterEnd(void) { return m_Rights.end(); }; + list::const_iterator IterBegin() { return m_Rights.begin(); }; + list::const_iterator IterEnd() { return m_Rights.end(); }; - bool CanBeModifiedByScript(void); - uint GetScriptID(void) const { return m_uiScriptID; } + bool CanBeModifiedByScript(); + uint GetScriptID() const { return m_uiScriptID; } private: - void OnChange(void); + void OnChange(); SString m_strACLName; list m_Rights; diff --git a/Server/mods/deathmatch/logic/CAccessControlListGroup.cpp b/Server/mods/deathmatch/logic/CAccessControlListGroup.cpp index 7d834745b1e..15396421276 100644 --- a/Server/mods/deathmatch/logic/CAccessControlListGroup.cpp +++ b/Server/mods/deathmatch/logic/CAccessControlListGroup.cpp @@ -17,7 +17,7 @@ CAccessControlListGroup::CAccessControlListGroup(const char* szGroupName) m_strGroupName = szGroupName; } -CAccessControlListGroup::~CAccessControlListGroup(void) +CAccessControlListGroup::~CAccessControlListGroup() { CIdArray::PushUniqueId(this, EIdClass::ACL_GROUP, m_uiScriptID); ObjectList::iterator iter = m_Objects.begin(); @@ -216,12 +216,12 @@ void CAccessControlListGroup::WriteToXMLNode(CXMLNode* pNode) } } -void CAccessControlListGroup::OnChange(void) +void CAccessControlListGroup::OnChange() { g_pGame->GetACLManager()->OnChange(); } -void CAccessControlListRight::OnChange(void) +void CAccessControlListRight::OnChange() { g_pGame->GetACLManager()->OnChange(); } diff --git a/Server/mods/deathmatch/logic/CAccessControlListGroup.h b/Server/mods/deathmatch/logic/CAccessControlListGroup.h index 671b07bc766..b031ba50ad8 100644 --- a/Server/mods/deathmatch/logic/CAccessControlListGroup.h +++ b/Server/mods/deathmatch/logic/CAccessControlListGroup.h @@ -34,13 +34,13 @@ class CAccessControlListGroupObject m_eObjectType = eObjectType; } - virtual ~CAccessControlListGroupObject(void){}; + virtual ~CAccessControlListGroupObject(){}; static SString GenerateKey(const char* szName, EObjectType eObjectType) { return SString("%s_%d", szName, (unsigned int)eObjectType); } - const char* GetObjectName(void) { return m_strName; }; - EObjectType GetObjectType(void) { return m_eObjectType; }; - const SString& GetObjectKey(void) { return m_strKey; }; + const char* GetObjectName() { return m_strName; }; + EObjectType GetObjectType() { return m_eObjectType; }; + const SString& GetObjectKey() { return m_strKey; }; private: SString m_strName; @@ -52,9 +52,9 @@ class CAccessControlListGroup { public: CAccessControlListGroup(const char* szGroupName); - ~CAccessControlListGroup(void); + ~CAccessControlListGroup(); - const char* GetGroupName(void) { return m_strGroupName; }; + const char* GetGroupName() { return m_strGroupName; }; CAccessControlListGroupObject* AddObject(const char* szObjectName, CAccessControlListGroupObject::EObjectType eObjectType); bool FindObjectMatch(const char* szObjectName, CAccessControlListGroupObject::EObjectType eObjectType); @@ -65,16 +65,16 @@ class CAccessControlListGroup class CAccessControlList* GetACL(const char* szACLName); void RemoveACL(class CAccessControlList* pACL); - list::iterator IterBeginACL(void) { return m_ACLs.begin(); }; - list::iterator IterEndACL(void) { return m_ACLs.end(); }; - list::iterator IterBeginObjects(void) { return m_Objects.begin(); }; - list::iterator IterEndObjects(void) { return m_Objects.end(); }; + list::iterator IterBeginACL() { return m_ACLs.begin(); }; + list::iterator IterEndACL() { return m_ACLs.end(); }; + list::iterator IterBeginObjects() { return m_Objects.begin(); }; + list::iterator IterEndObjects() { return m_Objects.end(); }; void WriteToXMLNode(CXMLNode* pNode); - uint GetScriptID(void) const { return m_uiScriptID; } + uint GetScriptID() const { return m_uiScriptID; } private: - void OnChange(void); + void OnChange(); typedef std::list ACLsList; diff --git a/Server/mods/deathmatch/logic/CAccessControlListManager.cpp b/Server/mods/deathmatch/logic/CAccessControlListManager.cpp index 83277031bae..693938f2148 100644 --- a/Server/mods/deathmatch/logic/CAccessControlListManager.cpp +++ b/Server/mods/deathmatch/logic/CAccessControlListManager.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CAccessControlListManager::CAccessControlListManager(void) : CXMLConfig(NULL) +CAccessControlListManager::CAccessControlListManager() : CXMLConfig(NULL) { m_pXML = NULL; m_pRootNode = NULL; @@ -21,7 +21,7 @@ CAccessControlListManager::CAccessControlListManager(void) : CXMLConfig(NULL) m_uiGlobalRevision = 1; } -CAccessControlListManager::~CAccessControlListManager(void) +CAccessControlListManager::~CAccessControlListManager() { if (m_bNeedsSave) Save(); @@ -38,7 +38,7 @@ CAccessControlListManager::~CAccessControlListManager(void) } } -bool CAccessControlListManager::Load(void) +bool CAccessControlListManager::Load() { m_bAllowSave = true; @@ -219,7 +219,7 @@ bool CAccessControlListManager::Load(void) return true; } -bool CAccessControlListManager::Reload(void) +bool CAccessControlListManager::Reload() { // Flush any pending saves - This is ok because reloading is for loading manual changes to acl.xml // and manual changes are subject to being overwritten by server actions at any time. @@ -229,7 +229,7 @@ bool CAccessControlListManager::Reload(void) return Load(); } -bool CAccessControlListManager::Save(void) +bool CAccessControlListManager::Save() { // Only allow save after a load was attempted if (!m_bAllowSave) @@ -302,7 +302,7 @@ CAccessControlList* CAccessControlListManager::GetACL(const char* szACLName) return NULL; } -void CAccessControlListManager::DoPulse(void) +void CAccessControlListManager::DoPulse() { // Clear cache every 12 hours or if dirty if (m_bReadCacheDirty || GetTickCount64_() - m_llLastTimeReadCacheCleared > 1000 * 60 * 60 * 12) @@ -313,7 +313,7 @@ void CAccessControlListManager::DoPulse(void) Save(); } -void CAccessControlListManager::ClearReadCache(void) +void CAccessControlListManager::ClearReadCache() { m_bReadCacheDirty = false; m_llLastTimeReadCacheCleared = GetTickCount64_(); @@ -445,7 +445,7 @@ void CAccessControlListManager::DeleteACL(class CAccessControlList* pACL) OnChange(); } -void CAccessControlListManager::ClearACLs(void) +void CAccessControlListManager::ClearACLs() { // Return true if it exists list::iterator iter = m_ACLs.begin(); @@ -459,7 +459,7 @@ void CAccessControlListManager::ClearACLs(void) OnChange(); } -void CAccessControlListManager::ClearGroups(void) +void CAccessControlListManager::ClearGroups() { // Delete all the ACLs list::iterator iter = m_Groups.begin(); @@ -563,7 +563,7 @@ std::vector CAccessControlListManager::GetObjectGroupNames(const SStrin // // Called when an item within the ACL is modified // -void CAccessControlListManager::OnChange(void) +void CAccessControlListManager::OnChange() { m_bReadCacheDirty = true; m_bNeedsSave = true; diff --git a/Server/mods/deathmatch/logic/CAccessControlListManager.h b/Server/mods/deathmatch/logic/CAccessControlListManager.h index 0b84863ce8a..d3a2ae63bd4 100644 --- a/Server/mods/deathmatch/logic/CAccessControlListManager.h +++ b/Server/mods/deathmatch/logic/CAccessControlListManager.h @@ -24,13 +24,13 @@ class CAccessControlListManager : public CXMLConfig { public: ZERO_ON_NEW - CAccessControlListManager(void); - virtual ~CAccessControlListManager(void); + CAccessControlListManager(); + virtual ~CAccessControlListManager(); - void DoPulse(void); - bool Load(void); - bool Reload(void); - bool Save(void); + void DoPulse(); + bool Load(); + bool Reload(); + bool Save(); class CAccessControlListGroup* GetGroup(const char* szGroupName); class CAccessControlList* GetACL(const char* szACLName); @@ -44,30 +44,30 @@ class CAccessControlListManager : public CXMLConfig void DeleteGroup(class CAccessControlListGroup* pGroup); void DeleteACL(class CAccessControlList* pACL); - void ClearACLs(void); - void ClearGroups(void); + void ClearACLs(); + void ClearGroups(); CAccessControlListGroup* GetGroupFromScriptID(uint uiScriptID); CAccessControlList* GetACLFromScriptID(uint uiScriptID); - list::const_iterator ACL_Begin(void) { return m_ACLs.begin(); }; - list::const_iterator ACL_End(void) { return m_ACLs.end(); }; - size_t ACL_Count(void) { return m_ACLs.size(); }; + list::const_iterator ACL_Begin() { return m_ACLs.begin(); }; + list::const_iterator ACL_End() { return m_ACLs.end(); }; + size_t ACL_Count() { return m_ACLs.size(); }; - list::const_iterator Groups_Begin(void) { return m_Groups.begin(); }; - list::const_iterator Groups_End(void) { return m_Groups.end(); }; - size_t Groups_Count(void) { return m_Groups.size(); }; + list::const_iterator Groups_Begin() { return m_Groups.begin(); }; + list::const_iterator Groups_End() { return m_Groups.end(); }; + size_t Groups_Count() { return m_Groups.size(); }; static const char* ExtractObjectName(const char* szObjectName, CAccessControlListGroupObject::EObjectType& eType); static const char* ExtractRightName(const char* szRightName, CAccessControlListRight::ERightType& eType); - void OnChange(void); - uint GetGlobalRevision(void) { return m_uiGlobalRevision; } + void OnChange(); + uint GetGlobalRevision() { return m_uiGlobalRevision; } std::vector GetObjectGroupNames(const SString& strObjectName, CAccessControlListGroupObject::EObjectType objectType); private: - void ClearReadCache(void); + void ClearReadCache(); bool InternalCanObjectUseRight(const char* szObjectName, CAccessControlListGroupObject::EObjectType, const char* szRightName, CAccessControlListRight::ERightType eRightType, bool bDefaultAccessRight); void RemoveACLDependencies(class CAccessControlList* pACL); diff --git a/Server/mods/deathmatch/logic/CAccessControlListRight.h b/Server/mods/deathmatch/logic/CAccessControlListRight.h index 4f4b1d7c7db..b9b0742bcc8 100644 --- a/Server/mods/deathmatch/logic/CAccessControlListRight.h +++ b/Server/mods/deathmatch/logic/CAccessControlListRight.h @@ -28,15 +28,15 @@ class CAccessControlListRight public: CAccessControlListRight(const char* szRightName, ERightType eRightType, bool bAccess, class CAccessControlListManager* pACLManager); - virtual ~CAccessControlListRight(void) { OnChange(); } + virtual ~CAccessControlListRight() { OnChange(); } void WriteToXMLNode(CXMLNode* pNode); - const char* GetRightName(void) { return m_strRightName; }; - unsigned int GetRightNameHash(void) { return m_uiNameHash; }; - ERightType GetRightType(void) { return m_eRightType; }; + const char* GetRightName() { return m_strRightName; }; + unsigned int GetRightNameHash() { return m_uiNameHash; }; + ERightType GetRightType() { return m_eRightType; }; - bool GetRightAccess(void) { return m_bAccess; }; + bool GetRightAccess() { return m_bAccess; }; void SetRightAccess(bool bAccess) { m_bAccess = bAccess; @@ -47,7 +47,7 @@ class CAccessControlListRight SString GetAttributeValue(const SString& strAttributeName); private: - void OnChange(void); + void OnChange(); SString m_strRightName; unsigned int m_uiNameHash; diff --git a/Server/mods/deathmatch/logic/CAccount.cpp b/Server/mods/deathmatch/logic/CAccount.cpp index 6feffc3c4aa..6c94bb5c80a 100644 --- a/Server/mods/deathmatch/logic/CAccount.cpp +++ b/Server/mods/deathmatch/logic/CAccount.cpp @@ -32,7 +32,7 @@ CAccount::CAccount(CAccountManager* pManager, EAccountType accountType, const st m_pManager->MarkAsChanged(this); // Save if password upgraded } -CAccount::~CAccount(void) +CAccount::~CAccount() { CIdArray::PushUniqueId(this, EIdClass::ACCOUNT, m_uiScriptID); if (m_pClient) @@ -96,7 +96,7 @@ void CAccount::SetPassword(const SString& strPassword) } } -SString CAccount::GetPasswordHash(void) +SString CAccount::GetPasswordHash() { return m_Password.GetPasswordHash(); } @@ -187,7 +187,7 @@ void CAccount::RemoveData(const std::string& strKey) // // Account serial usage is only recorded for accounts that require serial authorization, // and is only loaded when required. -void CAccount::EnsureLoadedSerialUsage(void) +void CAccount::EnsureLoadedSerialUsage() { if (!m_bLoadedSerialUsage) { @@ -196,12 +196,12 @@ void CAccount::EnsureLoadedSerialUsage(void) } } -bool CAccount::HasLoadedSerialUsage(void) +bool CAccount::HasLoadedSerialUsage() { return m_bLoadedSerialUsage; } -std::vector& CAccount::GetSerialUsageList(void) +std::vector& CAccount::GetSerialUsageList() { EnsureLoadedSerialUsage(); return m_SerialUsageList; @@ -286,7 +286,7 @@ bool CAccount::RemoveSerial(const SString& strSerial) // // Cleanup unauthorized serials // -void CAccount::RemoveUnauthorizedSerials(void) +void CAccount::RemoveUnauthorizedSerials() { EnsureLoadedSerialUsage(); for (auto iter = m_SerialUsageList.begin(); iter != m_SerialUsageList.end();) diff --git a/Server/mods/deathmatch/logic/CAccount.h b/Server/mods/deathmatch/logic/CAccount.h index be78d2c1b22..93f00f2c8b4 100644 --- a/Server/mods/deathmatch/logic/CAccount.h +++ b/Server/mods/deathmatch/logic/CAccount.h @@ -21,7 +21,7 @@ class CAccountPassword bool SetPassword(const SString& strPassword); bool IsPassword(const SString& strPassword); bool CanChangePasswordTo(const SString& strPassword); - SString GetPasswordHash(void); + SString GetPasswordHash(); enum EAccountPasswordType { @@ -32,7 +32,7 @@ class CAccountPassword }; protected: - SString GenerateSalt(void); + SString GenerateSalt(); SString m_strSha256; SString m_strSalt; @@ -61,56 +61,56 @@ class CAccount SString strLastLoginIp; time_t tLastLoginDate; time_t tLastLoginHttpDate; - bool IsAuthorized(void) const { return tAuthDate != 0; } + 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(void); + ~CAccount(); - bool IsRegistered(void) { return m_AccountType != EAccountType::Guest; } - bool IsConsoleAccount(void) { return m_AccountType == EAccountType::Console; } + bool IsRegistered() { return m_AccountType != EAccountType::Guest; } + bool IsConsoleAccount() { return m_AccountType == EAccountType::Console; } void OnLoginSuccess(const SString& strSerial, const SString& strIp); void OnLoginHttpSuccess(const SString& strIp); - const SString& GetName(void) { return m_strName; } + const SString& GetName() { return m_strName; } void SetName(const std::string& strName); void SetPassword(const SString& strPassword); bool IsPassword(const SString& strPassword, bool* pbUsedHttpPassAppend = nullptr); - SString GetPasswordHash(void); - const SString& GetHttpPassAppend(void) { return m_strHttpPassAppend; } + SString GetPasswordHash(); + const SString& GetHttpPassAppend() { return m_strHttpPassAppend; } void SetHttpPassAppend(const SString& strHttpPassAppend); - const std::string& GetIP(void) { return m_strIP; } - const std::string& GetSerial(void) { return m_strSerial; } - int GetID(void) { return m_iUserID; } + const std::string& GetIP() { return m_strIP; } + const std::string& GetSerial() { return m_strSerial; } + int GetID() { return m_iUserID; } - bool HasLoadedSerialUsage(void); - void EnsureLoadedSerialUsage(void); - std::vector& GetSerialUsageList(void); + bool HasLoadedSerialUsage(); + void EnsureLoadedSerialUsage(); + std::vector& GetSerialUsageList(); SSerialUsage* GetSerialUsage(const SString& strSerial); bool IsIpAuthorized(const SString& strIp); bool IsSerialAuthorized(const SString& strSerial); bool AddSerialForAuthorization(const SString& strSerial, const SString& strIp); bool AuthorizeSerial(const SString& strSerial, const SString& strWho); bool RemoveSerial(const SString& strSerial); - void RemoveUnauthorizedSerials(void); + void RemoveUnauthorizedSerials(); - CClient* GetClient(void) { return m_pClient; } + CClient* GetClient() { return m_pClient; } void SetClient(CClient* pClient); void SetChanged(bool bChanged) { m_bChanged = bChanged; } - bool HasChanged(void) { return m_bChanged; } - uint GetScriptID(void) const { return m_uiScriptID; } + bool HasChanged() { return m_bChanged; } + uint GetScriptID() const { return m_uiScriptID; } std::shared_ptr GetData(const std::string& strKey); bool SetData(const std::string& strKey, const std::string& strValue, int iType); bool HasData(const std::string& strKey); void RemoveData(const std::string& strKey); - std::map::iterator DataBegin(void) { return m_Data.begin(); } - std::map::iterator DataEnd(void) { return m_Data.end(); } + std::map::iterator DataBegin() { return m_Data.begin(); } + std::map::iterator DataEnd() { return m_Data.end(); } protected: CAccountData* GetDataPointer(const std::string& strKey); @@ -145,9 +145,9 @@ class CAccountData m_iType = iType; } - const std::string& GetKey(void) { return m_strKey; } - const std::string& GetStrValue(void) { return m_strValue; } - int GetType(void) { return m_iType; } + const std::string& GetKey() { return m_strKey; } + const std::string& GetStrValue() { return m_strValue; } + int GetType() { return m_iType; } void SetStrValue(const std::string& strValue) { m_strValue = strValue; } void SetType(int iType) { m_iType = iType; } diff --git a/Server/mods/deathmatch/logic/CAccountManager.cpp b/Server/mods/deathmatch/logic/CAccountManager.cpp index eb25b72af99..6f689a304d8 100644 --- a/Server/mods/deathmatch/logic/CAccountManager.cpp +++ b/Server/mods/deathmatch/logic/CAccountManager.cpp @@ -103,7 +103,7 @@ CAccountManager::CAccountManager(const SString& strDbPathFilename) } } -CAccountManager::~CAccountManager(void) +CAccountManager::~CAccountManager() { // Save everything Save(true); @@ -112,7 +112,7 @@ CAccountManager::~CAccountManager(void) RemoveAll(); } -void CAccountManager::ReconnectToDatabase(void) +void CAccountManager::ReconnectToDatabase() { if (m_hDbConnection != INVALID_DB_HANDLE) { @@ -130,7 +130,7 @@ void CAccountManager::ReconnectToDatabase(void) m_hDbConnection = m_pDatabaseManager->Connect("sqlite", PathConform(m_strDbPathFilename), "", "", strOptions); } -void CAccountManager::DoPulse(void) +void CAccountManager::DoPulse() { // Save it only once in a while whenever something has changed if (m_bChangedSinceSaved && GetTickCount64_() > m_llLastTimeSaved + 15000) @@ -140,7 +140,7 @@ void CAccountManager::DoPulse(void) } } -bool CAccountManager::Load(void) +bool CAccountManager::Load() { // Create a registry result CRegistryResult result; @@ -476,7 +476,7 @@ void CAccountManager::MarkAsChanged(CAccount* pAccount) } } -void CAccountManager::RemoveAll(void) +void CAccountManager::RemoveAll() { DeletePointersAndClearList(m_List); } diff --git a/Server/mods/deathmatch/logic/CAccountManager.h b/Server/mods/deathmatch/logic/CAccountManager.h index a25dda34f3e..2be5413828b 100644 --- a/Server/mods/deathmatch/logic/CAccountManager.h +++ b/Server/mods/deathmatch/logic/CAccountManager.h @@ -33,8 +33,8 @@ class CMappedAccountList : protected CFastList // CMappedList functions bool contains(CAccount* item) const { return Super::contains(item); } - iterator begin(void) { return Super::begin(); } - iterator end(void) { return Super::end(); } + iterator begin() { return Super::begin(); } + iterator end() { return Super::end(); } void push_back(CAccount* item) { @@ -51,14 +51,14 @@ class CMappedAccountList : protected CFastList assert(m_NameAccountMap.size() == size()); } - void clear(void) + void clear() { assert(m_NameAccountMap.size() == size()); m_NameAccountMap.clear(); Super::clear(); } - size_t size(void) const { return Super::size(); } + size_t size() const { return Super::size(); } // Account functions void FindAccountMatches(std::vector* pOutResults, const SString& strName, bool bCaseSensitive) @@ -115,16 +115,16 @@ class CAccountManager public: CAccountManager(const SString& strDbPathFilename); - ~CAccountManager(void); + ~CAccountManager(); - void DoPulse(void); + void DoPulse(); - bool Load(void); + bool Load(); void Save(bool bForce = false); void Save(CAccount* pParent, bool bCheckForErrors = true); - bool SaveSettings(void); - bool IntegrityCheck(void); + bool SaveSettings(); + bool IntegrityCheck(); CAccount* Get(const char* szName, const char* szPassword = nullptr, bool caseSensitive = true); CAccount* GetAccountFromScriptID(uint uiScriptID); @@ -160,10 +160,10 @@ class CAccountManager void ChangingName(CAccount* pAccount, const SString& strOldName, const SString& strNewName); void LoadAccountSerialUsage(CAccount* pAccount); void SaveAccountSerialUsage(CAccount* pAccount); - void ReconnectToDatabase(void); + void ReconnectToDatabase(); public: - void RemoveAll(void); + void RemoveAll(); static void StaticDbCallback(CDbJobData* pJobData, void* pContext); void DbCallback(CDbJobData* pJobData); static bool IsValidAccountName(const SString& strName); @@ -171,8 +171,8 @@ class CAccountManager static bool IsValidNewAccountName(const SString& strName); static bool IsValidNewPassword(const SString& strPassword); - CMappedAccountList::const_iterator IterBegin(void) { return m_List.begin(); }; - CMappedAccountList::const_iterator IterEnd(void) { return m_List.end(); }; + CMappedAccountList::const_iterator IterBegin() { return m_List.begin(); }; + CMappedAccountList::const_iterator IterEnd() { return m_List.end(); }; protected: CMappedAccountList m_List; diff --git a/Server/mods/deathmatch/logic/CAccountPassword.cpp b/Server/mods/deathmatch/logic/CAccountPassword.cpp index fb9c2d1f5b4..7ea142483b9 100644 --- a/Server/mods/deathmatch/logic/CAccountPassword.cpp +++ b/Server/mods/deathmatch/logic/CAccountPassword.cpp @@ -115,7 +115,7 @@ bool CAccountPassword::CanChangePasswordTo(const SString& strPassword) // Return password hash for saving // /////////////////////////////////////////////////////////////// -SString CAccountPassword::GetPasswordHash(void) +SString CAccountPassword::GetPasswordHash() { return m_strSha256 + m_strType + m_strSalt; } @@ -127,7 +127,7 @@ SString CAccountPassword::GetPasswordHash(void) // Generate new random salt string // /////////////////////////////////////////////////////////////// -SString CAccountPassword::GenerateSalt(void) +SString CAccountPassword::GenerateSalt() { char randomData[16]; g_pNetServer->GenerateRandomData(randomData, sizeof(randomData)); diff --git a/Server/mods/deathmatch/logic/CAclRightName.h b/Server/mods/deathmatch/logic/CAclRightName.h index 7d64152d8e6..4b1f35b4ee5 100644 --- a/Server/mods/deathmatch/logic/CAclRightName.h +++ b/Server/mods/deathmatch/logic/CAclRightName.h @@ -37,10 +37,10 @@ class CAclRightName bool operator==(const CAclRightName& other) const { return m_strFullName == other.m_strFullName; } - bool IsValid(void) const { return m_bValid; } - const SString& GetName(void) const { return m_strNamePart; } - CAccessControlListRight::ERightType GetType(void) const { return m_TypePart; } - const SString& GetFullName(void) const { return m_strFullName; } + bool IsValid() const { return m_bValid; } + const SString& GetName() const { return m_strNamePart; } + CAccessControlListRight::ERightType GetType() const { return m_TypePart; } + const SString& GetFullName() const { return m_strFullName; } protected: SString m_strNamePart; diff --git a/Server/mods/deathmatch/logic/CBan.cpp b/Server/mods/deathmatch/logic/CBan.cpp index cac88f4a3d4..350aa03a1d9 100644 --- a/Server/mods/deathmatch/logic/CBan.cpp +++ b/Server/mods/deathmatch/logic/CBan.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CBan::CBan(void) +CBan::CBan() { m_uiScriptID = CIdArray::PopUniqueId(this, EIdClass::BAN); m_tTimeOfBan = 0; @@ -20,13 +20,13 @@ CBan::CBan(void) CBanManager::SetBansModified(); } -CBan::~CBan(void) +CBan::~CBan() { CIdArray::PushUniqueId(this, EIdClass::BAN, m_uiScriptID); CBanManager::SetBansModified(); } -time_t CBan::GetBanTimeRemaining(void) +time_t CBan::GetBanTimeRemaining() { time_t End = GetTimeOfUnban(); if (End > 0) @@ -36,7 +36,7 @@ time_t CBan::GetBanTimeRemaining(void) return 0; } -SString CBan::GetDurationDesc(void) +SString CBan::GetDurationDesc() { time_t Start = GetTimeOfBan(); time_t End = GetTimeOfUnban(); @@ -59,7 +59,7 @@ SString CBan::GetDurationDesc(void) return ""; } -SString CBan::GetReasonText(void) const +SString CBan::GetReasonText() const { // Remove after first '(' because of extra info added by admin panel size_t pos = m_strReason.find_first_of(" ("); diff --git a/Server/mods/deathmatch/logic/CBan.h b/Server/mods/deathmatch/logic/CBan.h index 43895db3dca..72c6cedd56c 100644 --- a/Server/mods/deathmatch/logic/CBan.h +++ b/Server/mods/deathmatch/logic/CBan.h @@ -17,71 +17,71 @@ class CBan { public: - CBan(void); - ~CBan(void); + CBan(); + ~CBan(); - const std::string& GetIP(void) { return m_strIP; }; + const std::string& GetIP() { return m_strIP; }; void SetIP(const std::string& strIP) { CBanManager::SetBansModified(); m_strIP = strIP; }; - const std::string& GetNick(void) { return m_strNick; }; + const std::string& GetNick() { return m_strNick; }; void SetNick(const std::string& strNick) { CBanManager::SetBansModified(); m_strNick = strNick; }; - const std::string& GetBanner(void) { return m_strBanner; }; + const std::string& GetBanner() { return m_strBanner; }; void SetBanner(const std::string& strBanner) { CBanManager::SetBansModified(); m_strBanner = strBanner; }; - const std::string& GetReason(void) { return m_strReason; }; + const std::string& GetReason() { return m_strReason; }; void SetReason(const std::string& strReason) { CBanManager::SetBansModified(); m_strReason = strReason; }; - const time_t GetTimeOfBan(void) { return m_tTimeOfBan; }; + const time_t GetTimeOfBan() { return m_tTimeOfBan; }; void SetTimeOfBan(time_t tTimeOfBan) { CBanManager::SetBansModified(); m_tTimeOfBan = tTimeOfBan; }; - time_t GetTimeOfUnban(void) { return m_tTimeOfUnban; }; + time_t GetTimeOfUnban() { return m_tTimeOfUnban; }; void SetTimeOfUnban(time_t tTimeOfUnban) { CBanManager::SetBansModified(); m_tTimeOfUnban = tTimeOfUnban; }; - const std::string& GetSerial(void) { return m_strSerial; }; + const std::string& GetSerial() { return m_strSerial; }; void SetSerial(const std::string& strSerial) { CBanManager::SetBansModified(); m_strSerial = strSerial; }; - const std::string& GetAccount(void) { return m_strAccount; }; + const std::string& GetAccount() { return m_strAccount; }; void SetAccount(const std::string& strAccount) { CBanManager::SetBansModified(); m_strAccount = strAccount; }; - time_t GetBanTimeRemaining(void); - SString GetDurationDesc(void); - SString GetReasonText(void) const; - uint GetScriptID(void) const { return m_uiScriptID; } - bool IsBeingDeleted(void) const { return m_bBeingDeleted; } - void SetBeingDeleted(void) { m_bBeingDeleted = true; } + time_t GetBanTimeRemaining(); + SString GetDurationDesc(); + SString GetReasonText() const; + uint GetScriptID() const { return m_uiScriptID; } + bool IsBeingDeleted() const { return m_bBeingDeleted; } + void SetBeingDeleted() { m_bBeingDeleted = true; } private: std::string m_strIP; diff --git a/Server/mods/deathmatch/logic/CBanManager.cpp b/Server/mods/deathmatch/logic/CBanManager.cpp index b58eae1037d..da2e09bc18b 100644 --- a/Server/mods/deathmatch/logic/CBanManager.cpp +++ b/Server/mods/deathmatch/logic/CBanManager.cpp @@ -12,14 +12,14 @@ #include "StdInc.h" bool CBanManager::ms_bSaveRequired = false; -CBanManager::CBanManager(void) +CBanManager::CBanManager() { m_strPath = g_pServerInterface->GetModManager()->GetAbsolutePath(FILENAME_BANLIST); m_tUpdate = 0; m_bAllowSave = false; } -CBanManager::~CBanManager(void) +CBanManager::~CBanManager() { SaveBanList(); list::const_iterator iter = m_BanManager.begin(); @@ -37,7 +37,7 @@ CBanManager::~CBanManager(void) m_BansBeingDeleted.clear(); } -void CBanManager::DoPulse(void) +void CBanManager::DoPulse() { time_t tTime = time(NULL); @@ -334,7 +334,7 @@ unsigned int CBanManager::GetBansWithBanner(const char* szBanner) return uiOccurrances; } -bool CBanManager::LoadBanList(void) +bool CBanManager::LoadBanList() { m_bAllowSave = true; @@ -412,7 +412,7 @@ bool CBanManager::LoadBanList(void) return true; } -bool CBanManager::ReloadBanList(void) +bool CBanManager::ReloadBanList() { // Flush any pending saves - This is ok because reloadbans is for loading manual changes to banlist.xml // and manual changes are subject to being overwritten by server actions at any time. @@ -431,7 +431,7 @@ bool CBanManager::ReloadBanList(void) return LoadBanList(); } -void CBanManager::SaveBanList(void) +void CBanManager::SaveBanList() { // Only allow save after a load was attempted if (!m_bAllowSave) diff --git a/Server/mods/deathmatch/logic/CBanManager.h b/Server/mods/deathmatch/logic/CBanManager.h index 16ba2f56547..0344280b3e3 100644 --- a/Server/mods/deathmatch/logic/CBanManager.h +++ b/Server/mods/deathmatch/logic/CBanManager.h @@ -17,10 +17,10 @@ class CBanManager { public: - CBanManager(void); - virtual ~CBanManager(void); + CBanManager(); + virtual ~CBanManager(); - void DoPulse(void); + void DoPulse(); CBan* AddBan(CPlayer* pPlayer, const SString& strBanner = "Console", const SString& strReason = "", time_t tTimeOfUnban = 0); CBan* AddBan(const SString& strIP, const SString& strBanner = "Console", const SString& strReason = "", time_t tTimeOfUnban = 0); @@ -47,17 +47,17 @@ class CBanManager unsigned int GetBansWithNick(const char* szNick); unsigned int GetBansWithBanner(const char* szBanner); - bool LoadBanList(void); - bool ReloadBanList(void); - void SaveBanList(void); + bool LoadBanList(); + bool ReloadBanList(); + void SaveBanList(); void SafeSetValue(CXMLNode* pNode, const char* szKey, const std::string& strValue); void SafeSetValue(CXMLNode* pNode, const char* szKey, unsigned int); std::string SafeGetValue(CXMLNode* pNode, const char* szKey); bool IsValidIP(const char* szIP); - static void SetBansModified(void) { ms_bSaveRequired = true; } + static void SetBansModified() { ms_bSaveRequired = true; } - list::const_iterator IterBegin(void) { return m_BanManager.begin(); }; - list::const_iterator IterEnd(void) { return m_BanManager.end(); }; + list::const_iterator IterBegin() { return m_BanManager.begin(); }; + list::const_iterator IterEnd() { return m_BanManager.end(); }; private: SString m_strPath; diff --git a/Server/mods/deathmatch/logic/CBandwidthSettings.h b/Server/mods/deathmatch/logic/CBandwidthSettings.h index ff99bec79ee..d3ca7b4362f 100644 --- a/Server/mods/deathmatch/logic/CBandwidthSettings.h +++ b/Server/mods/deathmatch/logic/CBandwidthSettings.h @@ -22,13 +22,13 @@ enum struct CBandwidthSettings { public: - CBandwidthSettings(void) + CBandwidthSettings() { bBulletSyncEnabled = false; SetNone(); } - void SetNone(void) + void SetNone() { EnableLightSync(false); fZone0Radius = 50; @@ -43,7 +43,7 @@ struct CBandwidthSettings UpdateCachedValues(); } - void SetMedium(void) + void SetMedium() { EnableLightSync(false); fZone0Radius = 50; @@ -58,7 +58,7 @@ struct CBandwidthSettings UpdateCachedValues(); } - void SetMaximum(void) + void SetMaximum() { EnableLightSync(true); fZone0Radius = 20; @@ -84,7 +84,7 @@ struct CBandwidthSettings } } - void UpdateCachedValues(void) + void UpdateCachedValues() { fZone1Dot = cos(fZone1Angle / 180.f * PI * 0.5f); fZone2Dot = cos(fZone2Angle / 180.f * PI * 0.5f); diff --git a/Server/mods/deathmatch/logic/CBlendedWeather.cpp b/Server/mods/deathmatch/logic/CBlendedWeather.cpp index 409f4279ce8..8e770d4e4ee 100644 --- a/Server/mods/deathmatch/logic/CBlendedWeather.cpp +++ b/Server/mods/deathmatch/logic/CBlendedWeather.cpp @@ -25,7 +25,7 @@ CBlendedWeather::CBlendedWeather(CClock* pClock) m_pClock = pClock; } -void CBlendedWeather::DoPulse(void) +void CBlendedWeather::DoPulse() { Update(); } @@ -54,7 +54,7 @@ void CBlendedWeather::SetWeatherBlended(unsigned char ucWeather, unsigned char u } } -unsigned char CBlendedWeather::GetWeather(void) +unsigned char CBlendedWeather::GetWeather() { // If we're blending the weather, return the weather we started blending from if (m_ucBlendStopHour != 0xFF) @@ -66,7 +66,7 @@ unsigned char CBlendedWeather::GetWeather(void) return m_ucPrimaryWeather; } -void CBlendedWeather::Update(void) +void CBlendedWeather::Update() { // Grab the current time unsigned char ucHour, ucMinute; diff --git a/Server/mods/deathmatch/logic/CBlendedWeather.h b/Server/mods/deathmatch/logic/CBlendedWeather.h index aa110b65e8e..aed0baa85d2 100644 --- a/Server/mods/deathmatch/logic/CBlendedWeather.h +++ b/Server/mods/deathmatch/logic/CBlendedWeather.h @@ -18,18 +18,18 @@ class CBlendedWeather public: CBlendedWeather(CClock* pClock); - void DoPulse(void); + void DoPulse(); void SetWeather(unsigned char ucWeather); void SetWeatherBlended(unsigned char ucWeather, unsigned char ucHour); - unsigned char GetWeather(void); - unsigned char GetWeatherBlendingTo(void) { return m_ucSecondaryBlendedWeather; }; - unsigned char GetBlendedStartHour(void) { return m_ucBlendStartHour; }; - unsigned char GetBlendedStopHour(void) { return m_ucBlendStopHour; }; + unsigned char GetWeather(); + unsigned char GetWeatherBlendingTo() { return m_ucSecondaryBlendedWeather; }; + unsigned char GetBlendedStartHour() { return m_ucBlendStartHour; }; + unsigned char GetBlendedStopHour() { return m_ucBlendStopHour; }; private: - void Update(void); + void Update(); unsigned char m_ucPrimaryWeather; unsigned char m_ucSecondaryWeather; diff --git a/Server/mods/deathmatch/logic/CBlip.cpp b/Server/mods/deathmatch/logic/CBlip.cpp index 48987630ff0..b0a8d45e0fb 100644 --- a/Server/mods/deathmatch/logic/CBlip.cpp +++ b/Server/mods/deathmatch/logic/CBlip.cpp @@ -26,7 +26,7 @@ CBlip::CBlip(CElement* pParent, CBlipManager* pBlipManager) : CPerPlayerEntity(p m_pBlipManager->m_List.push_back(this); } -CBlip::~CBlip(void) +CBlip::~CBlip() { // Remove us from the manager's list Unlink(); @@ -49,7 +49,7 @@ CElement* CBlip::Clone(bool* bAddEntity, CResource* pResource) return pTemp; } -void CBlip::Unlink(void) +void CBlip::Unlink() { // Remove us from the manager's list m_pBlipManager->m_List.remove(this); @@ -137,7 +137,7 @@ bool CBlip::ReadSpecialData(const int iLine) return true; } -const CVector& CBlip::GetPosition(void) +const CVector& CBlip::GetPosition() { // Are we attached to something? if (m_pAttachedTo) diff --git a/Server/mods/deathmatch/logic/CBlip.h b/Server/mods/deathmatch/logic/CBlip.h index afedb6f46ca..df9062a3e36 100644 --- a/Server/mods/deathmatch/logic/CBlip.h +++ b/Server/mods/deathmatch/logic/CBlip.h @@ -19,15 +19,15 @@ class CBlip : public CPerPlayerEntity { public: CBlip(CElement* pParent, class CBlipManager* pBlipManager); - ~CBlip(void); + ~CBlip(); CElement* Clone(bool* bAddEntity, CResource* pResource) override; - void Unlink(void); + void Unlink(); - const CVector& GetPosition(void); + const CVector& GetPosition(); void SetPosition(const CVector& vecPosition); - SColor GetColor(void) const { return m_Color; } + SColor GetColor() const { return m_Color; } void SetColor(const SColor color) { m_Color = color; } void AttachTo(CElement* pElement); diff --git a/Server/mods/deathmatch/logic/CBlipManager.cpp b/Server/mods/deathmatch/logic/CBlipManager.cpp index 60f8d5fff02..5f0afd45a69 100644 --- a/Server/mods/deathmatch/logic/CBlipManager.cpp +++ b/Server/mods/deathmatch/logic/CBlipManager.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CBlipManager::CBlipManager(void) +CBlipManager::CBlipManager() { } @@ -41,7 +41,7 @@ CBlip* CBlipManager::CreateFromXML(CElement* pParent, CXMLNode& Node, CEvents* p return pBlip; } -void CBlipManager::DeleteAll(void) +void CBlipManager::DeleteAll() { // Delete all our blips DeletePointersAndClearList(m_List); diff --git a/Server/mods/deathmatch/logic/CBlipManager.h b/Server/mods/deathmatch/logic/CBlipManager.h index aed2894a355..a6829f2d4ed 100644 --- a/Server/mods/deathmatch/logic/CBlipManager.h +++ b/Server/mods/deathmatch/logic/CBlipManager.h @@ -21,18 +21,18 @@ class CBlipManager friend class CBlip; public: - CBlipManager(void); - ~CBlipManager(void) { DeleteAll(); }; + CBlipManager(); + ~CBlipManager() { DeleteAll(); }; CBlip* Create(CElement* pParent); CBlip* CreateFromXML(CElement* pParent, CXMLNode& Node, CEvents* pEvents); - void DeleteAll(void); + void DeleteAll(); - unsigned int Count(void) { return static_cast(m_List.size()); }; + unsigned int Count() { return static_cast(m_List.size()); }; bool Exists(CBlip* pBlip); - list::const_iterator IterBegin(void) { return m_List.begin(); }; - list::const_iterator IterEnd(void) { return m_List.end(); }; + list::const_iterator IterBegin() { return m_List.begin(); }; + list::const_iterator IterEnd() { return m_List.end(); }; static bool IsValidIcon(unsigned long ulIcon) { return ulIcon <= 63; }; diff --git a/Server/mods/deathmatch/logic/CBuildingRemoval.h b/Server/mods/deathmatch/logic/CBuildingRemoval.h index 06a647ff3db..c4f49d59d90 100644 --- a/Server/mods/deathmatch/logic/CBuildingRemoval.h +++ b/Server/mods/deathmatch/logic/CBuildingRemoval.h @@ -14,12 +14,12 @@ class CBuildingRemoval { public: CBuildingRemoval(unsigned short usModel, float fRadius, const CVector& vecPos, char cInterior); - ~CBuildingRemoval(void); + ~CBuildingRemoval(); - float GetRadius(void) { return m_fRadius; } - const CVector& GetPosition(void) { return m_vecPos; } - unsigned short GetModel(void) { return m_usModel; } - char GetInterior(void) { return m_cInterior; } + float GetRadius() { return m_fRadius; } + const CVector& GetPosition() { return m_vecPos; } + unsigned short GetModel() { return m_usModel; } + char GetInterior() { return m_cInterior; } private: unsigned short m_usModel; diff --git a/Server/mods/deathmatch/logic/CBuildingRemovalManager.cpp b/Server/mods/deathmatch/logic/CBuildingRemovalManager.cpp index f90ab60035c..63f09b9d882 100644 --- a/Server/mods/deathmatch/logic/CBuildingRemovalManager.cpp +++ b/Server/mods/deathmatch/logic/CBuildingRemovalManager.cpp @@ -9,11 +9,11 @@ *****************************************************************************/ #include "StdInc.h" -CBuildingRemovalManager::CBuildingRemovalManager(void) +CBuildingRemovalManager::CBuildingRemovalManager() { } -CBuildingRemovalManager::~CBuildingRemovalManager(void) +CBuildingRemovalManager::~CBuildingRemovalManager() { for (std::multimap::const_iterator iter = m_BuildingRemovals.begin(); iter != m_BuildingRemovals.end(); iter++) { @@ -51,7 +51,7 @@ void CBuildingRemovalManager::CreateBuildingRemoval(unsigned short usModel, floa m_BuildingRemovals.insert(std::pair(usModel, pBuildingRemoval)); } -void CBuildingRemovalManager::ClearBuildingRemovals(void) +void CBuildingRemovalManager::ClearBuildingRemovals() { for (std::multimap::const_iterator iter = m_BuildingRemovals.begin(); iter != m_BuildingRemovals.end(); iter++) { diff --git a/Server/mods/deathmatch/logic/CBuildingRemovalManager.h b/Server/mods/deathmatch/logic/CBuildingRemovalManager.h index f890c541783..df00bed1039 100644 --- a/Server/mods/deathmatch/logic/CBuildingRemovalManager.h +++ b/Server/mods/deathmatch/logic/CBuildingRemovalManager.h @@ -15,13 +15,13 @@ class CBuildingRemovalManager { public: - CBuildingRemovalManager(void); - ~CBuildingRemovalManager(void); + CBuildingRemovalManager(); + ~CBuildingRemovalManager(); void CreateBuildingRemoval(unsigned short usModel, float fRadius, const CVector& vecPos, char cInterior); - void ClearBuildingRemovals(void); + void ClearBuildingRemovals(); void RestoreWorldModel(unsigned short usModel, float fRadius, const CVector& vecPos, char cInterior); - multimap::const_iterator IterBegin(void) { return m_BuildingRemovals.begin(); }; - multimap::const_iterator IterEnd(void) { return m_BuildingRemovals.end(); }; + multimap::const_iterator IterBegin() { return m_BuildingRemovals.begin(); }; + multimap::const_iterator IterEnd() { return m_BuildingRemovals.end(); }; private: std::multimap m_BuildingRemovals; diff --git a/Server/mods/deathmatch/logic/CCameraSpatialDatabase.cpp b/Server/mods/deathmatch/logic/CCameraSpatialDatabase.cpp index 6f62c5b397b..39c78209a4d 100644 --- a/Server/mods/deathmatch/logic/CCameraSpatialDatabase.cpp +++ b/Server/mods/deathmatch/logic/CCameraSpatialDatabase.cpp @@ -41,7 +41,7 @@ class CCameraSpatialDatabaseImpl : public CCameraSpatialDatabase virtual void AllQuery(CCameraQueryResult& outResult); // CCameraSpatialDatabaseImpl functions - void FlushUpdateQueue(void); + void FlushUpdateQueue(); bool IsValidSphere(const CSphere& sphere); CItemTree m_Tree; @@ -160,7 +160,7 @@ void CCameraSpatialDatabaseImpl::AllQuery(CCameraQueryResult& outResult) // Process all entities that have changed since the last call // /////////////////////////////////////////////////////////////// -void CCameraSpatialDatabaseImpl::FlushUpdateQueue(void) +void CCameraSpatialDatabaseImpl::FlushUpdateQueue() { std::map updateQueueCopy = m_UpdateQueue; m_UpdateQueue.clear(); diff --git a/Server/mods/deathmatch/logic/CCameraSpatialDatabase.h b/Server/mods/deathmatch/logic/CCameraSpatialDatabase.h index 7ea865bd7f2..297264b70a0 100644 --- a/Server/mods/deathmatch/logic/CCameraSpatialDatabase.h +++ b/Server/mods/deathmatch/logic/CCameraSpatialDatabase.h @@ -25,7 +25,7 @@ class CCameraQueryResult : public std::vector class CCameraSpatialDatabase { public: - virtual ~CCameraSpatialDatabase(void) {} + virtual ~CCameraSpatialDatabase() {} virtual void UpdateItem(CPlayerCamera* pCamera) = 0; virtual void RemoveItem(CPlayerCamera* pCamera) = 0; diff --git a/Server/mods/deathmatch/logic/CClient.cpp b/Server/mods/deathmatch/logic/CClient.cpp index 1502a3f4657..18b7d3f5876 100644 --- a/Server/mods/deathmatch/logic/CClient.cpp +++ b/Server/mods/deathmatch/logic/CClient.cpp @@ -21,7 +21,7 @@ CClient::CClient(bool bAddGuestAccount) } } -CClient::~CClient(void) +CClient::~CClient() { if (m_pAccount) { @@ -33,12 +33,12 @@ CClient::~CClient(void) } } -bool CClient::IsRegistered(void) +bool CClient::IsRegistered() { return m_pAccount->IsRegistered(); } -CElement* CClient::GetElement(void) +CElement* CClient::GetElement() { CElement* pElement = NULL; switch (GetClientType()) diff --git a/Server/mods/deathmatch/logic/CClient.h b/Server/mods/deathmatch/logic/CClient.h index 31e8a5d6f6d..cb57583da7e 100644 --- a/Server/mods/deathmatch/logic/CClient.h +++ b/Server/mods/deathmatch/logic/CClient.h @@ -36,20 +36,20 @@ class CClient public: CClient(bool bAddGuestAccount = true); - ~CClient(void); + ~CClient(); - virtual int GetClientType(void) = 0; - virtual const char* GetNick(void) = 0; + virtual int GetClientType() = 0; + virtual const char* GetNick() = 0; - bool IsRegistered(void); + bool IsRegistered(); virtual void SendEcho(const char* szEcho) = 0; virtual void SendConsole(const char* szEcho) = 0; - CAccount* GetAccount(void) { return m_pAccount; } + CAccount* GetAccount() { return m_pAccount; } void SetAccount(CAccount* pAccount) { m_pAccount = pAccount; } - CElement* GetElement(void); + CElement* GetElement(); protected: CAccount* m_pAccount; diff --git a/Server/mods/deathmatch/logic/CClock.cpp b/Server/mods/deathmatch/logic/CClock.cpp index 8ffc40f5218..09f178f84b3 100644 --- a/Server/mods/deathmatch/logic/CClock.cpp +++ b/Server/mods/deathmatch/logic/CClock.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CClock::CClock(void) +CClock::CClock() { // Default to 12:00 m_ulMinuteDuration = 1000; @@ -40,7 +40,7 @@ void CClock::Set(unsigned char ucHour, unsigned char ucMinute) m_ullMidnightTime = GetTickCount64_() - ulSecondsFromMidnight * m_ulMinuteDuration; } -unsigned long CClock::GetMinuteDuration(void) +unsigned long CClock::GetMinuteDuration() { return m_ulMinuteDuration; } diff --git a/Server/mods/deathmatch/logic/CClock.h b/Server/mods/deathmatch/logic/CClock.h index 6b801b1f3d5..05a1c4f0925 100644 --- a/Server/mods/deathmatch/logic/CClock.h +++ b/Server/mods/deathmatch/logic/CClock.h @@ -14,13 +14,13 @@ class CClock { public: - CClock(void); + CClock(); void Get(unsigned char& ucHour, unsigned char& ucMinute); void Set(unsigned char ucHour, unsigned char ucMinute); void SetMinuteDuration(unsigned long ulDuration); - unsigned long GetMinuteDuration(void); + unsigned long GetMinuteDuration(); private: unsigned long long m_ullMidnightTime; diff --git a/Server/mods/deathmatch/logic/CColCircle.cpp b/Server/mods/deathmatch/logic/CColCircle.cpp index 60d27d42f1d..0e5fce25593 100644 --- a/Server/mods/deathmatch/logic/CColCircle.cpp +++ b/Server/mods/deathmatch/logic/CColCircle.cpp @@ -40,7 +40,7 @@ bool CColCircle::ReadSpecialData(const int iLine) return true; } -CSphere CColCircle::GetWorldBoundingSphere(void) +CSphere CColCircle::GetWorldBoundingSphere() { CSphere sphere; sphere.vecPosition.fX = m_vecPosition.fX; diff --git a/Server/mods/deathmatch/logic/CColCircle.h b/Server/mods/deathmatch/logic/CColCircle.h index 5fa4171839f..28eaf55069e 100644 --- a/Server/mods/deathmatch/logic/CColCircle.h +++ b/Server/mods/deathmatch/logic/CColCircle.h @@ -18,13 +18,13 @@ class CColCircle : public CColShape public: CColCircle(CColManager* pManager, CElement* pParent, const CVector2D& vecPosition, float fRadius, bool bIsPartnered = false); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); - eColShapeType GetShapeType(void) { return COLSHAPE_CIRCLE; } + eColShapeType GetShapeType() { return COLSHAPE_CIRCLE; } bool DoHitDetection(const CVector& vecNowPosition); - float GetRadius(void) { return m_fRadius; }; + float GetRadius() { return m_fRadius; }; void SetRadius(float fRadius) { m_fRadius = fRadius; diff --git a/Server/mods/deathmatch/logic/CColCuboid.cpp b/Server/mods/deathmatch/logic/CColCuboid.cpp index 4e4608539a9..c299bf11b73 100644 --- a/Server/mods/deathmatch/logic/CColCuboid.cpp +++ b/Server/mods/deathmatch/logic/CColCuboid.cpp @@ -46,7 +46,7 @@ bool CColCuboid::ReadSpecialData(const int iLine) return true; } -CSphere CColCuboid::GetWorldBoundingSphere(void) +CSphere CColCuboid::GetWorldBoundingSphere() { CSphere sphere; sphere.vecPosition = m_vecPosition + m_vecSize * 0.5f; diff --git a/Server/mods/deathmatch/logic/CColCuboid.h b/Server/mods/deathmatch/logic/CColCuboid.h index 177adb17c0b..a4c235326f8 100644 --- a/Server/mods/deathmatch/logic/CColCuboid.h +++ b/Server/mods/deathmatch/logic/CColCuboid.h @@ -18,13 +18,13 @@ class CColCuboid : public CColShape public: CColCuboid(CColManager* pManager, CElement* pParent, const CVector& vecPosition, const CVector& vecSize); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); - eColShapeType GetShapeType(void) { return COLSHAPE_CUBOID; } + eColShapeType GetShapeType() { return COLSHAPE_CUBOID; } bool DoHitDetection(const CVector& vecNowPosition); - const CVector& GetSize(void) { return m_vecSize; }; + const CVector& GetSize() { return m_vecSize; }; void SetSize(const CVector& vecSize) { m_vecSize = vecSize; diff --git a/Server/mods/deathmatch/logic/CColManager.cpp b/Server/mods/deathmatch/logic/CColManager.cpp index f256f003243..25229b38a08 100644 --- a/Server/mods/deathmatch/logic/CColManager.cpp +++ b/Server/mods/deathmatch/logic/CColManager.cpp @@ -11,13 +11,13 @@ #include "StdInc.h" -CColManager::CColManager(void) +CColManager::CColManager() { m_bCanRemoveFromList = true; m_bIteratingList = false; } -CColManager::~CColManager(void) +CColManager::~CColManager() { DeleteAll(); TakeOutTheTrash(); @@ -183,7 +183,7 @@ bool CColManager::Exists(CColShape* pShape) return ListContains(m_List, pShape); } -void CColManager::DeleteAll(void) +void CColManager::DeleteAll() { // Delete all of them DeletePointersAndClearList(m_List); @@ -205,7 +205,7 @@ void CColManager::RemoveFromList(CColShape* pShape) } } -void CColManager::TakeOutTheTrash(void) +void CColManager::TakeOutTheTrash() { vector::const_iterator iter = m_TrashCan.begin(); for (; iter != m_TrashCan.end(); iter++) diff --git a/Server/mods/deathmatch/logic/CColManager.h b/Server/mods/deathmatch/logic/CColManager.h index 7145d8dbbdb..a6372b25d90 100644 --- a/Server/mods/deathmatch/logic/CColManager.h +++ b/Server/mods/deathmatch/logic/CColManager.h @@ -19,21 +19,21 @@ class CColManager friend class CColShape; public: - CColManager(void); - ~CColManager(void); + CColManager(); + ~CColManager(); void DoHitDetection(const CVector& vecNowPosition, CElement* pElement, CColShape* pJustThis = NULL, bool bChildren = false); bool Exists(CColShape* pShape); - void DeleteAll(void); + void DeleteAll(); - std::vector::const_iterator IterBegin(void) { return m_List.begin(); } - std::vector::const_iterator IterEnd(void) { return m_List.end(); } + std::vector::const_iterator IterBegin() { return m_List.begin(); } + std::vector::const_iterator IterEnd() { return m_List.end(); } private: void AddToList(CColShape* pShape) { m_List.push_back(pShape); }; void RemoveFromList(CColShape* pShape); - void TakeOutTheTrash(void); + void TakeOutTheTrash(); void DoHitDetectionForColShape(CColShape* pShape); void DoHitDetectionForEntity(const CVector& vecNowPosition, CElement* pEntity); void HandleHitDetectionResult(bool bHit, CColShape* pShape, CElement* pEntity); diff --git a/Server/mods/deathmatch/logic/CColPolygon.cpp b/Server/mods/deathmatch/logic/CColPolygon.cpp index 8c2de227d6f..80fb4754fd9 100644 --- a/Server/mods/deathmatch/logic/CColPolygon.cpp +++ b/Server/mods/deathmatch/logic/CColPolygon.cpp @@ -102,7 +102,7 @@ bool CColPolygon::IsInBounds(CVector vecPoint) return fDist <= m_fRadius; } -CSphere CColPolygon::GetWorldBoundingSphere(void) +CSphere CColPolygon::GetWorldBoundingSphere() { CSphere sphere; sphere.vecPosition.fX = m_vecPosition.fX; diff --git a/Server/mods/deathmatch/logic/CColPolygon.h b/Server/mods/deathmatch/logic/CColPolygon.h index 792a5037044..fe97ea79504 100644 --- a/Server/mods/deathmatch/logic/CColPolygon.h +++ b/Server/mods/deathmatch/logic/CColPolygon.h @@ -20,9 +20,9 @@ class CColPolygon : public CColShape public: CColPolygon(CColManager* pManager, CElement* pParent, const CVector& vecPosition); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); - eColShapeType GetShapeType(void) { return COLSHAPE_POLYGON; } + eColShapeType GetShapeType() { return COLSHAPE_POLYGON; } bool DoHitDetection(const CVector& vecNowPosition); @@ -30,9 +30,9 @@ class CColPolygon : public CColShape void AddPoint(CVector2D vecPoint); - unsigned int CountPoints(void) const { return static_cast(m_Points.size()); }; - std::vector::const_iterator IterBegin(void) { return m_Points.begin(); }; - std::vector::const_iterator IterEnd(void) { return m_Points.end(); }; + unsigned int CountPoints() const { return static_cast(m_Points.size()); }; + std::vector::const_iterator IterBegin() { return m_Points.begin(); }; + std::vector::const_iterator IterEnd() { return m_Points.end(); }; protected: std::vector m_Points; diff --git a/Server/mods/deathmatch/logic/CColRectangle.cpp b/Server/mods/deathmatch/logic/CColRectangle.cpp index 9202455bca5..ad36b40cbc7 100644 --- a/Server/mods/deathmatch/logic/CColRectangle.cpp +++ b/Server/mods/deathmatch/logic/CColRectangle.cpp @@ -46,7 +46,7 @@ bool CColRectangle::ReadSpecialData(const int iLine) return true; } -CSphere CColRectangle::GetWorldBoundingSphere(void) +CSphere CColRectangle::GetWorldBoundingSphere() { CSphere sphere; sphere.vecPosition.fX = m_vecPosition.fX + m_vecSize.fX * 0.5f; diff --git a/Server/mods/deathmatch/logic/CColRectangle.h b/Server/mods/deathmatch/logic/CColRectangle.h index 82457f8ace7..968252c5fe4 100644 --- a/Server/mods/deathmatch/logic/CColRectangle.h +++ b/Server/mods/deathmatch/logic/CColRectangle.h @@ -19,13 +19,13 @@ class CColRectangle : public CColShape public: CColRectangle(CColManager* pManager, CElement* pParent, const CVector2D& vecPosition, const CVector2D& vecSize); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); - eColShapeType GetShapeType(void) { return COLSHAPE_RECTANGLE; } + eColShapeType GetShapeType() { return COLSHAPE_RECTANGLE; } bool DoHitDetection(const CVector& vecNowPosition); - const CVector2D& GetSize(void) { return m_vecSize; }; + const CVector2D& GetSize() { return m_vecSize; }; void SetSize(const CVector2D& vecSize) { m_vecSize = vecSize; diff --git a/Server/mods/deathmatch/logic/CColShape.cpp b/Server/mods/deathmatch/logic/CColShape.cpp index 330d608d88b..3f5de2bf87b 100644 --- a/Server/mods/deathmatch/logic/CColShape.cpp +++ b/Server/mods/deathmatch/logic/CColShape.cpp @@ -27,7 +27,7 @@ CColShape::CColShape(CColManager* pManager, CElement* pParent, bool bIsPartnered pManager->AddToList(this); } -CColShape::~CColShape(void) +CColShape::~CColShape() { if (m_pCallback) m_pCallback->Callback_OnCollisionDestroy(this); @@ -37,13 +37,13 @@ CColShape::~CColShape(void) Unlink(); } -void CColShape::Unlink(void) +void CColShape::Unlink() { // Remove us from manager's list m_pManager->RemoveFromList(this); } -const CVector& CColShape::GetPosition(void) +const CVector& CColShape::GetPosition() { if (m_pAttachedTo) GetAttachedPosition(m_vecPosition); @@ -88,7 +88,7 @@ bool CColShape::ColliderExists(CElement* pElement) return false; } -void CColShape::RemoveAllColliders(void) +void CColShape::RemoveAllColliders() { list::iterator iter = m_Colliders.begin(); for (; iter != m_Colliders.end(); iter++) @@ -98,7 +98,7 @@ void CColShape::RemoveAllColliders(void) m_Colliders.clear(); } -void CColShape::SizeChanged(void) +void CColShape::SizeChanged() { UpdateSpatialData(); // Maybe queue RefreshColliders for v1.1 diff --git a/Server/mods/deathmatch/logic/CColShape.h b/Server/mods/deathmatch/logic/CColShape.h index 01a62c7a9a7..de75405b7af 100644 --- a/Server/mods/deathmatch/logic/CColShape.h +++ b/Server/mods/deathmatch/logic/CColShape.h @@ -27,37 +27,37 @@ class CColShape : public CElement { public: CColShape(class CColManager* pManager, CElement* pParent, bool bIsPartnered = false); - virtual ~CColShape(void); + virtual ~CColShape(); - virtual eColShapeType GetShapeType(void) = 0; + virtual eColShapeType GetShapeType() = 0; - void Unlink(void); + void Unlink(); virtual bool DoHitDetection(const CVector& vecNowPosition) = 0; - bool IsEnabled(void) { return m_bIsEnabled; }; + bool IsEnabled() { return m_bIsEnabled; }; void SetEnabled(bool bEnabled) { m_bIsEnabled = bEnabled; }; - const CVector& GetPosition(void); + const CVector& GetPosition(); virtual void SetPosition(const CVector& vecPosition); void CallHitCallback(CElement& Element); void CallLeaveCallback(CElement& Element); class CColCallback* SetCallback(class CColCallback* pCallback) { return (m_pCallback = pCallback); }; - bool GetAutoCallEvent(void) { return m_bAutoCallEvent; }; + bool GetAutoCallEvent() { return m_bAutoCallEvent; }; void SetAutoCallEvent(bool bAutoCallEvent) { m_bAutoCallEvent = bAutoCallEvent; }; void AddCollider(CElement* pElement) { m_Colliders.push_back(pElement); } void RemoveCollider(CElement* pElement) { m_Colliders.remove(pElement); } bool ColliderExists(CElement* pElement); - void RemoveAllColliders(void); - list::iterator CollidersBegin(void) { return m_Colliders.begin(); } - list::iterator CollidersEnd(void) { return m_Colliders.end(); } + void RemoveAllColliders(); + list::iterator CollidersBegin() { return m_Colliders.begin(); } + list::iterator CollidersEnd() { return m_Colliders.end(); } - bool IsPartnered(void) { return m_bPartnered; } + bool IsPartnered() { return m_bPartnered; } - void SizeChanged(void); + void SizeChanged(); protected: CVector m_vecPosition; diff --git a/Server/mods/deathmatch/logic/CColSphere.cpp b/Server/mods/deathmatch/logic/CColSphere.cpp index 8bacf57e9e3..ed47b47f4ba 100644 --- a/Server/mods/deathmatch/logic/CColSphere.cpp +++ b/Server/mods/deathmatch/logic/CColSphere.cpp @@ -38,7 +38,7 @@ bool CColSphere::ReadSpecialData(const int iLine) return true; } -CSphere CColSphere::GetWorldBoundingSphere(void) +CSphere CColSphere::GetWorldBoundingSphere() { return CSphere(m_vecPosition, m_fRadius); } diff --git a/Server/mods/deathmatch/logic/CColSphere.h b/Server/mods/deathmatch/logic/CColSphere.h index 38212059565..8a39ab91ff4 100644 --- a/Server/mods/deathmatch/logic/CColSphere.h +++ b/Server/mods/deathmatch/logic/CColSphere.h @@ -18,13 +18,13 @@ class CColSphere : public CColShape public: CColSphere(CColManager* pManager, CElement* pParent, const CVector& vecPosition, float fRadius, bool bIsPartnered = false); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); - eColShapeType GetShapeType(void) { return COLSHAPE_SPHERE; } + eColShapeType GetShapeType() { return COLSHAPE_SPHERE; } bool DoHitDetection(const CVector& vecNowPosition); - float GetRadius(void) { return m_fRadius; }; + float GetRadius() { return m_fRadius; }; void SetRadius(float fRadius) { m_fRadius = fRadius; diff --git a/Server/mods/deathmatch/logic/CColTube.cpp b/Server/mods/deathmatch/logic/CColTube.cpp index 101765e847c..e87b9226cd6 100644 --- a/Server/mods/deathmatch/logic/CColTube.cpp +++ b/Server/mods/deathmatch/logic/CColTube.cpp @@ -40,7 +40,7 @@ bool CColTube::ReadSpecialData(const int iLine) return true; } -CSphere CColTube::GetWorldBoundingSphere(void) +CSphere CColTube::GetWorldBoundingSphere() { CSphere sphere; sphere.vecPosition.fX = m_vecPosition.fX; diff --git a/Server/mods/deathmatch/logic/CColTube.h b/Server/mods/deathmatch/logic/CColTube.h index 6bd86cec033..d6472d778ac 100644 --- a/Server/mods/deathmatch/logic/CColTube.h +++ b/Server/mods/deathmatch/logic/CColTube.h @@ -18,18 +18,18 @@ class CColTube : public CColShape public: CColTube(CColManager* pManager, CElement* pParent, const CVector& vecPosition, float fRadius, float fHeight); - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); - eColShapeType GetShapeType(void) { return COLSHAPE_TUBE; } + eColShapeType GetShapeType() { return COLSHAPE_TUBE; } bool DoHitDetection(const CVector& vecNowPosition); - float GetRadius(void) { return m_fRadius; }; + float GetRadius() { return m_fRadius; }; void SetRadius(float fRadius) { m_fRadius = fRadius; SizeChanged(); }; - float GetHeight(void) { return m_fHeight; }; + float GetHeight() { return m_fHeight; }; void SetHeight(float fHeight) { m_fHeight = fHeight; diff --git a/Server/mods/deathmatch/logic/CCommandFile.cpp b/Server/mods/deathmatch/logic/CCommandFile.cpp index 0e15205e5f4..760bfa500ce 100644 --- a/Server/mods/deathmatch/logic/CCommandFile.cpp +++ b/Server/mods/deathmatch/logic/CCommandFile.cpp @@ -19,7 +19,7 @@ CCommandFile::CCommandFile(const char* szFilename, CConsole& Console, CClient& C m_bEcho = true; } -CCommandFile::~CCommandFile(void) +CCommandFile::~CCommandFile() { // Unload it again if (m_pFile) @@ -28,7 +28,7 @@ CCommandFile::~CCommandFile(void) } } -bool CCommandFile::Run(void) +bool CCommandFile::Run() { // Got a file? if (m_pFile) diff --git a/Server/mods/deathmatch/logic/CCommandFile.h b/Server/mods/deathmatch/logic/CCommandFile.h index 018321f60bf..e9ed573d85b 100644 --- a/Server/mods/deathmatch/logic/CCommandFile.h +++ b/Server/mods/deathmatch/logic/CCommandFile.h @@ -19,10 +19,10 @@ class CCommandFile { public: CCommandFile(const char* szFilename, CConsole& Console, CClient& Client); - ~CCommandFile(void); + ~CCommandFile(); - bool IsValid(void) { return m_pFile != NULL; }; - bool Run(void); + bool IsValid() { return m_pFile != NULL; }; + bool Run(); private: bool Parse(char* szLine); diff --git a/Server/mods/deathmatch/logic/CCommandLineParser.cpp b/Server/mods/deathmatch/logic/CCommandLineParser.cpp index 26b09f90897..1318321e4e6 100644 --- a/Server/mods/deathmatch/logic/CCommandLineParser.cpp +++ b/Server/mods/deathmatch/logic/CCommandLineParser.cpp @@ -13,7 +13,7 @@ using namespace std; -CCommandLineParser::CCommandLineParser(void) +CCommandLineParser::CCommandLineParser() { m_bMainConfig = false; m_bIP = false; diff --git a/Server/mods/deathmatch/logic/CCommandLineParser.h b/Server/mods/deathmatch/logic/CCommandLineParser.h index 3ba723f6c2c..c180d13f3f6 100644 --- a/Server/mods/deathmatch/logic/CCommandLineParser.h +++ b/Server/mods/deathmatch/logic/CCommandLineParser.h @@ -16,7 +16,7 @@ class CCommandLineParser { public: - CCommandLineParser(void); + CCommandLineParser(); bool Parse(int iArgumentCount, char* szArguments[]); diff --git a/Server/mods/deathmatch/logic/CConnectHistory.cpp b/Server/mods/deathmatch/logic/CConnectHistory.cpp index a16a3044303..b87b4cb4623 100644 --- a/Server/mods/deathmatch/logic/CConnectHistory.cpp +++ b/Server/mods/deathmatch/logic/CConnectHistory.cpp @@ -91,7 +91,7 @@ CConnectHistoryItem& CConnectHistory::GetHistoryItem(const string& strIP) return iter->second; } -void CConnectHistory::RemoveExpired(void) +void CConnectHistory::RemoveExpired() { long long llCurrentTime = GetModuleTickCount64(); @@ -141,7 +141,7 @@ void CConnectHistory::RemoveExpired(void) } } -uint CConnectHistory::GetTotalFloodingCount(void) +uint CConnectHistory::GetTotalFloodingCount() { // Delete the expired entries RemoveExpired(); @@ -150,7 +150,7 @@ uint CConnectHistory::GetTotalFloodingCount(void) } // Internal function for debugging -long long CConnectHistory::GetModuleTickCount64(void) +long long CConnectHistory::GetModuleTickCount64() { long long llValue = ::GetModuleTickCount64(); llValue += m_llDebugTickCountOffset; diff --git a/Server/mods/deathmatch/logic/CConnectHistory.h b/Server/mods/deathmatch/logic/CConnectHistory.h index 581da6d880f..0456494bd52 100644 --- a/Server/mods/deathmatch/logic/CConnectHistory.h +++ b/Server/mods/deathmatch/logic/CConnectHistory.h @@ -16,7 +16,7 @@ typedef std::vector JoinTimesMap; struct CConnectHistoryItem { - CConnectHistoryItem(void) : llBanEndTime(0) {} + CConnectHistoryItem() : llBanEndTime(0) {} long long llBanEndTime; JoinTimesMap joinTimes; }; @@ -30,12 +30,12 @@ class CConnectHistory bool AddConnect(const std::string& strIP); bool IsFlooding(const std::string& strIP); CConnectHistoryItem& GetHistoryItem(const std::string& strIP); - uint GetTotalFloodingCount(void); + uint GetTotalFloodingCount(); SString DebugDump(long long llTickCountAdd); private: - void RemoveExpired(void); - long long GetModuleTickCount64(void); + void RemoveExpired(); + long long GetModuleTickCount64(); unsigned long m_ulSamplePeriod; unsigned long m_ulMaxConnections; diff --git a/Server/mods/deathmatch/logic/CConsole.cpp b/Server/mods/deathmatch/logic/CConsole.cpp index b1e5398a137..a577a3d3a5f 100644 --- a/Server/mods/deathmatch/logic/CConsole.cpp +++ b/Server/mods/deathmatch/logic/CConsole.cpp @@ -25,7 +25,7 @@ CConsole::CConsole(CBlipManager* pBlipManager, CMapManager* pMapManager, CPlayer m_pACLManager = pACLManager; } -CConsole::~CConsole(void) +CConsole::~CConsole() { // Delete all our commands DeleteAllCommands(); @@ -142,7 +142,7 @@ void CConsole::DeleteCommand(const char* szCommand) } } -void CConsole::DeleteAllCommands(void) +void CConsole::DeleteAllCommands() { // Delete all the command classes list::const_iterator iter = m_Commands.begin(); diff --git a/Server/mods/deathmatch/logic/CConsole.h b/Server/mods/deathmatch/logic/CConsole.h index 7d49e3fd55d..c3752eef846 100644 --- a/Server/mods/deathmatch/logic/CConsole.h +++ b/Server/mods/deathmatch/logic/CConsole.h @@ -20,24 +20,24 @@ class CConsole CConsole(class CBlipManager* pBlipManager, class CMapManager* pMapManager, class CPlayerManager* pPlayerManager, class CRegisteredCommands* pRegisteredCommands, class CVehicleManager* pVehicleManager, class CLuaManager* pLuaManager, class CBanManager* pBanManager, class CAccessControlListManager* pACLManager); - ~CConsole(void); + ~CConsole(); bool HandleInput(const char* szCommand, CClient* pClient, CClient* pEchoClient); void AddCommand(FCommandHandler* pHandler, const char* szCommand, bool bRestricted); void DeleteCommand(const char* szCommand); - void DeleteAllCommands(void); + void DeleteAllCommands(); CConsoleCommand* GetCommand(const char* szKey); - list::const_iterator CommandsBegin(void) { return m_Commands.begin(); }; - list::const_iterator CommandsEnd(void) { return m_Commands.end(); }; + list::const_iterator CommandsBegin() { return m_Commands.begin(); }; + list::const_iterator CommandsEnd() { return m_Commands.end(); }; - class CBlipManager* GetBlipManager(void) { return m_pBlipManager; }; - class CLuaManager* GetLuaManager(void) { return m_pLuaManager; }; - class CMapManager* GetMapManager(void) { return m_pMapManager; }; - class CPlayerManager* GetPlayerManager(void) { return m_pPlayerManager; }; - class CVehicleManager* GetVehicleManager(void) { return m_pVehicleManager; }; - class CBanManager* GetBanManager(void) { return m_pBanManager; }; + class CBlipManager* GetBlipManager() { return m_pBlipManager; }; + class CLuaManager* GetLuaManager() { return m_pLuaManager; }; + class CMapManager* GetMapManager() { return m_pMapManager; }; + class CPlayerManager* GetPlayerManager() { return m_pPlayerManager; }; + class CVehicleManager* GetVehicleManager() { return m_pVehicleManager; }; + class CBanManager* GetBanManager() { return m_pBanManager; }; private: class CBlipManager* m_pBlipManager; diff --git a/Server/mods/deathmatch/logic/CConsoleClient.h b/Server/mods/deathmatch/logic/CConsoleClient.h index ce36e65b2c5..d4ce4772add 100644 --- a/Server/mods/deathmatch/logic/CConsoleClient.h +++ b/Server/mods/deathmatch/logic/CConsoleClient.h @@ -20,15 +20,15 @@ class CConsoleClient : public CElement, public CClient { public: CConsoleClient(CConsole* pConsole); - virtual ~CConsoleClient(void){}; + virtual ~CConsoleClient(){}; - int GetClientType(void) { return CClient::CLIENT_CONSOLE; }; - const char* GetNick(void) { return m_strNick; }; + int GetClientType() { return CClient::CLIENT_CONSOLE; }; + const char* GetNick() { return m_strNick; }; void SendEcho(const char* szEcho) { CLogger::LogPrintf("%s\n", szEcho); }; void SendConsole(const char* szEcho) { CLogger::LogPrintf("%s\n", szEcho); }; - void Unlink(void){}; + void Unlink(){}; protected: bool ReadSpecialData(const int iLine) override { return false; } diff --git a/Server/mods/deathmatch/logic/CConsoleCommand.h b/Server/mods/deathmatch/logic/CConsoleCommand.h index 75206f115a4..9a86378e5c7 100644 --- a/Server/mods/deathmatch/logic/CConsoleCommand.h +++ b/Server/mods/deathmatch/logic/CConsoleCommand.h @@ -19,12 +19,12 @@ class CConsoleCommand { public: CConsoleCommand(FCommandHandler* pHandler, const char* szCommand, bool bRestricted); - ~CConsoleCommand(void) { delete[] m_szCommand; }; + ~CConsoleCommand() { delete[] m_szCommand; }; bool operator()(class CConsole* pConsole, const char* szArguments, CClient* pClient, CClient* pEchoClient); - FCommandHandler* GetHandler(void) { return m_pHandler; }; - const char* GetCommand(void) { return m_szCommand; }; - bool IsRestricted(void) { return m_bRestricted; }; + FCommandHandler* GetHandler() { return m_pHandler; }; + const char* GetCommand() { return m_szCommand; }; + bool IsRestricted() { return m_bRestricted; }; private: FCommandHandler* m_pHandler; diff --git a/Server/mods/deathmatch/logic/CCustomData.cpp b/Server/mods/deathmatch/logic/CCustomData.cpp index 59cc80881fd..c6d56a9af3a 100644 --- a/Server/mods/deathmatch/logic/CCustomData.cpp +++ b/Server/mods/deathmatch/logic/CCustomData.cpp @@ -151,7 +151,7 @@ CXMLNode* CCustomData::OutputToXML(CXMLNode* pNode) return pNode; } -unsigned short CCustomData::CountOnlySynchronized(void) +unsigned short CCustomData::CountOnlySynchronized() { return static_cast(m_SyncedData.size()); } diff --git a/Server/mods/deathmatch/logic/CCustomData.h b/Server/mods/deathmatch/logic/CCustomData.h index 79caa230ca0..1744781a8b3 100644 --- a/Server/mods/deathmatch/logic/CCustomData.h +++ b/Server/mods/deathmatch/logic/CCustomData.h @@ -35,15 +35,15 @@ class CCustomData bool Delete(const char* szName); - unsigned short CountOnlySynchronized(void); + unsigned short CountOnlySynchronized(); CXMLNode* OutputToXML(CXMLNode* pNode); - std::map::const_iterator IterBegin(void) { return m_Data.begin(); } - std::map::const_iterator IterEnd(void) { return m_Data.end(); } + std::map::const_iterator IterBegin() { return m_Data.begin(); } + std::map::const_iterator IterEnd() { return m_Data.end(); } - std::map::const_iterator SyncedIterBegin(void) { return m_SyncedData.begin(); } - std::map::const_iterator SyncedIterEnd(void) { return m_SyncedData.end(); } + std::map::const_iterator SyncedIterBegin() { return m_SyncedData.begin(); } + std::map::const_iterator SyncedIterEnd() { return m_SyncedData.end(); } private: bool DeleteSynced(const char* szName); diff --git a/Server/mods/deathmatch/logic/CCustomWeapon.cpp b/Server/mods/deathmatch/logic/CCustomWeapon.cpp index 642799a02d6..76be57a860d 100644 --- a/Server/mods/deathmatch/logic/CCustomWeapon.cpp +++ b/Server/mods/deathmatch/logic/CCustomWeapon.cpp @@ -79,7 +79,7 @@ void CCustomWeapon::SetWeaponTarget(CVector vecTarget) m_targetType = TARGET_TYPE_VECTOR; } -void CCustomWeapon::ResetWeaponTarget(void) +void CCustomWeapon::ResetWeaponTarget() { m_pTarget = NULL; m_vecTarget = CVector(0, 0, 0); @@ -162,12 +162,12 @@ void CCustomWeapon::SetWeaponFireTime(int iFireTime) m_iWeaponFireRate = iFireTime; } -int CCustomWeapon::GetWeaponFireTime(void) +int CCustomWeapon::GetWeaponFireTime() { return m_iWeaponFireRate; } -void CCustomWeapon::ResetWeaponFireTime(void) +void CCustomWeapon::ResetWeaponFireTime() { m_iWeaponFireRate = GetWeaponFireTime(m_pWeaponStat); } diff --git a/Server/mods/deathmatch/logic/CCustomWeapon.h b/Server/mods/deathmatch/logic/CCustomWeapon.h index f63fc562ba9..cc0ff81e43a 100644 --- a/Server/mods/deathmatch/logic/CCustomWeapon.h +++ b/Server/mods/deathmatch/logic/CCustomWeapon.h @@ -15,7 +15,7 @@ struct SLineOfSightFlags { - SLineOfSightFlags(void) + SLineOfSightFlags() : bCheckBuildings(true), bCheckVehicles(true), bCheckPeds(true), @@ -58,34 +58,34 @@ class CCustomWeapon : public CObject { public: CCustomWeapon(CElement* pParent, CObjectManager* pObjectManager, CCustomWeaponManager* pWeaponManager, eWeaponType weaponType); - ~CCustomWeapon(void); + ~CCustomWeapon(); void SetWeaponTarget(CElement* pTarget, int subTarget); void SetWeaponTarget(CVector vecTarget); - void ResetWeaponTarget(void); + void ResetWeaponTarget(); - eWeaponType GetWeaponType(void) { return m_Type; } + eWeaponType GetWeaponType() { return m_Type; } - eWeaponState GetWeaponState(void) { return m_State; } + eWeaponState GetWeaponState() { return m_State; } void SetWeaponState(eWeaponState state) { m_State = state; } void SetClipAmmo(int iAmmo) { m_nAmmoInClip = iAmmo; } - int GetClipAmmo(void) { return m_nAmmoInClip; } + int GetClipAmmo() { return m_nAmmoInClip; } void SetAmmo(int iAmmo) { m_nAmmoTotal = iAmmo; } - int GetAmmo(void) { return m_nAmmoTotal; } + int GetAmmo() { return m_nAmmoTotal; } - CWeaponStat* GetWeaponStat(void) { return m_pWeaponStat; } + CWeaponStat* GetWeaponStat() { return m_pWeaponStat; } - CPlayer* GetOwner(void) { return m_pOwner; } + CPlayer* GetOwner() { return m_pOwner; } void SetOwner(CPlayer* pOwner) { m_pOwner = pOwner; } - eTargetType GetTargetType(void) { return m_targetType; } - eBone GetTargetBone(void) { return m_targetBone; } - int GetTargetWheel(void) { return m_itargetWheel; } - CVector GetVectorTarget(void) { return m_vecTarget; } - CElement* GetElementTarget(void) { return m_pTarget; } - bool HasChangedStats(void) { return m_pWeaponStat->HasChanged(); } + eTargetType GetTargetType() { return m_targetType; } + eBone GetTargetBone() { return m_targetBone; } + int GetTargetWheel() { return m_itargetWheel; } + CVector GetVectorTarget() { return m_vecTarget; } + CElement* GetElementTarget() { return m_pTarget; } + bool HasChangedStats() { return m_pWeaponStat->HasChanged(); } bool SetFlags(eWeaponFlags flags, bool bData); bool SetFlags(const SLineOfSightFlags flags); @@ -93,12 +93,12 @@ class CCustomWeapon : public CObject bool GetFlags(eWeaponFlags flags, bool& bData); bool GetFlags(SLineOfSightFlags& flags); - SWeaponConfiguration GetFlags(void) { return m_weaponConfig; } + SWeaponConfiguration GetFlags() { return m_weaponConfig; } static int GetWeaponFireTime(CWeaponStat* pWeaponStat); void SetWeaponFireTime(int iWeaponFireTime); - int GetWeaponFireTime(void); - void ResetWeaponFireTime(void); + int GetWeaponFireTime(); + void ResetWeaponFireTime(); private: eWeaponType m_Type; diff --git a/Server/mods/deathmatch/logic/CCustomWeaponManager.cpp b/Server/mods/deathmatch/logic/CCustomWeaponManager.cpp index 9727857ae53..696cc322a70 100644 --- a/Server/mods/deathmatch/logic/CCustomWeaponManager.cpp +++ b/Server/mods/deathmatch/logic/CCustomWeaponManager.cpp @@ -18,7 +18,7 @@ CCustomWeaponManager::~CCustomWeaponManager() { } -void CCustomWeaponManager::DoPulse(void) +void CCustomWeaponManager::DoPulse() { } diff --git a/Server/mods/deathmatch/logic/CCustomWeaponManager.h b/Server/mods/deathmatch/logic/CCustomWeaponManager.h index 028cd3209ec..98499c3ecda 100644 --- a/Server/mods/deathmatch/logic/CCustomWeaponManager.h +++ b/Server/mods/deathmatch/logic/CCustomWeaponManager.h @@ -24,12 +24,12 @@ class CCustomWeaponManager friend class CCustomWeapon; public: - CCustomWeaponManager(void); - ~CCustomWeaponManager(void); - void DoPulse(void); + CCustomWeaponManager(); + ~CCustomWeaponManager(); + void DoPulse(); - CCustomWeaponListType::const_iterator IterBegin(void) const { return m_List.begin(); }; - CCustomWeaponListType::const_iterator IterEnd(void) const { return m_List.end(); }; + CCustomWeaponListType::const_iterator IterBegin() const { return m_List.begin(); }; + CCustomWeaponListType::const_iterator IterEnd() const { return m_List.end(); }; private: void AddToList(CCustomWeapon* pObject) { m_List.push_back(pObject); }; diff --git a/Server/mods/deathmatch/logic/CDatabaseConnectionSqlite.cpp b/Server/mods/deathmatch/logic/CDatabaseConnectionSqlite.cpp index 251381607ba..347ff039801 100644 --- a/Server/mods/deathmatch/logic/CDatabaseConnectionSqlite.cpp +++ b/Server/mods/deathmatch/logic/CDatabaseConnectionSqlite.cpp @@ -23,23 +23,23 @@ class CDatabaseConnectionSqlite : public CDatabaseConnection public: ZERO_ON_NEW CDatabaseConnectionSqlite(CDatabaseType* pManager, const SString& strPath, const SString& strOptions); - virtual ~CDatabaseConnectionSqlite(void); + virtual ~CDatabaseConnectionSqlite(); // CDatabaseConnection - virtual bool IsValid(void); - virtual const SString& GetLastErrorMessage(void); - virtual uint GetLastErrorCode(void); - virtual void AddRef(void); - virtual void Release(void); + virtual bool IsValid(); + virtual const SString& GetLastErrorMessage(); + virtual uint GetLastErrorCode(); + virtual void AddRef(); + virtual void Release(); virtual bool Query(const SString& strQuery, CRegistryResult& registryResult); - virtual void Flush(void); - virtual int GetShareCount(void) { return m_iRefCount; } + virtual void Flush(); + virtual int GetShareCount() { return m_iRefCount; } // CDatabaseConnectionSqlite void SetLastError(uint uiCode, const SString& strMessage); bool QueryInternal(const SString& strQuery, CRegistryResult& registryResult); - void BeginAutomaticTransaction(void); - void EndAutomaticTransaction(void); + void BeginAutomaticTransaction(); + void EndAutomaticTransaction(); int m_iRefCount; CDatabaseType* m_pManager; @@ -95,7 +95,7 @@ CDatabaseConnectionSqlite::CDatabaseConnectionSqlite(CDatabaseType* pManager, co // // /////////////////////////////////////////////////////////////// -CDatabaseConnectionSqlite::~CDatabaseConnectionSqlite(void) +CDatabaseConnectionSqlite::~CDatabaseConnectionSqlite() { Flush(); @@ -113,7 +113,7 @@ CDatabaseConnectionSqlite::~CDatabaseConnectionSqlite(void) // // /////////////////////////////////////////////////////////////// -void CDatabaseConnectionSqlite::AddRef(void) +void CDatabaseConnectionSqlite::AddRef() { m_iRefCount++; } @@ -125,7 +125,7 @@ void CDatabaseConnectionSqlite::AddRef(void) // // /////////////////////////////////////////////////////////////// -void CDatabaseConnectionSqlite::Release(void) +void CDatabaseConnectionSqlite::Release() { if (--m_iRefCount > 0) { @@ -144,7 +144,7 @@ void CDatabaseConnectionSqlite::Release(void) // Returns false if connection created all wrong // /////////////////////////////////////////////////////////////// -bool CDatabaseConnectionSqlite::IsValid(void) +bool CDatabaseConnectionSqlite::IsValid() { return m_bOpened; } @@ -156,7 +156,7 @@ bool CDatabaseConnectionSqlite::IsValid(void) // Only valid when IsValid() or Query() returns false // /////////////////////////////////////////////////////////////// -const SString& CDatabaseConnectionSqlite::GetLastErrorMessage(void) +const SString& CDatabaseConnectionSqlite::GetLastErrorMessage() { return m_strLastErrorMessage; } @@ -168,7 +168,7 @@ const SString& CDatabaseConnectionSqlite::GetLastErrorMessage(void) // Only valid when IsValid() or Query() returns false // /////////////////////////////////////////////////////////////// -uint CDatabaseConnectionSqlite::GetLastErrorCode(void) +uint CDatabaseConnectionSqlite::GetLastErrorCode() { return m_uiLastErrorCode; } @@ -313,7 +313,7 @@ bool CDatabaseConnectionSqlite::QueryInternal(const SString& strQuery, CRegistry // // /////////////////////////////////////////////////////////////// -void CDatabaseConnectionSqlite::BeginAutomaticTransaction(void) +void CDatabaseConnectionSqlite::BeginAutomaticTransaction() { if (m_bInAutomaticTransaction) { @@ -337,7 +337,7 @@ void CDatabaseConnectionSqlite::BeginAutomaticTransaction(void) // // /////////////////////////////////////////////////////////////// -void CDatabaseConnectionSqlite::EndAutomaticTransaction(void) +void CDatabaseConnectionSqlite::EndAutomaticTransaction() { if (m_bInAutomaticTransaction) { @@ -354,7 +354,7 @@ void CDatabaseConnectionSqlite::EndAutomaticTransaction(void) // Flush caches // /////////////////////////////////////////////////////////////// -void CDatabaseConnectionSqlite::Flush(void) +void CDatabaseConnectionSqlite::Flush() { EndAutomaticTransaction(); } diff --git a/Server/mods/deathmatch/logic/CDatabaseJobQueue.cpp b/Server/mods/deathmatch/logic/CDatabaseJobQueue.cpp index e188ab7a2d9..a66bbbb7974 100644 --- a/Server/mods/deathmatch/logic/CDatabaseJobQueue.cpp +++ b/Server/mods/deathmatch/logic/CDatabaseJobQueue.cpp @@ -26,11 +26,11 @@ class CDatabaseJobQueueImpl : public CDatabaseJobQueue { public: ZERO_ON_NEW - CDatabaseJobQueueImpl(void); - virtual ~CDatabaseJobQueueImpl(void); + CDatabaseJobQueueImpl(); + virtual ~CDatabaseJobQueueImpl(); // Main thread functions - virtual void DoPulse(void); + virtual void DoPulse(); virtual CDbJobData* AddCommand(EJobCommandType jobType, SConnectionHandle connectionHandle, const SString& strData); virtual bool PollCommand(CDbJobData* pJobData, uint uiTimeout); virtual bool FreeCommand(CDbJobData* pJobData); @@ -39,14 +39,14 @@ class CDatabaseJobQueueImpl : public CDatabaseJobQueue virtual bool UsesConnection(SConnectionHandle connectionHandle); protected: - void StopThread(void); - CDbJobData* GetNewJobData(void); - void UpdateDebugData(void); + void StopThread(); + CDbJobData* GetNewJobData(); + void UpdateDebugData(); void IgnoreJobResults(CDbJobData* pJobData); // Other thread functions static void* StaticThreadProc(void* pContext); - void* ThreadProc(void); + void* ThreadProc(); void ProcessCommand(CDbJobData* pJobData); void ProcessConnect(CDbJobData* pJobData); void ProcessDisconnect(CDbJobData* pJobData); @@ -88,7 +88,7 @@ class CDatabaseJobQueueImpl : public CDatabaseJobQueue /////////////////////////////////////////////////////////////// // Object creation /////////////////////////////////////////////////////////////// -CDatabaseJobQueue* NewDatabaseJobQueue(void) +CDatabaseJobQueue* NewDatabaseJobQueue() { return new CDatabaseJobQueueImpl(); } @@ -100,7 +100,7 @@ CDatabaseJobQueue* NewDatabaseJobQueue(void) // Init known database types and start the job service thread // /////////////////////////////////////////////////////////////// -CDatabaseJobQueueImpl::CDatabaseJobQueueImpl(void) : m_uiJobCountWarnThresh(200), m_uiConnectionCountWarnThresh(20) +CDatabaseJobQueueImpl::CDatabaseJobQueueImpl() : m_uiJobCountWarnThresh(200), m_uiConnectionCountWarnThresh(20) { // Add known database types CDatabaseType* pDatabaseTypeSqlite = NewDatabaseTypeSqlite(); @@ -121,7 +121,7 @@ CDatabaseJobQueueImpl::CDatabaseJobQueueImpl(void) : m_uiJobCountWarnThresh(200) // Stop threads and delete everything // /////////////////////////////////////////////////////////////// -CDatabaseJobQueueImpl::~CDatabaseJobQueueImpl(void) +CDatabaseJobQueueImpl::~CDatabaseJobQueueImpl() { // Stop the job queue processing thread StopThread(); @@ -141,7 +141,7 @@ CDatabaseJobQueueImpl::~CDatabaseJobQueueImpl(void) // Stop the job queue processing thread // /////////////////////////////////////////////////////////////// -void CDatabaseJobQueueImpl::StopThread(void) +void CDatabaseJobQueueImpl::StopThread() { // Stop the job queue processing thread shared.m_Mutex.Lock(); @@ -168,7 +168,7 @@ void CDatabaseJobQueueImpl::StopThread(void) // Return a new job data object // /////////////////////////////////////////////////////////////// -CDbJobData* CDatabaseJobQueueImpl::GetNewJobData(void) +CDbJobData* CDatabaseJobQueueImpl::GetNewJobData() { g_pStats->iDbJobDataCount++; CDbJobData* pJobData = new CDbJobData(); @@ -215,7 +215,7 @@ CDbJobData* CDatabaseJobQueueImpl::AddCommand(EJobCommandType jobType, SConnecti // Check if any callback functions are due // /////////////////////////////////////////////////////////////// -void CDatabaseJobQueueImpl::DoPulse(void) +void CDatabaseJobQueueImpl::DoPulse() { // Check if any connection needs a flush while (m_PendingFlushMap.size()) @@ -285,7 +285,7 @@ void CDatabaseJobQueueImpl::DoPulse(void) // Update info relevant to debugging database jobs // /////////////////////////////////////////////////////////////// -void CDatabaseJobQueueImpl::UpdateDebugData(void) +void CDatabaseJobQueueImpl::UpdateDebugData() { // Update once every 10 seconds if (m_JobCountElpasedTime.Get() < 10000) @@ -543,7 +543,7 @@ void* CDatabaseJobQueueImpl::StaticThreadProc(void* pContext) // Job service loop // /////////////////////////////////////////////////////////////// -void* CDatabaseJobQueueImpl::ThreadProc(void) +void* CDatabaseJobQueueImpl::ThreadProc() { shared.m_Mutex.Lock(); while (!shared.m_bTerminateThread) diff --git a/Server/mods/deathmatch/logic/CDatabaseJobQueue.h b/Server/mods/deathmatch/logic/CDatabaseJobQueue.h index 81a21066733..74315166195 100644 --- a/Server/mods/deathmatch/logic/CDatabaseJobQueue.h +++ b/Server/mods/deathmatch/logic/CDatabaseJobQueue.h @@ -19,9 +19,9 @@ class CDatabaseJobQueue { public: - virtual ~CDatabaseJobQueue(void) {} + virtual ~CDatabaseJobQueue() {} - virtual void DoPulse(void) = 0; + virtual void DoPulse() = 0; virtual CDbJobData* AddCommand(EJobCommandType jobType, SConnectionHandle connectionHandle, const SString& strData) = 0; virtual bool PollCommand(CDbJobData* pJobData, uint uiTimeout) = 0; virtual bool FreeCommand(CDbJobData* pJobData) = 0; @@ -30,4 +30,4 @@ class CDatabaseJobQueue virtual bool UsesConnection(SConnectionHandle connectionHandle) = 0; }; -CDatabaseJobQueue* NewDatabaseJobQueue(void); +CDatabaseJobQueue* NewDatabaseJobQueue(); diff --git a/Server/mods/deathmatch/logic/CDatabaseJobQueueManager.cpp b/Server/mods/deathmatch/logic/CDatabaseJobQueueManager.cpp index 06724503ff7..c842b9fc6f8 100644 --- a/Server/mods/deathmatch/logic/CDatabaseJobQueueManager.cpp +++ b/Server/mods/deathmatch/logic/CDatabaseJobQueueManager.cpp @@ -20,7 +20,7 @@ // Stop threads and delete everything // /////////////////////////////////////////////////////////////// -CDatabaseJobQueueManager::~CDatabaseJobQueueManager(void) +CDatabaseJobQueueManager::~CDatabaseJobQueueManager() { for (auto iter : m_QueueNameMap) { @@ -62,7 +62,7 @@ CDbJobData* CDatabaseJobQueueManager::AddCommand(EJobCommandType jobType, SConne // Check if any callback functions are due // /////////////////////////////////////////////////////////////// -void CDatabaseJobQueueManager::DoPulse(void) +void CDatabaseJobQueueManager::DoPulse() { for (const auto iter : m_QueueNameMap) { @@ -204,7 +204,7 @@ CDatabaseJobQueue* CDatabaseJobQueueManager::GetQueueFromConnectCommand(const SS // Return unused handle within correct range // /////////////////////////////////////////////////////////////// -SConnectionHandle CDatabaseJobQueueManager::GetNextConnectionHandle(void) +SConnectionHandle CDatabaseJobQueueManager::GetNextConnectionHandle() { do { diff --git a/Server/mods/deathmatch/logic/CDatabaseJobQueueManager.h b/Server/mods/deathmatch/logic/CDatabaseJobQueueManager.h index a2070d124ab..0d7f6f0f6cb 100644 --- a/Server/mods/deathmatch/logic/CDatabaseJobQueueManager.h +++ b/Server/mods/deathmatch/logic/CDatabaseJobQueueManager.h @@ -19,8 +19,8 @@ class CDatabaseJobQueueManager { public: ZERO_ON_NEW - ~CDatabaseJobQueueManager(void); - void DoPulse(void); + ~CDatabaseJobQueueManager(); + void DoPulse(); CDbJobData* AddCommand(EJobCommandType jobType, SConnectionHandle connectionHandle, const SString& strData); bool PollCommand(CDbJobData* pJobData, uint uiTimeout); bool FreeCommand(CDbJobData* pJobData); @@ -31,7 +31,7 @@ class CDatabaseJobQueueManager protected: CDatabaseJobQueue* GetQueueFromConnectCommand(const SString& strData); CDatabaseJobQueue* FindQueueFromConnection(SConnectionHandle connectionHandle); - SConnectionHandle GetNextConnectionHandle(void); + SConnectionHandle GetNextConnectionHandle(); std::map m_QueueNameMap; SConnectionHandle m_ConnectionHandleCounter; diff --git a/Server/mods/deathmatch/logic/CDatabaseManager.cpp b/Server/mods/deathmatch/logic/CDatabaseManager.cpp index 4d3f4358a04..3599bf9233e 100644 --- a/Server/mods/deathmatch/logic/CDatabaseManager.cpp +++ b/Server/mods/deathmatch/logic/CDatabaseManager.cpp @@ -26,11 +26,11 @@ class CDatabaseManagerImpl : public CDatabaseManager { public: ZERO_ON_NEW - CDatabaseManagerImpl(void); - virtual ~CDatabaseManagerImpl(void); + CDatabaseManagerImpl(); + virtual ~CDatabaseManagerImpl(); // CDatabaseManager - virtual void DoPulse(void); + virtual void DoPulse(); virtual SConnectionHandle Connect(const SString& strType, const SString& strHost, const SString& strUsername, const SString& strPassword, const SString& strOptions); virtual bool Disconnect(SConnectionHandle hConnection); @@ -43,8 +43,8 @@ class CDatabaseManagerImpl : public CDatabaseManager virtual bool QueryPoll(CDbJobData* pJobData, uint ulTimeout); virtual bool QueryFree(CDbJobData* pJobData); virtual CDbJobData* GetQueryFromId(SDbJobId id); - virtual const SString& GetLastErrorMessage(void) { return m_strLastErrorMessage; } - virtual bool IsLastErrorSuppressed(void) { return m_bLastErrorSuppressed; } + virtual const SString& GetLastErrorMessage() { return m_strLastErrorMessage; } + virtual bool IsLastErrorSuppressed() { return m_bLastErrorSuppressed; } virtual bool QueryWithResultf(SConnectionHandle hConnection, CRegistryResult* pResult, const char* szQuery, ...); virtual bool QueryWithCallback(SConnectionHandle hConnection, PFN_DBRESULT pfnDbResult, void* pCallbackContext, const SString& strQuery, CLuaArguments* pArgs = nullptr); @@ -56,7 +56,7 @@ class CDatabaseManagerImpl : public CDatabaseManager SString InsertQueryArguments(SConnectionHandle hConnection, const char* szQuery, va_list vl); SString HideQuestionMark(const SString& strQuery); SString RestoreQuestionMark(const SString& strQuery); - void ClearLastErrorMessage(void) + void ClearLastErrorMessage() { m_strLastErrorMessage.clear(); m_bLastErrorSuppressed = false; @@ -76,7 +76,7 @@ class CDatabaseManagerImpl : public CDatabaseManager /////////////////////////////////////////////////////////////// // Object creation /////////////////////////////////////////////////////////////// -CDatabaseManager* NewDatabaseManager(void) +CDatabaseManager* NewDatabaseManager() { return new CDatabaseManagerImpl(); } @@ -88,7 +88,7 @@ CDatabaseManager* NewDatabaseManager(void) // // /////////////////////////////////////////////////////////////// -CDatabaseManagerImpl::CDatabaseManagerImpl(void) +CDatabaseManagerImpl::CDatabaseManagerImpl() { m_JobQueue = new CDatabaseJobQueueManager(); } @@ -100,7 +100,7 @@ CDatabaseManagerImpl::CDatabaseManagerImpl(void) // // /////////////////////////////////////////////////////////////// -CDatabaseManagerImpl::~CDatabaseManagerImpl(void) +CDatabaseManagerImpl::~CDatabaseManagerImpl() { // Disconnect all active connections std::map connectionTypeMapCopy = m_ConnectionTypeMap; @@ -117,7 +117,7 @@ CDatabaseManagerImpl::~CDatabaseManagerImpl(void) // Check if any callback functions are due // /////////////////////////////////////////////////////////////// -void CDatabaseManagerImpl::DoPulse(void) +void CDatabaseManagerImpl::DoPulse() { m_JobQueue->DoPulse(); } @@ -646,7 +646,7 @@ SString CDatabaseManagerImpl::RestoreQuestionMark(const SString& strQuery) // // /////////////////////////////////////////////////////////////// -CDbJobData::CDbJobData(void) +CDbJobData::CDbJobData() { id = CIdArray::PopUniqueId(this, EIdClass::DB_JOBDATA); } @@ -658,7 +658,7 @@ CDbJobData::CDbJobData(void) // // /////////////////////////////////////////////////////////////// -CDbJobData::~CDbJobData(void) +CDbJobData::~CDbJobData() { CIdArray::PushUniqueId(this, EIdClass::DB_JOBDATA, id); } @@ -693,7 +693,7 @@ bool CDbJobData::SetCallback(PFN_DBRESULT pfnDbResult, void* pContext) // Returns true if callback has been set and has not been called yet // /////////////////////////////////////////////////////////////// -bool CDbJobData::HasCallback(void) +bool CDbJobData::HasCallback() { return callback.bSet && !callback.bDone; } @@ -705,7 +705,7 @@ bool CDbJobData::HasCallback(void) // Do callback // /////////////////////////////////////////////////////////////// -void CDbJobData::ProcessCallback(void) +void CDbJobData::ProcessCallback() { assert(HasCallback()); callback.bDone = true; @@ -719,7 +719,7 @@ void CDbJobData::ProcessCallback(void) // Remove sensitive info // /////////////////////////////////////////////////////////////// -SString CDbJobData::GetCommandStringForLog(void) +SString CDbJobData::GetCommandStringForLog() { if (command.type == EJobCommand::CONNECT) { diff --git a/Server/mods/deathmatch/logic/CDatabaseManager.h b/Server/mods/deathmatch/logic/CDatabaseManager.h index 7f25c074e03..4162c8dd69a 100644 --- a/Server/mods/deathmatch/logic/CDatabaseManager.h +++ b/Server/mods/deathmatch/logic/CDatabaseManager.h @@ -75,7 +75,7 @@ typedef void (*PFN_DBRESULT)(CDbJobData* pJobData, void* pContext); class CDbOptionsMap : public CArgMap { public: - CDbOptionsMap(void) : CArgMap("=", ";") {} + CDbOptionsMap() : CArgMap("=", ";") {} }; // @@ -86,15 +86,15 @@ class CDbJobData public: ZERO_ON_NEW - CDbJobData(void); - ~CDbJobData(void); - SDbJobId GetId(void) { return id; } + CDbJobData(); + ~CDbJobData(); + SDbJobId GetId() { return id; } bool SetCallback(PFN_DBRESULT pfnDbResult, void* pContext); - bool HasCallback(void); - void ProcessCallback(void); + bool HasCallback(); + void ProcessCallback(); void SetLuaDebugInfo(const SLuaDebugInfo& luaDebugInfo) { m_LuaDebugInfo = luaDebugInfo; } - CDatabaseJobQueue* GetQueue(void) { return command.pJobQueue; } - SString GetCommandStringForLog(void); + CDatabaseJobQueue* GetQueue() { return command.pJobQueue; } + SString GetCommandStringForLog(); EJobStageType stage; SDbJobId id; @@ -143,9 +143,9 @@ class CDbJobData class CDatabaseManager { public: - virtual ~CDatabaseManager(void) {} + virtual ~CDatabaseManager() {} - virtual void DoPulse(void) = 0; + virtual void DoPulse() = 0; virtual SConnectionHandle Connect(const SString& strType, const SString& strHost, const SString& strUsername = "", const SString& strPassword = "", const SString& strOptions = "") = 0; virtual bool Disconnect(SConnectionHandle hConnection) = 0; @@ -158,8 +158,8 @@ class CDatabaseManager virtual bool QueryPoll(CDbJobData* pJobData, uint ulTimeout) = 0; virtual bool QueryFree(CDbJobData* pJobData) = 0; virtual CDbJobData* GetQueryFromId(SDbJobId id) = 0; - virtual const SString& GetLastErrorMessage(void) = 0; - virtual bool IsLastErrorSuppressed(void) = 0; + virtual const SString& GetLastErrorMessage() = 0; + virtual bool IsLastErrorSuppressed() = 0; virtual bool QueryWithResultf(SConnectionHandle hConnection, CRegistryResult* pResult, const char* szQuery, ...) = 0; virtual bool QueryWithCallback(SConnectionHandle hConnection, PFN_DBRESULT pfnDbResult, void* pCallbackContext, const SString& strQuery, CLuaArguments* pArgs = nullptr) = 0; @@ -167,7 +167,7 @@ class CDatabaseManager virtual void SetLogLevel(EJobLogLevelType logLevel, const SString& strLogFilename) = 0; }; -CDatabaseManager* NewDatabaseManager(void); +CDatabaseManager* NewDatabaseManager(); /////////////////////////////////////////////////////////////// // @@ -186,13 +186,13 @@ class CDatabaseConnectionElement : public CElement SetTypeName("db-connection"); } - virtual ~CDatabaseConnectionElement(void) {} + virtual ~CDatabaseConnectionElement() {} // CElement - virtual void Unlink(void) { g_pGame->GetDatabaseManager()->Disconnect(m_Connection); } + virtual void Unlink() { g_pGame->GetDatabaseManager()->Disconnect(m_Connection); } // CDatabaseConnectionElement - SConnectionHandle GetConnectionHandle(void) { return m_Connection; } + SConnectionHandle GetConnectionHandle() { return m_Connection; } protected: bool ReadSpecialData(const int iLine) override { return false; } diff --git a/Server/mods/deathmatch/logic/CDatabaseType.h b/Server/mods/deathmatch/logic/CDatabaseType.h index 23430ca6adf..a54080d195c 100644 --- a/Server/mods/deathmatch/logic/CDatabaseType.h +++ b/Server/mods/deathmatch/logic/CDatabaseType.h @@ -21,9 +21,9 @@ class CDatabaseConnection; class CDatabaseType { public: - virtual ~CDatabaseType(void) {} + virtual ~CDatabaseType() {} - virtual SString GetDataSourceTag(void) = 0; + virtual SString GetDataSourceTag() = 0; virtual CDatabaseConnection* Connect(const SString& strHost, const SString& strUsername, const SString& strPassword, const SString& strDriverOptions) = 0; virtual void NotifyConnectionDeleted(CDatabaseConnection* pConnection) = 0; virtual void NotifyConnectionChanged(CDatabaseConnection* pConnection) = 0; @@ -39,17 +39,17 @@ class CDatabaseType class CDatabaseConnection { public: - virtual ~CDatabaseConnection(void) {} + virtual ~CDatabaseConnection() {} // CDatabaseConnection - virtual bool IsValid(void) = 0; - virtual const SString& GetLastErrorMessage(void) = 0; - virtual uint GetLastErrorCode(void) = 0; - virtual void AddRef(void) = 0; - virtual void Release(void) = 0; + virtual bool IsValid() = 0; + virtual const SString& GetLastErrorMessage() = 0; + virtual uint GetLastErrorCode() = 0; + virtual void AddRef() = 0; + virtual void Release() = 0; virtual bool Query(const SString& strQuery, CRegistryResult& registryResult) = 0; - virtual void Flush(void) = 0; - virtual int GetShareCount(void) = 0; + virtual void Flush() = 0; + virtual int GetShareCount() = 0; bool m_bLoggingEnabled; SString m_strLogTag; @@ -60,12 +60,12 @@ class CDatabaseConnection // // Create interfaces for sqlite // -CDatabaseType* NewDatabaseTypeSqlite(void); +CDatabaseType* NewDatabaseTypeSqlite(); CDatabaseConnection* NewDatabaseConnectionSqlite(CDatabaseType* pManager, const SString& strPath, const SString& strOptions); // // Create interfaces for mysql // -CDatabaseType* NewDatabaseTypeMySql(void); +CDatabaseType* NewDatabaseTypeMySql(); typedef CDatabaseConnection*(NewDatabaseConnectionMySql_t)(CDatabaseType* pManager, const SString& strHost, const SString& strUsername, const SString& strPassword, const SString& strOptions); diff --git a/Server/mods/deathmatch/logic/CDatabaseTypeMySql.cpp b/Server/mods/deathmatch/logic/CDatabaseTypeMySql.cpp index c9080d9f5d3..1104f930106 100644 --- a/Server/mods/deathmatch/logic/CDatabaseTypeMySql.cpp +++ b/Server/mods/deathmatch/logic/CDatabaseTypeMySql.cpp @@ -25,11 +25,11 @@ class CDatabaseTypeMySql : public CDatabaseType { public: ZERO_ON_NEW - CDatabaseTypeMySql(void); - virtual ~CDatabaseTypeMySql(void); + CDatabaseTypeMySql(); + virtual ~CDatabaseTypeMySql(); // CDatabaseType - virtual SString GetDataSourceTag(void); + virtual SString GetDataSourceTag(); virtual CDatabaseConnection* Connect(const SString& strHost, const SString& strUsername, const SString& strPassword, const SString& strDriverOptions); virtual void NotifyConnectionDeleted(CDatabaseConnection* pConnection); virtual void NotifyConnectionChanged(CDatabaseConnection* pConnection); @@ -37,7 +37,7 @@ class CDatabaseTypeMySql : public CDatabaseType // CDatabaseTypeMySql CDatabaseConnection* CallNewDatabaseConnectionMySql(CDatabaseType* pManager, const SString& strHost, const SString& strUsername, const SString& strPassword, const SString& strOptions); - void UpdateStats(void); + void UpdateStats(); CDynamicLibrary m_DbconmyLib; NewDatabaseConnectionMySql_t* m_pfnNewDatabaseConnection; @@ -49,7 +49,7 @@ class CDatabaseTypeMySql : public CDatabaseType /////////////////////////////////////////////////////////////// // Object creation /////////////////////////////////////////////////////////////// -CDatabaseType* NewDatabaseTypeMySql(void) +CDatabaseType* NewDatabaseTypeMySql() { return new CDatabaseTypeMySql(); } @@ -61,7 +61,7 @@ CDatabaseType* NewDatabaseTypeMySql(void) // // /////////////////////////////////////////////////////////////// -CDatabaseTypeMySql::CDatabaseTypeMySql(void) +CDatabaseTypeMySql::CDatabaseTypeMySql() { } @@ -72,7 +72,7 @@ CDatabaseTypeMySql::CDatabaseTypeMySql(void) // // /////////////////////////////////////////////////////////////// -CDatabaseTypeMySql::~CDatabaseTypeMySql(void) +CDatabaseTypeMySql::~CDatabaseTypeMySql() { assert(m_SharedConnectionMap.empty()); assert(m_AllConnectionMap.empty()); @@ -85,7 +85,7 @@ CDatabaseTypeMySql::~CDatabaseTypeMySql(void) // Return database type as a string // /////////////////////////////////////////////////////////////// -SString CDatabaseTypeMySql::GetDataSourceTag(void) +SString CDatabaseTypeMySql::GetDataSourceTag() { return "mysql"; } @@ -217,7 +217,7 @@ CDatabaseConnection* CDatabaseTypeMySql::CallNewDatabaseConnectionMySql(CDatabas // Tracking connections // /////////////////////////////////////////////////////////////// -void CDatabaseTypeMySql::UpdateStats(void) +void CDatabaseTypeMySql::UpdateStats() { // Remove all lines with this key CPerfStatDebugTable::GetSingleton()->RemoveLines(m_strStatsKeyHead + "*"); diff --git a/Server/mods/deathmatch/logic/CDatabaseTypeSqlite.cpp b/Server/mods/deathmatch/logic/CDatabaseTypeSqlite.cpp index 70d3c7bef3d..0ec329cb394 100644 --- a/Server/mods/deathmatch/logic/CDatabaseTypeSqlite.cpp +++ b/Server/mods/deathmatch/logic/CDatabaseTypeSqlite.cpp @@ -22,17 +22,17 @@ class CDatabaseTypeSqlite : public CDatabaseType { public: ZERO_ON_NEW - CDatabaseTypeSqlite(void); - virtual ~CDatabaseTypeSqlite(void); + CDatabaseTypeSqlite(); + virtual ~CDatabaseTypeSqlite(); // CDatabaseType - virtual SString GetDataSourceTag(void); + virtual SString GetDataSourceTag(); virtual CDatabaseConnection* Connect(const SString& strHost, const SString& strUsername, const SString& strPassword, const SString& strDriverOptions); virtual void NotifyConnectionDeleted(CDatabaseConnection* pConnection); virtual void NotifyConnectionChanged(CDatabaseConnection* pConnection); // CDatabaseTypeSqlite - void UpdateStats(void); + void UpdateStats(); std::map m_SharedConnectionMap; std::set m_AllConnectionMap; @@ -42,7 +42,7 @@ class CDatabaseTypeSqlite : public CDatabaseType /////////////////////////////////////////////////////////////// // Object creation /////////////////////////////////////////////////////////////// -CDatabaseType* NewDatabaseTypeSqlite(void) +CDatabaseType* NewDatabaseTypeSqlite() { return new CDatabaseTypeSqlite(); } @@ -54,7 +54,7 @@ CDatabaseType* NewDatabaseTypeSqlite(void) // // /////////////////////////////////////////////////////////////// -CDatabaseTypeSqlite::CDatabaseTypeSqlite(void) +CDatabaseTypeSqlite::CDatabaseTypeSqlite() { } @@ -65,7 +65,7 @@ CDatabaseTypeSqlite::CDatabaseTypeSqlite(void) // // /////////////////////////////////////////////////////////////// -CDatabaseTypeSqlite::~CDatabaseTypeSqlite(void) +CDatabaseTypeSqlite::~CDatabaseTypeSqlite() { assert(m_SharedConnectionMap.empty()); assert(m_AllConnectionMap.empty()); @@ -78,7 +78,7 @@ CDatabaseTypeSqlite::~CDatabaseTypeSqlite(void) // Return database type as a string // /////////////////////////////////////////////////////////////// -SString CDatabaseTypeSqlite::GetDataSourceTag(void) +SString CDatabaseTypeSqlite::GetDataSourceTag() { return "sqlite"; } @@ -182,7 +182,7 @@ CDatabaseConnection* CDatabaseTypeSqlite::Connect(const SString& strHost, const // Tracking connections // /////////////////////////////////////////////////////////////// -void CDatabaseTypeSqlite::UpdateStats(void) +void CDatabaseTypeSqlite::UpdateStats() { SString strModPath = PathConform(g_pServerInterface->GetModManager()->GetModPath()); diff --git a/Server/mods/deathmatch/logic/CDummy.cpp b/Server/mods/deathmatch/logic/CDummy.cpp index 7d167868bc7..0aa3c20656b 100644 --- a/Server/mods/deathmatch/logic/CDummy.cpp +++ b/Server/mods/deathmatch/logic/CDummy.cpp @@ -25,7 +25,7 @@ CDummy::CDummy(CGroups* pGroups, CElement* pParent) : CElement(pParent) } } -CDummy::~CDummy(void) +CDummy::~CDummy() { // Unlink from manager Unlink(); @@ -39,7 +39,7 @@ CElement* CDummy::Clone(bool* bAddEntity, CResource* pResource) return pNewElement; } -void CDummy::Unlink(void) +void CDummy::Unlink() { // Remove us from groupmanager's list if (m_pGroups) diff --git a/Server/mods/deathmatch/logic/CDummy.h b/Server/mods/deathmatch/logic/CDummy.h index 30ddd3aec61..71be7bc79de 100644 --- a/Server/mods/deathmatch/logic/CDummy.h +++ b/Server/mods/deathmatch/logic/CDummy.h @@ -17,12 +17,12 @@ class CDummy : public CElement { public: CDummy(class CGroups* pGroups, CElement* pParent); - ~CDummy(void); + ~CDummy(); CElement* Clone(bool* bAddEntity, CResource* pResource) override; - bool IsEntity(void) { return true; } + bool IsEntity() { return true; } - void Unlink(void); + void Unlink(); protected: bool ReadSpecialData(const int iLine) override; diff --git a/Server/mods/deathmatch/logic/CDynamicLibrary.cpp b/Server/mods/deathmatch/logic/CDynamicLibrary.cpp index 4798933fdd7..060303c454e 100644 --- a/Server/mods/deathmatch/logic/CDynamicLibrary.cpp +++ b/Server/mods/deathmatch/logic/CDynamicLibrary.cpp @@ -12,13 +12,13 @@ #include #include "CDynamicLibrary.h" -CDynamicLibrary::CDynamicLibrary(void) +CDynamicLibrary::CDynamicLibrary() { // Init m_hModule = 0; } -CDynamicLibrary::~CDynamicLibrary(void) +CDynamicLibrary::~CDynamicLibrary() { // Make sure we unload Unload(); @@ -56,7 +56,7 @@ bool CDynamicLibrary::Load(const char* szFilename) return m_hModule != 0; } -void CDynamicLibrary::Unload(void) +void CDynamicLibrary::Unload() { // Got a module? if (m_hModule != 0) @@ -72,7 +72,7 @@ void CDynamicLibrary::Unload(void) } } -bool CDynamicLibrary::IsLoaded(void) +bool CDynamicLibrary::IsLoaded() { return m_hModule != 0; } diff --git a/Server/mods/deathmatch/logic/CDynamicLibrary.h b/Server/mods/deathmatch/logic/CDynamicLibrary.h index 31aacdbdd09..a58294f9a8b 100644 --- a/Server/mods/deathmatch/logic/CDynamicLibrary.h +++ b/Server/mods/deathmatch/logic/CDynamicLibrary.h @@ -20,12 +20,12 @@ class CDynamicLibrary { public: - CDynamicLibrary(void); - ~CDynamicLibrary(void); + CDynamicLibrary(); + ~CDynamicLibrary(); bool Load(const char* szFilename); - void Unload(void); - bool IsLoaded(void); + void Unload(); + bool IsLoaded(); void* GetProcedureAddress(const char* szProcName); diff --git a/Server/mods/deathmatch/logic/CElement.cpp b/Server/mods/deathmatch/logic/CElement.cpp index fbbad3b8f65..4dca6b0c4f1 100644 --- a/Server/mods/deathmatch/logic/CElement.cpp +++ b/Server/mods/deathmatch/logic/CElement.cpp @@ -56,7 +56,7 @@ CElement::CElement(CElement* pParent) m_pAttachedTo = NULL; } -CElement::~CElement(void) +CElement::~CElement() { // Get rid of the children elements ClearChildren(); @@ -125,7 +125,7 @@ CElement::~CElement(void) SAFE_RELEASE(m_pChildrenListSnapshot); } -bool CElement::IsCloneable(void) +bool CElement::IsCloneable() { auto iType = GetType(); switch (iType) @@ -144,7 +144,7 @@ bool CElement::IsCloneable(void) } } -const CVector& CElement::GetPosition(void) +const CVector& CElement::GetPosition() { if (m_pAttachedTo) GetAttachedPosition(m_vecPosition); @@ -336,7 +336,7 @@ bool CElement::IsMyParent(CElement* pElement, bool bRecursive) return false; } -void CElement::ClearChildren(void) +void CElement::ClearChildren() { // Sanity check assert(m_pParent != this); @@ -465,7 +465,7 @@ void CElement::DeleteEvents(CLuaMain* pLuaMain, bool bRecursive) } } -void CElement::DeleteAllEvents(void) +void CElement::DeleteAllEvents() { m_pEventManager->DeleteAll(); } @@ -860,7 +860,7 @@ void CElement::OnSubtreeRemove(CElement* pElement) } } -void CElement::UpdatePerPlayerEntities(void) +void CElement::UpdatePerPlayerEntities() { // Call a virtual method that will end up CPerPlayerEntity or some other class using references UpdatePerPlayer(); @@ -873,7 +873,7 @@ void CElement::UpdatePerPlayerEntities(void) } } -CElement* CElement::GetRootElement(void) +CElement* CElement::GetRootElement() { if (m_pParent) { @@ -1043,7 +1043,7 @@ bool CElement::CollisionExists(CColShape* pShape) return false; } -void CElement::RemoveAllCollisions(void) +void CElement::RemoveAllCollisions() { list::iterator iter = m_Collisions.begin(); for (; iter != m_Collisions.end(); iter++) @@ -1053,7 +1053,7 @@ void CElement::RemoveAllCollisions(void) m_Collisions.clear(); } -CClient* CElement::GetClient(void) +CClient* CElement::GetClient() { CClient* pClient = NULL; switch (GetType()) @@ -1121,7 +1121,7 @@ bool CElement::IsElementAttached(CElement* pElement) return false; } -bool CElement::IsAttachable(void) +bool CElement::IsAttachable() { switch (GetType()) { @@ -1143,7 +1143,7 @@ bool CElement::IsAttachable(void) return false; } -bool CElement::IsAttachToable(void) +bool CElement::IsAttachToable() { switch (GetType()) { @@ -1189,7 +1189,7 @@ void CElement::GetAttachedRotation(CVector& vecRotation) } } -unsigned char CElement::GenerateSyncTimeContext(void) +unsigned char CElement::GenerateSyncTimeContext() { // Increment the sync time index ++m_ucSyncTimeContext; @@ -1442,13 +1442,13 @@ void CElement::SetPosition(const CVector& vecPosition) UpdateSpatialData(); }; -CSphere CElement::GetWorldBoundingSphere(void) +CSphere CElement::GetWorldBoundingSphere() { // Default to a point around the entity's position return CSphere(GetPosition(), 0.f); } -void CElement::UpdateSpatialData(void) +void CElement::UpdateSpatialData() { // Avoid recursion if (!m_bUpdatingSpatialData) @@ -1473,7 +1473,7 @@ void CElement::UpdateSpatialData(void) // // Ensure children list snapshot is up to date and return it // -CElementListSnapshot* CElement::GetChildrenListSnapshot(void) +CElementListSnapshot* CElement::GetChildrenListSnapshot() { // See if list needs updating if (m_Children.GetRevision() != m_uiChildrenListSnapshotRevision || m_pChildrenListSnapshot == NULL) diff --git a/Server/mods/deathmatch/logic/CElement.h b/Server/mods/deathmatch/logic/CElement.h index c23b93b8ffc..df61ac41878 100644 --- a/Server/mods/deathmatch/logic/CElement.h +++ b/Server/mods/deathmatch/logic/CElement.h @@ -84,25 +84,25 @@ class CElement public: CElement(CElement* pParent); - virtual ~CElement(void); + virtual ~CElement(); virtual CElement* Clone(bool* bAddEntity, CResource* pResource) { return nullptr; } - bool IsCloneable(void); + bool IsCloneable(); - bool IsBeingDeleted(void) { return m_bIsBeingDeleted; }; + bool IsBeingDeleted() { return m_bIsBeingDeleted; }; void SetIsBeingDeleted(bool bBeingDeleted) { m_bIsBeingDeleted = bBeingDeleted; }; - virtual void Unlink(void) = 0; + virtual void Unlink() = 0; - ElementID GetID(void) { return m_ID; }; + ElementID GetID() { return m_ID; }; - virtual const CVector& GetPosition(void); + virtual const CVector& GetPosition(); virtual void SetPosition(const CVector& vecPosition); virtual void GetRotation(CVector& vecRotation) { vecRotation = CVector(); } virtual void GetMatrix(CMatrix& matrix); virtual void SetMatrix(const CMatrix& matrix); - virtual bool IsPerPlayerEntity(void) { return false; }; + virtual bool IsPerPlayerEntity() { return false; }; CElement* FindChild(const char* szName, unsigned int uiIndex, bool bRecursive); CElement* FindChildByType(const char* szType, unsigned int uiIndex, bool bRecursive); @@ -111,7 +111,7 @@ class CElement void GetChildrenByType(const char* szType, lua_State* pLua); bool IsMyChild(CElement* pElement, bool bRecursive); bool IsMyParent(CElement* pElement, bool bRecursive); - void ClearChildren(void); + void ClearChildren(); void GetDescendantsByType(std::vector& outResult, EElementType elementType); void GetDescendantsByTypeSlow(std::vector& outResult, uint uiTypeHash); template @@ -120,8 +120,8 @@ class CElement GetDescendantsByType((std::vector&)outResult, elementType); } - CMapEventManager* GetEventManager(void) { return m_pEventManager; }; - CElement* GetParentEntity(void) { return m_pParent; }; + CMapEventManager* GetEventManager() { return m_pEventManager; }; + CElement* GetParentEntity() { return m_pParent; }; CElement* SetParentObject(CElement* pParent, bool bUpdatePerPlayerEntities = true); @@ -130,10 +130,10 @@ class CElement bool CallEvent(const char* szName, const CLuaArguments& Arguments, CPlayer* pCaller = NULL); bool DeleteEvent(CLuaMain* pLuaMain, const char* szName, const CLuaFunctionRef& iLuaFunction = CLuaFunctionRef()); void DeleteEvents(CLuaMain* pLuaMain, bool bRecursive); - void DeleteAllEvents(void); + void DeleteAllEvents(); void ReadCustomData(CEvents* pEvents, CXMLNode& Node); - CCustomData* GetCustomDataPointer(void) { return m_pCustomData; } + CCustomData* GetCustomDataPointer() { return m_pCustomData; } CLuaArgument* GetCustomData(const char* szName, bool bInheritData, bool* pbIsSynced = NULL); CLuaArguments* GetAllCustomData(CLuaArguments* table); bool GetCustomDataString(const char* szName, char* pOut, size_t sizeBuffer, bool bInheritData); @@ -148,21 +148,21 @@ class CElement void CleanUpForVM(CLuaMain* pLuaMain, bool bRecursive); - unsigned int CountChildren(void) { return static_cast(m_Children.size()); }; - CChildListType ::const_iterator IterBegin(void) { return m_Children.begin(); }; - CChildListType ::const_iterator IterEnd(void) { return m_Children.end(); }; - CChildListType ::const_reverse_iterator IterReverseBegin(void) { return m_Children.rbegin(); }; - CChildListType ::const_reverse_iterator IterReverseEnd(void) { return m_Children.rend(); }; - CElementListSnapshot* GetChildrenListSnapshot(void); + unsigned int CountChildren() { return static_cast(m_Children.size()); }; + CChildListType ::const_iterator IterBegin() { return m_Children.begin(); }; + CChildListType ::const_iterator IterEnd() { return m_Children.end(); }; + CChildListType ::const_reverse_iterator IterReverseBegin() { return m_Children.rbegin(); }; + CChildListType ::const_reverse_iterator IterReverseEnd() { return m_Children.rend(); }; + CElementListSnapshot* GetChildrenListSnapshot(); static uint GetTypeHashFromString(const SString& strTypeName); - EElementType GetType(void) { return m_iType; }; - virtual bool IsEntity(void) { return false; }; - unsigned int GetTypeHash(void) { return m_uiTypeHash; }; - const std::string& GetTypeName(void) { return m_strTypeName; }; + EElementType GetType() { return m_iType; }; + virtual bool IsEntity() { return false; }; + unsigned int GetTypeHash() { return m_uiTypeHash; }; + const std::string& GetTypeName() { return m_strTypeName; }; void SetTypeName(const std::string& strTypeName); - const std::string& GetName(void) { return m_strName; }; + const std::string& GetName() { return m_strName; }; void SetName(const std::string& strName) { m_strName = strName; }; bool LoadFromCustomData(CEvents* pEvents, CXMLNode& Node); @@ -170,37 +170,37 @@ class CElement void OnSubtreeAdd(CElement* pElement); void OnSubtreeRemove(CElement* pElement); - virtual void UpdatePerPlayer(void){}; - void UpdatePerPlayerEntities(void); + virtual void UpdatePerPlayer(){}; + void UpdatePerPlayerEntities(); void AddCollision(class CColShape* pShape) { m_Collisions.push_back(pShape); } void RemoveCollision(class CColShape* pShape) { m_Collisions.remove(pShape); } bool CollisionExists(class CColShape* pShape); - void RemoveAllCollisions(void); - std::list::iterator CollisionsBegin(void) { return m_Collisions.begin(); } - std::list::iterator CollisionsEnd(void) { return m_Collisions.end(); } + void RemoveAllCollisions(); + std::list::iterator CollisionsBegin() { return m_Collisions.begin(); } + std::list::iterator CollisionsEnd() { return m_Collisions.end(); } - unsigned short GetDimension(void) { return m_usDimension; } + unsigned short GetDimension() { return m_usDimension; } void SetDimension(unsigned short usDimension) { m_usDimension = usDimension; } - class CClient* GetClient(void); + class CClient* GetClient(); - CElement* GetAttachedToElement(void) { return m_pAttachedTo; } + CElement* GetAttachedToElement() { return m_pAttachedTo; } virtual void AttachTo(CElement* pElement); virtual void GetAttachedOffsets(CVector& vecPosition, CVector& vecRotation); virtual void SetAttachedOffsets(CVector& vecPosition, CVector& vecRotation); void AddAttachedElement(CElement* pElement); void RemoveAttachedElement(CElement* pElement); - std::list::const_iterator AttachedElementsBegin(void) { return m_AttachedElements.begin(); } - std::list::const_iterator AttachedElementsEnd(void) { return m_AttachedElements.end(); } - const char* GetAttachToID(void) { return m_strAttachToID; } + std::list::const_iterator AttachedElementsBegin() { return m_AttachedElements.begin(); } + std::list::const_iterator AttachedElementsEnd() { return m_AttachedElements.end(); } + const char* GetAttachToID() { return m_strAttachToID; } bool IsElementAttached(CElement* pElement); - virtual bool IsAttachable(void); - virtual bool IsAttachToable(void); + virtual bool IsAttachable(); + virtual bool IsAttachToable(); void GetAttachedPosition(CVector& vecPosition); void GetAttachedRotation(CVector& vecRotation); - CElementGroup* GetElementGroup(void) { return m_pElementGroup; } + CElementGroup* GetElementGroup() { return m_pElementGroup; } void SetElementGroup(CElementGroup* elementGroup) { m_pElementGroup = elementGroup; } // This is used for realtime synced elements. Whenever a position/rotation change is @@ -209,28 +209,28 @@ class CElement // If this value doesn't match the value from the sync packet, the packet should be // ignored. Note that if this value is 0, all sync packets should be accepted. This is // so we don't need this byte when the element is created first. - unsigned char GetSyncTimeContext(void) { return m_ucSyncTimeContext; }; - unsigned char GenerateSyncTimeContext(void); + unsigned char GetSyncTimeContext() { return m_ucSyncTimeContext; }; + unsigned char GenerateSyncTimeContext(); bool CanUpdateSync(unsigned char ucRemote); void AddOriginSourceUser(class CPed* pPed) { m_OriginSourceUsers.push_back(pPed); } void RemoveOriginSourceUser(class CPed* pPed) { m_OriginSourceUsers.remove(pPed); } - unsigned char GetInterior(void) { return m_ucInterior; } + unsigned char GetInterior() { return m_ucInterior; } void SetInterior(unsigned char ucInterior) { m_ucInterior = ucInterior; } - bool IsDoubleSided(void) { return m_bDoubleSided; } + bool IsDoubleSided() { return m_bDoubleSided; } void SetDoubleSided(bool bDoubleSided) { m_bDoubleSided = bDoubleSided; } // Spatial database - virtual CSphere GetWorldBoundingSphere(void); - virtual void UpdateSpatialData(void); + virtual CSphere GetWorldBoundingSphere(); + virtual void UpdateSpatialData(); - bool IsCallPropagationEnabled(void) { return m_bCallPropagationEnabled; } + bool IsCallPropagationEnabled() { return m_bCallPropagationEnabled; } void SetCallPropagationEnabled(bool bEnabled) { m_bCallPropagationEnabled = bEnabled; } protected: - CElement* GetRootElement(void); + CElement* GetRootElement(); virtual bool ReadSpecialData(const int iLine) = 0; CElement* FindChildIndex(const char* szName, unsigned int uiIndex, unsigned int& uiCurrentIndex, bool bRecursive); diff --git a/Server/mods/deathmatch/logic/CElementDeleter.cpp b/Server/mods/deathmatch/logic/CElementDeleter.cpp index 64918fae026..f046b4b4b35 100644 --- a/Server/mods/deathmatch/logic/CElementDeleter.cpp +++ b/Server/mods/deathmatch/logic/CElementDeleter.cpp @@ -40,7 +40,7 @@ void CElementDeleter::Delete(class CElement* pElement, bool bUnlink, bool bUpdat } } -void CElementDeleter::DoDeleteAll(void) +void CElementDeleter::DoDeleteAll() { // This depends on CElementDeleter::Unreference() being called in ~CElement() while (!m_List.empty()) diff --git a/Server/mods/deathmatch/logic/CElementDeleter.h b/Server/mods/deathmatch/logic/CElementDeleter.h index 6507db765a1..311819ecf2d 100644 --- a/Server/mods/deathmatch/logic/CElementDeleter.h +++ b/Server/mods/deathmatch/logic/CElementDeleter.h @@ -16,10 +16,10 @@ class CElementDeleter { public: - ~CElementDeleter(void) { DoDeleteAll(); }; + ~CElementDeleter() { DoDeleteAll(); }; void Delete(class CElement* pElement, bool bUnlink = true, bool bUpdatePerPlayerEntities = true); - void DoDeleteAll(void); + void DoDeleteAll(); bool IsBeingDeleted(class CElement* pElement); void Unreference(CElement* pElement); diff --git a/Server/mods/deathmatch/logic/CElementGroup.cpp b/Server/mods/deathmatch/logic/CElementGroup.cpp index e22ef39db53..060f43e3a78 100644 --- a/Server/mods/deathmatch/logic/CElementGroup.cpp +++ b/Server/mods/deathmatch/logic/CElementGroup.cpp @@ -84,7 +84,7 @@ void CElementGroup::Remove(class CElement* element) m_elements.remove(element); } -unsigned int CElementGroup::GetCount(void) +unsigned int CElementGroup::GetCount() { return m_elements.size(); } diff --git a/Server/mods/deathmatch/logic/CElementGroup.h b/Server/mods/deathmatch/logic/CElementGroup.h index 800f76a8683..b7a6892ca71 100644 --- a/Server/mods/deathmatch/logic/CElementGroup.h +++ b/Server/mods/deathmatch/logic/CElementGroup.h @@ -24,8 +24,8 @@ class CElementGroup ~CElementGroup(); void Add(CElement* element); void Remove(CElement* element); - unsigned int GetCount(void); + unsigned int GetCount(); - CFastList::const_iterator IterBegin(void) { return m_elements.begin(); } - CFastList::const_iterator IterEnd(void) { return m_elements.end(); } + CFastList::const_iterator IterBegin() { return m_elements.begin(); } + CFastList::const_iterator IterEnd() { return m_elements.end(); } }; diff --git a/Server/mods/deathmatch/logic/CElementIDs.cpp b/Server/mods/deathmatch/logic/CElementIDs.cpp index 51608de7556..2f757e10827 100644 --- a/Server/mods/deathmatch/logic/CElementIDs.cpp +++ b/Server/mods/deathmatch/logic/CElementIDs.cpp @@ -16,7 +16,7 @@ using namespace std; CStack CElementIDs::m_UniqueIDs; SFixedArray CElementIDs::m_Elements; -void CElementIDs::Initialize(void) +void CElementIDs::Initialize() { memset(&m_Elements[0], 0, sizeof(m_Elements)); } diff --git a/Server/mods/deathmatch/logic/CElementIDs.h b/Server/mods/deathmatch/logic/CElementIDs.h index fde0cac5fa0..cd296e77a52 100644 --- a/Server/mods/deathmatch/logic/CElementIDs.h +++ b/Server/mods/deathmatch/logic/CElementIDs.h @@ -16,7 +16,7 @@ class CElementIDs { public: - static void Initialize(void); + static void Initialize(); static ElementID PopUniqueID(CElement* pElement); static void PushUniqueID(ElementID ID); diff --git a/Server/mods/deathmatch/logic/CEvents.cpp b/Server/mods/deathmatch/logic/CEvents.cpp index 83e99f7f126..62ac3bc5dcb 100644 --- a/Server/mods/deathmatch/logic/CEvents.cpp +++ b/Server/mods/deathmatch/logic/CEvents.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CEvents::CEvents(void) +CEvents::CEvents() { m_bWasEventCancelled = false; m_bEventCancelled = false; @@ -94,7 +94,7 @@ SEvent* CEvents::Get(const char* szName) return NULL; } -void CEvents::RemoveAllEvents(void) +void CEvents::RemoveAllEvents() { // Delete all items CFastHashMap::const_iterator iter = m_EventHashMap.begin(); @@ -108,7 +108,7 @@ void CEvents::RemoveAllEvents(void) m_EventHashMap.clear(); } -void CEvents::PreEventPulse(void) +void CEvents::PreEventPulse() { m_CancelledList.push_back(m_bEventCancelled); m_bEventCancelled = false; @@ -116,7 +116,7 @@ void CEvents::PreEventPulse(void) m_strLastError = ""; } -void CEvents::PostEventPulse(void) +void CEvents::PostEventPulse() { m_bWasEventCancelled = m_bEventCancelled; m_bEventCancelled = m_CancelledList.back() ? true : false; @@ -134,12 +134,12 @@ void CEvents::CancelEvent(bool bCancelled, const char* szReason) m_strLastError = SStringX(szReason); } -bool CEvents::WasEventCancelled(void) +bool CEvents::WasEventCancelled() { return m_bWasEventCancelled; } -const char* CEvents::GetLastError(void) +const char* CEvents::GetLastError() { return m_strLastError; } diff --git a/Server/mods/deathmatch/logic/CEvents.h b/Server/mods/deathmatch/logic/CEvents.h index a089699397f..e64304661d7 100644 --- a/Server/mods/deathmatch/logic/CEvents.h +++ b/Server/mods/deathmatch/logic/CEvents.h @@ -26,8 +26,8 @@ struct SEvent class CEvents { public: - CEvents(void); - ~CEvents(void) { RemoveAllEvents(); }; + CEvents(); + ~CEvents() { RemoveAllEvents(); }; bool AddEvent(const char* szName, const char* szArguments, class CLuaMain* pLuaMain, bool bAllowRemoteTrigger); void RemoveEvent(SEvent* pEvent); @@ -37,19 +37,19 @@ class CEvents bool Exists(const char* szName) { return Get(szName) != NULL; }; SEvent* Get(const char* szName); - CFastHashMap::const_iterator IterBegin(void) { return m_EventHashMap.begin(); }; - CFastHashMap::const_iterator IterEnd(void) { return m_EventHashMap.end(); }; + CFastHashMap::const_iterator IterBegin() { return m_EventHashMap.begin(); }; + CFastHashMap::const_iterator IterEnd() { return m_EventHashMap.end(); }; - void PreEventPulse(void); - void PostEventPulse(void); + void PreEventPulse(); + void PostEventPulse(); void CancelEvent(bool bCancelled = true); void CancelEvent(bool bCancelled, const char* szReason); - bool WasEventCancelled(void); - const char* GetLastError(void); + bool WasEventCancelled(); + const char* GetLastError(); private: - void RemoveAllEvents(void); + void RemoveAllEvents(); CFastHashMap m_EventHashMap; diff --git a/Server/mods/deathmatch/logic/CGame.cpp b/Server/mods/deathmatch/logic/CGame.cpp index 0e460b0c0e7..084697a71eb 100644 --- a/Server/mods/deathmatch/logic/CGame.cpp +++ b/Server/mods/deathmatch/logic/CGame.cpp @@ -88,7 +88,7 @@ void sighandler(int sig) } #endif -CGame::CGame(void) : m_FloodProtect(4, 30000, 30000) // Max of 4 connections per 30 seconds, then 30 second ignore +CGame::CGame() : m_FloodProtect(4, 30000, 30000) // Max of 4 connections per 30 seconds, then 30 second ignore { // Set our global pointer g_pGame = this; @@ -206,7 +206,7 @@ CGame::CGame(void) : m_FloodProtect(4, 30000, 30000) // Max of 4 conn pthread_mutex_init(&mutexhttp, NULL); } -void CGame::ResetMapInfo(void) +void CGame::ResetMapInfo() { // Add variables to get reset in resetMapInfo here m_fGravity = 0.008f; @@ -243,7 +243,7 @@ void CGame::ResetMapInfo(void) g_pGame->SetHasMoonSize(false); } -CGame::~CGame(void) +CGame::~CGame() { m_bBeingDeleted = true; @@ -370,7 +370,7 @@ void CGame::HandleInput(char* szCommand) Unlock(); } -void CGame::DoPulse(void) +void CGame::DoPulse() { // Lock the critical section so http server won't interrupt in the middle of our pulse Lock(); @@ -945,7 +945,7 @@ bool CGame::Start(int iArgumentCount, char* szArguments[]) return true; } -void CGame::Stop(void) +void CGame::Stop() { m_bServerFullyUp = false; @@ -960,7 +960,7 @@ void CGame::Stop(void) } // Handle logging output from the net module -void CGame::PrintLogOutputFromNetModule(void) +void CGame::PrintLogOutputFromNetModule() { std::vector lineList; SStringX(g_pRealNetServer->GetLogOutput()).Split("\n", lineList); @@ -969,7 +969,7 @@ void CGame::PrintLogOutputFromNetModule(void) CLogger::LogPrint(*iter + "\n"); } -void CGame::StartOpenPortsTest(void) +void CGame::StartOpenPortsTest() { if (m_pOpenPortsTester) m_pOpenPortsTester->Start(); @@ -1439,7 +1439,7 @@ void CGame::QuitPlayer(CPlayer& Player, CClient::eQuitReasons Reason, bool bSayI m_lightsyncManager.UnregisterPlayer(&Player); } -void CGame::AddBuiltInEvents(void) +void CGame::AddBuiltInEvents() { // Resource events m_Events.AddEvent("onResourcePreStart", "resource", NULL, false); @@ -3921,12 +3921,12 @@ void CGame::PlayerCompleteConnect(CPlayer* pPlayer) pPlayer->SetSpawned(true); } -void CGame::Lock(void) +void CGame::Lock() { pthread_mutex_lock(&mutexhttp); } -void CGame::Unlock(void) +void CGame::Unlock() { pthread_mutex_unlock(&mutexhttp); } @@ -3956,7 +3956,7 @@ void CGame::SetCloudsEnabled(bool bEnabled) { m_bCloudsEnabled = bEnabled; } -bool CGame::GetCloudsEnabled(void) +bool CGame::GetCloudsEnabled() { return m_bCloudsEnabled; } @@ -3981,7 +3981,7 @@ void CGame::SetJetpackWeaponEnabled(eWeaponType weaponType, bool bEnabled) // // Handle basic backup of databases and config files // -void CGame::HandleBackup(void) +void CGame::HandleBackup() { // Get backup vars SString strBackupPath = PathConform(m_pMainConfig->GetBackupPath()).TrimEnd(PATH_SEPERATOR); @@ -4138,7 +4138,7 @@ bool CGame::SendPacket(unsigned char ucPacketID, const NetServerPlayerID& player // // Optimization for latent sends // -void CGame::SendPacketBatchEnd(void) +void CGame::SendPacketBatchEnd() { if (m_bLatentSendsEnabled) GetLatentTransferManager()->AddSendBatchEnd(); @@ -4151,7 +4151,7 @@ void CGame::SendPacketBatchEnd(void) // Determine the state of bullet sync // ////////////////////////////////////////////////////////////////// -bool CGame::IsBulletSyncActive(void) +bool CGame::IsBulletSyncActive() { bool bConfigSaysEnable = m_pMainConfig->GetBulletSyncEnabled(); #if 0 // No auto bullet sync as there are some problems with it @@ -4252,7 +4252,7 @@ bool CGame::IsBelowRecommendedClient(const SString& strVersion) // Determine min client version setting to apply for connecting players // ////////////////////////////////////////////////////////////////// -SString CGame::CalculateMinClientRequirement(void) +SString CGame::CalculateMinClientRequirement() { if (g_pGame->IsBeingDeleted()) return ""; @@ -4362,7 +4362,7 @@ SString CGame::CalculateMinClientRequirement(void) // // Handle encryption of Windows crash dump files // -void CGame::HandleCrashDumpEncryption(void) +void CGame::HandleCrashDumpEncryption() { #ifdef WIN32 SString strDumpDirPath = g_pServerInterface->GetAbsolutePath(SERVER_DUMP_PATH); diff --git a/Server/mods/deathmatch/logic/CGame.h b/Server/mods/deathmatch/logic/CGame.h index 9f7758aacad..ac51f491d43 100644 --- a/Server/mods/deathmatch/logic/CGame.h +++ b/Server/mods/deathmatch/logic/CGame.h @@ -186,95 +186,95 @@ class CGame }; public: - CGame(void); - ~CGame(void); + CGame(); + ~CGame(); void GetTag(char* szInfoTag, int iInfoTag); void HandleInput(char* szCommand); - void DoPulse(void); + void DoPulse(); bool Start(int iArgumentCount, char* szArguments[]); - void Stop(void); + void Stop(); static bool StaticProcessPacket(unsigned char ucPacketID, const NetServerPlayerID& Socket, NetBitStreamInterface* BitStream, SNetExtraInfo* pNetExtraInfo); bool ProcessPacket(CPacket& Packet); void SetIsFinished(bool bFinished) { m_bIsFinished = bFinished; }; - bool IsFinished(void) { return m_bIsFinished; }; - - CMainConfig* GetConfig(void) { return m_pMainConfig; } - CHandlingManager* GetHandlingManager(void) { return m_pHandlingManager; } - CMapManager* GetMapManager(void) { return m_pMapManager; } - CPlayerManager* GetPlayerManager(void) { return m_pPlayerManager; } - CObjectManager* GetObjectManager(void) { return m_pObjectManager; } - CVehicleManager* GetVehicleManager(void) { return m_pVehicleManager; } - CTeamManager* GetTeamManager(void) { return m_pTeamManager; } - CUnoccupiedVehicleSync* GetUnoccupiedVehicleSync(void) { return m_pUnoccupiedVehicleSync; } - CPedSync* GetPedSync(void) { return m_pPedSync; } - CRegisteredCommands* GetRegisteredCommands(void) { return m_pRegisteredCommands; } + bool IsFinished() { return m_bIsFinished; }; + + CMainConfig* GetConfig() { return m_pMainConfig; } + CHandlingManager* GetHandlingManager() { return m_pHandlingManager; } + CMapManager* GetMapManager() { return m_pMapManager; } + CPlayerManager* GetPlayerManager() { return m_pPlayerManager; } + CObjectManager* GetObjectManager() { return m_pObjectManager; } + CVehicleManager* GetVehicleManager() { return m_pVehicleManager; } + CTeamManager* GetTeamManager() { return m_pTeamManager; } + CUnoccupiedVehicleSync* GetUnoccupiedVehicleSync() { return m_pUnoccupiedVehicleSync; } + CPedSync* GetPedSync() { return m_pPedSync; } + CRegisteredCommands* GetRegisteredCommands() { return m_pRegisteredCommands; } #ifdef WITH_OBJECT_SYNC - CObjectSync* GetObjectSync(void) { return m_pObjectSync; } + CObjectSync* GetObjectSync() { return m_pObjectSync; } #endif - CConsole* GetConsole(void) { return m_pConsole; } - CDatabaseManager* GetDatabaseManager(void) { return m_pDatabaseManager; } - CLuaCallbackManager* GetLuaCallbackManager(void) { return m_pLuaCallbackManager; } - CRegistryManager* GetRegistryManager(void) { return m_pRegistryManager; } - CRegistry* GetRegistry(void) { return m_pRegistry; } - CAccountManager* GetAccountManager(void) { return m_pAccountManager; } - CScriptDebugging* GetScriptDebugging(void) { return m_pScriptDebugging; } - CEvents* GetEvents(void) { return &m_Events; } - CColManager* GetColManager(void) { return m_pColManager; } - CLatentTransferManager* GetLatentTransferManager(void) { return m_pLatentTransferManager; } - CDebugHookManager* GetDebugHookManager(void) { return m_pDebugHookManager; } - CPedManager* GetPedManager(void) { return m_pPedManager; } - CResourceManager* GetResourceManager(void) { return m_pResourceManager; } - CMarkerManager* GetMarkerManager(void) { return m_pMarkerManager; } - CBlipManager* GetBlipManager(void) { return m_pBlipManager; } - CPickupManager* GetPickupManager(void) { return m_pPickupManager; } - CRadarAreaManager* GetRadarAreaManager(void) { return m_pRadarAreaManager; } - CGroups* GetGroups(void) { return m_pGroups; } - CElementDeleter* GetElementDeleter(void) { return &m_ElementDeleter; } - CConnectHistory* GetJoinFloodProtector(void) { return &m_FloodProtect; } - CHTTPD* GetHTTPD(void) { return m_pHTTPD; } - CSettings* GetSettings(void) { return m_pSettings; } - CAccessControlListManager* GetACLManager(void) { return m_pACLManager; } - CBanManager* GetBanManager(void) { return m_pBanManager; } - CRemoteCalls* GetRemoteCalls(void) { return m_pRemoteCalls; } - CZoneNames* GetZoneNames(void) { return m_pZoneNames; } - CClock* GetClock(void) { return m_pClock; } - CWaterManager* GetWaterManager(void) { return m_pWaterManager; } - CLightsyncManager* GetLightSyncManager(void) { return &m_lightsyncManager; } - CWeaponStatManager* GetWeaponStatManager(void) { return m_pWeaponStatsManager; } - CBuildingRemovalManager* GetBuildingRemovalManager(void) { return m_pBuildingRemovalManager; } - CCustomWeaponManager* GetCustomWeaponManager(void) { return m_pCustomWeaponManager; } - CFunctionUseLogger* GetFunctionUseLogger(void) { return m_pFunctionUseLogger; } - CMasterServerAnnouncer* GetMasterServerAnnouncer(void) { return m_pMasterServerAnnouncer; } - SharedUtil::CAsyncTaskScheduler* GetAsyncTaskScheduler(void) { return m_pAsyncTaskScheduler; } + CConsole* GetConsole() { return m_pConsole; } + CDatabaseManager* GetDatabaseManager() { return m_pDatabaseManager; } + CLuaCallbackManager* GetLuaCallbackManager() { return m_pLuaCallbackManager; } + CRegistryManager* GetRegistryManager() { return m_pRegistryManager; } + CRegistry* GetRegistry() { return m_pRegistry; } + CAccountManager* GetAccountManager() { return m_pAccountManager; } + CScriptDebugging* GetScriptDebugging() { return m_pScriptDebugging; } + CEvents* GetEvents() { return &m_Events; } + CColManager* GetColManager() { return m_pColManager; } + CLatentTransferManager* GetLatentTransferManager() { return m_pLatentTransferManager; } + CDebugHookManager* GetDebugHookManager() { return m_pDebugHookManager; } + CPedManager* GetPedManager() { return m_pPedManager; } + CResourceManager* GetResourceManager() { return m_pResourceManager; } + CMarkerManager* GetMarkerManager() { return m_pMarkerManager; } + CBlipManager* GetBlipManager() { return m_pBlipManager; } + CPickupManager* GetPickupManager() { return m_pPickupManager; } + CRadarAreaManager* GetRadarAreaManager() { return m_pRadarAreaManager; } + CGroups* GetGroups() { return m_pGroups; } + CElementDeleter* GetElementDeleter() { return &m_ElementDeleter; } + CConnectHistory* GetJoinFloodProtector() { return &m_FloodProtect; } + CHTTPD* GetHTTPD() { return m_pHTTPD; } + CSettings* GetSettings() { return m_pSettings; } + CAccessControlListManager* GetACLManager() { return m_pACLManager; } + CBanManager* GetBanManager() { return m_pBanManager; } + CRemoteCalls* GetRemoteCalls() { return m_pRemoteCalls; } + CZoneNames* GetZoneNames() { return m_pZoneNames; } + CClock* GetClock() { return m_pClock; } + CWaterManager* GetWaterManager() { return m_pWaterManager; } + CLightsyncManager* GetLightSyncManager() { return &m_lightsyncManager; } + CWeaponStatManager* GetWeaponStatManager() { return m_pWeaponStatsManager; } + CBuildingRemovalManager* GetBuildingRemovalManager() { return m_pBuildingRemovalManager; } + CCustomWeaponManager* GetCustomWeaponManager() { return m_pCustomWeaponManager; } + CFunctionUseLogger* GetFunctionUseLogger() { return m_pFunctionUseLogger; } + CMasterServerAnnouncer* GetMasterServerAnnouncer() { return m_pMasterServerAnnouncer; } + SharedUtil::CAsyncTaskScheduler* GetAsyncTaskScheduler() { return m_pAsyncTaskScheduler; } void JoinPlayer(CPlayer& Player); void InitialDataStream(CPlayer& Player); void QuitPlayer(CPlayer& Player, CClient::eQuitReasons Reason = CClient::QUIT_QUIT, bool bSayInConsole = true, const char* szKickReason = "None", const char* szResponsiblePlayer = "None"); - class CLuaManager* GetLuaManager(void) { return m_pLuaManager; }; + class CLuaManager* GetLuaManager() { return m_pLuaManager; }; - float GetGravity(void) { return m_fGravity; } + float GetGravity() { return m_fGravity; } void SetGravity(float fGravity) { m_fGravity = fGravity; } - unsigned char GetTrafficLightState(void) { return m_ucTrafficLightState; } + unsigned char GetTrafficLightState() { return m_ucTrafficLightState; } void SetTrafficLightState(unsigned char ucState) { m_ucTrafficLightState = ucState; } - bool GetTrafficLightsLocked(void) { return m_bTrafficLightsLocked; } + bool GetTrafficLightsLocked() { return m_bTrafficLightsLocked; } void SetTrafficLightsLocked(bool bLocked) { m_bTrafficLightsLocked = bLocked; } - float GetJetpackMaxHeight(void) { return m_fJetpackMaxHeight; } + float GetJetpackMaxHeight() { return m_fJetpackMaxHeight; } void SetJetpackMaxHeight(float fMaxHeight) { m_fJetpackMaxHeight = fMaxHeight; } - float GetGameSpeed(void) { return m_fGameSpeed; } + float GetGameSpeed() { return m_fGameSpeed; } void SetGameSpeed(float fGameSpeed) { m_fGameSpeed = fGameSpeed; } - bool HasSkyGradient(void) { return m_bHasSkyGradient; } + bool HasSkyGradient() { return m_bHasSkyGradient; } void SetHasSkyGradient(bool bHasSkyGradient) { m_bHasSkyGradient = bHasSkyGradient; } void GetSkyGradient(unsigned char& ucTR, unsigned char& ucTG, unsigned char& ucTB, unsigned char& ucBR, unsigned char& ucBG, unsigned char& ucBB) @@ -296,16 +296,16 @@ class CGame m_ucSkyGradientBB = ucBB; } - bool HasHeatHaze(void) { return m_bHasHeatHaze; } + bool HasHeatHaze() { return m_bHasHeatHaze; } void SetHasHeatHaze(bool bHasHeatHaze) { m_bHasHeatHaze = bHasHeatHaze; } void GetHeatHaze(SHeatHazeSettings& heatHazeSettings) { heatHazeSettings = m_HeatHazeSettings; } void SetHeatHaze(const SHeatHazeSettings& heatHazeSettings) { m_HeatHazeSettings = heatHazeSettings; } - bool GetInteriorSoundsEnabled(void) { return m_bInteriorSoundsEnabled; } + bool GetInteriorSoundsEnabled() { return m_bInteriorSoundsEnabled; } void SetInteriorSoundsEnabled(bool bEnable) { m_bInteriorSoundsEnabled = bEnable; } - bool HasWaterColor(void) { return m_bOverrideWaterColor; } + bool HasWaterColor() { return m_bOverrideWaterColor; } void SetHasWaterColor(bool bOverrideWaterColor) { m_bOverrideWaterColor = bOverrideWaterColor; } void GetWaterColor(unsigned char& ucRed, unsigned char& ucGreen, unsigned char& ucBlue, unsigned char& ucAlpha) @@ -323,19 +323,19 @@ class CGame m_ucWaterAlpha = ucAlpha; } - bool HasRainLevel(void) { return m_bOverrideRainLevel; } + bool HasRainLevel() { return m_bOverrideRainLevel; } void SetHasRainLevel(bool bOverrideRainLevel) { m_bOverrideRainLevel = bOverrideRainLevel; } - float GetRainLevel(void) { return m_fRainLevel; } + float GetRainLevel() { return m_fRainLevel; } void SetRainLevel(float& fRainLevel) { m_fRainLevel = fRainLevel; } - bool HasSunSize(void) { return m_bOverrideSunSize; } + bool HasSunSize() { return m_bOverrideSunSize; } void SetHasSunSize(bool bOverrideSunSize) { m_bOverrideSunSize = bOverrideSunSize; } - float GetSunSize(void) { return m_fSunSize; } + float GetSunSize() { return m_fSunSize; } void SetSunSize(float& fSunSize) { m_fSunSize = fSunSize; } - bool HasSunColor(void) { return m_bOverrideSunColor; } + bool HasSunColor() { return m_bOverrideSunColor; } void SetHasSunColor(bool bOverrideSunColor) { m_bOverrideSunColor = bOverrideSunColor; } void GetSunColor(unsigned char& ucCoreR, unsigned char& ucCoreG, unsigned char& ucCoreB, unsigned char& ucCoronaR, unsigned char& ucCoronaG, @@ -359,7 +359,7 @@ class CGame m_ucSunCoronaB = ucCoronaB; } - bool HasWindVelocity(void) { return m_bOverrideWindVelocity; } + bool HasWindVelocity() { return m_bOverrideWindVelocity; } void SetHasWindVelocity(bool bOverrideWindVelocity) { m_bOverrideWindVelocity = bOverrideWindVelocity; } void GetWindVelocity(float& fVelX, float& fVelY, float& fVelZ) @@ -375,38 +375,38 @@ class CGame m_fWindVelZ = fVelZ; } - bool HasFarClipDistance(void) { return m_bOverrideFarClip; } + bool HasFarClipDistance() { return m_bOverrideFarClip; } void SetHasFarClipDistance(bool bOverrideFarClip) { m_bOverrideFarClip = bOverrideFarClip; } - float GetFarClipDistance(void) { return m_fFarClipDistance; } + float GetFarClipDistance() { return m_fFarClipDistance; } void SetFarClipDistance(float& fFarClipDistance) { m_fFarClipDistance = fFarClipDistance; } - bool HasFogDistance(void) { return m_bOverrideFogDistance; } + bool HasFogDistance() { return m_bOverrideFogDistance; } void SetHasFogDistance(bool bOverrideFogDistance) { m_bOverrideFogDistance = bOverrideFogDistance; } - float GetFogDistance(void) { return m_fFogDistance; } + float GetFogDistance() { return m_fFogDistance; } void SetFogDistance(float& fFogDistance) { m_fFogDistance = fFogDistance; } - float GetAircraftMaxHeight(void) { return m_fAircraftMaxHeight; } + float GetAircraftMaxHeight() { return m_fAircraftMaxHeight; } void SetAircraftMaxHeight(float fMaxHeight) { m_fAircraftMaxHeight = fMaxHeight; } - float GetAircraftMaxVelocity(void) { return m_fAircraftMaxVelocity; } + float GetAircraftMaxVelocity() { return m_fAircraftMaxVelocity; } void SetAircraftMaxVelocity(float fVelocity) { m_fAircraftMaxVelocity = fVelocity; m_fAircraftMaxVelocity_Sq = fVelocity * fVelocity; } - bool GetOcclusionsEnabled(void) { return m_bOcclusionsEnabled; } + bool GetOcclusionsEnabled() { return m_bOcclusionsEnabled; } void SetOcclusionsEnabled(bool bOcclusionsEnabled) { m_bOcclusionsEnabled = bOcclusionsEnabled; } - SGarageStates& GetGarageStates(void) { return m_bGarageStates; } + SGarageStates& GetGarageStates() { return m_bGarageStates; } - void Lock(void); - void Unlock(void); + void Lock(); + void Unlock(); - bool IsBeingDeleted(void) { return m_bBeingDeleted; } - void ResetMapInfo(void); + bool IsBeingDeleted() { return m_bBeingDeleted; } + void ResetMapInfo(); void SetGlitchEnabled(const std::string& strGlitch, bool bEnabled); bool IsGlitchEnabled(const std::string& strGlitch); @@ -415,49 +415,49 @@ class CGame bool IsGlitch(const std::string& strGlitch) { return m_GlitchNames.count(strGlitch) > 0; } void SetCloudsEnabled(bool bEnabled); - bool GetCloudsEnabled(void); + bool GetCloudsEnabled(); void SetJetpackWeaponEnabled(eWeaponType weaponType, bool bEnabled); bool GetJetpackWeaponEnabled(eWeaponType weaponType); - bool HasMoonSize(void) { return m_bOverrideMoonSize; } + bool HasMoonSize() { return m_bOverrideMoonSize; } void SetHasMoonSize(bool bOverrideMoonSize) { m_bOverrideMoonSize = bOverrideMoonSize; } - int GetMoonSize(void) { return m_iMoonSize; } + int GetMoonSize() { return m_iMoonSize; } void SetMoonSize(int iMoonSize) { m_iMoonSize = iMoonSize; } - void PrintLogOutputFromNetModule(void); - void StartOpenPortsTest(void); + void PrintLogOutputFromNetModule(); + void StartOpenPortsTest(); - bool IsServerFullyUp(void) { return m_bServerFullyUp; } + bool IsServerFullyUp() { return m_bServerFullyUp; } - ushort GetServerFPS(void) { return m_usFPS; } - int GetSyncFPS(void) { return m_iSyncFPS; } + ushort GetServerFPS() { return m_usFPS; } + int GetSyncFPS() { return m_iSyncFPS; } void SetSyncFPS(int iSyncFPS) { m_iSyncFPS = iSyncFPS; } - void HandleBackup(void); - void HandleCrashDumpEncryption(void); + void HandleBackup(); + void HandleCrashDumpEncryption(); void EnableLatentSends(bool bEnabled, int iBandwidth = 0, CLuaMain* pLuaMain = NULL, ushort usResourceNetId = 0xFFFF); void SendPacketBatchBegin(unsigned char ucPacketId, NetBitStreamInterface* pBitStream); bool SendPacket(unsigned char ucPacketID, const NetServerPlayerID& playerID, NetBitStreamInterface* pBitStream, bool bBroadcast, NetServerPacketPriority packetPriority, NetServerPacketReliability packetReliability, ePacketOrdering packetOrdering = PACKET_ORDERING_DEFAULT); - void SendPacketBatchEnd(void); + void SendPacketBatchEnd(); - bool IsBulletSyncActive(void); + bool IsBulletSyncActive(); void SendSyncSettings(CPlayer* pPlayer = NULL); - SString CalculateMinClientRequirement(void); + SString CalculateMinClientRequirement(); bool IsBelowMinimumClient(const SString& strVersion); bool IsBelowRecommendedClient(const SString& strVersion); - void ApplyAseSetting(void); - bool IsUsingMtaServerConf(void) { return m_bUsingMtaServerConf; } + void ApplyAseSetting(); + bool IsUsingMtaServerConf() { return m_bUsingMtaServerConf; } void SetDevelopmentMode(bool enabled) { m_DevelopmentModeEnabled = enabled; } bool GetDevelopmentMode() { return m_DevelopmentModeEnabled; } private: - void AddBuiltInEvents(void); + void AddBuiltInEvents(); void RelayPlayerPuresync(class CPacket& Packet); void RelayNearbyPacket(class CPacket& Packet); diff --git a/Server/mods/deathmatch/logic/CGroups.cpp b/Server/mods/deathmatch/logic/CGroups.cpp index c99f505d913..89d294043db 100644 --- a/Server/mods/deathmatch/logic/CGroups.cpp +++ b/Server/mods/deathmatch/logic/CGroups.cpp @@ -34,7 +34,7 @@ void CGroups::Delete(CDummy* pDummy) delete pDummy; } -void CGroups::DeleteAll(void) +void CGroups::DeleteAll() { DeletePointersAndClearList(m_List); } diff --git a/Server/mods/deathmatch/logic/CGroups.h b/Server/mods/deathmatch/logic/CGroups.h index 4ca09f3eff8..d19829239d0 100644 --- a/Server/mods/deathmatch/logic/CGroups.h +++ b/Server/mods/deathmatch/logic/CGroups.h @@ -20,17 +20,17 @@ class CGroups friend class CDummy; public: - CGroups(void) {} - ~CGroups(void) { DeleteAll(); } + CGroups() {} + ~CGroups() { DeleteAll(); } CDummy* Create(CElement* pParent); CDummy* CreateFromXML(CElement* pParent, CXMLNode& Node, CEvents* pEvents); void Delete(CDummy* pDummy); - void DeleteAll(void); + void DeleteAll(); - list::const_iterator IterBegin(void) { return m_List.begin(); } - list::const_iterator IterEnd(void) { return m_List.end(); } + list::const_iterator IterBegin() { return m_List.begin(); } + list::const_iterator IterEnd() { return m_List.end(); } private: void AddToList(CDummy* pDummy) { m_List.push_back(pDummy); }; diff --git a/Server/mods/deathmatch/logic/CHTTPD.cpp b/Server/mods/deathmatch/logic/CHTTPD.cpp index 2260a6f428c..38a036dc558 100644 --- a/Server/mods/deathmatch/logic/CHTTPD.cpp +++ b/Server/mods/deathmatch/logic/CHTTPD.cpp @@ -15,7 +15,7 @@ extern CGame* g_pGame; -CHTTPD::CHTTPD(void) +CHTTPD::CHTTPD() : m_BruteForceProtect(4, 30000, 60000 * 5) // Max of 4 attempts per 30 seconds, then 5 minute ignore , m_HttpDosProtect(0, 0, 0) @@ -39,7 +39,7 @@ CHTTPD::~CHTTPD() StopHTTPD(); } -bool CHTTPD::StopHTTPD(void) +bool CHTTPD::StopHTTPD() { // Stop the server if we started it if (m_bStartedServer) @@ -259,7 +259,7 @@ CAccount* CHTTPD::CheckAuthentication(HttpRequest* ipoHttpRequest) } // Called from worker thread. Careful now. -void CHTTPD::HttpPulse(void) +void CHTTPD::HttpPulse() { std::lock_guard guard(m_mutexLoggedInMap); diff --git a/Server/mods/deathmatch/logic/CHTTPD.h b/Server/mods/deathmatch/logic/CHTTPD.h index bff82949b7b..2a6119d0858 100644 --- a/Server/mods/deathmatch/logic/CHTTPD.h +++ b/Server/mods/deathmatch/logic/CHTTPD.h @@ -21,19 +21,19 @@ class CHTTPD : public EHS { public: - CHTTPD(void); // start the initial server + CHTTPD(); // start the initial server ~CHTTPD(); // EHS interface HttpResponse* RouteRequest(HttpRequest* ipoHttpRequest); ResponseCode HandleRequest(HttpRequest* ipoHttpRequest, HttpResponse* ipoHttpResponse); - void HttpPulse(void); + void HttpPulse(); bool ShouldAllowConnection(const char* szAddress); // CHTTPD methods bool StartHTTPD(const char* szIP, unsigned int port); - bool StopHTTPD(void); + bool StopHTTPD(); void SetResource(CResource* resource) { m_resource = resource; } - CResource* GetResource(void) { return m_resource; } + CResource* GetResource() { return m_resource; } class CAccount* CheckAuthentication(HttpRequest* ipoHttpRequest); void SetDefaultResource(const char* szResourceName) { m_strDefaultResourceName = szResourceName ? szResourceName : ""; } ResponseCode RequestLogin(HttpRequest* ipoHttpRequest, HttpResponse* ipoHttpResponse); diff --git a/Server/mods/deathmatch/logic/CHandlingEntry.h b/Server/mods/deathmatch/logic/CHandlingEntry.h index c8052c56374..4dd866baac6 100644 --- a/Server/mods/deathmatch/logic/CHandlingEntry.h +++ b/Server/mods/deathmatch/logic/CHandlingEntry.h @@ -96,60 +96,60 @@ class CHandlingEntry }; // Constructor for creatable dummy entries - CHandlingEntry(void){}; + CHandlingEntry(){}; // Constructor for original entries CHandlingEntry(tHandlingData* pOriginal); - ~CHandlingEntry(void){}; + ~CHandlingEntry(){}; // Use this to copy data from an another handling class to this void ApplyHandlingData(const CHandlingEntry* pData); // Get functions - tHandlingData GetHandlingData(void) { return m_Handling; }; - float GetMass(void) const { return m_Handling.fMass; }; - float GetTurnMass(void) const { return m_Handling.fTurnMass; }; - float GetDragCoeff(void) const { return m_Handling.fDragCoeff; }; - const CVector& GetCenterOfMass(void) const { return m_Handling.vecCenterOfMass; }; - - unsigned int GetPercentSubmerged(void) const { return m_Handling.uiPercentSubmerged; }; - float GetTractionMultiplier(void) const { return m_Handling.fTractionMultiplier; }; - - eDriveType GetCarDriveType(void) const { return static_cast(m_Handling.Transmission.ucDriveType); }; - eEngineType GetCarEngineType(void) const { return static_cast(m_Handling.Transmission.ucEngineType); }; - unsigned char GetNumberOfGears(void) const { return m_Handling.Transmission.ucNumberOfGears; }; - - float GetEngineAcceleration(void) const { return m_Handling.Transmission.fEngineAcceleration; }; - float GetEngineInertia(void) const { return m_Handling.Transmission.fEngineInertia; }; - float GetMaxVelocity(void) const { return m_Handling.Transmission.fMaxVelocity; }; - - float GetBrakeDeceleration(void) const { return m_Handling.fBrakeDeceleration; }; - float GetBrakeBias(void) const { return m_Handling.fBrakeBias; }; - bool GetABS(void) const { return m_Handling.bABS; }; - - float GetSteeringLock(void) const { return m_Handling.fSteeringLock; }; - float GetTractionLoss(void) const { return m_Handling.fTractionLoss; }; - float GetTractionBias(void) const { return m_Handling.fTractionBias; }; - - float GetSuspensionForceLevel(void) const { return m_Handling.fSuspensionForceLevel; }; - float GetSuspensionDamping(void) const { return m_Handling.fSuspensionDamping; }; - float GetSuspensionHighSpeedDamping(void) const { return m_Handling.fSuspensionHighSpdDamping; }; - float GetSuspensionUpperLimit(void) const { return m_Handling.fSuspensionUpperLimit; }; - float GetSuspensionLowerLimit(void) const { return m_Handling.fSuspensionLowerLimit; }; - float GetSuspensionFrontRearBias(void) const { return m_Handling.fSuspensionFrontRearBias; }; - float GetSuspensionAntiDiveMultiplier(void) const { return m_Handling.fSuspensionAntiDiveMultiplier; }; - - float GetCollisionDamageMultiplier(void) const { return m_Handling.fCollisionDamageMultiplier; }; - - unsigned int GetHandlingFlags(void) const { return m_Handling.uiHandlingFlags; }; - unsigned int GetModelFlags(void) const { return m_Handling.uiModelFlags; }; - float GetSeatOffsetDistance(void) const { return m_Handling.fSeatOffsetDistance; }; - unsigned int GetMonetary(void) const { return m_Handling.uiMonetary; }; - - eLightType GetHeadLight(void) const { return static_cast(m_Handling.ucHeadLight); }; - eLightType GetTailLight(void) const { return static_cast(m_Handling.ucTailLight); }; - unsigned char GetAnimGroup(void) const { return m_Handling.ucAnimGroup; }; + tHandlingData GetHandlingData() { return m_Handling; }; + float GetMass() const { return m_Handling.fMass; }; + float GetTurnMass() const { return m_Handling.fTurnMass; }; + float GetDragCoeff() const { return m_Handling.fDragCoeff; }; + const CVector& GetCenterOfMass() const { return m_Handling.vecCenterOfMass; }; + + unsigned int GetPercentSubmerged() const { return m_Handling.uiPercentSubmerged; }; + float GetTractionMultiplier() const { return m_Handling.fTractionMultiplier; }; + + eDriveType GetCarDriveType() const { return static_cast(m_Handling.Transmission.ucDriveType); }; + eEngineType GetCarEngineType() const { return static_cast(m_Handling.Transmission.ucEngineType); }; + unsigned char GetNumberOfGears() const { return m_Handling.Transmission.ucNumberOfGears; }; + + float GetEngineAcceleration() const { return m_Handling.Transmission.fEngineAcceleration; }; + float GetEngineInertia() const { return m_Handling.Transmission.fEngineInertia; }; + float GetMaxVelocity() const { return m_Handling.Transmission.fMaxVelocity; }; + + float GetBrakeDeceleration() const { return m_Handling.fBrakeDeceleration; }; + float GetBrakeBias() const { return m_Handling.fBrakeBias; }; + bool GetABS() const { return m_Handling.bABS; }; + + float GetSteeringLock() const { return m_Handling.fSteeringLock; }; + float GetTractionLoss() const { return m_Handling.fTractionLoss; }; + float GetTractionBias() const { return m_Handling.fTractionBias; }; + + float GetSuspensionForceLevel() const { return m_Handling.fSuspensionForceLevel; }; + float GetSuspensionDamping() const { return m_Handling.fSuspensionDamping; }; + float GetSuspensionHighSpeedDamping() const { return m_Handling.fSuspensionHighSpdDamping; }; + float GetSuspensionUpperLimit() const { return m_Handling.fSuspensionUpperLimit; }; + float GetSuspensionLowerLimit() const { return m_Handling.fSuspensionLowerLimit; }; + float GetSuspensionFrontRearBias() const { return m_Handling.fSuspensionFrontRearBias; }; + float GetSuspensionAntiDiveMultiplier() const { return m_Handling.fSuspensionAntiDiveMultiplier; }; + + float GetCollisionDamageMultiplier() const { return m_Handling.fCollisionDamageMultiplier; }; + + unsigned int GetHandlingFlags() const { return m_Handling.uiHandlingFlags; }; + unsigned int GetModelFlags() const { return m_Handling.uiModelFlags; }; + float GetSeatOffsetDistance() const { return m_Handling.fSeatOffsetDistance; }; + unsigned int GetMonetary() const { return m_Handling.uiMonetary; }; + + eLightType GetHeadLight() const { return static_cast(m_Handling.ucHeadLight); }; + eLightType GetTailLight() const { return static_cast(m_Handling.ucTailLight); }; + unsigned char GetAnimGroup() const { return m_Handling.ucAnimGroup; }; // Set functions void SetMass(float fMass) { m_Handling.fMass = fMass; }; diff --git a/Server/mods/deathmatch/logic/CHandlingManager.cpp b/Server/mods/deathmatch/logic/CHandlingManager.cpp index f73d4e67b9b..b6353ee63c5 100644 --- a/Server/mods/deathmatch/logic/CHandlingManager.cpp +++ b/Server/mods/deathmatch/logic/CHandlingManager.cpp @@ -16,7 +16,7 @@ SFixedArray CHandlingManager::m_OriginalHandlingData; SFixedArray CHandlingManager::m_pOriginalEntries; SFixedArray CHandlingManager::m_pModelEntries; -CHandlingManager::CHandlingManager(void) +CHandlingManager::CHandlingManager() { // Initialize all default handlings InitializeDefaultHandlings(); @@ -73,7 +73,7 @@ CHandlingManager::CHandlingManager(void) } //* needs testing by someone who knows more about handling -CHandlingManager::~CHandlingManager(void) +CHandlingManager::~CHandlingManager() { // Destroy all original handling entries for (int i = 0; i < HT_MAX; i++) @@ -88,7 +88,7 @@ CHandlingManager::~CHandlingManager(void) } } -CHandlingEntry* CHandlingManager::CreateHandlingData(void) +CHandlingEntry* CHandlingManager::CreateHandlingData() { CHandlingEntry* pHandlingEntry = new CHandlingEntry(); return pHandlingEntry; @@ -607,7 +607,7 @@ eHandlingTypes CHandlingManager::GetHandlingID(eVehicleTypes eModel) return HT_LANDSTAL; } -void CHandlingManager::InitializeDefaultHandlings(void) +void CHandlingManager::InitializeDefaultHandlings() { // Reset memset(&m_OriginalHandlingData[0], 0, sizeof(m_OriginalHandlingData)); diff --git a/Server/mods/deathmatch/logic/CHandlingManager.h b/Server/mods/deathmatch/logic/CHandlingManager.h index fe540eb82f0..bac0fbfd712 100644 --- a/Server/mods/deathmatch/logic/CHandlingManager.h +++ b/Server/mods/deathmatch/logic/CHandlingManager.h @@ -18,10 +18,10 @@ class CHandlingManager; class CHandlingManager { public: - CHandlingManager(void); - ~CHandlingManager(void); + CHandlingManager(); + ~CHandlingManager(); - CHandlingEntry* CreateHandlingData(void); + CHandlingEntry* CreateHandlingData(); bool ApplyHandlingData(eVehicleTypes eModel, CHandlingEntry* pEntry); @@ -38,7 +38,7 @@ class CHandlingManager std::map m_HandlingNames; private: - void InitializeDefaultHandlings(void); + void InitializeDefaultHandlings(); // Original handling data unaffected by handling.cfg changes static SFixedArray m_OriginalHandlingData; diff --git a/Server/mods/deathmatch/logic/CKeyBinds.cpp b/Server/mods/deathmatch/logic/CKeyBinds.cpp index 0c2ad857e5a..60371d8ac5e 100644 --- a/Server/mods/deathmatch/logic/CKeyBinds.cpp +++ b/Server/mods/deathmatch/logic/CKeyBinds.cpp @@ -170,7 +170,7 @@ CKeyBinds::CKeyBinds(CPlayer* pPlayer) m_pPlayer = pPlayer; } -CKeyBinds::~CKeyBinds(void) +CKeyBinds::~CKeyBinds() { Clear(); } @@ -609,7 +609,7 @@ bool CKeyBinds::IsMouse(const SBindableKey* pKey) return false; } -void CKeyBinds::RemoveDeletedBinds(void) +void CKeyBinds::RemoveDeletedBinds() { list::iterator iter = m_List.begin(); while (iter != m_List.end()) diff --git a/Server/mods/deathmatch/logic/CKeyBinds.h b/Server/mods/deathmatch/logic/CKeyBinds.h index a8ac78749ce..57257c68e9a 100644 --- a/Server/mods/deathmatch/logic/CKeyBinds.h +++ b/Server/mods/deathmatch/logic/CKeyBinds.h @@ -35,33 +35,33 @@ struct SBindableGTAControl class CKeyBind { public: - CKeyBind(void) + CKeyBind() { boundKey = NULL; luaMain = NULL; beingDeleted = false; } - virtual ~CKeyBind(void) {} - bool IsBeingDeleted(void) { return beingDeleted; } + virtual ~CKeyBind() {} + bool IsBeingDeleted() { return beingDeleted; } const SBindableKey* boundKey; CLuaMain* luaMain; bool beingDeleted; - virtual eKeyBindType GetType(void) = 0; + virtual eKeyBindType GetType() = 0; }; class CKeyBindWithState : public CKeyBind { public: - CKeyBindWithState(void) { bHitState = true; } + CKeyBindWithState() { bHitState = true; } bool bHitState; }; class CFunctionBind { public: - CFunctionBind(void) {} - ~CFunctionBind(void) {} + CFunctionBind() {} + ~CFunctionBind() {} CLuaFunctionRef m_iLuaFunction; CLuaArguments m_Arguments; }; @@ -69,13 +69,13 @@ class CFunctionBind class CKeyFunctionBind : public CKeyBindWithState, public CFunctionBind { public: - eKeyBindType GetType(void) { return KEY_BIND_FUNCTION; } + eKeyBindType GetType() { return KEY_BIND_FUNCTION; } }; class CControlFunctionBind : public CKeyBindWithState, public CFunctionBind { public: - eKeyBindType GetType(void) { return KEY_BIND_CONTROL_FUNCTION; } + eKeyBindType GetType() { return KEY_BIND_CONTROL_FUNCTION; } const SBindableGTAControl* boundControl; }; @@ -83,7 +83,7 @@ class CKeyBinds { public: CKeyBinds(class CPlayer* pPlayer); - ~CKeyBinds(void); + ~CKeyBinds(); static const SBindableKey* GetBindableFromKey(const char* szKey); static const SBindableGTAControl* GetBindableFromControl(const char* szControl); @@ -94,8 +94,8 @@ class CKeyBinds void Call(CKeyBind* pKeyBind); bool ProcessKey(const char* szKey, bool bHitState, eKeyBindType bindType); - std::list::iterator IterBegin(void) { return m_List.begin(); } - std::list::iterator IterEnd(void) { return m_List.end(); } + std::list::iterator IterBegin() { return m_List.begin(); } + std::list::iterator IterEnd() { return m_List.end(); } // Key-function bind funcs bool AddKeyFunction(const char* szKey, bool bHitState, CLuaMain* pLuaMain, const CLuaFunctionRef& iLuaFunction, CLuaArguments& Arguments); @@ -117,7 +117,7 @@ class CKeyBinds void RemoveAllKeys(CLuaMain* pLuaMain); static bool IsMouse(const SBindableKey* pKey); - void RemoveDeletedBinds(void); + void RemoveDeletedBinds(); protected: bool Remove(CKeyBind* pKeyBind); diff --git a/Server/mods/deathmatch/logic/CLanBroadcast.cpp b/Server/mods/deathmatch/logic/CLanBroadcast.cpp index 19763cfa920..5f0c01bd481 100644 --- a/Server/mods/deathmatch/logic/CLanBroadcast.cpp +++ b/Server/mods/deathmatch/logic/CLanBroadcast.cpp @@ -46,12 +46,12 @@ CLanBroadcast::CLanBroadcast(unsigned short usServerPort) m_strServerMessage = ss.str(); } -CLanBroadcast::~CLanBroadcast(void) +CLanBroadcast::~CLanBroadcast() { closesocket(m_Socket); } -void CLanBroadcast::DoPulse(void) +void CLanBroadcast::DoPulse() { sockaddr_in SockAddr; #ifndef WIN32 diff --git a/Server/mods/deathmatch/logic/CLanBroadcast.h b/Server/mods/deathmatch/logic/CLanBroadcast.h index b9b83a215ff..9d43b5ea758 100644 --- a/Server/mods/deathmatch/logic/CLanBroadcast.h +++ b/Server/mods/deathmatch/logic/CLanBroadcast.h @@ -32,11 +32,11 @@ class CLanBroadcast { public: CLanBroadcast(unsigned short usServerPort); - ~CLanBroadcast(void); + ~CLanBroadcast(); - void DoPulse(void); + void DoPulse(); - unsigned short GetPort(void) { return SERVER_LIST_BROADCAST_PORT; }; + unsigned short GetPort() { return SERVER_LIST_BROADCAST_PORT; }; private: unsigned int m_Socket; diff --git a/Server/mods/deathmatch/logic/CLogger.cpp b/Server/mods/deathmatch/logic/CLogger.cpp index bc0f4f8b5a0..95071b568ff 100644 --- a/Server/mods/deathmatch/logic/CLogger.cpp +++ b/Server/mods/deathmatch/logic/CLogger.cpp @@ -180,18 +180,18 @@ void CLogger::SetMinLogLevel(eLogLevel logLevel) // // Advanced animation to entertain user // -void CLogger::ProgressDotsBegin(void) +void CLogger::ProgressDotsBegin() { m_bPrintingDots = true; } -void CLogger::ProgressDotsUpdate(void) +void CLogger::ProgressDotsUpdate() { if (m_bPrintingDots) HandleLogPrint(false, "", ".", true, true, false); } -void CLogger::ProgressDotsEnd(void) +void CLogger::ProgressDotsEnd() { if (m_bPrintingDots) { @@ -200,7 +200,7 @@ void CLogger::ProgressDotsEnd(void) } } -void CLogger::BeginConsoleOutputCapture(void) +void CLogger::BeginConsoleOutputCapture() { m_CaptureBufferMutex.Lock(); m_strCaptureBuffer.clear(); @@ -208,7 +208,7 @@ void CLogger::BeginConsoleOutputCapture(void) m_CaptureBufferMutex.Unlock(); } -SString CLogger::EndConsoleOutputCapture(void) +SString CLogger::EndConsoleOutputCapture() { m_CaptureBufferMutex.Lock(); SString strTemp = m_strCaptureBuffer; diff --git a/Server/mods/deathmatch/logic/CLogger.h b/Server/mods/deathmatch/logic/CLogger.h index 4926145c249..80b4e819d91 100644 --- a/Server/mods/deathmatch/logic/CLogger.h +++ b/Server/mods/deathmatch/logic/CLogger.h @@ -41,12 +41,12 @@ class CLogger static void SetMinLogLevel(eLogLevel logLevel); - static void ProgressDotsBegin(void); - static void ProgressDotsUpdate(void); - static void ProgressDotsEnd(void); + static void ProgressDotsBegin(); + static void ProgressDotsUpdate(); + static void ProgressDotsEnd(); - static void BeginConsoleOutputCapture(void); - static SString EndConsoleOutputCapture(void); + static void BeginConsoleOutputCapture(); + static SString EndConsoleOutputCapture(); private: static void HandleLogPrint(bool bTimeStamp, const char* szPrePend, const char* szMessage, bool bToConsole, bool bToLogFile, bool bToAuthFile, diff --git a/Server/mods/deathmatch/logic/CMainConfig.cpp b/Server/mods/deathmatch/logic/CMainConfig.cpp index 1b479e7fa5d..0a656a21656 100644 --- a/Server/mods/deathmatch/logic/CMainConfig.cpp +++ b/Server/mods/deathmatch/logic/CMainConfig.cpp @@ -69,7 +69,7 @@ CMainConfig::CMainConfig(CConsole* pConsole, CLuaManager* pLuaMain) : CXMLConfig m_bSyncMapElementData = true; } -bool CMainConfig::Load(void) +bool CMainConfig::Load() { // Eventually destroy the previously loaded xml if (m_pFile) @@ -519,7 +519,7 @@ bool CMainConfig::Load(void) // // Set those settings! // -void CMainConfig::ApplyBandwidthReductionMode(void) +void CMainConfig::ApplyBandwidthReductionMode() { if (m_strBandwidthReductionMode == "maximum") { @@ -546,7 +546,7 @@ void CMainConfig::SetFakeLag(int iPacketLoss, int iExtraPing, int iExtraPingVary ApplyNetOptions(); } -void CMainConfig::ApplyNetOptions(void) +void CMainConfig::ApplyNetOptions() { m_NetOptions.netFilter.bValid = true; m_NetOptions.netFilter.bAutoFilter = m_bNetAutoFilter != 0; @@ -558,12 +558,12 @@ void CMainConfig::ApplyNetOptions(void) g_pNetServer->SetNetOptions(m_NetOptions); } -void CMainConfig::ApplyThreadNetEnabled(void) +void CMainConfig::ApplyThreadNetEnabled() { CSimControl::EnableSimSystem(m_bThreadNetEnabled, false); } -bool CMainConfig::LoadExtended(void) +bool CMainConfig::LoadExtended() { std::string strBuffer; int iTemp = 0, iResult = 0; @@ -795,7 +795,7 @@ bool CMainConfig::LoadExtended(void) return true; } -bool CMainConfig::Save(void) +bool CMainConfig::Save() { // If we have a file if (m_pFile && m_pRootNode) @@ -814,7 +814,7 @@ bool CMainConfig::Save(void) // Compare against default config and add missing nodes. // Returns true if nodes were added. // -bool CMainConfig::AddMissingSettings(void) +bool CMainConfig::AddMissingSettings() { // Only mtaserver.conf is currently supported if (!g_pGame->IsUsingMtaServerConf()) @@ -932,7 +932,7 @@ void CMainConfig::SetCommandLineParser(CCommandLineParser* pCommandLineParser) } } -SString CMainConfig::GetServerIP(void) +SString CMainConfig::GetServerIP() { std::string strServerIP; if (m_pCommandLineParser && m_pCommandLineParser->GetIP(strServerIP)) @@ -940,7 +940,7 @@ SString CMainConfig::GetServerIP(void) return SString(m_strServerIP).SplitLeft(","); } -SString CMainConfig::GetServerIPList(void) +SString CMainConfig::GetServerIPList() { std::string strServerIP; if (m_pCommandLineParser && m_pCommandLineParser->GetIP(strServerIP)) @@ -948,7 +948,7 @@ SString CMainConfig::GetServerIPList(void) return m_strServerIP; } -unsigned short CMainConfig::GetServerPort(void) +unsigned short CMainConfig::GetServerPort() { unsigned short usPort; if (m_pCommandLineParser && m_pCommandLineParser->GetPort(usPort)) @@ -956,17 +956,17 @@ unsigned short CMainConfig::GetServerPort(void) return m_usServerPort; } -unsigned int CMainConfig::GetHardMaxPlayers(void) +unsigned int CMainConfig::GetHardMaxPlayers() { return m_uiHardMaxPlayers; } -unsigned int CMainConfig::GetMaxPlayers(void) +unsigned int CMainConfig::GetMaxPlayers() { return std::min(GetHardMaxPlayers(), m_uiSoftMaxPlayers); } -unsigned short CMainConfig::GetHTTPPort(void) +unsigned short CMainConfig::GetHTTPPort() { unsigned short usHTTPPort; if (m_pCommandLineParser && m_pCommandLineParser->GetHTTPPort(usHTTPPort)) @@ -974,7 +974,7 @@ unsigned short CMainConfig::GetHTTPPort(void) return m_usHTTPPort; } -bool CMainConfig::IsVoiceEnabled(void) +bool CMainConfig::IsVoiceEnabled() { bool bDisabled; if (m_pCommandLineParser && m_pCommandLineParser->IsVoiceDisabled(bDisabled)) @@ -982,7 +982,7 @@ bool CMainConfig::IsVoiceEnabled(void) return m_bVoiceEnabled; } -int CMainConfig::GetPendingWorkToDoSleepTime(void) +int CMainConfig::GetPendingWorkToDoSleepTime() { if (m_iPendingWorkToDoSleepTime != -1) { @@ -999,7 +999,7 @@ int CMainConfig::GetPendingWorkToDoSleepTime(void) return 10; } -int CMainConfig::GetNoWorkToDoSleepTime(void) +int CMainConfig::GetNoWorkToDoSleepTime() { if (m_iNoWorkToDoSleepTime != -1) { @@ -1013,12 +1013,12 @@ int CMainConfig::GetNoWorkToDoSleepTime(void) return 10; } -void CMainConfig::NotifyDidBackup(void) +void CMainConfig::NotifyDidBackup() { m_bDidBackup = true; } -bool CMainConfig::ShouldCompactInternalDatabases(void) +bool CMainConfig::ShouldCompactInternalDatabases() { return (m_iCompactInternalDatabases == 1 && m_bDidBackup) || m_iCompactInternalDatabases == 2; } @@ -1403,7 +1403,7 @@ bool CMainConfig::SetSetting(const SString& strName, const SString& strValue, bo // Put some int settings into an array for referencing // ////////////////////////////////////////////////////////////////////// -const std::vector& CMainConfig::GetIntSettingList(void) +const std::vector& CMainConfig::GetIntSettingList() { static const SIntSetting settings[] = { // Set, save, min, def, max, name, variable, callback @@ -1449,19 +1449,19 @@ const std::vector& CMainConfig::GetIntSettingList(void) // Settings change callback // ////////////////////////////////////////////////////////////////////// -void CMainConfig::OnTickRateChange(void) +void CMainConfig::OnTickRateChange() { CStaticFunctionDefinitions::SendSyncIntervals(); g_pGame->SendSyncSettings(); g_pGame->CalculateMinClientRequirement(); } -void CMainConfig::OnAseSettingChange(void) +void CMainConfig::OnAseSettingChange() { g_pGame->ApplyAseSetting(); } -void CGame::ApplyAseSetting(void) +void CGame::ApplyAseSetting() { if (!m_pMainConfig->GetAseLanListenEnabled()) SAFE_DELETE(m_pLanBroadcast); diff --git a/Server/mods/deathmatch/logic/CMainConfig.h b/Server/mods/deathmatch/logic/CMainConfig.h index 058fb5341a1..b128632b2dd 100644 --- a/Server/mods/deathmatch/logic/CMainConfig.h +++ b/Server/mods/deathmatch/logic/CMainConfig.h @@ -22,7 +22,7 @@ class CMainConfig; #define MAX_MAP_NAME_LENGTH 64 class CMainConfig; -typedef void (CMainConfig::*PFN_SettingChangeCallback)(void); +typedef void (CMainConfig::*PFN_SettingChangeCallback)(); struct SIntSetting { @@ -42,87 +42,87 @@ class CMainConfig : public CXMLConfig ZERO_ON_NEW CMainConfig(CConsole* pConsole, class CLuaManager* pLuaMain); - bool Load(void); - bool LoadExtended(void); - bool Save(void); + bool Load(); + bool LoadExtended(); + bool Save(); - const std::string& GetServerName(void) { return m_strServerName; }; - SString GetServerIP(void); - SString GetServerIPList(void); - unsigned short GetServerPort(void); - unsigned int GetMaxPlayers(void); - unsigned int GetHardMaxPlayers(void); + const std::string& GetServerName() { return m_strServerName; }; + SString GetServerIP(); + SString GetServerIPList(); + unsigned short GetServerPort(); + unsigned int GetMaxPlayers(); + unsigned int GetHardMaxPlayers(); void SetSoftMaxPlayers(unsigned int v) { m_uiSoftMaxPlayers = v; } - bool IsHTTPEnabled(void) { return m_bHTTPEnabled; }; + bool IsHTTPEnabled() { return m_bHTTPEnabled; }; bool IsValidPassword(const char* szPassword); - bool HasPassword(void) { return !m_strPassword.empty(); }; - const std::string& GetPassword(void) { return m_strPassword; }; + bool HasPassword() { return !m_strPassword.empty(); }; + const std::string& GetPassword() { return m_strPassword; }; bool SetPassword(const char* szPassword, bool bSave); - bool IsVoiceEnabled(void); - unsigned int GetVoiceSampleRate(void) { return m_uiVoiceSampleRate; }; - unsigned int GetVoiceQuality(void) { return m_ucVoiceQuality; }; - unsigned int GetVoiceBitrate(void) { return m_uiVoiceBitrate; }; - - bool GetAseInternetPushEnabled(void) { return m_iAseMode == 2 && !IsFakeLagCommandEnabled(); } - bool GetAseInternetListenEnabled(void) { return m_iAseMode == 1 && !IsFakeLagCommandEnabled(); } - bool GetAseLanListenEnabled(void) { return m_bDontBroadcastLan ? false : true; } - unsigned short GetHTTPPort(void); - eHTTPDownloadType GetHTTPDownloadType(void) { return m_ucHTTPDownloadType; }; - const std::string& GetHTTPDownloadURL(void) { return m_strHTTPDownloadURL; }; - int GetHTTPMaxConnectionsPerClient(void) { return m_iHTTPMaxConnectionsPerClient; }; - int GetHTTPThreadCount(void) { return m_iHTTPThreadCount; }; - int GetHTTPDosThreshold(void) { return m_iHTTPDosThreshold; }; - const SString& GetHTTPDosExclude(void) { return m_strHTTPDosExclude; }; - int GetEnableClientChecks(void) { return m_iEnableClientChecks; }; - const std::string& GetLogFile(void) { return m_strLogFile; }; - const std::string& GetAuthFile(void) { return m_strAuthFile; }; - bool GetJoinFloodProtectionEnabled(void) { return m_bJoinFloodProtectionEnabled; }; - bool GetScriptDebugLogEnabled(void) { return m_bScriptDebugLogEnabled && !m_strScriptDebugLogFile.empty(); }; - const std::string& GetScriptDebugLogFile(void) { return m_strScriptDebugLogFile; }; - unsigned int GetScriptDebugLogLevel(void) { return m_uiScriptDebugLogLevel; }; - const std::string& GetAccessControlListFile(void) { return m_strAccessControlListFile; }; - bool GetSerialVerificationEnabled(void) { return m_bVerifySerials; }; + bool IsVoiceEnabled(); + unsigned int GetVoiceSampleRate() { return m_uiVoiceSampleRate; }; + unsigned int GetVoiceQuality() { return m_ucVoiceQuality; }; + unsigned int GetVoiceBitrate() { return m_uiVoiceBitrate; }; + + bool GetAseInternetPushEnabled() { return m_iAseMode == 2 && !IsFakeLagCommandEnabled(); } + bool GetAseInternetListenEnabled() { return m_iAseMode == 1 && !IsFakeLagCommandEnabled(); } + bool GetAseLanListenEnabled() { return m_bDontBroadcastLan ? false : true; } + unsigned short GetHTTPPort(); + eHTTPDownloadType GetHTTPDownloadType() { return m_ucHTTPDownloadType; }; + const std::string& GetHTTPDownloadURL() { return m_strHTTPDownloadURL; }; + int GetHTTPMaxConnectionsPerClient() { return m_iHTTPMaxConnectionsPerClient; }; + int GetHTTPThreadCount() { return m_iHTTPThreadCount; }; + int GetHTTPDosThreshold() { return m_iHTTPDosThreshold; }; + const SString& GetHTTPDosExclude() { return m_strHTTPDosExclude; }; + int GetEnableClientChecks() { return m_iEnableClientChecks; }; + const std::string& GetLogFile() { return m_strLogFile; }; + const std::string& GetAuthFile() { return m_strAuthFile; }; + bool GetJoinFloodProtectionEnabled() { return m_bJoinFloodProtectionEnabled; }; + bool GetScriptDebugLogEnabled() { return m_bScriptDebugLogEnabled && !m_strScriptDebugLogFile.empty(); }; + const std::string& GetScriptDebugLogFile() { return m_strScriptDebugLogFile; }; + unsigned int GetScriptDebugLogLevel() { return m_uiScriptDebugLogLevel; }; + const std::string& GetAccessControlListFile() { return m_strAccessControlListFile; }; + bool GetSerialVerificationEnabled() { return m_bVerifySerials; }; bool IsDisableAC(const char* szTagAC) { return MapContains(m_DisableComboACMap, szTagAC); }; bool IsEnableDiagnostic(const char* szTag) { return MapContains(m_EnableDiagnosticMap, szTag); }; - SString GetMinClientVersion(void) { return m_strMinClientVersion; } - const SString& GetRecommendedClientVersion(void) { return m_strRecommendedClientVersion; } - int GetMinClientVersionAutoUpdate(void) { return m_iMinClientVersionAutoUpdate; } - const SString& GetIdFile(void) { return m_strIdFile; } - bool GetThreadNetEnabled(void) { return m_bThreadNetEnabled; } - const SString& GetGlobalDatabasesPath(void) { return m_strGlobalDatabasesPath; } - const SString& GetSystemDatabasesPath(void) { return m_strSystemDatabasesPath; } - const SString& GetBackupPath(void) { return m_strBackupPath; } - int GetBackupInterval(void) { return m_iBackupInterval; } - int GetBackupAmount(void) { return m_iBackupAmount; } - void NotifyDidBackup(void); - bool ShouldCompactInternalDatabases(void); - unsigned short GetFPSLimit(void) { return m_usFPSLimit; }; + SString GetMinClientVersion() { return m_strMinClientVersion; } + const SString& GetRecommendedClientVersion() { return m_strRecommendedClientVersion; } + int GetMinClientVersionAutoUpdate() { return m_iMinClientVersionAutoUpdate; } + const SString& GetIdFile() { return m_strIdFile; } + bool GetThreadNetEnabled() { return m_bThreadNetEnabled; } + const SString& GetGlobalDatabasesPath() { return m_strGlobalDatabasesPath; } + const SString& GetSystemDatabasesPath() { return m_strSystemDatabasesPath; } + const SString& GetBackupPath() { return m_strBackupPath; } + int GetBackupInterval() { return m_iBackupInterval; } + int GetBackupAmount() { return m_iBackupAmount; } + void NotifyDidBackup(); + bool ShouldCompactInternalDatabases(); + unsigned short GetFPSLimit() { return m_usFPSLimit; }; bool SetFPSLimit(unsigned short usFPS, bool bSave); - int GetPendingWorkToDoSleepTime(void); - int GetNoWorkToDoSleepTime(void); - int GetServerLogicFpsLimit(void) { return m_iServerLogicFpsLimit; }; - const SString& GetDbLogFilename(void) { return m_strDbLogFilename; } - bool GetSyncMapElementData(void) const { return m_bSyncMapElementData; } + int GetPendingWorkToDoSleepTime(); + int GetNoWorkToDoSleepTime(); + int GetServerLogicFpsLimit() { return m_iServerLogicFpsLimit; }; + const SString& GetDbLogFilename() { return m_strDbLogFilename; } + bool GetSyncMapElementData() const { return m_bSyncMapElementData; } void SetSyncMapElementData(bool bOn) { m_bSyncMapElementData = bOn; } - bool GetBulletSyncEnabled(void) const { return m_bBulletSyncEnabled != 0; } - int GetVehExtrapolatePercent(void) const { return m_iVehExtrapolatePercent; } - int GetVehExtrapolatePingLimit(void) const { return m_iVehExtrapolatePingLimit; } - bool GetUseAltPulseOrder(void) const { return m_bUseAltPulseOrder != 0; } - const SString& GetLoadstringLogFilename(void) const { return m_strLoadstringLogFilename; } - bool GetLoadstringLogEnabled(void) const { return !m_strLoadstringLogFilename.empty(); } - bool GetCrashDumpUploadEnabled(void) const { return m_bCrashDumpUploadEnabled != 0; } - bool GetFilterDuplicateLogLinesEnabled(void) const { return m_bFilterDuplicateLogLinesEnabled != 0; } + bool GetBulletSyncEnabled() const { return m_bBulletSyncEnabled != 0; } + int GetVehExtrapolatePercent() const { return m_iVehExtrapolatePercent; } + int GetVehExtrapolatePingLimit() const { return m_iVehExtrapolatePingLimit; } + bool GetUseAltPulseOrder() const { return m_bUseAltPulseOrder != 0; } + const SString& GetLoadstringLogFilename() const { return m_strLoadstringLogFilename; } + bool GetLoadstringLogEnabled() const { return !m_strLoadstringLogFilename.empty(); } + bool GetCrashDumpUploadEnabled() const { return m_bCrashDumpUploadEnabled != 0; } + bool GetFilterDuplicateLogLinesEnabled() const { return m_bFilterDuplicateLogLinesEnabled != 0; } bool IsAuthSerialGroup(const SString& strGroup) const { return ListContains(m_AuthSerialGroupList, strGroup); }; bool IsAuthSerialHttpIpException(const SString& strIp) const { return ListContains(m_AuthSerialHttpIpExceptionList, strIp); } - bool GetAuthSerialEnabled(void) const { return !m_AuthSerialGroupList.empty(); }; - bool GetAuthSerialHttpEnabled(void) const { return m_bAuthSerialHttpEnabled && GetAuthSerialEnabled(); }; - const std::vector& GetAuthSerialGroupList(void) const { return m_AuthSerialGroupList; } - const std::vector& GetAuthSerialHttpIpExceptionList(void) const { return m_AuthSerialHttpIpExceptionList; } - const std::vector& GetOwnerEmailAddressList(void) const { return m_OwnerEmailAddressList; } - bool IsDatabaseCredentialsProtectionEnabled(void) const { return m_bDatabaseCredentialsProtectionEnabled != 0; } - bool IsFakeLagCommandEnabled(void) const { return m_bFakeLagCommandEnabled != 0; } + bool GetAuthSerialEnabled() const { return !m_AuthSerialGroupList.empty(); }; + bool GetAuthSerialHttpEnabled() const { return m_bAuthSerialHttpEnabled && GetAuthSerialEnabled(); }; + const std::vector& GetAuthSerialGroupList() const { return m_AuthSerialGroupList; } + const std::vector& GetAuthSerialHttpIpExceptionList() const { return m_AuthSerialHttpIpExceptionList; } + const std::vector& GetOwnerEmailAddressList() const { return m_OwnerEmailAddressList; } + bool IsDatabaseCredentialsProtectionEnabled() const { return m_bDatabaseCredentialsProtectionEnabled != 0; } + bool IsFakeLagCommandEnabled() const { return m_bFakeLagCommandEnabled != 0; } SString GetSetting(const SString& configSetting); bool GetSetting(const SString& configSetting, SString& strValue); @@ -130,20 +130,20 @@ class CMainConfig : public CXMLConfig bool GetSettingTable(const SString& strName, CLuaArguments* outTable); void SetCommandLineParser(CCommandLineParser* pCommandLineParser); - void ApplyNetOptions(void); - void ApplyBandwidthReductionMode(void); - void ApplyThreadNetEnabled(void); + void ApplyNetOptions(); + void ApplyBandwidthReductionMode(); + void ApplyThreadNetEnabled(); void SetFakeLag(int iPacketLoss, int iExtraPing, int iExtraPingVary, int iKBPSLimit); - const SNetOptions& GetNetOptions(void) { return m_NetOptions; } + const SNetOptions& GetNetOptions() { return m_NetOptions; } - const std::vector& GetIntSettingList(void); - void OnTickRateChange(void); - void OnAseSettingChange(void); + const std::vector& GetIntSettingList(); + void OnTickRateChange(); + void OnAseSettingChange(); private: void RegisterCommand(const char* szName, FCommandHandler* pFunction, bool bRestricted); bool GetSettingTable(const SString& strName, const char** szAttribNames, uint uiNumAttribNames, CLuaArguments* outTable); - bool AddMissingSettings(void); + bool AddMissingSettings(); CConsole* m_pConsole; CLuaManager* m_pLuaManager; diff --git a/Server/mods/deathmatch/logic/CMapEvent.cpp b/Server/mods/deathmatch/logic/CMapEvent.cpp index c0d6af54d67..ddfa05ef03e 100644 --- a/Server/mods/deathmatch/logic/CMapEvent.cpp +++ b/Server/mods/deathmatch/logic/CMapEvent.cpp @@ -25,7 +25,7 @@ CMapEvent::CMapEvent(CLuaMain* pMain, const char* szName, const CLuaFunctionRef& m_strName.AssignLeft(szName, MAPEVENT_MAX_LENGTH_NAME); } -CMapEvent::~CMapEvent(void) +CMapEvent::~CMapEvent() { } diff --git a/Server/mods/deathmatch/logic/CMapEvent.h b/Server/mods/deathmatch/logic/CMapEvent.h index 831743d513b..5d088fe09e7 100644 --- a/Server/mods/deathmatch/logic/CMapEvent.h +++ b/Server/mods/deathmatch/logic/CMapEvent.h @@ -21,11 +21,11 @@ class CMapEvent friend class CMapEventManager; public: - class CLuaMain* GetVM(void) { return m_pMain; }; - const SString& GetName(void) { return m_strName; }; - const CLuaFunctionRef& GetLuaFunction(void) { return m_iLuaFunction; }; - bool IsPropagated(void) { return m_bPropagated; } - bool IsBeingDestroyed(void) { return m_bBeingDestroyed; } + class CLuaMain* GetVM() { return m_pMain; }; + const SString& GetName() { return m_strName; }; + const CLuaFunctionRef& GetLuaFunction() { return m_iLuaFunction; }; + bool IsPropagated() { return m_bPropagated; } + bool IsBeingDestroyed() { return m_bBeingDestroyed; } void Call(const class CLuaArguments& Arguments); bool IsHigherPriorityThan(const CMapEvent* pOther); @@ -33,7 +33,7 @@ class CMapEvent private: CMapEvent(class CLuaMain* pMain, const char* szName, const CLuaFunctionRef& iLuaFunction, bool bPropagated, EEventPriorityType eventPriority, float fPriorityMod); - ~CMapEvent(void); + ~CMapEvent(); void SetBeingDestroyed(bool bBeingDestroyed) { m_bBeingDestroyed = bBeingDestroyed; } diff --git a/Server/mods/deathmatch/logic/CMapEventManager.cpp b/Server/mods/deathmatch/logic/CMapEventManager.cpp index 2bc9cdb4b1d..c19483ae600 100644 --- a/Server/mods/deathmatch/logic/CMapEventManager.cpp +++ b/Server/mods/deathmatch/logic/CMapEventManager.cpp @@ -11,13 +11,13 @@ #include "StdInc.h" -CMapEventManager::CMapEventManager(void) +CMapEventManager::CMapEventManager() { m_bIteratingList = false; m_bHasEvents = false; } -CMapEventManager::~CMapEventManager(void) +CMapEventManager::~CMapEventManager() { // If this happens while we're iterating the list, we're screwed assert(!m_bIteratingList); @@ -100,7 +100,7 @@ bool CMapEventManager::Delete(CLuaMain* pLuaMain, const char* szName, const CLua return bRemovedSomeone; } -void CMapEventManager::DeleteAll(void) +void CMapEventManager::DeleteAll() { // Delete all the events EventsIter iter = m_EventsMap.begin(); @@ -281,7 +281,7 @@ bool CMapEventManager::Call(const char* szName, const CLuaArguments& Arguments, return bCalled; } -void CMapEventManager::TakeOutTheTrash(void) +void CMapEventManager::TakeOutTheTrash() { // Loop through our trashcan deleting every item std::list::const_iterator iterTrash = m_TrashCan.begin(); diff --git a/Server/mods/deathmatch/logic/CMapEventManager.h b/Server/mods/deathmatch/logic/CMapEventManager.h index 0fbef8d43a1..f58be584d64 100644 --- a/Server/mods/deathmatch/logic/CMapEventManager.h +++ b/Server/mods/deathmatch/logic/CMapEventManager.h @@ -18,21 +18,21 @@ class CMapEventManager { public: - CMapEventManager(void); - ~CMapEventManager(void); + CMapEventManager(); + ~CMapEventManager(); bool Add(CLuaMain* pLuaMain, const char* szName, const CLuaFunctionRef& iLuaFunction, bool bPropagated, EEventPriorityType eventPriority, float fPriorityMod); bool Delete(CLuaMain* pLuaMain, const char* szName = NULL, const CLuaFunctionRef& iLuaFunction = CLuaFunctionRef()); - void DeleteAll(void); + void DeleteAll(); bool HandleExists(CLuaMain* pLuaMain, const char* szName, const CLuaFunctionRef& iLuaFunction); - bool HasEvents(void) const { return m_bHasEvents; } + bool HasEvents() const { return m_bHasEvents; } void GetHandles(CLuaMain* pLuaMain, const char* szName, lua_State* luaVM); bool Call(const char* szName, const CLuaArguments& Arguments, class CElement* pSource, class CElement* pThis, class CPlayer* pCaller = NULL); private: - void TakeOutTheTrash(void); + void TakeOutTheTrash(); void AddInternal(CMapEvent* pEvent); bool m_bHasEvents; diff --git a/Server/mods/deathmatch/logic/CMapManager.cpp b/Server/mods/deathmatch/logic/CMapManager.cpp index fc20d9a3f58..08e74f4d3cf 100644 --- a/Server/mods/deathmatch/logic/CMapManager.cpp +++ b/Server/mods/deathmatch/logic/CMapManager.cpp @@ -46,7 +46,7 @@ CMapManager::CMapManager(CBlipManager* pBlipManager, CObjectManager* pObjectMana m_pBlendedWeather = new CBlendedWeather(m_pServerClock); } -CMapManager::~CMapManager(void) +CMapManager::~CMapManager() { // Delete the weather manager delete m_pBlendedWeather; @@ -54,7 +54,7 @@ CMapManager::~CMapManager(void) delete m_pRootElement; } -void CMapManager::DoPulse(void) +void CMapManager::DoPulse() { // Do the respawning checks DoRespawning(); @@ -101,7 +101,7 @@ CElement* CMapManager::LoadMapData(CResource& Loader, CElement& Parent, CXMLNode return NULL; } -void CMapManager::BroadcastMapInformation(void) +void CMapManager::BroadcastMapInformation() { // Start an entity list packet CEntityAddPacket EntityPacket; @@ -618,7 +618,7 @@ void CMapManager::SpawnPlayer(CPlayer& Player, const CVector& vecPosition, float Player.CallEvent("onPlayerSpawn", OnPlayerSpawnArguments); } -void CMapManager::DoRespawning(void) +void CMapManager::DoRespawning() { // Time to do the next search for respawnable things? if (SharedUtil::GetModuleTickCount64() >= m_llLastRespawnTime + 1000) @@ -632,7 +632,7 @@ void CMapManager::DoRespawning(void) } } -void CMapManager::DoPickupRespawning(void) +void CMapManager::DoPickupRespawning() { // Grab the current time CTickCount currentTime = CTickCount::Now(); @@ -746,7 +746,7 @@ bool CMapManager::ParseVisibleToData(CPerPlayerEntity& Entity, char* szData) return bAnyReferences; } -void CMapManager::DoVehicleRespawning(void) +void CMapManager::DoVehicleRespawning() { CVehicleSpawnPacket VehicleSpawnPacket; @@ -949,7 +949,7 @@ bool CMapManager::HandleNode(CResource& Loader, CXMLNode& Node, CElement* pParen return false; } -void CMapManager::LinkupElements(void) +void CMapManager::LinkupElements() { // * Link up all the attaching elements list::const_iterator iterVehicles = m_pVehicleManager->IterBegin(); diff --git a/Server/mods/deathmatch/logic/CMapManager.h b/Server/mods/deathmatch/logic/CMapManager.h index 81334bf83c8..23efba054b4 100644 --- a/Server/mods/deathmatch/logic/CMapManager.h +++ b/Server/mods/deathmatch/logic/CMapManager.h @@ -34,15 +34,15 @@ class CMapManager CRadarAreaManager* pRadarAreaManager, CMarkerManager* pMarkerManager, CVehicleManager* pVehicleManager, CTeamManager* pTeamManager, CPedManager* pPedManager, CColManager* pColManager, CWaterManager* pWaterManager, CClock* pClock, class CLuaManager* pLuaManager, CGroups* pGroups, CEvents* pEvents, class CScriptDebugging* pScriptDebugging, CElementDeleter* pElementDeleter); - ~CMapManager(void); + ~CMapManager(); - CBlendedWeather* GetWeather(void) { return m_pBlendedWeather; }; + CBlendedWeather* GetWeather() { return m_pBlendedWeather; }; - void DoPulse(void); + void DoPulse(); CElement* LoadMapData(CResource& Loader, CElement& Parent, CXMLNode& Node); - void BroadcastMapInformation(void); + void BroadcastMapInformation(); void SendMapInformation(CPlayer& Player); void SendBlips(CPlayer& Player); void SendPerPlayerEntities(CPlayer& Player); @@ -55,19 +55,19 @@ class CMapManager void OnPlayerJoin(CPlayer& Player); void OnPlayerQuit(CPlayer& Player); - CDummy* GetRootElement(void) const { return m_pRootElement; }; + CDummy* GetRootElement() const { return m_pRootElement; }; - CClock* GetServerClock(void) { return m_pServerClock; } + CClock* GetServerClock() { return m_pServerClock; } - void SpawnPlayers(void); + void SpawnPlayers(); void SpawnPlayer(CPlayer& Player, const CVector& vecPosition, float fRotation, unsigned short usModel, unsigned char ucInterior = 0, unsigned short usDimension = 0, CTeam* pTeam = NULL); - void DoRespawning(void); - void DoPickupRespawning(void); - void DoPlayerRespawning(void); - void DoVehicleRespawning(void); - void RespawnAllVehicles(void); + void DoRespawning(); + void DoPickupRespawning(); + void DoPlayerRespawning(); + void DoVehicleRespawning(); + void RespawnAllVehicles(); private: void SetUpVisibleToReferences(CElement* pElement); @@ -77,7 +77,7 @@ class CMapManager CElement* LoadNode(CResource& Loader, CXMLNode& Node, CElement* pParent, vector* pAdded, bool bIsDuringStart); bool LoadSubNodes(CResource& Loader, CXMLNode& Node, CElement* pParent, vector* pAdded, bool bIsDuringStart); bool HandleNode(CResource& Loader, CXMLNode& Node, CElement* pParent, vector* pAdded, bool bIsDuringStart, CElement** pCreated); - void LinkupElements(void); + void LinkupElements(); CBlipManager* m_pBlipManager; CObjectManager* m_pObjectManager; diff --git a/Server/mods/deathmatch/logic/CMarker.cpp b/Server/mods/deathmatch/logic/CMarker.cpp index 1a7ec650f45..b46675100b1 100644 --- a/Server/mods/deathmatch/logic/CMarker.cpp +++ b/Server/mods/deathmatch/logic/CMarker.cpp @@ -34,7 +34,7 @@ CMarker::CMarker(CMarkerManager* pMarkerManager, CColManager* pColManager, CElem UpdateSpatialData(); } -CMarker::~CMarker(void) +CMarker::~CMarker() { // Delete our collision object if (m_pCollision) @@ -59,7 +59,7 @@ CElement* CMarker::Clone(bool* bAddEntity, CResource* pResource) return pTemp; } -void CMarker::Unlink(void) +void CMarker::Unlink() { // Remove us from the marker manager m_pMarkerManager->RemoveFromList(this); @@ -380,7 +380,7 @@ void CMarker::UpdateCollisionObject(unsigned char ucOldType) } } -CSphere CMarker::GetWorldBoundingSphere(void) +CSphere CMarker::GetWorldBoundingSphere() { return CSphere(GetPosition(), GetSize()); } diff --git a/Server/mods/deathmatch/logic/CMarker.h b/Server/mods/deathmatch/logic/CMarker.h index c0577f6a937..c680e88c5a5 100644 --- a/Server/mods/deathmatch/logic/CMarker.h +++ b/Server/mods/deathmatch/logic/CMarker.h @@ -43,17 +43,17 @@ class CMarker : public CPerPlayerEntity, private CColCallback public: CMarker(class CMarkerManager* pMarkerManager, CColManager* pColManager, CElement* pParent); - ~CMarker(void); + ~CMarker(); CElement* Clone(bool* bAddEntity, CResource* pResource) override; - void Unlink(void); + void Unlink(); - bool HasTarget(void) { return m_bHasTarget; }; - const CVector& GetTarget(void) { return m_vecTarget; }; - unsigned char GetMarkerType(void) { return m_ucType; }; - float GetSize(void) { return m_fSize; }; - SColor GetColor(void) const { return m_Color; }; - unsigned char GetIcon(void) { return m_ucIcon; } + bool HasTarget() { return m_bHasTarget; }; + const CVector& GetTarget() { return m_vecTarget; }; + unsigned char GetMarkerType() { return m_ucType; }; + float GetSize() { return m_fSize; }; + SColor GetColor() const { return m_Color; }; + unsigned char GetIcon() { return m_ucIcon; } void SetPosition(const CVector& vecPosition); void SetTarget(const CVector* pTargetVector); @@ -63,9 +63,9 @@ class CMarker : public CPerPlayerEntity, private CColCallback void SetIcon(unsigned char ucIcon); - CColShape* GetColShape(void) { return m_pCollision; } + CColShape* GetColShape() { return m_pCollision; } - virtual CSphere GetWorldBoundingSphere(void); + virtual CSphere GetWorldBoundingSphere(); protected: bool ReadSpecialData(const int iLine) override; diff --git a/Server/mods/deathmatch/logic/CMarkerManager.cpp b/Server/mods/deathmatch/logic/CMarkerManager.cpp index 301d6348386..a800b13c59b 100644 --- a/Server/mods/deathmatch/logic/CMarkerManager.cpp +++ b/Server/mods/deathmatch/logic/CMarkerManager.cpp @@ -43,7 +43,7 @@ CMarker* CMarkerManager::CreateFromXML(CElement* pParent, CXMLNode& Node, CEvent return pMarker; } -void CMarkerManager::DeleteAll(void) +void CMarkerManager::DeleteAll() { // Delete all markers in the list DeletePointersAndClearList(m_Markers); diff --git a/Server/mods/deathmatch/logic/CMarkerManager.h b/Server/mods/deathmatch/logic/CMarkerManager.h index 8739f4b7f80..412c76f253a 100644 --- a/Server/mods/deathmatch/logic/CMarkerManager.h +++ b/Server/mods/deathmatch/logic/CMarkerManager.h @@ -23,17 +23,17 @@ class CMarkerManager public: CMarkerManager(CColManager* pColManager); - ~CMarkerManager(void) { DeleteAll(); }; + ~CMarkerManager() { DeleteAll(); }; CMarker* Create(CElement* pParent); CMarker* CreateFromXML(CElement* pParent, CXMLNode& Node, CEvents* pEvents); - void DeleteAll(void); + void DeleteAll(); - unsigned int Count(void) { return static_cast(m_Markers.size()); }; + unsigned int Count() { return static_cast(m_Markers.size()); }; bool Exists(CMarker* pMarker); - list::const_iterator IterBegin(void) { return m_Markers.begin(); }; - list::const_iterator IterEnd(void) { return m_Markers.end(); }; + list::const_iterator IterBegin() { return m_Markers.begin(); }; + list::const_iterator IterEnd() { return m_Markers.end(); }; static int StringToType(const char* szString); static bool TypeToString(unsigned int uiType, char* szString); diff --git a/Server/mods/deathmatch/logic/CObject.cpp b/Server/mods/deathmatch/logic/CObject.cpp index 91d1cfc3649..26fd71d5ef8 100644 --- a/Server/mods/deathmatch/logic/CObject.cpp +++ b/Server/mods/deathmatch/logic/CObject.cpp @@ -69,7 +69,7 @@ CObject::CObject(const CObject& Copy) : CElement(Copy.m_pParent), m_bIsLowLod(Co UpdateSpatialData(); } -CObject::~CObject(void) +CObject::~CObject() { if (m_pMoveAnimation != NULL) { @@ -89,7 +89,7 @@ CElement* CObject::Clone(bool* bAddEntity, CResource* pResource) return new CObject(*this); } -void CObject::Unlink(void) +void CObject::Unlink() { // Remove us from the manager's list m_pObjectManager->RemoveFromList(this); @@ -218,7 +218,7 @@ void CObject::SetMatrix(const CMatrix& matrix) SetRotation(vecRotation); } -const CVector& CObject::GetPosition(void) +const CVector& CObject::GetPosition() { CVector vecOldPosition = m_vecPosition; @@ -303,7 +303,7 @@ void CObject::SetRotation(const CVector& vecRotation) } } -bool CObject::IsMoving(void) +bool CObject::IsMoving() { // Are we currently moving? if (m_pMoveAnimation != NULL) @@ -344,7 +344,7 @@ void CObject::Move(const CPositionRotationAnimation& a_rMoveAnimation) } } -void CObject::StopMoving(void) +void CObject::StopMoving() { // Were we moving in the first place if (m_pMoveAnimation != NULL) @@ -398,7 +398,7 @@ void CObject::SetSyncer(CPlayer* pPlayer) } } -bool CObject::IsLowLod(void) +bool CObject::IsLowLod() { return m_bIsLowLod; } @@ -440,7 +440,7 @@ bool CObject::SetLowLodObject(CObject* pNewLowLodObject) } } -CObject* CObject::GetLowLodObject(void) +CObject* CObject::GetLowLodObject() { if (m_bIsLowLod) return NULL; diff --git a/Server/mods/deathmatch/logic/CObject.h b/Server/mods/deathmatch/logic/CObject.h index 713ab285738..99fd46689d0 100644 --- a/Server/mods/deathmatch/logic/CObject.h +++ b/Server/mods/deathmatch/logic/CObject.h @@ -26,14 +26,14 @@ class CObject : public CElement public: explicit CObject(CElement* pParent, class CObjectManager* pObjectManager, bool bIsLowLod); explicit CObject(const CObject& Copy); - ~CObject(void); + ~CObject(); CElement* Clone(bool* bAddEntity, CResource* pResource) override; - bool IsEntity(void) { return true; } + bool IsEntity() { return true; } - void Unlink(void); + void Unlink(); - const CVector& GetPosition(void); + const CVector& GetPosition(); void SetPosition(const CVector& vecPosition); void GetRotation(CVector& vecRotation); @@ -42,40 +42,40 @@ class CObject : public CElement void GetMatrix(CMatrix& matrix); void SetMatrix(const CMatrix& matrix); - bool IsMoving(void); + bool IsMoving(); void Move(const CPositionRotationAnimation& a_rMoveAnimation); - void StopMoving(void); + void StopMoving(); const CPositionRotationAnimation* GetMoveAnimation(); - unsigned char GetAlpha(void) { return m_ucAlpha; } + unsigned char GetAlpha() { return m_ucAlpha; } void SetAlpha(unsigned char ucAlpha) { m_ucAlpha = ucAlpha; } - unsigned short GetModel(void) { return m_usModel; } + unsigned short GetModel() { return m_usModel; } void SetModel(unsigned short usModel) { m_usModel = usModel; } - const CVector& GetScale(void) { return m_vecScale; } + const CVector& GetScale() { return m_vecScale; } void SetScale(const CVector& vecScale) { m_vecScale = vecScale; } - bool GetCollisionEnabled(void) { return m_bCollisionsEnabled; } + bool GetCollisionEnabled() { return m_bCollisionsEnabled; } void SetCollisionEnabled(bool bCollisionEnabled) { m_bCollisionsEnabled = bCollisionEnabled; } - bool IsFrozen(void) { return m_bIsFrozen; } + bool IsFrozen() { return m_bIsFrozen; } void SetFrozen(bool bFrozen) { m_bIsFrozen = bFrozen; } - float GetHealth(void) { return m_fHealth; } + float GetHealth() { return m_fHealth; } void SetHealth(float fHealth) { m_fHealth = fHealth; } - bool IsSyncable(void) { return m_bSyncable; } + bool IsSyncable() { return m_bSyncable; } void SetSyncable(bool bSyncable) { m_bSyncable = bSyncable; } - CPlayer* GetSyncer(void) { return m_pSyncer; } + CPlayer* GetSyncer() { return m_pSyncer; } void SetSyncer(CPlayer* pPlayer); - bool IsLowLod(void); + bool IsLowLod(); bool SetLowLodObject(CObject* pLowLodObject); - CObject* GetLowLodObject(void); + CObject* GetLowLodObject(); - bool IsVisibleInAllDimensions(void) { return m_bVisibleInAllDimensions; }; + bool IsVisibleInAllDimensions() { return m_bVisibleInAllDimensions; }; void SetVisibleInAllDimensions(bool bVisible) { m_bVisibleInAllDimensions = bVisible; }; protected: diff --git a/Server/mods/deathmatch/logic/CObjectManager.cpp b/Server/mods/deathmatch/logic/CObjectManager.cpp index 48ec46f8f4b..8b6a6558f7c 100644 --- a/Server/mods/deathmatch/logic/CObjectManager.cpp +++ b/Server/mods/deathmatch/logic/CObjectManager.cpp @@ -82,11 +82,11 @@ static unsigned short g_usBreakableModelList[] = { // Glass 3859, 3858, 3857, 1649, 3851}; -CObjectManager::CObjectManager(void) +CObjectManager::CObjectManager() { } -CObjectManager::~CObjectManager(void) +CObjectManager::~CObjectManager() { // Delete all our objects DeleteAll(); @@ -118,7 +118,7 @@ CObject* CObjectManager::CreateFromXML(CElement* pParent, CXMLNode& Node, CEvent return pObject; } -void CObjectManager::DeleteAll(void) +void CObjectManager::DeleteAll() { // Delete all objects, make sure they dont remove themselves from our list (would make this damn slow) DeletePointersAndClearList(m_List); diff --git a/Server/mods/deathmatch/logic/CObjectManager.h b/Server/mods/deathmatch/logic/CObjectManager.h index ab34c82ab96..10a5485fea9 100644 --- a/Server/mods/deathmatch/logic/CObjectManager.h +++ b/Server/mods/deathmatch/logic/CObjectManager.h @@ -24,18 +24,18 @@ class CObjectManager friend class CObject; public: - CObjectManager(void); - ~CObjectManager(void); + CObjectManager(); + ~CObjectManager(); CObject* Create(CElement* pParent, bool bIsLowLod); CObject* CreateFromXML(CElement* pParent, CXMLNode& Node, CEvents* pEvents, bool bIsLowLod); - void DeleteAll(void); + void DeleteAll(); - unsigned int Count(void) { return static_cast(m_List.size()); }; + unsigned int Count() { return static_cast(m_List.size()); }; bool Exists(CObject* pObject); - CObjectListType::const_iterator IterBegin(void) const { return m_List.begin(); }; - CObjectListType::const_iterator IterEnd(void) const { return m_List.end(); }; + CObjectListType::const_iterator IterBegin() const { return m_List.begin(); }; + CObjectListType::const_iterator IterEnd() const { return m_List.end(); }; static bool IsValidModel(unsigned long ulObjectModel); static bool IsBreakableModel(unsigned long ulObjectModel); diff --git a/Server/mods/deathmatch/logic/CObjectSync.cpp b/Server/mods/deathmatch/logic/CObjectSync.cpp index 0427c74f3bf..dae7bdb56a2 100644 --- a/Server/mods/deathmatch/logic/CObjectSync.cpp +++ b/Server/mods/deathmatch/logic/CObjectSync.cpp @@ -22,7 +22,7 @@ CObjectSync::CObjectSync(CPlayerManager* pPlayerManager, CObjectManager* pObject m_pObjectManager = pObjectManager; } -void CObjectSync::DoPulse(void) +void CObjectSync::DoPulse() { // Time to check for players that should no longer be syncing a object or objects that should be synced? if (m_UpdateTimer.Get() > SYNC_RATE) @@ -59,7 +59,7 @@ void CObjectSync::OverrideSyncer(CObject* pObject, CPlayer* pPlayer) StartSync(pPlayer, pObject); } -void CObjectSync::Update(void) +void CObjectSync::Update() { // Update all objects list::const_iterator iter = m_pObjectManager->IterBegin(); diff --git a/Server/mods/deathmatch/logic/CObjectSync.h b/Server/mods/deathmatch/logic/CObjectSync.h index ac7e5cab5b2..b9faeed79ac 100644 --- a/Server/mods/deathmatch/logic/CObjectSync.h +++ b/Server/mods/deathmatch/logic/CObjectSync.h @@ -22,13 +22,13 @@ class CObjectSync public: CObjectSync(CPlayerManager* pPlayerManager, CObjectManager* pObjectManager); - void DoPulse(void); + void DoPulse(); bool ProcessPacket(CPacket& Packet); void OverrideSyncer(CObject* pObject, CPlayer* pPlayer); private: - void Update(void); + void Update(); void UpdateObject(CObject* pObject); void FindSyncer(CObject* pObject); CPlayer* FindPlayerCloseToObject(CObject* pObject, float fMaxDistance); diff --git a/Server/mods/deathmatch/logic/CPacketTranslator.cpp b/Server/mods/deathmatch/logic/CPacketTranslator.cpp index 29bd896dd4e..29e3cd25371 100644 --- a/Server/mods/deathmatch/logic/CPacketTranslator.cpp +++ b/Server/mods/deathmatch/logic/CPacketTranslator.cpp @@ -16,7 +16,7 @@ CPacketTranslator::CPacketTranslator(CPlayerManager* pPlayerManager) m_pPlayerManager = pPlayerManager; } -CPacketTranslator::~CPacketTranslator(void) +CPacketTranslator::~CPacketTranslator() { } diff --git a/Server/mods/deathmatch/logic/CPacketTranslator.h b/Server/mods/deathmatch/logic/CPacketTranslator.h index 6fa1c59f4aa..f5bf6017006 100644 --- a/Server/mods/deathmatch/logic/CPacketTranslator.h +++ b/Server/mods/deathmatch/logic/CPacketTranslator.h @@ -24,7 +24,7 @@ class CPacketTranslator { public: CPacketTranslator(CPlayerManager* pPlayerManager); - ~CPacketTranslator(void); + ~CPacketTranslator(); CPacket* Translate(const NetServerPlayerID& Socket, ePacketID PacketID, NetBitStreamInterface& BitStream, SNetExtraInfo* pNetExtraInfo); diff --git a/Server/mods/deathmatch/logic/CPad.cpp b/Server/mods/deathmatch/logic/CPad.cpp index 4becd029243..71b3deda5af 100644 --- a/Server/mods/deathmatch/logic/CPad.cpp +++ b/Server/mods/deathmatch/logic/CPad.cpp @@ -109,7 +109,7 @@ void CPad::NewControllerState(const CControllerState& State) SetCurrentControllerState(State); } -void CPad::UpdateKeys(void) +void CPad::UpdateKeys() { if (m_pPlayer) { diff --git a/Server/mods/deathmatch/logic/CPad.h b/Server/mods/deathmatch/logic/CPad.h index 2b3c4faf38d..f95c8780a69 100644 --- a/Server/mods/deathmatch/logic/CPad.h +++ b/Server/mods/deathmatch/logic/CPad.h @@ -61,7 +61,7 @@ class CControllerState bool ShockButtonL; bool m_bPedWalk; - CControllerState(void) { memset(this, 0, sizeof(CControllerState)); } + CControllerState() { memset(this, 0, sizeof(CControllerState)); } void Copy(const CControllerState& State) { memcpy(this, &State, sizeof(CControllerState)); } }; @@ -145,7 +145,7 @@ class CPad public: CPad(CPlayer* pPlayer); - const CControllerState& GetCurrentControllerState(void) { return m_csCurrentState; } + const CControllerState& GetCurrentControllerState() { return m_csCurrentState; } void SetCurrentControllerState(const CControllerState& State); void NewControllerState(const CControllerState& State); @@ -161,7 +161,7 @@ class CPad void SetAllMTAControlsEnabled(bool bEnabled); protected: - void UpdateKeys(void); + void UpdateKeys(); CPlayer* m_pPlayer; diff --git a/Server/mods/deathmatch/logic/CPed.cpp b/Server/mods/deathmatch/logic/CPed.cpp index 08d665edc15..46996cc8671 100644 --- a/Server/mods/deathmatch/logic/CPed.cpp +++ b/Server/mods/deathmatch/logic/CPed.cpp @@ -81,7 +81,7 @@ CPed::CPed(CPedManager* pPedManager, CElement* pParent, unsigned short usModel) } } -CPed::~CPed(void) +CPed::~CPed() { // Make sure we've no longer occupied any vehicle if (m_pVehicle) @@ -117,7 +117,7 @@ CElement* CPed::Clone(bool* bAddEntity, CResource* pResource) return pTemp; } -void CPed::Unlink(void) +void CPed::Unlink() { // Remove us from the Ped manager if (m_pPedManager) @@ -232,7 +232,7 @@ bool CPed::ReadSpecialData(const int iLine) return true; } -bool CPed::HasValidModel(void) +bool CPed::HasValidModel() { return CPedManager::IsValidModel(m_usModel); } @@ -319,7 +319,7 @@ void CPed::SetWeaponTotalAmmo(unsigned short usTotalAmmo, unsigned char ucSlot) } } -float CPed::GetMaxHealth(void) +float CPed::GetMaxHealth() { // TODO: Verify this formula @@ -391,7 +391,7 @@ void CPed::SetVehicleAction(unsigned int uiAction) m_uiVehicleAction = uiAction; } -bool CPed::IsAttachToable(void) +bool CPed::IsAttachToable() { // We're not attachable if we're inside a vehicle (that would get messy) if (!GetOccupiedVehicle()) diff --git a/Server/mods/deathmatch/logic/CPed.h b/Server/mods/deathmatch/logic/CPed.h index 65ef82f4cb7..912e4302233 100644 --- a/Server/mods/deathmatch/logic/CPed.h +++ b/Server/mods/deathmatch/logic/CPed.h @@ -106,7 +106,7 @@ enum eBone class CWeapon { public: - CWeapon(void) + CWeapon() { ucType = 0; usAmmo = 0; @@ -132,35 +132,35 @@ class CPed : public CElement }; CPed(class CPedManager* pPedManager, CElement* pParent, unsigned short usModel); - ~CPed(void); + ~CPed(); CElement* Clone(bool* bAddEntity, CResource* pResource) override; - bool IsEntity(void) { return true; } + bool IsEntity() { return true; } - virtual void Unlink(void); + virtual void Unlink(); - bool HasValidModel(void); + bool HasValidModel(); - bool IsPlayer(void) { return m_bIsPlayer; } - unsigned short GetModel(void) { return m_usModel; }; + bool IsPlayer() { return m_bIsPlayer; } + unsigned short GetModel() { return m_usModel; }; void SetModel(unsigned short usModel) { m_usModel = usModel; }; - bool IsDucked(void) { return m_bDucked; }; + bool IsDucked() { return m_bDucked; }; void SetDucked(bool bDucked) { m_bDucked = bDucked; }; - bool IsChoking(void) { return m_bIsChoking; }; + bool IsChoking() { return m_bIsChoking; }; void SetChoking(bool bChoking) { m_bIsChoking = bChoking; }; - bool IsWearingGoggles(void) { return m_bWearingGoggles; }; + bool IsWearingGoggles() { return m_bWearingGoggles; }; void SetWearingGoggles(bool bWearingGoggles) { m_bWearingGoggles = bWearingGoggles; }; - bool IsOnFire(void) { return m_bIsOnFire; } + bool IsOnFire() { return m_bIsOnFire; } void SetOnFire(bool bOnFire) { m_bIsOnFire = bOnFire; } CWeapon* GetWeapon(unsigned char ucSlot = 0xFF); - unsigned char GetWeaponSlot(void) { return m_ucWeaponSlot; } + unsigned char GetWeaponSlot() { return m_ucWeaponSlot; } void SetWeaponSlot(unsigned char ucSlot); - unsigned char GetCurrentWeaponState(void) { return m_ucCurrentWeaponState; }; + unsigned char GetCurrentWeaponState() { return m_ucCurrentWeaponState; }; void SetCurrentWeaponState(unsigned char ucWeaponState) { m_ucCurrentWeaponState = ucWeaponState; }; unsigned char GetWeaponType(unsigned char ucSlot = 0xFF); void SetWeaponType(unsigned char ucType, unsigned char ucSlot = 0xFF); @@ -169,10 +169,10 @@ class CPed : public CElement unsigned short GetWeaponTotalAmmo(unsigned char ucSlot = 0xFF); void SetWeaponTotalAmmo(unsigned short usTotalAmmo, unsigned char ucSlot = 0xFF); - float GetMaxHealth(void); - float GetHealth(void) { return m_fHealth; } + float GetMaxHealth(); + float GetHealth() { return m_fHealth; } void SetHealth(float fHealth) { m_fHealth = fHealth; } - float GetArmor(void) { return m_fArmor; } + float GetArmor() { return m_fArmor; } void SetArmor(float fArmor) { m_fArmor = fArmor; } float GetPlayerStat(unsigned short usStat) { return (usStat < NUM_PLAYER_STATS) ? m_fStats[usStat] : 0; } @@ -182,87 +182,87 @@ class CPed : public CElement m_fStats[usStat] = fValue; } - CPlayerClothes* GetClothes(void) { return m_pClothes; } + CPlayerClothes* GetClothes() { return m_pClothes; } static const char* GetBodyPartName(unsigned char ucID); - bool HasJetPack(void) { return m_bHasJetPack; } + bool HasJetPack() { return m_bHasJetPack; } void SetHasJetPack(bool bHasJetPack) { m_bHasJetPack = bHasJetPack; } - bool IsInWater(void) { return m_bInWater; } + bool IsInWater() { return m_bInWater; } void SetInWater(bool bInWater) { m_bInWater = bInWater; } - bool IsOnGround(void) { return m_bOnGround; } + bool IsOnGround() { return m_bOnGround; } void SetOnGround(bool bOnGround) { m_bOnGround = bOnGround; } - unsigned char GetAlpha(void) { return m_ucAlpha; } + unsigned char GetAlpha() { return m_ucAlpha; } void SetAlpha(unsigned char ucAlpha) { m_ucAlpha = ucAlpha; } - CPlayerTasks* GetTasks(void) { return m_pTasks; } + CPlayerTasks* GetTasks() { return m_pTasks; } - CElement* GetContactElement(void) { return m_pContactElement; } + CElement* GetContactElement() { return m_pContactElement; } void SetContactElement(CElement* pElement); void GetContactPosition(CVector& vecPosition) { vecPosition = m_vecContactPosition; } void SetContactPosition(CVector& vecPosition) { m_vecContactPosition = vecPosition; } - bool IsDead(void) { return m_bIsDead; }; + bool IsDead() { return m_bIsDead; }; void SetIsDead(bool bDead); - bool IsSpawned(void) { return m_bSpawned; } + bool IsSpawned() { return m_bSpawned; } void SetSpawned(bool bSpawned) { m_bSpawned = bSpawned; } - float GetRotation(void) { return m_fRotation; } + float GetRotation() { return m_fRotation; } void SetRotation(float fRotation) { m_fRotation = fRotation; } void GetRotation(CVector& vecRotation); void GetMatrix(CMatrix& matrix); void SetMatrix(const CMatrix& matrix); - CElement* GetTargetedElement(void) { return m_pTargetedEntity; } + CElement* GetTargetedElement() { return m_pTargetedEntity; } void SetTargetedElement(CElement* pEntity) { m_pTargetedEntity = pEntity; } - unsigned char GetFightingStyle(void) { return m_ucFightingStyle; } + unsigned char GetFightingStyle() { return m_ucFightingStyle; } void SetFightingStyle(unsigned char ucStyle) { m_ucFightingStyle = ucStyle; } - unsigned char GetMoveAnim(void) { return m_iMoveAnim; } + unsigned char GetMoveAnim() { return m_iMoveAnim; } void SetMoveAnim(int iMoveAnim) { m_iMoveAnim = iMoveAnim; } - float GetGravity(void) { return m_fGravity; } + float GetGravity() { return m_fGravity; } void SetGravity(float fGravity) { m_fGravity = fGravity; } - CVehicle* GetOccupiedVehicle(void) { return m_pVehicle; }; - unsigned int GetOccupiedVehicleSeat(void) { return m_uiVehicleSeat; }; + CVehicle* GetOccupiedVehicle() { return m_pVehicle; }; + unsigned int GetOccupiedVehicleSeat() { return m_uiVehicleSeat; }; CVehicle* SetOccupiedVehicle(CVehicle* pVehicle, unsigned int uiSeat); - unsigned int GetVehicleAction(void) { return m_uiVehicleAction; }; + unsigned int GetVehicleAction() { return m_uiVehicleAction; }; void SetVehicleAction(unsigned int uiAction); - bool IsAttachToable(void); + bool IsAttachToable(); void GetVelocity(CVector& vecVelocity) { vecVelocity = m_vecVelocity; }; void SetVelocity(const CVector& vecVelocity) { m_vecVelocity = vecVelocity; }; - bool IsDoingGangDriveby(void) { return m_bDoingGangDriveby; } + bool IsDoingGangDriveby() { return m_bDoingGangDriveby; } void SetDoingGangDriveby(bool bDriveby) { m_bDoingGangDriveby = bDriveby; } - bool IsHeadless(void) { return m_bHeadless; }; + bool IsHeadless() { return m_bHeadless; }; void SetHeadless(bool bHeadless) { m_bHeadless = bHeadless; }; - bool IsFrozen(void) { return m_bFrozen; }; + bool IsFrozen() { return m_bFrozen; }; void SetFrozen(bool bFrozen) { m_bFrozen = bFrozen; }; - class CPlayer* GetSyncer(void) { return m_pSyncer; }; + class CPlayer* GetSyncer() { return m_pSyncer; }; void SetSyncer(class CPlayer* pPlayer); - bool IsSyncable(void) { return m_bSyncable; }; + bool IsSyncable() { return m_bSyncable; }; void SetSyncable(bool bSynced) { m_bSyncable = bSynced; }; CPlayer* m_pSyncer; - bool IsStealthAiming(void) { return m_bStealthAiming; } + bool IsStealthAiming() { return m_bStealthAiming; } void SetStealthAiming(bool bAiming) { m_bStealthAiming = bAiming; } - bool GetCollisionEnabled(void) { return m_bCollisionsEnabled; } + bool GetCollisionEnabled() { return m_bCollisionsEnabled; } void SetCollisionEnabled(bool bCollisionEnabled) { m_bCollisionsEnabled = bCollisionEnabled; } protected: diff --git a/Server/mods/deathmatch/logic/CPedManager.cpp b/Server/mods/deathmatch/logic/CPedManager.cpp index 830afb59b7a..749760755d2 100644 --- a/Server/mods/deathmatch/logic/CPedManager.cpp +++ b/Server/mods/deathmatch/logic/CPedManager.cpp @@ -11,11 +11,11 @@ #include "StdInc.h" -CPedManager::CPedManager(void) +CPedManager::CPedManager() { } -CPedManager::~CPedManager(void) +CPedManager::~CPedManager() { DeleteAll(); } @@ -53,7 +53,7 @@ CPed* CPedManager::CreateFromXML(CElement* pParent, CXMLNode& Node, CEvents* pEv return pPed; } -void CPedManager::DeleteAll(void) +void CPedManager::DeleteAll() { // Delete all items DeletePointersAndClearList(m_List); diff --git a/Server/mods/deathmatch/logic/CPedManager.h b/Server/mods/deathmatch/logic/CPedManager.h index 7b60f46a735..5536bff1177 100644 --- a/Server/mods/deathmatch/logic/CPedManager.h +++ b/Server/mods/deathmatch/logic/CPedManager.h @@ -18,18 +18,18 @@ class CPedManager friend class CPed; public: - CPedManager(void); - ~CPedManager(void); + CPedManager(); + ~CPedManager(); class CPed* Create(unsigned short usModel, CElement* pParent); class CPed* CreateFromXML(CElement* pParent, CXMLNode& Node, CEvents* pEvents); - void DeleteAll(void); + void DeleteAll(); - unsigned int Count(void) { return static_cast(m_List.size()); }; + unsigned int Count() { return static_cast(m_List.size()); }; bool Exists(class CPed* pPed); - list::const_iterator IterBegin(void) { return m_List.begin(); } - list::const_iterator IterEnd(void) { return m_List.end(); } + list::const_iterator IterBegin() { return m_List.begin(); } + list::const_iterator IterEnd() { return m_List.end(); } static bool IsValidModel(unsigned short usModel); diff --git a/Server/mods/deathmatch/logic/CPedSync.cpp b/Server/mods/deathmatch/logic/CPedSync.cpp index fd32ddef56d..b0f17ec81d0 100644 --- a/Server/mods/deathmatch/logic/CPedSync.cpp +++ b/Server/mods/deathmatch/logic/CPedSync.cpp @@ -17,7 +17,7 @@ CPedSync::CPedSync(CPlayerManager* pPlayerManager, CPedManager* pPedManager) m_pPedManager = pPedManager; } -void CPedSync::DoPulse(void) +void CPedSync::DoPulse() { // Time to check for players that should no longer be syncing a ped or peds that should be synced? if (m_UpdateTimer.Get() > 500) @@ -53,7 +53,7 @@ void CPedSync::OverrideSyncer(CPed* pPed, CPlayer* pPlayer) StartSync(pPlayer, pPed); } -void CPedSync::Update(void) +void CPedSync::Update() { // Update all the ped's sync states list::const_iterator iter = m_pPedManager->IterBegin(); diff --git a/Server/mods/deathmatch/logic/CPedSync.h b/Server/mods/deathmatch/logic/CPedSync.h index afda3ec4d83..c2493245d6d 100644 --- a/Server/mods/deathmatch/logic/CPedSync.h +++ b/Server/mods/deathmatch/logic/CPedSync.h @@ -20,13 +20,13 @@ class CPedSync public: CPedSync(CPlayerManager* pPlayerManager, CPedManager* pPedManager); - void DoPulse(void); + void DoPulse(); bool ProcessPacket(CPacket& Packet); void OverrideSyncer(CPed* pPed, CPlayer* pPlayer); private: - void Update(void); + void Update(); void UpdatePed(CPed* pPed); void FindSyncer(CPed* pPed); CPlayer* FindPlayerCloseToPed(CPed* pPed, float fMaxDistance); diff --git a/Server/mods/deathmatch/logic/CPerPlayerEntity.cpp b/Server/mods/deathmatch/logic/CPerPlayerEntity.cpp index 6449cfbc344..0ba18859394 100644 --- a/Server/mods/deathmatch/logic/CPerPlayerEntity.cpp +++ b/Server/mods/deathmatch/logic/CPerPlayerEntity.cpp @@ -20,7 +20,7 @@ CPerPlayerEntity::CPerPlayerEntity(CElement* pParent) : CElement(pParent) AddVisibleToReference(g_pGame->GetMapManager()->GetRootElement()); }; -CPerPlayerEntity::~CPerPlayerEntity(void) +CPerPlayerEntity::~CPerPlayerEntity() { // Unsync us from everyone // Sync ( false ); @@ -71,7 +71,7 @@ void CPerPlayerEntity::OnReferencedSubtreeRemove(CElement* pElement) RemovePlayersBelow(pElement, m_PlayersRemoved); } -void CPerPlayerEntity::UpdatePerPlayer(void) +void CPerPlayerEntity::UpdatePerPlayer() { if (m_PlayersAdded.empty() && m_PlayersRemoved.empty()) // This check reduces cpu usage when loading large maps (due to recursion) return; @@ -136,7 +136,7 @@ bool CPerPlayerEntity::RemoveVisibleToReference(CElement* pElement) return false; } -void CPerPlayerEntity::ClearVisibleToReferences(void) +void CPerPlayerEntity::ClearVisibleToReferences() { // For each reference in our list bool bCleared = false; diff --git a/Server/mods/deathmatch/logic/CPerPlayerEntity.h b/Server/mods/deathmatch/logic/CPerPlayerEntity.h index 539d3cc8ae3..c41fbbaac98 100644 --- a/Server/mods/deathmatch/logic/CPerPlayerEntity.h +++ b/Server/mods/deathmatch/logic/CPerPlayerEntity.h @@ -20,27 +20,27 @@ class CPerPlayerEntity : public CElement public: CPerPlayerEntity(CElement* pParent); - ~CPerPlayerEntity(void); + ~CPerPlayerEntity(); - bool IsEntity(void) { return true; } - bool IsPerPlayerEntity(void) { return true; }; + bool IsEntity() { return true; } + bool IsPerPlayerEntity() { return true; }; bool Sync(bool bSync); - bool IsSynced(void) { return m_bIsSynced; }; + bool IsSynced() { return m_bIsSynced; }; void SetIsSynced(bool bIsSynced) { m_bIsSynced = bIsSynced; }; void OnReferencedSubtreeAdd(CElement* pElement); void OnReferencedSubtreeRemove(CElement* pElement); - void UpdatePerPlayer(void); + void UpdatePerPlayer(); bool AddVisibleToReference(CElement* pElement); bool RemoveVisibleToReference(CElement* pElement); - void ClearVisibleToReferences(void); + void ClearVisibleToReferences(); bool IsVisibleToReferenced(CElement* pElement); bool IsVisibleToPlayer(CPlayer& Player); - const std::set& GetPlayersList(void) { return m_Players; } + const std::set& GetPlayersList() { return m_Players; } static void StaticOnPlayerDelete(CPlayer* pPlayer); void OnPlayerDelete(CPlayer* pPlayer); diff --git a/Server/mods/deathmatch/logic/CPerfStat.BandwidthReduction.cpp b/Server/mods/deathmatch/logic/CPerfStat.BandwidthReduction.cpp index b582a4dfe5f..3a7deb6b9ba 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.BandwidthReduction.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.BandwidthReduction.cpp @@ -23,16 +23,16 @@ class CPerfStatBandwidthReductionImpl : public CPerfStatBandwidthReduction public: ZERO_ON_NEW - CPerfStatBandwidthReductionImpl(void); - virtual ~CPerfStatBandwidthReductionImpl(void); + CPerfStatBandwidthReductionImpl(); + virtual ~CPerfStatBandwidthReductionImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CPerfStatBandwidthReductionImpl - void RecordStats(void); + void RecordStats(); long long m_llNextRecordTime; SString m_strCategoryName; @@ -66,7 +66,7 @@ CPerfStatBandwidthReduction* CPerfStatBandwidthReduction::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatBandwidthReductionImpl::CPerfStatBandwidthReductionImpl(void) +CPerfStatBandwidthReductionImpl::CPerfStatBandwidthReductionImpl() { m_strCategoryName = "Bandwidth reduction"; } @@ -78,7 +78,7 @@ CPerfStatBandwidthReductionImpl::CPerfStatBandwidthReductionImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatBandwidthReductionImpl::~CPerfStatBandwidthReductionImpl(void) +CPerfStatBandwidthReductionImpl::~CPerfStatBandwidthReductionImpl() { } @@ -89,7 +89,7 @@ CPerfStatBandwidthReductionImpl::~CPerfStatBandwidthReductionImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatBandwidthReductionImpl::GetCategoryName(void) +const SString& CPerfStatBandwidthReductionImpl::GetCategoryName() { return m_strCategoryName; } @@ -101,7 +101,7 @@ const SString& CPerfStatBandwidthReductionImpl::GetCategoryName(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatBandwidthReductionImpl::DoPulse(void) +void CPerfStatBandwidthReductionImpl::DoPulse() { long long llTime = GetTickCount64_(); @@ -120,7 +120,7 @@ void CPerfStatBandwidthReductionImpl::DoPulse(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatBandwidthReductionImpl::RecordStats(void) +void CPerfStatBandwidthReductionImpl::RecordStats() { for (uint i = 0; i < ZONE_MAX; i++) { diff --git a/Server/mods/deathmatch/logic/CPerfStat.BandwidthUsage.cpp b/Server/mods/deathmatch/logic/CPerfStat.BandwidthUsage.cpp index db54b30127e..be913cfea3d 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.BandwidthUsage.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.BandwidthUsage.cpp @@ -70,7 +70,7 @@ namespace } // Unix time. Put here for easy changing when debugging - time_t UnixTimeNow(void) + time_t UnixTimeNow() { time_t tTime = time(NULL); return tTime; @@ -95,20 +95,20 @@ class CPerfStatBandwidthUsageImpl : public CPerfStatBandwidthUsage public: ZERO_ON_NEW - CPerfStatBandwidthUsageImpl(void); - virtual ~CPerfStatBandwidthUsageImpl(void); + CPerfStatBandwidthUsageImpl(); + virtual ~CPerfStatBandwidthUsageImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); - virtual void Stop(void); + virtual void Stop(); // CPerfStatBandwidthUsageImpl - void RecordStats(void); + void RecordStats(); void AddSampleAtTime(time_t tTime, long long llGameRecv, long long llGameRecvBlocked, long long llGameSent, long long llGameResent, long long llHttpSent); - void LoadStats(void); - void SaveStats(void); + void LoadStats(); + void SaveStats(); long long m_llNextRecordTime; long long m_llNextSaveTime; @@ -142,7 +142,7 @@ CPerfStatBandwidthUsage* CPerfStatBandwidthUsage::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatBandwidthUsageImpl::CPerfStatBandwidthUsageImpl(void) +CPerfStatBandwidthUsageImpl::CPerfStatBandwidthUsageImpl() { m_strCategoryName = "Bandwidth usage"; SString strDatabaseFilename = PathJoin(g_pGame->GetConfig()->GetSystemDatabasesPath(), "stats.db"); @@ -157,7 +157,7 @@ CPerfStatBandwidthUsageImpl::CPerfStatBandwidthUsageImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatBandwidthUsageImpl::~CPerfStatBandwidthUsageImpl(void) +CPerfStatBandwidthUsageImpl::~CPerfStatBandwidthUsageImpl() { } @@ -168,7 +168,7 @@ CPerfStatBandwidthUsageImpl::~CPerfStatBandwidthUsageImpl(void) // Save stats and clean up the database connection // /////////////////////////////////////////////////////////////// -void CPerfStatBandwidthUsageImpl::Stop(void) +void CPerfStatBandwidthUsageImpl::Stop() { SaveStats(); g_pGame->GetDatabaseManager()->Disconnect(m_DatabaseConnection); @@ -181,7 +181,7 @@ void CPerfStatBandwidthUsageImpl::Stop(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatBandwidthUsageImpl::GetCategoryName(void) +const SString& CPerfStatBandwidthUsageImpl::GetCategoryName() { return m_strCategoryName; } @@ -193,7 +193,7 @@ const SString& CPerfStatBandwidthUsageImpl::GetCategoryName(void) // Load from permanent storage // /////////////////////////////////////////////////////////////// -void CPerfStatBandwidthUsageImpl::LoadStats(void) +void CPerfStatBandwidthUsageImpl::LoadStats() { SFixedArray uiSizeList; uiSizeList[BWSTAT_INDEX_SPECIAL] = 1; @@ -343,7 +343,7 @@ void CPerfStatBandwidthUsageImpl::LoadStats(void) // Save to permanent storage // /////////////////////////////////////////////////////////////// -void CPerfStatBandwidthUsageImpl::SaveStats(void) +void CPerfStatBandwidthUsageImpl::SaveStats() { CDatabaseManager* pDatabaseManager = g_pGame->GetDatabaseManager(); @@ -375,7 +375,7 @@ void CPerfStatBandwidthUsageImpl::SaveStats(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatBandwidthUsageImpl::DoPulse(void) +void CPerfStatBandwidthUsageImpl::DoPulse() { long long llTime = GetTickCount64_(); @@ -405,7 +405,7 @@ void CPerfStatBandwidthUsageImpl::DoPulse(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatBandwidthUsageImpl::RecordStats(void) +void CPerfStatBandwidthUsageImpl::RecordStats() { // Sample new stats and calc the delta SBandwidthStatistics liveStats; diff --git a/Server/mods/deathmatch/logic/CPerfStat.DebugInfo.cpp b/Server/mods/deathmatch/logic/CPerfStat.DebugInfo.cpp index 101d2054bf5..3a560395c66 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.DebugInfo.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.DebugInfo.cpp @@ -33,12 +33,12 @@ class CPerfStatDebugInfoImpl : public CPerfStatDebugInfo public: ZERO_ON_NEW - CPerfStatDebugInfoImpl(void); - virtual ~CPerfStatDebugInfoImpl(void); + CPerfStatDebugInfoImpl(); + virtual ~CPerfStatDebugInfoImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CPerfStatDebugInfo @@ -46,7 +46,7 @@ class CPerfStatDebugInfoImpl : public CPerfStatDebugInfo virtual void AddLine(const SString& strSection, const SString& strData); // CPerfStatDebugInfoImpl - void RecordStats(void); + void RecordStats(); SString m_strCategoryName; bool m_bActive; @@ -79,7 +79,7 @@ CPerfStatDebugInfo* CPerfStatDebugInfo::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatDebugInfoImpl::CPerfStatDebugInfoImpl(void) +CPerfStatDebugInfoImpl::CPerfStatDebugInfoImpl() { m_strCategoryName = "Debug info"; } @@ -91,7 +91,7 @@ CPerfStatDebugInfoImpl::CPerfStatDebugInfoImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatDebugInfoImpl::~CPerfStatDebugInfoImpl(void) +CPerfStatDebugInfoImpl::~CPerfStatDebugInfoImpl() { } @@ -102,7 +102,7 @@ CPerfStatDebugInfoImpl::~CPerfStatDebugInfoImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatDebugInfoImpl::GetCategoryName(void) +const SString& CPerfStatDebugInfoImpl::GetCategoryName() { return m_strCategoryName; } @@ -114,7 +114,7 @@ const SString& CPerfStatDebugInfoImpl::GetCategoryName(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatDebugInfoImpl::DoPulse(void) +void CPerfStatDebugInfoImpl::DoPulse() { // Check if time to auto deactivate if (m_bActive) diff --git a/Server/mods/deathmatch/logic/CPerfStat.DebugTable.cpp b/Server/mods/deathmatch/logic/CPerfStat.DebugTable.cpp index 600469fa5a8..0b733ade7cb 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.DebugTable.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.DebugTable.cpp @@ -33,12 +33,12 @@ class CPerfStatDebugTableImpl : public CPerfStatDebugTable public: ZERO_ON_NEW - CPerfStatDebugTableImpl(void); - virtual ~CPerfStatDebugTableImpl(void); + CPerfStatDebugTableImpl(); + virtual ~CPerfStatDebugTableImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CPerfStatDebugTable @@ -74,7 +74,7 @@ CPerfStatDebugTable* CPerfStatDebugTable::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatDebugTableImpl::CPerfStatDebugTableImpl(void) +CPerfStatDebugTableImpl::CPerfStatDebugTableImpl() { m_TimeSinceRemoveOld.SetMaxIncrement(500, true); m_strCategoryName = "Debug table"; @@ -87,7 +87,7 @@ CPerfStatDebugTableImpl::CPerfStatDebugTableImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatDebugTableImpl::~CPerfStatDebugTableImpl(void) +CPerfStatDebugTableImpl::~CPerfStatDebugTableImpl() { } @@ -98,7 +98,7 @@ CPerfStatDebugTableImpl::~CPerfStatDebugTableImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatDebugTableImpl::GetCategoryName(void) +const SString& CPerfStatDebugTableImpl::GetCategoryName() { return m_strCategoryName; } @@ -110,7 +110,7 @@ const SString& CPerfStatDebugTableImpl::GetCategoryName(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatDebugTableImpl::DoPulse(void) +void CPerfStatDebugTableImpl::DoPulse() { // Do remove old once every second if (m_TimeSinceRemoveOld.Get() < 1000) diff --git a/Server/mods/deathmatch/logic/CPerfStat.EventPacketUsage.cpp b/Server/mods/deathmatch/logic/CPerfStat.EventPacketUsage.cpp index d333ed9539b..a110f5a9302 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.EventPacketUsage.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.EventPacketUsage.cpp @@ -13,7 +13,7 @@ struct SEventUsage { - SEventUsage(void) : iTotal(0), iEventOut(0), iElementDataOut(0), iElementDataRelay(0) {} + SEventUsage() : iTotal(0), iEventOut(0), iElementDataOut(0), iElementDataRelay(0) {} SString strName; int iTotal; int iEventOut; @@ -33,12 +33,12 @@ class CPerfStatEventPacketUsageImpl : public CPerfStatEventPacketUsage public: ZERO_ON_NEW - CPerfStatEventPacketUsageImpl(void); - virtual ~CPerfStatEventPacketUsageImpl(void); + CPerfStatEventPacketUsageImpl(); + virtual ~CPerfStatEventPacketUsageImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CPerfStatEventPacketUsage @@ -47,7 +47,7 @@ class CPerfStatEventPacketUsageImpl : public CPerfStatEventPacketUsage virtual void UpdateEventUsageOut(const char* szName, uint uiNumPlayers); // CPerfStatEventPacketUsageImpl - void MaybeRecordStats(void); + void MaybeRecordStats(); bool m_bEnabled; CElapsedTime m_TimeSinceGetStats; @@ -80,7 +80,7 @@ CPerfStatEventPacketUsage* CPerfStatEventPacketUsage::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatEventPacketUsageImpl::CPerfStatEventPacketUsageImpl(void) +CPerfStatEventPacketUsageImpl::CPerfStatEventPacketUsageImpl() { m_strCategoryName = "Event Packet usage"; } @@ -92,7 +92,7 @@ CPerfStatEventPacketUsageImpl::CPerfStatEventPacketUsageImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatEventPacketUsageImpl::~CPerfStatEventPacketUsageImpl(void) +CPerfStatEventPacketUsageImpl::~CPerfStatEventPacketUsageImpl() { } @@ -103,7 +103,7 @@ CPerfStatEventPacketUsageImpl::~CPerfStatEventPacketUsageImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatEventPacketUsageImpl::GetCategoryName(void) +const SString& CPerfStatEventPacketUsageImpl::GetCategoryName() { return m_strCategoryName; } @@ -115,7 +115,7 @@ const SString& CPerfStatEventPacketUsageImpl::GetCategoryName(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatEventPacketUsageImpl::DoPulse(void) +void CPerfStatEventPacketUsageImpl::DoPulse() { MaybeRecordStats(); } @@ -178,7 +178,7 @@ void CPerfStatEventPacketUsageImpl::UpdateEventUsageOut(const char* szName, uint // // /////////////////////////////////////////////////////////////// -void CPerfStatEventPacketUsageImpl::MaybeRecordStats(void) +void CPerfStatEventPacketUsageImpl::MaybeRecordStats() { // Someone watching? if (m_TimeSinceGetStats.Get() < 10000) diff --git a/Server/mods/deathmatch/logic/CPerfStat.FunctionTiming.cpp b/Server/mods/deathmatch/logic/CPerfStat.FunctionTiming.cpp index 46b064e5656..0d2cd1bcc26 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.FunctionTiming.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.FunctionTiming.cpp @@ -20,7 +20,7 @@ namespace // struct STiming { - STiming(void) : uiNumCalls(0), fTotalMs(0), fPeakMs(0), fResBiggestMs(0), uiTotalBytes(0), uiPeakBytes(0), uiResBiggestBytes(0) {} + STiming() : uiNumCalls(0), fTotalMs(0), fPeakMs(0), fResBiggestMs(0), uiTotalBytes(0), uiPeakBytes(0), uiResBiggestBytes(0) {} uint uiNumCalls; float fTotalMs; @@ -36,7 +36,7 @@ namespace struct SFunctionTimingInfo { - SFunctionTimingInfo(void) : iPrevIndex(0) {} + SFunctionTimingInfo() : iPrevIndex(0) {} STiming now5s; STiming prev60s; int iPrevIndex; @@ -86,12 +86,12 @@ class CPerfStatFunctionTimingImpl : public CPerfStatFunctionTiming { public: ZERO_ON_NEW - CPerfStatFunctionTimingImpl(void); - virtual ~CPerfStatFunctionTimingImpl(void); + CPerfStatFunctionTimingImpl(); + virtual ~CPerfStatFunctionTimingImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CPerfStatFunctionTiming @@ -132,7 +132,7 @@ CPerfStatFunctionTiming* CPerfStatFunctionTiming::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatFunctionTimingImpl::CPerfStatFunctionTimingImpl(void) +CPerfStatFunctionTimingImpl::CPerfStatFunctionTimingImpl() { m_strCategoryName = "Function stats"; ms_PeakUsThresh = DEFAULT_THRESH_MS * 1000; @@ -145,7 +145,7 @@ CPerfStatFunctionTimingImpl::CPerfStatFunctionTimingImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatFunctionTimingImpl::~CPerfStatFunctionTimingImpl(void) +CPerfStatFunctionTimingImpl::~CPerfStatFunctionTimingImpl() { } @@ -156,7 +156,7 @@ CPerfStatFunctionTimingImpl::~CPerfStatFunctionTimingImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatFunctionTimingImpl::GetCategoryName(void) +const SString& CPerfStatFunctionTimingImpl::GetCategoryName() { return m_strCategoryName; } @@ -168,7 +168,7 @@ const SString& CPerfStatFunctionTimingImpl::GetCategoryName(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatFunctionTimingImpl::DoPulse(void) +void CPerfStatFunctionTimingImpl::DoPulse() { // Maybe turn off stats gathering if nobody is watching if (m_bIsActive && m_TimeSinceLastViewed.Get() > 15000) diff --git a/Server/mods/deathmatch/logic/CPerfStat.LibMemory.cpp b/Server/mods/deathmatch/logic/CPerfStat.LibMemory.cpp index fd5ffd9c0a2..97551286751 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.LibMemory.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.LibMemory.cpp @@ -20,7 +20,7 @@ namespace class CLibMemory { public: - CLibMemory(void) { memset(this, 0, sizeof(*this)); } + CLibMemory() { memset(this, 0, sizeof(*this)); } int Delta; int Current; @@ -55,12 +55,12 @@ class CPerfStatLibMemoryImpl : public CPerfStatLibMemory { public: ZERO_ON_NEW - CPerfStatLibMemoryImpl(void); - virtual ~CPerfStatLibMemoryImpl(void); + CPerfStatLibMemoryImpl(); + virtual ~CPerfStatLibMemoryImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CPerfStatLibMemory @@ -97,7 +97,7 @@ CPerfStatLibMemory* CPerfStatLibMemory::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatLibMemoryImpl::CPerfStatLibMemoryImpl(void) +CPerfStatLibMemoryImpl::CPerfStatLibMemoryImpl() { m_strCategoryName = "Lib memory"; } @@ -109,7 +109,7 @@ CPerfStatLibMemoryImpl::CPerfStatLibMemoryImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatLibMemoryImpl::~CPerfStatLibMemoryImpl(void) +CPerfStatLibMemoryImpl::~CPerfStatLibMemoryImpl() { } @@ -120,7 +120,7 @@ CPerfStatLibMemoryImpl::~CPerfStatLibMemoryImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatLibMemoryImpl::GetCategoryName(void) +const SString& CPerfStatLibMemoryImpl::GetCategoryName() { return m_strCategoryName; } @@ -153,7 +153,7 @@ void CPerfStatLibMemoryImpl::UpdateLibMemory(const SString& strLibName, int iMem // // /////////////////////////////////////////////////////////////// -void CPerfStatLibMemoryImpl::DoPulse(void) +void CPerfStatLibMemoryImpl::DoPulse() { } diff --git a/Server/mods/deathmatch/logic/CPerfStat.LuaMemory.cpp b/Server/mods/deathmatch/logic/CPerfStat.LuaMemory.cpp index bb0fd00b4cf..53d59e9dac2 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.LuaMemory.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.LuaMemory.cpp @@ -19,7 +19,7 @@ namespace class CLuaMainMemory { public: - CLuaMainMemory(void) { memset(this, 0, sizeof(*this)); } + CLuaMainMemory() { memset(this, 0, sizeof(*this)); } int Delta; int Current; @@ -52,12 +52,12 @@ class CPerfStatLuaMemoryImpl : public CPerfStatLuaMemory { public: ZERO_ON_NEW - CPerfStatLuaMemoryImpl(void); - virtual ~CPerfStatLuaMemoryImpl(void); + CPerfStatLuaMemoryImpl(); + virtual ~CPerfStatLuaMemoryImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CPerfStatLuaMemory @@ -96,7 +96,7 @@ CPerfStatLuaMemory* CPerfStatLuaMemory::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatLuaMemoryImpl::CPerfStatLuaMemoryImpl(void) +CPerfStatLuaMemoryImpl::CPerfStatLuaMemoryImpl() { m_strCategoryName = "Lua memory"; } @@ -108,7 +108,7 @@ CPerfStatLuaMemoryImpl::CPerfStatLuaMemoryImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatLuaMemoryImpl::~CPerfStatLuaMemoryImpl(void) +CPerfStatLuaMemoryImpl::~CPerfStatLuaMemoryImpl() { } @@ -119,7 +119,7 @@ CPerfStatLuaMemoryImpl::~CPerfStatLuaMemoryImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatLuaMemoryImpl::GetCategoryName(void) +const SString& CPerfStatLuaMemoryImpl::GetCategoryName() { return m_strCategoryName; } @@ -185,7 +185,7 @@ void CPerfStatLuaMemoryImpl::UpdateLuaMemory(CLuaMain* pLuaMain, int iMemUsed) // // /////////////////////////////////////////////////////////////// -void CPerfStatLuaMemoryImpl::DoPulse(void) +void CPerfStatLuaMemoryImpl::DoPulse() { } diff --git a/Server/mods/deathmatch/logic/CPerfStat.LuaTiming.cpp b/Server/mods/deathmatch/logic/CPerfStat.LuaTiming.cpp index 81e53aac5cf..2f344f20481 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.LuaTiming.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.LuaTiming.cpp @@ -113,12 +113,12 @@ class CPerfStatLuaTimingImpl : public CPerfStatLuaTiming { public: ZERO_ON_NEW - CPerfStatLuaTimingImpl(void); - virtual ~CPerfStatLuaTimingImpl(void); + CPerfStatLuaTimingImpl(); + virtual ~CPerfStatLuaTimingImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CPerfStatLuaTiming @@ -160,7 +160,7 @@ CPerfStatLuaTiming* CPerfStatLuaTiming::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatLuaTimingImpl::CPerfStatLuaTimingImpl(void) +CPerfStatLuaTimingImpl::CPerfStatLuaTimingImpl() { m_strCategoryName = "Lua timing"; } @@ -172,7 +172,7 @@ CPerfStatLuaTimingImpl::CPerfStatLuaTimingImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatLuaTimingImpl::~CPerfStatLuaTimingImpl(void) +CPerfStatLuaTimingImpl::~CPerfStatLuaTimingImpl() { } @@ -183,7 +183,7 @@ CPerfStatLuaTimingImpl::~CPerfStatLuaTimingImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatLuaTimingImpl::GetCategoryName(void) +const SString& CPerfStatLuaTimingImpl::GetCategoryName() { return m_strCategoryName; } @@ -256,7 +256,7 @@ void CPerfStatLuaTimingImpl::UpdateLuaTiming(CLuaMain* pLuaMain, const char* szE // // /////////////////////////////////////////////////////////////// -void CPerfStatLuaTimingImpl::DoPulse(void) +void CPerfStatLuaTimingImpl::DoPulse() { long long llTickCount = GetTickCount64_(); long long llDelta = llTickCount - m_LastTickCount; diff --git a/Server/mods/deathmatch/logic/CPerfStat.PacketUsage.cpp b/Server/mods/deathmatch/logic/CPerfStat.PacketUsage.cpp index 90bb57c4349..425604efe00 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.PacketUsage.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.PacketUsage.cpp @@ -23,16 +23,16 @@ class CPerfStatPacketUsageImpl : public CPerfStatPacketUsage public: ZERO_ON_NEW - CPerfStatPacketUsageImpl(void); - virtual ~CPerfStatPacketUsageImpl(void); + CPerfStatPacketUsageImpl(); + virtual ~CPerfStatPacketUsageImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CPerfStatPacketUsageImpl - void MaybeRecordStats(void); + void MaybeRecordStats(); int m_iStatsCleared; CElapsedTime m_TimeSinceGetStats; @@ -66,7 +66,7 @@ CPerfStatPacketUsage* CPerfStatPacketUsage::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatPacketUsageImpl::CPerfStatPacketUsageImpl(void) +CPerfStatPacketUsageImpl::CPerfStatPacketUsageImpl() { m_strCategoryName = "Packet usage"; } @@ -78,7 +78,7 @@ CPerfStatPacketUsageImpl::CPerfStatPacketUsageImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatPacketUsageImpl::~CPerfStatPacketUsageImpl(void) +CPerfStatPacketUsageImpl::~CPerfStatPacketUsageImpl() { } @@ -89,7 +89,7 @@ CPerfStatPacketUsageImpl::~CPerfStatPacketUsageImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatPacketUsageImpl::GetCategoryName(void) +const SString& CPerfStatPacketUsageImpl::GetCategoryName() { return m_strCategoryName; } @@ -101,7 +101,7 @@ const SString& CPerfStatPacketUsageImpl::GetCategoryName(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatPacketUsageImpl::DoPulse(void) +void CPerfStatPacketUsageImpl::DoPulse() { MaybeRecordStats(); } @@ -113,7 +113,7 @@ void CPerfStatPacketUsageImpl::DoPulse(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatPacketUsageImpl::MaybeRecordStats(void) +void CPerfStatPacketUsageImpl::MaybeRecordStats() { // Someone watching? if (m_TimeSinceGetStats.Get() < 10000) diff --git a/Server/mods/deathmatch/logic/CPerfStat.PlayerPacketUsage.cpp b/Server/mods/deathmatch/logic/CPerfStat.PlayerPacketUsage.cpp index 63dc7772767..134c4285d37 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.PlayerPacketUsage.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.PlayerPacketUsage.cpp @@ -103,16 +103,16 @@ class CPerfStatPlayerPacketUsageImpl : public CPerfStatPlayerPacketUsage { public: ZERO_ON_NEW - CPerfStatPlayerPacketUsageImpl(void); - virtual ~CPerfStatPlayerPacketUsageImpl(void); + CPerfStatPlayerPacketUsageImpl(); + virtual ~CPerfStatPlayerPacketUsageImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CPerfStatPlayerPacketUsageImpl functions - void UpdatePlayerPacketUsage(void); + void UpdatePlayerPacketUsage(); void GetPlayerPacketUsageStats(CPerfStatResult* pResult, const std::map& strOptionMap, const SString& strFilter); void OutputTimeSpanBlock(CPerfStatResult* pResult, const CTimeSpanBlock& TimeSpanBlock, int iTopPos, int flags, const SString& BlockName, bool bDetail); @@ -146,7 +146,7 @@ CPerfStatPlayerPacketUsage* CPerfStatPlayerPacketUsage::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatPlayerPacketUsageImpl::CPerfStatPlayerPacketUsageImpl(void) +CPerfStatPlayerPacketUsageImpl::CPerfStatPlayerPacketUsageImpl() { m_strCategoryName = "Player packet usage"; } @@ -158,7 +158,7 @@ CPerfStatPlayerPacketUsageImpl::CPerfStatPlayerPacketUsageImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatPlayerPacketUsageImpl::~CPerfStatPlayerPacketUsageImpl(void) +CPerfStatPlayerPacketUsageImpl::~CPerfStatPlayerPacketUsageImpl() { } @@ -169,7 +169,7 @@ CPerfStatPlayerPacketUsageImpl::~CPerfStatPlayerPacketUsageImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatPlayerPacketUsageImpl::GetCategoryName(void) +const SString& CPerfStatPlayerPacketUsageImpl::GetCategoryName() { return m_strCategoryName; } @@ -181,7 +181,7 @@ const SString& CPerfStatPlayerPacketUsageImpl::GetCategoryName(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatPlayerPacketUsageImpl::DoPulse(void) +void CPerfStatPlayerPacketUsageImpl::DoPulse() { long long llTickCount = GetTickCount64_(); long long llDelta = llTickCount - m_LastTickCount; @@ -215,7 +215,7 @@ void CPerfStatPlayerPacketUsageImpl::DoPulse(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatPlayerPacketUsageImpl::UpdatePlayerPacketUsage(void) +void CPerfStatPlayerPacketUsageImpl::UpdatePlayerPacketUsage() { // Get stats from net module uchar packetIdList[] = {PACKET_ID_COMMAND, PACKET_ID_LUA_EVENT, PACKET_ID_CUSTOM_DATA}; diff --git a/Server/mods/deathmatch/logic/CPerfStat.RPCPacketUsage.cpp b/Server/mods/deathmatch/logic/CPerfStat.RPCPacketUsage.cpp index e59c46b517a..6d9d081a26d 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.RPCPacketUsage.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.RPCPacketUsage.cpp @@ -244,12 +244,12 @@ class CPerfStatRPCPacketUsageImpl : public CPerfStatRPCPacketUsage public: ZERO_ON_NEW - CPerfStatRPCPacketUsageImpl(void); - virtual ~CPerfStatRPCPacketUsageImpl(void); + CPerfStatRPCPacketUsageImpl(); + virtual ~CPerfStatRPCPacketUsageImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CPerfStatRPCPacketUsage @@ -257,7 +257,7 @@ class CPerfStatRPCPacketUsageImpl : public CPerfStatRPCPacketUsage virtual void UpdatePacketUsageOut(uchar ucRpcId, uint uiSize); // CPerfStatRPCPacketUsageImpl - void MaybeRecordStats(void); + void MaybeRecordStats(); int m_iStatsCleared; CElapsedTime m_TimeSinceGetStats; @@ -296,7 +296,7 @@ CPerfStatRPCPacketUsage* CPerfStatRPCPacketUsage::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatRPCPacketUsageImpl::CPerfStatRPCPacketUsageImpl(void) +CPerfStatRPCPacketUsageImpl::CPerfStatRPCPacketUsageImpl() { m_strCategoryName = "RPC Packet usage"; assert(sizeof(m_PacketStatsIn) == sizeof(m_PrevPacketStatsIn)); @@ -310,7 +310,7 @@ CPerfStatRPCPacketUsageImpl::CPerfStatRPCPacketUsageImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatRPCPacketUsageImpl::~CPerfStatRPCPacketUsageImpl(void) +CPerfStatRPCPacketUsageImpl::~CPerfStatRPCPacketUsageImpl() { } @@ -321,7 +321,7 @@ CPerfStatRPCPacketUsageImpl::~CPerfStatRPCPacketUsageImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatRPCPacketUsageImpl::GetCategoryName(void) +const SString& CPerfStatRPCPacketUsageImpl::GetCategoryName() { return m_strCategoryName; } @@ -333,7 +333,7 @@ const SString& CPerfStatRPCPacketUsageImpl::GetCategoryName(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatRPCPacketUsageImpl::DoPulse(void) +void CPerfStatRPCPacketUsageImpl::DoPulse() { MaybeRecordStats(); } @@ -373,7 +373,7 @@ void CPerfStatRPCPacketUsageImpl::UpdatePacketUsageOut(uchar ucRpcId, uint uiSiz // // /////////////////////////////////////////////////////////////// -void CPerfStatRPCPacketUsageImpl::MaybeRecordStats(void) +void CPerfStatRPCPacketUsageImpl::MaybeRecordStats() { // Someone watching? if (m_TimeSinceGetStats.Get() < 10000) diff --git a/Server/mods/deathmatch/logic/CPerfStat.ServerInfo.cpp b/Server/mods/deathmatch/logic/CPerfStat.ServerInfo.cpp index 3b63fc753d8..814e48c75ed 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.ServerInfo.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.ServerInfo.cpp @@ -58,17 +58,17 @@ class CPerfStatServerInfoImpl : public CPerfStatServerInfo public: ZERO_ON_NEW - CPerfStatServerInfoImpl(void); - virtual ~CPerfStatServerInfoImpl(void); + CPerfStatServerInfoImpl(); + virtual ~CPerfStatServerInfoImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CPerfStatServerInfoImpl - void RecordStats(void); - SString GetProcessMemoryUsage(void); + void RecordStats(); + SString GetProcessMemoryUsage(); SString m_strCategoryName; time_t m_tStartTime; @@ -116,7 +116,7 @@ CPerfStatServerInfo* CPerfStatServerInfo::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatServerInfoImpl::CPerfStatServerInfoImpl(void) +CPerfStatServerInfoImpl::CPerfStatServerInfoImpl() { m_strCategoryName = "Server info"; m_tStartTime = time(NULL); @@ -129,7 +129,7 @@ CPerfStatServerInfoImpl::CPerfStatServerInfoImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatServerInfoImpl::~CPerfStatServerInfoImpl(void) +CPerfStatServerInfoImpl::~CPerfStatServerInfoImpl() { } @@ -140,7 +140,7 @@ CPerfStatServerInfoImpl::~CPerfStatServerInfoImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatServerInfoImpl::GetCategoryName(void) +const SString& CPerfStatServerInfoImpl::GetCategoryName() { return m_strCategoryName; } @@ -152,7 +152,7 @@ const SString& CPerfStatServerInfoImpl::GetCategoryName(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatServerInfoImpl::DoPulse(void) +void CPerfStatServerInfoImpl::DoPulse() { long long llTime = GetTickCount64_(); @@ -173,7 +173,7 @@ void CPerfStatServerInfoImpl::DoPulse(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatServerInfoImpl::RecordStats(void) +void CPerfStatServerInfoImpl::RecordStats() { // Sample new stats and calc the delta SBandwidthStatistics liveStats; @@ -204,7 +204,7 @@ void CPerfStatServerInfoImpl::RecordStats(void) // // /////////////////////////////////////////////////////////////// -SString CPerfStatServerInfoImpl::GetProcessMemoryUsage(void) +SString CPerfStatServerInfoImpl::GetProcessMemoryUsage() { #ifdef WIN32 PROCESS_MEMORY_COUNTERS psmemCounter; diff --git a/Server/mods/deathmatch/logic/CPerfStat.ServerTiming.cpp b/Server/mods/deathmatch/logic/CPerfStat.ServerTiming.cpp index b25f5043100..99a25fd1759 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.ServerTiming.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.ServerTiming.cpp @@ -22,12 +22,12 @@ class CPerfStatServerTimingImpl : public CPerfStatServerTiming { public: ZERO_ON_NEW - CPerfStatServerTimingImpl(void); - virtual ~CPerfStatServerTimingImpl(void); + CPerfStatServerTimingImpl(); + virtual ~CPerfStatServerTimingImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CPerfStatServerTiming @@ -65,7 +65,7 @@ CPerfStatServerTiming* CPerfStatServerTiming::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatServerTimingImpl::CPerfStatServerTimingImpl(void) +CPerfStatServerTimingImpl::CPerfStatServerTimingImpl() { m_strCategoryName = "Server timing"; } @@ -77,7 +77,7 @@ CPerfStatServerTimingImpl::CPerfStatServerTimingImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatServerTimingImpl::~CPerfStatServerTimingImpl(void) +CPerfStatServerTimingImpl::~CPerfStatServerTimingImpl() { } @@ -88,7 +88,7 @@ CPerfStatServerTimingImpl::~CPerfStatServerTimingImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatServerTimingImpl::GetCategoryName(void) +const SString& CPerfStatServerTimingImpl::GetCategoryName() { return m_strCategoryName; } @@ -100,7 +100,7 @@ const SString& CPerfStatServerTimingImpl::GetCategoryName(void) // // /////////////////////////////////////////////////////////////// -void CPerfStatServerTimingImpl::DoPulse(void) +void CPerfStatServerTimingImpl::DoPulse() { // Maybe turn off stats gathering if nobody is watching if (m_bIsActive && m_TimeSinceLastViewed.Get() > 15000) diff --git a/Server/mods/deathmatch/logic/CPerfStat.SqliteTiming.cpp b/Server/mods/deathmatch/logic/CPerfStat.SqliteTiming.cpp index 13f7428e89d..87891f26f77 100644 --- a/Server/mods/deathmatch/logic/CPerfStat.SqliteTiming.cpp +++ b/Server/mods/deathmatch/logic/CPerfStat.SqliteTiming.cpp @@ -34,12 +34,12 @@ class CPerfStatSqliteTimingImpl : public CPerfStatSqliteTiming { public: ZERO_ON_NEW - CPerfStatSqliteTimingImpl(void); - virtual ~CPerfStatSqliteTimingImpl(void); + CPerfStatSqliteTimingImpl(); + virtual ~CPerfStatSqliteTimingImpl(); // CPerfStatModule - virtual const SString& GetCategoryName(void); - virtual void DoPulse(void); + virtual const SString& GetCategoryName(); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter); // CPerfStatSqliteTiming @@ -82,7 +82,7 @@ CPerfStatSqliteTiming* CPerfStatSqliteTiming::GetSingleton() // // /////////////////////////////////////////////////////////////// -CPerfStatSqliteTimingImpl::CPerfStatSqliteTimingImpl(void) +CPerfStatSqliteTimingImpl::CPerfStatSqliteTimingImpl() { m_strCategoryName = "Sqlite timing"; } @@ -94,7 +94,7 @@ CPerfStatSqliteTimingImpl::CPerfStatSqliteTimingImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatSqliteTimingImpl::~CPerfStatSqliteTimingImpl(void) +CPerfStatSqliteTimingImpl::~CPerfStatSqliteTimingImpl() { } @@ -105,7 +105,7 @@ CPerfStatSqliteTimingImpl::~CPerfStatSqliteTimingImpl(void) // // /////////////////////////////////////////////////////////////// -const SString& CPerfStatSqliteTimingImpl::GetCategoryName(void) +const SString& CPerfStatSqliteTimingImpl::GetCategoryName() { return m_strCategoryName; } @@ -187,7 +187,7 @@ void CPerfStatSqliteTimingImpl::SetCurrentResource(lua_State* luaVM) // // /////////////////////////////////////////////////////////////// -void CPerfStatSqliteTimingImpl::DoPulse(void) +void CPerfStatSqliteTimingImpl::DoPulse() { long long llTime = GetTickCount64_(); // Remove old stats diff --git a/Server/mods/deathmatch/logic/CPerfStatManager.cpp b/Server/mods/deathmatch/logic/CPerfStatManager.cpp index e048a38cd8d..b89231da01b 100644 --- a/Server/mods/deathmatch/logic/CPerfStatManager.cpp +++ b/Server/mods/deathmatch/logic/CPerfStatManager.cpp @@ -22,18 +22,18 @@ std::unique_ptr g_pStats(new SStatData()); class CPerfStatManagerImpl : public CPerfStatManager { public: - CPerfStatManagerImpl(void); - virtual ~CPerfStatManagerImpl(void); + CPerfStatManagerImpl(); + virtual ~CPerfStatManagerImpl(); // CPerfStatManager - virtual void DoPulse(void); + virtual void DoPulse(); virtual void GetStats(CPerfStatResult* pOutResult, const SString& strCategory, const SString& strOptions, const SString& strFilter); - virtual void Stop(void); + virtual void Stop(); // CPerfStatManagerImpl void AddModule(CPerfStatModule* pModule); void RemoveModule(CPerfStatModule* pModule); - uint GetModuleCount(void); + uint GetModuleCount(); CPerfStatModule* GetModuleByIndex(uint uiIndex); CPerfStatModule* GetModuleByCategoryName(const SString& strCategory); @@ -49,7 +49,7 @@ class CPerfStatManagerImpl : public CPerfStatManager /////////////////////////////////////////////////////////////// static std::unique_ptr g_pPerfStatManagerImp; -CPerfStatManager* CPerfStatManager::GetSingleton(void) +CPerfStatManager* CPerfStatManager::GetSingleton() { // If we're stopping the server, do not create a PerfStatManager just to destroy it if (g_pGame->IsBeingDeleted()) @@ -67,7 +67,7 @@ CPerfStatManager* CPerfStatManager::GetSingleton(void) // // /////////////////////////////////////////////////////////////// -CPerfStatManagerImpl::CPerfStatManagerImpl(void) +CPerfStatManagerImpl::CPerfStatManagerImpl() { AddModule(CPerfStatLuaTiming::GetSingleton()); AddModule(CPerfStatLuaMemory::GetSingleton()); @@ -93,7 +93,7 @@ CPerfStatManagerImpl::CPerfStatManagerImpl(void) // // /////////////////////////////////////////////////////////////// -CPerfStatManagerImpl::~CPerfStatManagerImpl(void) +CPerfStatManagerImpl::~CPerfStatManagerImpl() { } @@ -104,7 +104,7 @@ CPerfStatManagerImpl::~CPerfStatManagerImpl(void) // Stops all modules by invoking Stop() on all modules // /////////////////////////////////////////////////////////////// -void CPerfStatManagerImpl::Stop(void) +void CPerfStatManagerImpl::Stop() { for (auto const& module : m_ModuleList) module->Stop(); @@ -144,7 +144,7 @@ void CPerfStatManagerImpl::RemoveModule(CPerfStatModule* pModule) // // /////////////////////////////////////////////////////////////// -uint CPerfStatManagerImpl::GetModuleCount(void) +uint CPerfStatManagerImpl::GetModuleCount() { return m_ModuleList.size(); } @@ -188,7 +188,7 @@ CPerfStatModule* CPerfStatManagerImpl::GetModuleByCategoryName(const SString& st // // /////////////////////////////////////////////////////////////// -void CPerfStatManagerImpl::DoPulse(void) +void CPerfStatManagerImpl::DoPulse() { for (uint i = 0; i < GetModuleCount(); i++) { diff --git a/Server/mods/deathmatch/logic/CPerfStatManager.h b/Server/mods/deathmatch/logic/CPerfStatManager.h index de07b4c556d..5aa3413ce94 100644 --- a/Server/mods/deathmatch/logic/CPerfStatManager.h +++ b/Server/mods/deathmatch/logic/CPerfStatManager.h @@ -17,11 +17,11 @@ class CPerfStatManager { public: - virtual ~CPerfStatManager(void) {} + virtual ~CPerfStatManager() {} - virtual void DoPulse(void) = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const SString& strCategory, const SString& strOptions, const SString& strFilter) = 0; - virtual void Stop(void) = 0; + virtual void Stop() = 0; // Utility static SString GetScaledByteString(long long Amount); @@ -32,5 +32,5 @@ class CPerfStatManager static SString GetPerSecondString(long long llValue, double dDeltaTickCount); static SString GetPercentString(long long llValue, long long llTotal); - static CPerfStatManager* GetSingleton(void); + static CPerfStatManager* GetSingleton(); }; diff --git a/Server/mods/deathmatch/logic/CPerfStatModule.h b/Server/mods/deathmatch/logic/CPerfStatModule.h index a5738d4f39d..3fffecbbcc7 100644 --- a/Server/mods/deathmatch/logic/CPerfStatModule.h +++ b/Server/mods/deathmatch/logic/CPerfStatModule.h @@ -77,7 +77,7 @@ class CPerfStatResult iNumColumns++; } - SString* AddRow(void) + SString* AddRow() { iNumRows++; cellList.insert(cellList.end(), ColumnCount(), SString()); @@ -108,12 +108,12 @@ class CPerfStatResult class CPerfStatModule { public: - virtual ~CPerfStatModule(void) {} + virtual ~CPerfStatModule() {} - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; - virtual void Stop(void){}; + virtual void Stop(){}; }; // @@ -123,8 +123,8 @@ class CPerfStatLuaTiming : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CPerfStatLuaTiming @@ -132,7 +132,7 @@ class CPerfStatLuaTiming : public CPerfStatModule virtual void OnLuaMainDestroy(CLuaMain* pLuaMain) = 0; virtual void UpdateLuaTiming(CLuaMain* pLuaMain, const char* szEventName, TIMEUS timeUs) = 0; - static CPerfStatLuaTiming* GetSingleton(void); + static CPerfStatLuaTiming* GetSingleton(); }; // @@ -142,15 +142,15 @@ class CPerfStatLuaMemory : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CPerfStatLuaMemory virtual void OnLuaMainCreate(CLuaMain* pLuaMain) = 0; virtual void OnLuaMainDestroy(CLuaMain* pLuaMain) = 0; - static CPerfStatLuaMemory* GetSingleton(void); + static CPerfStatLuaMemory* GetSingleton(); }; // @@ -160,13 +160,13 @@ class CPerfStatLibMemory : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CPerfStatLibMemory - static CPerfStatLibMemory* GetSingleton(void); + static CPerfStatLibMemory* GetSingleton(); }; // @@ -176,13 +176,13 @@ class CPerfStatPacketUsage : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CPerfStatPacketUsage - static CPerfStatPacketUsage* GetSingleton(void); + static CPerfStatPacketUsage* GetSingleton(); }; // @@ -192,15 +192,15 @@ class CPerfStatRPCPacketUsage : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CPerfStatRPCPacketUsage virtual void UpdatePacketUsageIn(uchar ucRpcId, uint uiSize) = 0; virtual void UpdatePacketUsageOut(uchar ucRpcId, uint uiSize) = 0; - static CPerfStatRPCPacketUsage* GetSingleton(void); + static CPerfStatRPCPacketUsage* GetSingleton(); }; // @@ -210,8 +210,8 @@ class CPerfStatEventPacketUsage : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CPerfStatRPCPacketUsage @@ -219,7 +219,7 @@ class CPerfStatEventPacketUsage : public CPerfStatModule virtual void UpdateElementDataUsageRelayed(const char* szName, uint uiNumPlayers, uint uiSize) = 0; virtual void UpdateEventUsageOut(const char* szName, uint uiNumPlayers) = 0; - static CPerfStatEventPacketUsage* GetSingleton(void); + static CPerfStatEventPacketUsage* GetSingleton(); }; // @@ -229,11 +229,11 @@ class CPerfStatPlayerPacketUsage : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; - static CPerfStatPlayerPacketUsage* GetSingleton(void); + static CPerfStatPlayerPacketUsage* GetSingleton(); }; // @@ -243,14 +243,14 @@ class CPerfStatBandwidthUsage : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; - virtual void Stop(void) = 0; + virtual void Stop() = 0; // CPerfStatBandwidthUsage - static CPerfStatBandwidthUsage* GetSingleton(void); + static CPerfStatBandwidthUsage* GetSingleton(); }; // @@ -260,8 +260,8 @@ class CPerfStatSqliteTiming : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CPerfStatSqliteTiming @@ -270,7 +270,7 @@ class CPerfStatSqliteTiming : public CPerfStatModule virtual void UpdateSqliteTiming(CRegistry* pRegistry, const char* szQuery, TIMEUS timeUs) = 0; virtual void SetCurrentResource(lua_State* luaVM) = 0; - static CPerfStatSqliteTiming* GetSingleton(void); + static CPerfStatSqliteTiming* GetSingleton(); }; // @@ -280,13 +280,13 @@ class CPerfStatBandwidthReduction : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CPerfStatBandwidthReduction - static CPerfStatBandwidthReduction* GetSingleton(void); + static CPerfStatBandwidthReduction* GetSingleton(); }; // @@ -296,13 +296,13 @@ class CPerfStatServerInfo : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CPerfStatServerInfo - static CPerfStatServerInfo* GetSingleton(void); + static CPerfStatServerInfo* GetSingleton(); }; // @@ -312,11 +312,11 @@ class CPerfStatServerTiming : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; - static CPerfStatServerTiming* GetSingleton(void); + static CPerfStatServerTiming* GetSingleton(); }; // @@ -326,14 +326,14 @@ class CPerfStatFunctionTiming : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CPerfStatFunctionTiming virtual void UpdateTiming(const SString& strResourceName, const char* szFunctionName, TIMEUS timeUs, uint uiDeltaBytes) = 0; - static CPerfStatFunctionTiming* GetSingleton(void); + static CPerfStatFunctionTiming* GetSingleton(); static TIMEUS ms_PeakUsThresh; }; @@ -344,15 +344,15 @@ class CPerfStatDebugInfo : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CPerfStatDebugInfo virtual bool IsActive(const char* szSectionName = NULL) = 0; virtual void AddLine(const SString& strSection, const SString& strData) = 0; - static CPerfStatDebugInfo* GetSingleton(void); + static CPerfStatDebugInfo* GetSingleton(); }; // @@ -362,13 +362,13 @@ class CPerfStatDebugTable : public CPerfStatModule { public: // CPerfStatModule - virtual const SString& GetCategoryName(void) = 0; - virtual void DoPulse(void) = 0; + virtual const SString& GetCategoryName() = 0; + virtual void DoPulse() = 0; virtual void GetStats(CPerfStatResult* pOutResult, const std::map& optionMap, const SString& strFilter) = 0; // CPerfStatDebugInfo virtual void RemoveLines(const SString& strKeyMatch) = 0; virtual void UpdateLine(const SString& strKey, int iLifeTimeMs, ...) = 0; - static CPerfStatDebugTable* GetSingleton(void); + static CPerfStatDebugTable* GetSingleton(); }; diff --git a/Server/mods/deathmatch/logic/CPickup.cpp b/Server/mods/deathmatch/logic/CPickup.cpp index 024082e38af..54c3eee06a1 100644 --- a/Server/mods/deathmatch/logic/CPickup.cpp +++ b/Server/mods/deathmatch/logic/CPickup.cpp @@ -46,7 +46,7 @@ CPickup::CPickup(CElement* pParent, CPickupManager* pPickupManager, CColManager* UpdateSpatialData(); } -CPickup::~CPickup(void) +CPickup::~CPickup() { // Delete our collision object if (m_pCollision) @@ -70,7 +70,7 @@ CElement* CPickup::Clone(bool* bAddEntity, CResource* pResource) return pTemp; } -void CPickup::Unlink(void) +void CPickup::Unlink() { // Remove us from the pickup manager's list m_pPickupManager->RemoveFromList(this); @@ -317,7 +317,7 @@ void CPickup::SetVisible(bool bVisible) m_pCollision->SetEnabled(bVisible); } -void CPickup::Randomize(void) +void CPickup::Randomize() { // Randomize type if (m_bIsTypeRandom) diff --git a/Server/mods/deathmatch/logic/CPickup.h b/Server/mods/deathmatch/logic/CPickup.h index d64a5f44e47..f19b453a191 100644 --- a/Server/mods/deathmatch/logic/CPickup.h +++ b/Server/mods/deathmatch/logic/CPickup.h @@ -90,60 +90,60 @@ class CPickup : public CElement, private CColCallback }; CPickup(CElement* pParent, class CPickupManager* pPickupManager, CColManager* pColManager); - ~CPickup(void); + ~CPickup(); CElement* Clone(bool* bAddEntity, CResource* pResource) override; - bool IsEntity(void) { return true; } + bool IsEntity() { return true; } - void Unlink(void); + void Unlink(); void SetPosition(const CVector& vecPosition); - unsigned char GetPickupType(void) { return m_ucType; }; + unsigned char GetPickupType() { return m_ucType; }; void SetPickupType(unsigned char ucType); - bool IsTypeRandom(void) { return m_bIsTypeRandom; }; + bool IsTypeRandom() { return m_bIsTypeRandom; }; - unsigned char GetWeaponType(void) { return m_ucWeaponType; }; + unsigned char GetWeaponType() { return m_ucWeaponType; }; void SetWeaponType(unsigned char ucWeaponType); - bool IsWeaponTypeRandom(void) { return m_bIsWeaponTypeRandom; }; + bool IsWeaponTypeRandom() { return m_bIsWeaponTypeRandom; }; - unsigned short GetAmmo(void) { return m_usAmmo; }; + unsigned short GetAmmo() { return m_usAmmo; }; void SetAmmo(unsigned short usAmmo) { m_usAmmo = usAmmo; }; - float GetAmount(void) { return m_fAmount; } + float GetAmount() { return m_fAmount; } void SetAmount(float fAmount) { m_fAmount = fAmount; } - bool IsHealthRandom(void) { return m_bIsHealthRandom; }; + bool IsHealthRandom() { return m_bIsHealthRandom; }; - unsigned long GetRespawnIntervals(void) { return m_ulRespawnIntervals; }; + unsigned long GetRespawnIntervals() { return m_ulRespawnIntervals; }; void SetRespawnIntervals(unsigned long ulRespawnIntervals) { m_ulRespawnIntervals = ulRespawnIntervals; }; - CTickCount GetLastUsedTime(void) { return m_LastUsedTime; } - CTickCount GetCreationTime(void) { return m_CreationTime; } + CTickCount GetLastUsedTime() { return m_LastUsedTime; } + CTickCount GetCreationTime() { return m_CreationTime; } - unsigned short GetModel(void) { return m_usModel; }; + unsigned short GetModel() { return m_usModel; }; void SetModel(unsigned short usModel) { m_usModel = usModel; }; - bool IsVisible(void) { return m_bVisible; }; + bool IsVisible() { return m_bVisible; }; void SetVisible(bool bVisible); - void Randomize(void); + void Randomize(); bool CanUse(class CPlayer& Player, bool bOnfootCheck = true); void Use(class CPlayer& Player); - bool IsSpawned(void) { return m_bSpawned; } + bool IsSpawned() { return m_bSpawned; } void SetSpawned(bool bSpawned) { m_bSpawned = bSpawned; } - CColShape* GetColShape(void) { return m_pCollision; } + CColShape* GetColShape() { return m_pCollision; } void SetEnabled(bool bEnabled) { if (m_pCollision) m_pCollision->SetEnabled(bEnabled); } - bool IsEnabled(void) { return m_pCollision && m_pCollision->IsEnabled(); } + bool IsEnabled() { return m_pCollision && m_pCollision->IsEnabled(); } void SetDoneDelayHack(bool bDone) { m_bDoneDelayHack = bDone; } - bool HasDoneDelayHack(void) { return m_bDoneDelayHack; } + bool HasDoneDelayHack() { return m_bDoneDelayHack; } protected: bool ReadSpecialData(const int iLine) override; diff --git a/Server/mods/deathmatch/logic/CPickupManager.cpp b/Server/mods/deathmatch/logic/CPickupManager.cpp index 87370790090..a4bd1d570ae 100644 --- a/Server/mods/deathmatch/logic/CPickupManager.cpp +++ b/Server/mods/deathmatch/logic/CPickupManager.cpp @@ -51,7 +51,7 @@ CPickup* CPickupManager::CreateFromXML(CElement* pParent, CXMLNode& Node, CEvent return pPickup; } -void CPickupManager::DeleteAll(void) +void CPickupManager::DeleteAll() { DeletePointersAndClearList(m_List); } diff --git a/Server/mods/deathmatch/logic/CPickupManager.h b/Server/mods/deathmatch/logic/CPickupManager.h index d490f9036fa..33b5f51e41e 100644 --- a/Server/mods/deathmatch/logic/CPickupManager.h +++ b/Server/mods/deathmatch/logic/CPickupManager.h @@ -23,22 +23,22 @@ class CPickupManager public: CPickupManager(CColManager* pColManager); - ~CPickupManager(void) { DeleteAll(); }; + ~CPickupManager() { DeleteAll(); }; CPickup* Create(CElement* pParent); CPickup* CreateFromXML(CElement* pParent, CXMLNode& Node, CEvents* pEvents); - void DeleteAll(void); + void DeleteAll(); - unsigned int Count(void) { return static_cast(m_List.size()); }; + unsigned int Count() { return static_cast(m_List.size()); }; bool Exists(CPickup* pPickup); - list::const_iterator IterBegin(void) { return m_List.begin(); }; - list::const_iterator IterEnd(void) { return m_List.end(); }; + list::const_iterator IterBegin() { return m_List.begin(); }; + list::const_iterator IterEnd() { return m_List.end(); }; static bool IsValidWeaponID(unsigned int uiWeaponID); static unsigned short GetWeaponModel(unsigned int uiWeaponID); - static unsigned short GetHealthModel(void) { return 1240; }; - static unsigned short GetArmorModel(void) { return 1242; }; + static unsigned short GetHealthModel() { return 1240; }; + static unsigned short GetArmorModel() { return 1242; }; private: void AddToList(CPickup* pPickup) { m_List.push_back(pPickup); }; diff --git a/Server/mods/deathmatch/logic/CPlayer.cpp b/Server/mods/deathmatch/logic/CPlayer.cpp index 32bc991583c..5e3224aade5 100644 --- a/Server/mods/deathmatch/logic/CPlayer.cpp +++ b/Server/mods/deathmatch/logic/CPlayer.cpp @@ -104,7 +104,7 @@ CPlayer::CPlayer(CPlayerManager* pPlayerManager, class CScriptDebugging* pScript m_bIsLeavingServer = false; } -CPlayer::~CPlayer(void) +CPlayer::~CPlayer() { // Make sure the script debugger doesn't reference us SetScriptDebugLevel(0); @@ -172,7 +172,7 @@ CPlayer::~CPlayer(void) Unlink(); } -void CPlayer::Unlink(void) +void CPlayer::Unlink() { // Remove us from the player manager m_pPlayerManager->RemoveFromList(this); @@ -181,7 +181,7 @@ void CPlayer::Unlink(void) CPerPlayerEntity::StaticOnPlayerDelete(this); } -void CPlayer::DoPulse(void) +void CPlayer::DoPulse() { if (IsJoined()) { @@ -206,7 +206,7 @@ void CPlayer::SetNick(const char* szNick) m_strNick.AssignLeft(szNick, MAX_PLAYER_NICK_LENGTH); } -const char* CPlayer::GetSourceIP(void) +const char* CPlayer::GetSourceIP() { if (m_strIP.empty()) { @@ -318,7 +318,7 @@ void CPlayer::RemoveSyncingVehicle(CVehicle* pVehicle) } } -void CPlayer::RemoveAllSyncingVehicles(void) +void CPlayer::RemoveAllSyncingVehicles() { // Unreference us from all list::const_iterator iter = m_SyncingVehicles.begin(); @@ -364,7 +364,7 @@ void CPlayer::RemoveSyncingPed(CPed* pPed) } } -void CPlayer::RemoveAllSyncingPeds(void) +void CPlayer::RemoveAllSyncingPeds() { // Unreference us from all list::const_iterator iter = m_SyncingPeds.begin(); @@ -410,7 +410,7 @@ void CPlayer::RemoveSyncingObject(CObject* pObject) } } -void CPlayer::RemoveAllSyncingObjects(void) +void CPlayer::RemoveAllSyncingObjects() { // Unreference us from all list::const_iterator iter = m_SyncingObjects.begin(); @@ -437,7 +437,7 @@ void CPlayer::SetDamageInfo(ElementID ElementID, unsigned char ucWeapon, unsigne m_llSetDamageInfoTime = GetTickCount64_(); } -void CPlayer::ValidateDamageInfo(void) +void CPlayer::ValidateDamageInfo() { if (m_llSetDamageInfoTime + 100 < GetTickCount64_()) { @@ -448,19 +448,19 @@ void CPlayer::ValidateDamageInfo(void) } } -ElementID CPlayer::GetPlayerAttacker(void) +ElementID CPlayer::GetPlayerAttacker() { ValidateDamageInfo(); return m_PlayerAttackerID; } -unsigned char CPlayer::GetAttackWeapon(void) +unsigned char CPlayer::GetAttackWeapon() { ValidateDamageInfo(); return m_ucAttackWeapon; } -unsigned char CPlayer::GetAttackBodyPart(void) +unsigned char CPlayer::GetAttackBodyPart() { ValidateDamageInfo(); return m_ucAttackBodyPart; @@ -479,7 +479,7 @@ void CPlayer::SetTeam(CTeam* pTeam, bool bChangeTeam) m_pTeam->AddPlayer(this, false); } -void CPlayer::Reset(void) +void CPlayer::Reset() { // Called when resetMapInfo is called to reset per player information that is reset in the clientside implimentation of resetMapInfo. This stops our // functions clientside and serverside possibly returning different results. @@ -560,7 +560,7 @@ void CPlayer::SetNametagOverrideColor(unsigned char ucR, unsigned char ucG, unsi m_bNametagColorOverridden = true; } -void CPlayer::RemoveNametagOverrideColor(void) +void CPlayer::RemoveNametagOverrideColor() { m_ucNametagR = 255; m_ucNametagG = 255; @@ -569,7 +569,7 @@ void CPlayer::RemoveNametagOverrideColor(void) } // Is it time to send a pure sync to every other player ? -bool CPlayer::IsTimeForPuresyncFar(void) +bool CPlayer::IsTimeForPuresyncFar() { long long llTime = GetModuleTickCount64(); if (llTime > m_llNextFarPuresyncTime) @@ -630,7 +630,7 @@ void CPlayer::SetWeaponCorrect(bool bWeaponCorrect) m_uiWeaponIncorrectCount++; } -bool CPlayer::GetWeaponCorrect(void) +bool CPlayer::GetWeaponCorrect() { return m_uiWeaponIncorrectCount == 0; } @@ -671,7 +671,7 @@ bool CPlayer::ShouldPlayerBeInNearList(CPlayer* pOther) return false; } -void CPlayer::MaybeUpdateOthersNearList(void) +void CPlayer::MaybeUpdateOthersNearList() { // If too long since last update if (m_UpdateNearListTimer.Get() > (uint)g_TickRateSettings.iNearListUpdate * 9 / 10) @@ -691,7 +691,7 @@ void CPlayer::MaybeUpdateOthersNearList(void) } // Put this player in other players nearlist if this player can observe them in some way -void CPlayer::UpdateOthersNearList(void) +void CPlayer::UpdateOthersNearList() { m_UpdateNearListTimer.Reset(); @@ -975,7 +975,7 @@ bool CPlayer::IsTimeToReceivePuresyncNearFrom(CPlayer* pOther, SViewerInfo& near // // Get the size pure sync packet will be for stats only // -int CPlayer::GetApproxPuresyncPacketSize(void) +int CPlayer::GetApproxPuresyncPacketSize() { // vehicle passenger=15/driver=52, ped with weapon=34/no weapon=30 return m_pVehicle ? (m_uiVehicleSeat ? 15 : 52) : (m_ucWeaponSlot ? 34 : 30); diff --git a/Server/mods/deathmatch/logic/CPlayer.h b/Server/mods/deathmatch/logic/CPlayer.h index c741194b1a3..370094ab432 100644 --- a/Server/mods/deathmatch/logic/CPlayer.h +++ b/Server/mods/deathmatch/logic/CPlayer.h @@ -38,7 +38,7 @@ enum eVoiceState struct SViewerInfo { - SViewerInfo(void) : iMoveToFarCountDown(0), iZone(0), llLastUpdateTime(0), bInPureSyncSimSendList(false) {} + SViewerInfo() : iMoveToFarCountDown(0), iZone(0), llLastUpdateTime(0), bInPureSyncSimSendList(false) {} int iMoveToFarCountDown; @@ -72,186 +72,186 @@ class CPlayer : public CPed, public CClient public: ZERO_ON_NEW CPlayer(class CPlayerManager* pPlayerManager, class CScriptDebugging* pScriptDebugging, const NetServerPlayerID& PlayerSocket); - ~CPlayer(void); + ~CPlayer(); - void DoPulse(void); + void DoPulse(); - void Unlink(void); + void Unlink(); - bool DoNotSendEntities(void) { return m_bDoNotSendEntities; }; + bool DoNotSendEntities() { return m_bDoNotSendEntities; }; void SetDoNotSendEntities(bool bDont) { m_bDoNotSendEntities = bDont; }; - int GetClientType(void) { return CClient::CLIENT_PLAYER; }; - unsigned long long GetTimeSinceConnected(void) { return m_ConnectedTimer.Get(); } + int GetClientType() { return CClient::CLIENT_PLAYER; }; + unsigned long long GetTimeSinceConnected() { return m_ConnectedTimer.Get(); } - const char* GetNick(void) { return m_strNick; }; + const char* GetNick() { return m_strNick; }; void SetNick(const char* szNick); - int GetGameVersion(void) { return m_iGameVersion; }; + int GetGameVersion() { return m_iGameVersion; }; void SetGameVersion(int iGameVersion) { m_iGameVersion = iGameVersion; }; - unsigned short GetMTAVersion(void) { return m_usMTAVersion; }; + unsigned short GetMTAVersion() { return m_usMTAVersion; }; void SetMTAVersion(unsigned short usMTAVersion) { m_usMTAVersion = usMTAVersion; }; - unsigned short GetBitStreamVersion(void) { return m_usBitStreamVersion; }; + unsigned short GetBitStreamVersion() { return m_usBitStreamVersion; }; void SetBitStreamVersion(unsigned short usBitStreamVersion) { m_usBitStreamVersion = usBitStreamVersion; }; void SetPlayerVersion(const SString& strPlayerVersion); - const SString& GetPlayerVersion(void) { return m_strPlayerVersion; }; + const SString& GetPlayerVersion() { return m_strPlayerVersion; }; - bool IsMuted(void) { return m_bIsMuted; }; + bool IsMuted() { return m_bIsMuted; }; void SetMuted(bool bSetMuted) { m_bIsMuted = bSetMuted; }; - bool IsJoined(void) { return m_bIsJoined; } - void SetJoined(void) { m_bIsJoined = true; } + bool IsJoined() { return m_bIsJoined; } + void SetJoined() { m_bIsJoined = true; } - float GetCameraRotation(void) { return m_fCameraRotation; }; + float GetCameraRotation() { return m_fCameraRotation; }; void SetCameraRotation(float fRotation) { m_fCameraRotation = fRotation; }; - long GetMoney(void) { return m_lMoney; }; + long GetMoney() { return m_lMoney; }; void SetMoney(long lMoney) { m_lMoney = lMoney; }; - const CVector& GetSniperSourceVector(void) { return m_vecSniperSource; }; + const CVector& GetSniperSourceVector() { return m_vecSniperSource; }; void SetSniperSourceVector(const CVector& vecSource) { m_vecSniperSource = vecSource; }; void GetTargettingVector(CVector& vecTarget) { vecTarget = m_vecTargetting; }; void SetTargettingVector(const CVector& vecTarget) { m_vecTargetting = vecTarget; }; - float GetAimDirection(void) { return m_fAimDirection; }; + float GetAimDirection() { return m_fAimDirection; }; void SetAimDirection(float fDirection) { m_fAimDirection = fDirection; }; - unsigned char GetDriveByDirection(void) { return m_ucDriveByDirection; }; + unsigned char GetDriveByDirection() { return m_ucDriveByDirection; }; void SetDriveByDirection(unsigned char ucDirection) { m_ucDriveByDirection = ucDirection; }; - bool IsAkimboArmUp(void) { return m_bAkimboArmUp; }; + bool IsAkimboArmUp() { return m_bAkimboArmUp; }; void SetAkimboArmUp(bool bUp) { m_bAkimboArmUp = bUp; }; - NetServerPlayerID& GetSocket(void) { return m_PlayerSocket; }; - const char* GetSourceIP(void); - unsigned short GetSourcePort(void) { return m_PlayerSocket.GetPort(); }; + NetServerPlayerID& GetSocket() { return m_PlayerSocket; }; + const char* GetSourceIP(); + unsigned short GetSourcePort() { return m_PlayerSocket.GetPort(); }; void SetPing(uint uiPing) { m_uiPing = uiPing; } - unsigned int GetPing(void) { return m_uiPing; } + unsigned int GetPing() { return m_uiPing; } - time_t GetNickChangeTime(void) { return m_tNickChange; }; + time_t GetNickChangeTime() { return m_tNickChange; }; void SetNickChangeTime(time_t tNickChange) { m_tNickChange = tNickChange; }; uint Send(const CPacket& Packet); void SendEcho(const char* szEcho); void SendConsole(const char* szEcho); - CPlayerTextManager* GetPlayerTextManager(void) { return m_pPlayerTextManager; }; + CPlayerTextManager* GetPlayerTextManager() { return m_pPlayerTextManager; }; void AddSyncingVehicle(CVehicle* pVehicle); void RemoveSyncingVehicle(CVehicle* pVehicle); - void RemoveAllSyncingVehicles(void); + void RemoveAllSyncingVehicles(); - unsigned int CountSyncingVehicles(void) { return static_cast(m_SyncingVehicles.size()); }; - std::list::const_iterator IterSyncingVehicleBegin(void) { return m_SyncingVehicles.begin(); }; - std::list::const_iterator IterSyncingVehicleEnd(void) { return m_SyncingVehicles.end(); }; + unsigned int CountSyncingVehicles() { return static_cast(m_SyncingVehicles.size()); }; + std::list::const_iterator IterSyncingVehicleBegin() { return m_SyncingVehicles.begin(); }; + std::list::const_iterator IterSyncingVehicleEnd() { return m_SyncingVehicles.end(); }; void AddSyncingPed(CPed* pPed); void RemoveSyncingPed(CPed* pPed); - void RemoveAllSyncingPeds(void); + void RemoveAllSyncingPeds(); - unsigned int CountSyncingPeds(void) { return static_cast(m_SyncingPeds.size()); }; - std::list::const_iterator IterSyncingPedBegin(void) { return m_SyncingPeds.begin(); }; - std::list::const_iterator IterSyncingPedEnd(void) { return m_SyncingPeds.end(); }; + unsigned int CountSyncingPeds() { return static_cast(m_SyncingPeds.size()); }; + std::list::const_iterator IterSyncingPedBegin() { return m_SyncingPeds.begin(); }; + std::list::const_iterator IterSyncingPedEnd() { return m_SyncingPeds.end(); }; void AddSyncingObject(CObject* pObject); void RemoveSyncingObject(CObject* pObject); - void RemoveAllSyncingObjects(void); + void RemoveAllSyncingObjects(); - unsigned int CountSyncingObjects(void) { return static_cast(m_SyncingObjects.size()); }; - std::list::const_iterator IterSyncingObjectBegin(void) { return m_SyncingObjects.begin(); }; - std::list::const_iterator IterSyncingObjectEnd(void) { return m_SyncingObjects.end(); }; + unsigned int CountSyncingObjects() { return static_cast(m_SyncingObjects.size()); }; + std::list::const_iterator IterSyncingObjectBegin() { return m_SyncingObjects.begin(); }; + std::list::const_iterator IterSyncingObjectEnd() { return m_SyncingObjects.end(); }; - unsigned int GetScriptDebugLevel(void) { return m_uiScriptDebugLevel; }; + unsigned int GetScriptDebugLevel() { return m_uiScriptDebugLevel; }; bool SetScriptDebugLevel(unsigned int uiLevel); void SetDamageInfo(ElementID ElementID, unsigned char ucWeapon, unsigned char ucBodyPart); - void ValidateDamageInfo(void); - ElementID GetPlayerAttacker(void); - unsigned char GetAttackWeapon(void); - unsigned char GetAttackBodyPart(void); + void ValidateDamageInfo(); + ElementID GetPlayerAttacker(); + unsigned char GetAttackWeapon(); + unsigned char GetAttackBodyPart(); - CTeam* GetTeam(void) { return m_pTeam; } + CTeam* GetTeam() { return m_pTeam; } void SetTeam(CTeam* pTeam, bool bChangeTeam = false); - CPad* GetPad(void) { return m_pPad; } + CPad* GetPad() { return m_pPad; } - bool IsDebuggerVisible(void) { return m_bDebuggerVisible; } + bool IsDebuggerVisible() { return m_bDebuggerVisible; } void SetDebuggerVisible(bool bVisible) { m_bDebuggerVisible = bVisible; } - unsigned int GetWantedLevel(void) { return m_uiWantedLevel; } + unsigned int GetWantedLevel() { return m_uiWantedLevel; } void SetWantedLevel(unsigned int uiWantedLevel) { m_uiWantedLevel = uiWantedLevel; } - bool GetForcedScoreboard(void) { return m_bForcedScoreboard; } + bool GetForcedScoreboard() { return m_bForcedScoreboard; } void SetForcedScoreboard(bool bVisible) { m_bForcedScoreboard = bVisible; } - bool GetForcedMap(void) { return m_bForcedMap; } + bool GetForcedMap() { return m_bForcedMap; } void SetForcedMap(bool bVisible) { m_bForcedMap = bVisible; } - void Reset(void); + void Reset(); - CPlayerCamera* GetCamera(void) { return m_pCamera; } + CPlayerCamera* GetCamera() { return m_pCamera; } - CKeyBinds* GetKeyBinds(void) { return m_pKeyBinds; } + CKeyBinds* GetKeyBinds() { return m_pKeyBinds; } - bool IsCursorShowing(void) { return m_bCursorShowing; } + bool IsCursorShowing() { return m_bCursorShowing; } void SetCursorShowing(bool bCursorShowing) { m_bCursorShowing = bCursorShowing; } - char* GetNametagText(void) { return m_szNametagText; } + char* GetNametagText() { return m_szNametagText; } void SetNametagText(const char* szText); void GetNametagColor(unsigned char& ucR, unsigned char& ucG, unsigned char& ucB); void SetNametagOverrideColor(unsigned char ucR, unsigned char ucG, unsigned char ucB); - void RemoveNametagOverrideColor(void); - bool IsNametagColorOverridden(void) { return m_bNametagColorOverridden; } + void RemoveNametagOverrideColor(); + bool IsNametagColorOverridden() { return m_bNametagColorOverridden; } - bool IsNametagShowing(void) { return m_bNametagShowing; } + bool IsNametagShowing() { return m_bNametagShowing; } void SetNametagShowing(bool bShowing) { m_bNametagShowing = bShowing; } const std::string& GetSerial(uint uiIndex = 0) { return m_strSerials[uiIndex % NUMELMS(m_strSerials)]; } void SetSerial(const std::string& strSerial, uint uiIndex) { m_strSerials[uiIndex % NUMELMS(m_strSerials)] = strSerial; } - const std::string& GetSerialUser(void) { return m_strSerialUser; }; + const std::string& GetSerialUser() { return m_strSerialUser; }; void SetSerialUser(const std::string& strUser) { m_strSerialUser = strUser; }; - const std::string& GetCommunityID(void) { return m_strCommunityID; }; + const std::string& GetCommunityID() { return m_strCommunityID; }; void SetCommunityID(const std::string& strID) { m_strCommunityID = strID; }; - unsigned char GetBlurLevel(void) { return m_ucBlurLevel; } + unsigned char GetBlurLevel() { return m_ucBlurLevel; } void SetBlurLevel(unsigned char ucBlurLevel) { m_ucBlurLevel = ucBlurLevel; } - bool IsTimeForPuresyncFar(void); + bool IsTimeForPuresyncFar(); // Sync stuff void SetSyncingVelocity(bool bSyncing) { m_bSyncingVelocity = bSyncing; } - bool IsSyncingVelocity(void) const { return m_bSyncingVelocity; } - void IncrementPuresync(void) { m_uiPuresyncPackets++; } - unsigned int GetPuresyncCount(void) const { return m_uiPuresyncPackets; } + bool IsSyncingVelocity() const { return m_bSyncingVelocity; } + void IncrementPuresync() { m_uiPuresyncPackets++; } + unsigned int GetPuresyncCount() const { return m_uiPuresyncPackets; } - void NotifyReceivedSync(void) { m_LastReceivedSyncTimer.Reset(); } - unsigned long long GetTimeSinceReceivedSync(void) { return m_LastReceivedSyncTimer.Get(); } - bool UhOhNetworkTrouble(void) { return GetTimeSinceReceivedSync() > 5000; } + void NotifyReceivedSync() { m_LastReceivedSyncTimer.Reset(); } + unsigned long long GetTimeSinceReceivedSync() { return m_LastReceivedSyncTimer.Get(); } + bool UhOhNetworkTrouble() { return GetTimeSinceReceivedSync() > 5000; } const std::string& GetAnnounceValue(const std::string& strKey) const; void SetAnnounceValue(const std::string& strKey, const std::string& strValue); // Checks void SetWeaponCorrect(bool bWeaponCorrect); - bool GetWeaponCorrect(void); + bool GetWeaponCorrect(); - void MaybeUpdateOthersNearList(void); - void UpdateOthersNearList(void); + void MaybeUpdateOthersNearList(); + void UpdateOthersNearList(); void RefreshNearPlayer(CPlayer* pOther); - SViewerMapType& GetNearPlayerList(void) { return m_NearPlayerList; } - SViewerMapType& GetFarPlayerList(void) { return m_FarPlayerList; } + SViewerMapType& GetNearPlayerList() { return m_NearPlayerList; } + SViewerMapType& GetFarPlayerList() { return m_FarPlayerList; } void AddPlayerToDistLists(CPlayer* pOther); void RemovePlayerFromDistLists(CPlayer* pOther); void MovePlayerToNearList(CPlayer* pOther); void MovePlayerToFarList(CPlayer* pOther); bool ShouldPlayerBeInNearList(CPlayer* pOther); - SScreenShotInfo& GetScreenShotInfo(void) { return m_ScreenShotInfo; } + SScreenShotInfo& GetScreenShotInfo() { return m_ScreenShotInfo; } - CPlayerStatsPacket* GetPlayerStatsPacket(void) { return m_pPlayerStatsPacket; } + CPlayerStatsPacket* GetPlayerStatsPacket() { return m_pPlayerStatsPacket; } void SetPlayerStat(unsigned short usID, float fValue); float GetWeaponRangeFromSlot(uint uiSlot = 0xFF); - CVehicle* GetJackingVehicle(void) { return m_pJackingVehicle; } + CVehicle* GetJackingVehicle() { return m_pJackingVehicle; } void SetJackingVehicle(CVehicle* pVehicle); void SetLeavingServer(bool bLeaving) noexcept { m_bIsLeavingServer = bLeaving; } @@ -293,38 +293,38 @@ class CPlayer : public CPed, public CClient bool m_bSyncPosition; }; - SLightweightSyncData& GetLightweightSyncData(void) { return m_lightweightSyncData; } + SLightweightSyncData& GetLightweightSyncData() { return m_lightweightSyncData; } void SetPosition(const CVector& vecPosition); - long long GetPositionLastChanged(void) { return m_llLastPositionHasChanged; } - void MarkPositionAsChanged(void) { m_llLastPositionHasChanged = GetTickCount64_(); } + long long GetPositionLastChanged() { return m_llLastPositionHasChanged; } + void MarkPositionAsChanged() { m_llLastPositionHasChanged = GetTickCount64_(); } // // End Light Sync // - eVoiceState GetVoiceState(void) { return m_VoiceState; } + eVoiceState GetVoiceState() { return m_VoiceState; } void SetVoiceState(eVoiceState State) { m_VoiceState = State; } - std::list::const_iterator IterBroadcastListBegin(void) { return m_lstBroadcastList.begin(); }; - std::list::const_iterator IterBroadcastListEnd(void) { return m_lstBroadcastList.end(); }; - bool IsVoiceMuted(void) { return m_lstBroadcastList.empty(); } + std::list::const_iterator IterBroadcastListBegin() { return m_lstBroadcastList.begin(); }; + std::list::const_iterator IterBroadcastListEnd() { return m_lstBroadcastList.end(); }; + bool IsVoiceMuted() { return m_lstBroadcastList.empty(); } void SetVoiceBroadcastTo(CElement* pElement); void SetVoiceBroadcastTo(const std::list& lstElements); void SetVoiceIgnoredElement(CElement* pElement); void SetVoiceIgnoredList(const std::list& lstElements); - std::list::const_iterator IterIgnoredListBegin(void) { return m_lstIgnoredList.begin(); }; - std::list::const_iterator IterIgnoredListEnd(void) { return m_lstIgnoredList.end(); }; + std::list::const_iterator IterIgnoredListBegin() { return m_lstIgnoredList.begin(); }; + std::list::const_iterator IterIgnoredListEnd() { return m_lstIgnoredList.end(); }; bool IsPlayerIgnoringElement(CElement* pElement); void SetCameraOrientation(const CVector& vecPosition, const CVector& vecFwd); bool IsTimeToReceivePuresyncNearFrom(CPlayer* pOther, SViewerInfo& nearInfo); int GetPuresyncZone(CPlayer* pOther); - int GetApproxPuresyncPacketSize(void); - const CVector& GetCamPosition(void) { return m_vecCamPosition; }; - const CVector& GetCamFwd(void) { return m_vecCamFwd; }; - const SString& GetQuitReasonForLog(void) { return m_strQuitReasonForLog; } + int GetApproxPuresyncPacketSize(); + const CVector& GetCamPosition() { return m_vecCamPosition; }; + const CVector& GetCamFwd() { return m_vecCamFwd; }; + const SString& GetQuitReasonForLog() { return m_strQuitReasonForLog; } void SetQuitReasonForLog(const SString& strReason) { m_strQuitReasonForLog = strReason; } CFastHashSet m_PureSyncSimSendList; @@ -338,8 +338,8 @@ class CPlayer : public CPed, public CClient private: SLightweightSyncData m_lightweightSyncData; - void WriteCameraModePacket(void); - void WriteCameraPositionPacket(void); + void WriteCameraModePacket(); + void WriteCameraPositionPacket(); class CPlayerManager* m_pPlayerManager; class CScriptDebugging* m_pScriptDebugging; diff --git a/Server/mods/deathmatch/logic/CPlayerCamera.cpp b/Server/mods/deathmatch/logic/CPlayerCamera.cpp index d5003d97b0b..b24e5fdd96c 100644 --- a/Server/mods/deathmatch/logic/CPlayerCamera.cpp +++ b/Server/mods/deathmatch/logic/CPlayerCamera.cpp @@ -29,7 +29,7 @@ CPlayerCamera::CPlayerCamera(CPlayer* pPlayer) GetCameraSpatialDatabase()->UpdateItem(this); } -CPlayerCamera::~CPlayerCamera(void) +CPlayerCamera::~CPlayerCamera() { GetCameraSpatialDatabase()->RemoveItem(this); } @@ -46,7 +46,7 @@ void CPlayerCamera::SetMode(eCameraMode Mode) } } -const CVector& CPlayerCamera::GetPosition(void) const +const CVector& CPlayerCamera::GetPosition() const { if (m_Mode == CAMERAMODE_PLAYER && m_pTarget) { @@ -136,7 +136,7 @@ void CPlayerCamera::SetRotation(CVector& vecRotation) m_vecLookAt = vecNormal; } -uchar CPlayerCamera::GenerateSyncTimeContext(void) +uchar CPlayerCamera::GenerateSyncTimeContext() { // Increment the sync time index (skipping 0) m_ucSyncTimeContext = std::max(1, m_ucSyncTimeContext + 1); diff --git a/Server/mods/deathmatch/logic/CPlayerCamera.h b/Server/mods/deathmatch/logic/CPlayerCamera.h index 38f3843c87f..4444149342e 100644 --- a/Server/mods/deathmatch/logic/CPlayerCamera.h +++ b/Server/mods/deathmatch/logic/CPlayerCamera.h @@ -27,12 +27,12 @@ class CPlayerCamera { public: CPlayerCamera(CPlayer* pPlayer); - ~CPlayerCamera(void); + ~CPlayerCamera(); - eCameraMode GetMode(void) const { return m_Mode; } + eCameraMode GetMode() const { return m_Mode; } void SetMode(eCameraMode Mode); - const CVector& GetPosition(void) const; + const CVector& GetPosition() const; void GetPosition(CVector& vecPosition) const; void SetPosition(const CVector& vecPosition); @@ -41,22 +41,22 @@ class CPlayerCamera void SetMatrix(const CVector& vecPosition, const CVector& vecLookAt); - CElement* GetTarget(void) const { return m_pTarget; } + CElement* GetTarget() const { return m_pTarget; } void SetTarget(CElement* pElement); - float GetRoll(void) const { return m_fRoll; } + float GetRoll() const { return m_fRoll; } void SetRoll(float fRoll) { m_fRoll = fRoll; } - float GetFOV(void) const { return m_fFOV; } + float GetFOV() const { return m_fFOV; } void SetFOV(float fFOV) { m_fFOV = fFOV; } void SetRotation(CVector& vecRotation); - unsigned char GetInterior(void) const { return m_ucInterior; } + unsigned char GetInterior() const { return m_ucInterior; } void SetInterior(unsigned char ucInterior) { m_ucInterior = ucInterior; } - CPlayer* GetPlayer(void) const { return m_pPlayer; } + CPlayer* GetPlayer() const { return m_pPlayer; } - uchar GenerateSyncTimeContext(void); + uchar GenerateSyncTimeContext(); bool CanUpdateSync(uchar ucRemote); private: diff --git a/Server/mods/deathmatch/logic/CPlayerClothes.cpp b/Server/mods/deathmatch/logic/CPlayerClothes.cpp index ca9ec5d8b4e..fd12594165e 100644 --- a/Server/mods/deathmatch/logic/CPlayerClothes.cpp +++ b/Server/mods/deathmatch/logic/CPlayerClothes.cpp @@ -291,7 +291,7 @@ static const SPlayerClothing g_SuitClothing[SUIT_CLOTHING_MAX + 1] = { {"gimpleg", "gimpleg"}, {"valet", "valet"}, {"countrytr", "countrytr"}, {"croupier", "valet"}, {"policetr", "policetr"}, {"balaclava", "balaclava"}, {"pimptr", "pimptr"}, {"garageleg", "garagetr"}, {"medictr", "medictr"}, {NULL, NULL}}; -CPlayerClothes::CPlayerClothes(void) +CPlayerClothes::CPlayerClothes() { memset(&m_Clothes[0], 0, sizeof(m_Clothes)); } @@ -336,7 +336,7 @@ bool CPlayerClothes::RemoveClothes(unsigned char ucType) return false; } -void CPlayerClothes::RemoveAll(void) +void CPlayerClothes::RemoveAll() { for (unsigned char ucType = 0; ucType < PLAYER_CLOTHING_SLOTS; ucType++) { @@ -344,7 +344,7 @@ void CPlayerClothes::RemoveAll(void) } } -void CPlayerClothes::DefaultClothes(void) +void CPlayerClothes::DefaultClothes() { RemoveAll(); diff --git a/Server/mods/deathmatch/logic/CPlayerClothes.h b/Server/mods/deathmatch/logic/CPlayerClothes.h index aaa73c032e4..2cc3fd03a98 100644 --- a/Server/mods/deathmatch/logic/CPlayerClothes.h +++ b/Server/mods/deathmatch/logic/CPlayerClothes.h @@ -51,15 +51,15 @@ struct SPlayerClothing class CPlayerClothes { public: - CPlayerClothes(void); + CPlayerClothes(); const SPlayerClothing* GetClothing(unsigned char ucType); void AddClothes(const char* szTexture, const char* szModel, unsigned char ucType); bool RemoveClothes(unsigned char ucType); - void RemoveAll(void); + void RemoveAll(); - void DefaultClothes(void); + void DefaultClothes(); static bool HasEmptyClothing(unsigned char ucType); static bool IsEmptyClothing(const SPlayerClothing* pClothing, unsigned char ucType); diff --git a/Server/mods/deathmatch/logic/CPlayerManager.cpp b/Server/mods/deathmatch/logic/CPlayerManager.cpp index bd003f88955..224a66c309a 100644 --- a/Server/mods/deathmatch/logic/CPlayerManager.cpp +++ b/Server/mods/deathmatch/logic/CPlayerManager.cpp @@ -12,19 +12,19 @@ #include "StdInc.h" #include "net/SimHeaders.h" -CPlayerManager::CPlayerManager(void) +CPlayerManager::CPlayerManager() { // Init m_pScriptDebugging = NULL; m_ZombieCheckTimer.SetUseModuleTickCount(true); } -CPlayerManager::~CPlayerManager(void) +CPlayerManager::~CPlayerManager() { DeleteAll(); } -void CPlayerManager::DoPulse(void) +void CPlayerManager::DoPulse() { PulseZombieCheck(); @@ -35,7 +35,7 @@ void CPlayerManager::DoPulse(void) } } -void CPlayerManager::PulseZombieCheck(void) +void CPlayerManager::PulseZombieCheck() { // Only check once a second if (m_ZombieCheckTimer.Get() < 1000) @@ -95,7 +95,7 @@ CPlayer* CPlayerManager::Create(const NetServerPlayerID& PlayerSocket) return pPlayer; } -unsigned int CPlayerManager::CountJoined(void) +unsigned int CPlayerManager::CountJoined() { // Count each ingame player unsigned int uiCount = 0; @@ -145,7 +145,7 @@ CPlayer* CPlayerManager::Get(const char* szNick, bool bCaseSensitive) return NULL; } -void CPlayerManager::DeleteAll(void) +void CPlayerManager::DeleteAll() { // Delete all the items in the list while (!m_Players.empty()) @@ -319,7 +319,7 @@ bool CPlayerManager::IsValidPlayerModel(unsigned short usPlayerModel) (usPlayerModel >= 274 && usPlayerModel <= 288) || (usPlayerModel >= 290 && usPlayerModel <= 312)); } -void CPlayerManager::ResetAll(void) +void CPlayerManager::ResetAll() { list::const_iterator iter = m_Players.begin(); for (; iter != m_Players.end(); iter++) diff --git a/Server/mods/deathmatch/logic/CPlayerManager.h b/Server/mods/deathmatch/logic/CPlayerManager.h index 100036b45d1..9b585d276d2 100644 --- a/Server/mods/deathmatch/logic/CPlayerManager.h +++ b/Server/mods/deathmatch/logic/CPlayerManager.h @@ -23,26 +23,26 @@ class CPlayerManager friend class CPlayer; public: - CPlayerManager(void); - ~CPlayerManager(void); + CPlayerManager(); + ~CPlayerManager(); - void DoPulse(void); - void PulseZombieCheck(void); + void DoPulse(); + void PulseZombieCheck(); void SetScriptDebugging(class CScriptDebugging* pScriptDebugging) { m_pScriptDebugging = pScriptDebugging; }; CPlayer* Create(const NetServerPlayerID& PlayerSocket); - void DeleteAll(void); + void DeleteAll(); - unsigned int Count(void) { return static_cast(m_Players.size()); } - unsigned int CountJoined(void); + unsigned int Count() { return static_cast(m_Players.size()); } + unsigned int CountJoined(); bool Exists(CPlayer* pPlayer); CPlayer* Get(const NetServerPlayerID& PlayerSocket); CPlayer* Get(const char* szNick, bool bCaseSensitive = false); - std::list::const_iterator IterBegin(void) { return m_Players.begin(); }; - std::list::const_iterator IterEnd(void) { return m_Players.end(); }; + std::list::const_iterator IterBegin() { return m_Players.begin(); }; + std::list::const_iterator IterEnd() { return m_Players.end(); }; void BroadcastOnlyJoined(const CPacket& Packet, CPlayer* pSkip = NULL); void BroadcastDimensionOnlyJoined(const CPacket& Packet, ushort usDimension, CPlayer* pSkip = NULL); @@ -54,9 +54,9 @@ class CPlayerManager static bool IsValidPlayerModel(unsigned short usPlayerModel); - void ResetAll(void); + void ResetAll(); void OnPlayerJoin(CPlayer* pPlayer); - const SString& GetLowestConnectedPlayerVersion(void) { return m_strLowestConnectedPlayerVersion; } + const SString& GetLowestConnectedPlayerVersion() { return m_strLowestConnectedPlayerVersion; } private: void AddToList(CPlayer* pPlayer); diff --git a/Server/mods/deathmatch/logic/CPlayerStats.cpp b/Server/mods/deathmatch/logic/CPlayerStats.cpp index 810deee69b5..13ec0f21251 100644 --- a/Server/mods/deathmatch/logic/CPlayerStats.cpp +++ b/Server/mods/deathmatch/logic/CPlayerStats.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CPlayerStats::~CPlayerStats(void) +CPlayerStats::~CPlayerStats() { vector::iterator iter = m_List.begin(); for (; iter != m_List.end(); iter++) diff --git a/Server/mods/deathmatch/logic/CPlayerStats.h b/Server/mods/deathmatch/logic/CPlayerStats.h index edb16222a28..e7bad45d142 100644 --- a/Server/mods/deathmatch/logic/CPlayerStats.h +++ b/Server/mods/deathmatch/logic/CPlayerStats.h @@ -25,13 +25,13 @@ struct sStat class CPlayerStats { public: - ~CPlayerStats(void); + ~CPlayerStats(); bool GetStat(unsigned short usID, float& fValue); void SetStat(unsigned short usID, float fValue); - vector::const_iterator IterBegin(void) { return m_List.begin(); } - vector::const_iterator IterEnd(void) { return m_List.end(); } - unsigned short GetSize(void) { return static_cast(m_List.size()); } + vector::const_iterator IterBegin() { return m_List.begin(); } + vector::const_iterator IterEnd() { return m_List.end(); } + unsigned short GetSize() { return static_cast(m_List.size()); } private: vector m_List; diff --git a/Server/mods/deathmatch/logic/CPlayerTasks.cpp b/Server/mods/deathmatch/logic/CPlayerTasks.cpp index 7442b4f0f45..c01c74540cb 100644 --- a/Server/mods/deathmatch/logic/CPlayerTasks.cpp +++ b/Server/mods/deathmatch/logic/CPlayerTasks.cpp @@ -11,13 +11,13 @@ #include "StdInc.h" -CPlayerTasks::CPlayerTasks(void) +CPlayerTasks::CPlayerTasks() { memset(&m_PriorityTasks[0], 0, sizeof(m_PriorityTasks)); memset(&m_SecondaryTasks[0], 0, sizeof(m_SecondaryTasks)); } -CPlayerTasks::~CPlayerTasks(void) +CPlayerTasks::~CPlayerTasks() { unsigned int i; for (i = 0; i < TASK_PRIORITY_MAX; i++) diff --git a/Server/mods/deathmatch/logic/CPlayerTasks.h b/Server/mods/deathmatch/logic/CPlayerTasks.h index 5edbed66c93..b0f573e51cc 100644 --- a/Server/mods/deathmatch/logic/CPlayerTasks.h +++ b/Server/mods/deathmatch/logic/CPlayerTasks.h @@ -42,8 +42,8 @@ enum class CPlayerTasks { public: - CPlayerTasks(void); - ~CPlayerTasks(void); + CPlayerTasks(); + ~CPlayerTasks(); CPlayerTask* GetPriorityTask(unsigned int uiTaskType); bool SetPriorityTask(unsigned int uiTaskType, CPlayerTask* pTask); @@ -59,7 +59,7 @@ class CPlayerTasks class CPlayerTask { public: - CPlayerTask(void) + CPlayerTask() { m_usID = 0xFFFF; m_pSubTask = NULL; @@ -69,11 +69,11 @@ class CPlayerTask m_usID = usID; m_pSubTask = NULL; } - ~CPlayerTask(void) { delete m_pSubTask; } + ~CPlayerTask() { delete m_pSubTask; } - unsigned short GetID(void) { return m_usID; } - char* GetName(void) { return (m_usID < 1802) ? TaskNames[m_usID].szName : sNoTaskName; } - CPlayerTask* GetSubTask(void) { return m_pSubTask; } + unsigned short GetID() { return m_usID; } + char* GetName() { return (m_usID < 1802) ? TaskNames[m_usID].szName : sNoTaskName; } + CPlayerTask* GetSubTask() { return m_pSubTask; } void SetSubTask(CPlayerTask* pTask) { m_pSubTask = pTask; } protected: diff --git a/Server/mods/deathmatch/logic/CPlayerTextManager.cpp b/Server/mods/deathmatch/logic/CPlayerTextManager.cpp index f1178cfbc4d..a39bcd72543 100644 --- a/Server/mods/deathmatch/logic/CPlayerTextManager.cpp +++ b/Server/mods/deathmatch/logic/CPlayerTextManager.cpp @@ -16,7 +16,7 @@ CPlayerTextManager::CPlayerTextManager(CPlayer* player) m_pPlayer = player; } -CPlayerTextManager::~CPlayerTextManager(void) +CPlayerTextManager::~CPlayerTextManager() { // Remove us from all text display's lists // Note that RemoveObserver removes itself from the list so we just do this till there are 0 items left diff --git a/Server/mods/deathmatch/logic/CPlayerTextManager.h b/Server/mods/deathmatch/logic/CPlayerTextManager.h index 8c2690d8e4a..1cfa3f66b1e 100644 --- a/Server/mods/deathmatch/logic/CPlayerTextManager.h +++ b/Server/mods/deathmatch/logic/CPlayerTextManager.h @@ -35,10 +35,10 @@ class CPlayerTextManager public: CPlayerTextManager(CPlayer* player); - ~CPlayerTextManager(void); + ~CPlayerTextManager(); void Update(CTextItem* textItem, bool bRemovedFromDisplay = false); - void Process(void); + void Process(); - CPlayer* GetPlayer(void); + CPlayer* GetPlayer(); }; diff --git a/Server/mods/deathmatch/logic/CRPCFunctions.cpp b/Server/mods/deathmatch/logic/CRPCFunctions.cpp index 41263f934fc..9acce4b1db3 100644 --- a/Server/mods/deathmatch/logic/CRPCFunctions.cpp +++ b/Server/mods/deathmatch/logic/CRPCFunctions.cpp @@ -19,7 +19,7 @@ CPlayer* CRPCFunctions::m_pSourcePlayer; static CPlayerManager* m_pPlayerManager; -CRPCFunctions::CRPCFunctions(void) +CRPCFunctions::CRPCFunctions() { g_pRPCFunctions = this; @@ -27,7 +27,7 @@ CRPCFunctions::CRPCFunctions(void) AddHandlers(); } -CRPCFunctions::~CRPCFunctions(void) +CRPCFunctions::~CRPCFunctions() { vector::iterator iter = m_RPCHandlers.begin(); for (; iter != m_RPCHandlers.end(); iter++) @@ -39,7 +39,7 @@ CRPCFunctions::~CRPCFunctions(void) g_pRPCFunctions = NULL; } -void CRPCFunctions::AddHandlers(void) +void CRPCFunctions::AddHandlers() { AddHandler(PLAYER_INGAME_NOTICE, PlayerInGameNotice); AddHandler(INITIAL_DATA_STREAM, InitialDataStream); diff --git a/Server/mods/deathmatch/logic/CRPCFunctions.h b/Server/mods/deathmatch/logic/CRPCFunctions.h index 337735cf64a..e671081bdef 100644 --- a/Server/mods/deathmatch/logic/CRPCFunctions.h +++ b/Server/mods/deathmatch/logic/CRPCFunctions.h @@ -35,10 +35,10 @@ class CRPCFunctions }; public: - CRPCFunctions(void); - virtual ~CRPCFunctions(void); + CRPCFunctions(); + virtual ~CRPCFunctions(); - void AddHandlers(void); + void AddHandlers(); static void AddHandler(unsigned char ucID, pfnRPCHandler Callback); void ProcessPacket(const NetServerPlayerID& Socket, NetBitStreamInterface& bitStream); diff --git a/Server/mods/deathmatch/logic/CRadarArea.cpp b/Server/mods/deathmatch/logic/CRadarArea.cpp index ef88c0209b8..152cbd4567a 100644 --- a/Server/mods/deathmatch/logic/CRadarArea.cpp +++ b/Server/mods/deathmatch/logic/CRadarArea.cpp @@ -24,7 +24,7 @@ CRadarArea::CRadarArea(CRadarAreaManager* pRadarAreaManager, CElement* pParent) pRadarAreaManager->AddToList(this); } -CRadarArea::~CRadarArea(void) +CRadarArea::~CRadarArea() { // Unlink us from manager Unlink(); @@ -46,7 +46,7 @@ CElement* CRadarArea::Clone(bool* bAddEntity, CResource* pResource) return pTemp; } -void CRadarArea::Unlink(void) +void CRadarArea::Unlink() { // Remove us from the manager's list m_pRadarAreaManager->RemoveFromList(this); diff --git a/Server/mods/deathmatch/logic/CRadarArea.h b/Server/mods/deathmatch/logic/CRadarArea.h index 9f65082a38d..4de63e253e7 100644 --- a/Server/mods/deathmatch/logic/CRadarArea.h +++ b/Server/mods/deathmatch/logic/CRadarArea.h @@ -19,14 +19,14 @@ class CRadarArea : public CPerPlayerEntity friend class CRadarAreaManager; public: - ~CRadarArea(void); + ~CRadarArea(); CElement* Clone(bool* bAddEntity, CResource* pResource) override; - void Unlink(void); + void Unlink(); - const CVector2D& GetSize(void) { return m_vecSize; }; - SColor GetColor(void) const { return m_Color; }; - bool IsFlashing(void) { return m_bIsFlashing; }; + const CVector2D& GetSize() { return m_vecSize; }; + SColor GetColor() const { return m_Color; }; + bool IsFlashing() { return m_bIsFlashing; }; void SetPosition(const CVector& vecPosition); void SetSize(const CVector2D& vecSize); diff --git a/Server/mods/deathmatch/logic/CRadarAreaManager.cpp b/Server/mods/deathmatch/logic/CRadarAreaManager.cpp index 947646004ee..0d35b77b7a0 100644 --- a/Server/mods/deathmatch/logic/CRadarAreaManager.cpp +++ b/Server/mods/deathmatch/logic/CRadarAreaManager.cpp @@ -11,11 +11,11 @@ #include "StdInc.h" -CRadarAreaManager::CRadarAreaManager(void) +CRadarAreaManager::CRadarAreaManager() { } -CRadarAreaManager::~CRadarAreaManager(void) +CRadarAreaManager::~CRadarAreaManager() { // Delete all the radar areas DeleteAll(); @@ -47,7 +47,7 @@ CRadarArea* CRadarAreaManager::CreateFromXML(CElement* pParent, CXMLNode& Node, return pArea; } -void CRadarAreaManager::DeleteAll(void) +void CRadarAreaManager::DeleteAll() { // Delete all the radar areas DeletePointersAndClearList(m_List); diff --git a/Server/mods/deathmatch/logic/CRadarAreaManager.h b/Server/mods/deathmatch/logic/CRadarAreaManager.h index 4a186a30110..d0cdb299767 100644 --- a/Server/mods/deathmatch/logic/CRadarAreaManager.h +++ b/Server/mods/deathmatch/logic/CRadarAreaManager.h @@ -19,18 +19,18 @@ class CRadarAreaManager friend class CRadarArea; public: - CRadarAreaManager(void); - ~CRadarAreaManager(void); + CRadarAreaManager(); + ~CRadarAreaManager(); CRadarArea* Create(CElement* pParent); CRadarArea* CreateFromXML(CElement* pParent, CXMLNode& Node, CEvents* pEvents); - void DeleteAll(void); + void DeleteAll(); - unsigned int Count(void) { return static_cast(m_List.size()); }; + unsigned int Count() { return static_cast(m_List.size()); }; bool Exists(CRadarArea* pArea); - list::const_iterator IterBegin(void) { return m_List.begin(); }; - list::const_iterator IterEnd(void) { return m_List.end(); }; + list::const_iterator IterBegin() { return m_List.begin(); }; + list::const_iterator IterEnd() { return m_List.end(); }; private: void AddToList(CRadarArea* pArea) { m_List.push_back(pArea); }; diff --git a/Server/mods/deathmatch/logic/CRegisteredCommands.cpp b/Server/mods/deathmatch/logic/CRegisteredCommands.cpp index a0581db8028..afdd4725e91 100644 --- a/Server/mods/deathmatch/logic/CRegisteredCommands.cpp +++ b/Server/mods/deathmatch/logic/CRegisteredCommands.cpp @@ -17,7 +17,7 @@ CRegisteredCommands::CRegisteredCommands(CAccessControlListManager* pACLManager) m_bIteratingList = false; } -CRegisteredCommands::~CRegisteredCommands(void) +CRegisteredCommands::~CRegisteredCommands() { ClearCommands(); } @@ -94,7 +94,7 @@ bool CRegisteredCommands::RemoveCommand(CLuaMain* pLuaMain, const char* szKey, c return bFound; } -void CRegisteredCommands::ClearCommands(void) +void CRegisteredCommands::ClearCommands() { // Delete all the commands list::const_iterator iter = m_Commands.begin(); @@ -294,7 +294,7 @@ void CRegisteredCommands::GetCommands(lua_State* luaVM, CLuaMain* pTargetLuaMain } } -void CRegisteredCommands::TakeOutTheTrash(void) +void CRegisteredCommands::TakeOutTheTrash() { list::iterator iter = m_TrashCan.begin(); diff --git a/Server/mods/deathmatch/logic/CRegisteredCommands.h b/Server/mods/deathmatch/logic/CRegisteredCommands.h index 72be9175fd2..9059d472e56 100644 --- a/Server/mods/deathmatch/logic/CRegisteredCommands.h +++ b/Server/mods/deathmatch/logic/CRegisteredCommands.h @@ -29,11 +29,11 @@ class CRegisteredCommands public: CRegisteredCommands(class CAccessControlListManager* pACLManager); - ~CRegisteredCommands(void); + ~CRegisteredCommands(); bool AddCommand(class CLuaMain* pLuaMain, const char* szKey, const CLuaFunctionRef& iLuaFunction, bool bRestricted, bool bCaseSensitive); bool RemoveCommand(class CLuaMain* pLuaMain, const char* szKey, const CLuaFunctionRef& iLuaFunction = CLuaFunctionRef()); - void ClearCommands(void); + void ClearCommands(); void CleanUpForVM(class CLuaMain* pLuaMain); bool CommandExists(const char* szKey, class CLuaMain* pLuaMain = NULL); @@ -47,7 +47,7 @@ class CRegisteredCommands SCommand* GetCommand(const char* szKey, class CLuaMain* pLuaMain = NULL); void CallCommandHandler(class CLuaMain* pLuaMain, const CLuaFunctionRef& iLuaFunction, const char* szKey, const char* szArguments, class CClient* pClient); - void TakeOutTheTrash(void); + void TakeOutTheTrash(); list m_Commands; list m_TrashCan; diff --git a/Server/mods/deathmatch/logic/CRegistry.cpp b/Server/mods/deathmatch/logic/CRegistry.cpp index 12dacef7b7f..5f84532e20f 100644 --- a/Server/mods/deathmatch/logic/CRegistry.cpp +++ b/Server/mods/deathmatch/logic/CRegistry.cpp @@ -21,7 +21,7 @@ CRegistry::CRegistry(const std::string& strFileName) Load(strFileName); } -CRegistry::~CRegistry(void) +CRegistry::~CRegistry() { EndAutomaticTransaction(); CPerfStatSqliteTiming::GetSingleton()->OnSqliteClose(this); @@ -65,7 +65,7 @@ void CRegistry::Load(const std::string& strFileName) } } -bool CRegistry::IntegrityCheck(void) +bool CRegistry::IntegrityCheck() { // Check database integrity { @@ -377,7 +377,7 @@ bool CRegistry::Select(const std::string& strColumns, const std::string& strTabl return QueryInternal(strQuery.c_str(), pResult); } -void CRegistry::BeginAutomaticTransaction(void) +void CRegistry::BeginAutomaticTransaction() { if (!m_bInAutomaticTransaction) { @@ -394,7 +394,7 @@ void CRegistry::BeginAutomaticTransaction(void) } } -void CRegistry::EndAutomaticTransaction(void) +void CRegistry::EndAutomaticTransaction() { if (m_bInAutomaticTransaction) { diff --git a/Server/mods/deathmatch/logic/CRegistry.h b/Server/mods/deathmatch/logic/CRegistry.h index add95ca2bde..f296e49758d 100644 --- a/Server/mods/deathmatch/logic/CRegistry.h +++ b/Server/mods/deathmatch/logic/CRegistry.h @@ -26,12 +26,12 @@ class CRegistry { friend class CRegistryManager; CRegistry(const std::string& strFileName); - ~CRegistry(void); + ~CRegistry(); public: void SuspendBatching(uint uiTicks); void Load(const std::string& strFileName); - bool IntegrityCheck(void); + bool IntegrityCheck(); void CreateTable(const std::string& strTable, const std::string& strDefinition, bool bSilent = false); void DropTable(const std::string& strTable); @@ -45,7 +45,7 @@ class CRegistry bool Query(const char* szQuery, ...); bool Query(CRegistryResult* pResult, const char* szQuery, ...); - const SString& GetLastError(void) { return m_strLastErrorMessage; } + const SString& GetLastError() { return m_strLastErrorMessage; } protected: bool SetLastErrorMessage(const std::string& strLastErrorMessage, const std::string& strQuery); @@ -53,8 +53,8 @@ class CRegistry bool ExecInternal(const char* szQuery); bool Query(CRegistryResult* pResult, const char* szQuery, va_list vl); bool QueryInternal(const char* szQuery, CRegistryResult* pResult); - void BeginAutomaticTransaction(void); - void EndAutomaticTransaction(void); + void BeginAutomaticTransaction(); + void EndAutomaticTransaction(); sqlite3* m_db; bool m_bOpened; @@ -70,7 +70,7 @@ class CRegistry struct CRegistryResultCell { - CRegistryResultCell(void) + CRegistryResultCell() { nType = SQLITE_NULL; nLength = 0; @@ -89,7 +89,7 @@ struct CRegistryResultCell memcpy(pVal, cell.pVal, nLength); } }; - ~CRegistryResultCell(void) + ~CRegistryResultCell() { if (pVal) delete[] pVal; @@ -120,7 +120,7 @@ struct CRegistryResultCell } template - T GetNumber(void) const + T GetNumber() const { if (nType == SQLITE_INTEGER) return static_cast(nVal); @@ -142,7 +142,7 @@ typedef std::list::const_iterator CRegistryResultIterator; struct CRegistryResultData { - CRegistryResultData(void) + CRegistryResultData() { nRows = 0; nColumns = 0; @@ -150,7 +150,7 @@ struct CRegistryResultData ullLastInsertId = 0; pNextResult = nullptr; } - ~CRegistryResultData(void) { SAFE_DELETE(pNextResult); } + ~CRegistryResultData() { SAFE_DELETE(pNextResult); } std::vector ColNames; std::list Data; int nRows; @@ -160,6 +160,6 @@ struct CRegistryResultData CRegistryResultData* pNextResult; CRegistryResultData* GetThis() { return this; } - CRegistryResultIterator begin(void) const { return Data.begin(); } - CRegistryResultIterator end(void) const { return Data.end(); } + CRegistryResultIterator begin() const { return Data.begin(); } + CRegistryResultIterator end() const { return Data.end(); } }; diff --git a/Server/mods/deathmatch/logic/CRegistryManager.cpp b/Server/mods/deathmatch/logic/CRegistryManager.cpp index b844e4b3dc7..2ad6f9aab23 100644 --- a/Server/mods/deathmatch/logic/CRegistryManager.cpp +++ b/Server/mods/deathmatch/logic/CRegistryManager.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CRegistryManager::~CRegistryManager(void) +CRegistryManager::~CRegistryManager() { // Current behaviour is that there should be no open DB's at this point assert(m_RegistryList.size() == 0); @@ -19,7 +19,7 @@ CRegistryManager::~CRegistryManager(void) CloseRegistry(m_RegistryList.front()); } -void CRegistryManager::DoPulse(void) +void CRegistryManager::DoPulse() { // End automatic transactions started in the previous pulse for (unsigned int i = 0; i < m_RegistryList.size(); i++) diff --git a/Server/mods/deathmatch/logic/CRegistryManager.h b/Server/mods/deathmatch/logic/CRegistryManager.h index 4cf3f291425..5697adbd3c6 100644 --- a/Server/mods/deathmatch/logic/CRegistryManager.h +++ b/Server/mods/deathmatch/logic/CRegistryManager.h @@ -16,8 +16,8 @@ class CRegistry; class CRegistryManager { public: - ~CRegistryManager(void); - void DoPulse(void); + ~CRegistryManager(); + void DoPulse(); CRegistry* OpenRegistry(const std::string& strFileName); bool CloseRegistry(CRegistry* pRegistry); diff --git a/Server/mods/deathmatch/logic/CRemoteCalls.cpp b/Server/mods/deathmatch/logic/CRemoteCalls.cpp index c33efaa3ad4..73cfa39f4a8 100644 --- a/Server/mods/deathmatch/logic/CRemoteCalls.cpp +++ b/Server/mods/deathmatch/logic/CRemoteCalls.cpp @@ -125,7 +125,7 @@ EDownloadModeType CRemoteCalls::GetDownloadModeForQueueName(const SString& strQu } } -void CRemoteCalls::ProcessQueuedFiles(void) +void CRemoteCalls::ProcessQueuedFiles() { for (auto iter = m_QueueIndexMap.cbegin(); iter != m_QueueIndexMap.cend();) { @@ -292,7 +292,7 @@ void CRemoteCall::DownloadFinishedCallback(const SHttpDownloadResult& result) } // Return true if cancel was done -bool CRemoteCall::CancelDownload(void) +bool CRemoteCall::CancelDownload() { if (m_downloadMode != EDownloadModeType::NONE) { diff --git a/Server/mods/deathmatch/logic/CRemoteCalls.h b/Server/mods/deathmatch/logic/CRemoteCalls.h index f06194f1c53..9b3773c7573 100644 --- a/Server/mods/deathmatch/logic/CRemoteCalls.h +++ b/Server/mods/deathmatch/logic/CRemoteCalls.h @@ -41,7 +41,7 @@ class CRemoteCall ~CRemoteCall(); void MakeCall(); static void DownloadFinishedCallback(const SHttpDownloadResult& result); - bool CancelDownload(void); + bool CancelDownload(); bool GetDownloadStatus(SDownloadStatus& outDownloadStatus); CLuaMain* GetVM() { return m_VM; }; bool IsFetch() { return m_bIsFetch; } @@ -75,7 +75,7 @@ class CRemoteCalls void Remove(CLuaMain* luaMain); void Remove(CRemoteCall* call); bool CallExists(CRemoteCall* call); - void ProcessQueuedFiles(void); + void ProcessQueuedFiles(); EDownloadModeType GetDownloadModeForQueueName(const SString& strQueueName); EDownloadModeType GetDownloadModeFromQueueIndex(uint uiIndex); }; diff --git a/Server/mods/deathmatch/logic/CResource.AclRequest.cpp b/Server/mods/deathmatch/logic/CResource.AclRequest.cpp index 3565f0e979c..a74a2e3ba0d 100644 --- a/Server/mods/deathmatch/logic/CResource.AclRequest.cpp +++ b/Server/mods/deathmatch/logic/CResource.AclRequest.cpp @@ -17,7 +17,7 @@ // Get group name for aclrequest acl // /////////////////////////////////////////////////////////////// -SString CResource::GetAutoGroupName(void) +SString CResource::GetAutoGroupName() { return SString("autoGroup_%s", GetName().c_str()); } @@ -29,7 +29,7 @@ SString CResource::GetAutoGroupName(void) // Get acl name for aclrequest items // /////////////////////////////////////////////////////////////// -SString CResource::GetAutoAclName(void) +SString CResource::GetAutoAclName() { return SString("autoACL_%s", GetName().c_str()); } @@ -42,7 +42,7 @@ SString CResource::GetAutoAclName(void) // Can't fail // /////////////////////////////////////////////////////////////// -CAccessControlList* CResource::GetAutoAcl(void) +CAccessControlList* CResource::GetAutoAcl() { return g_pGame->GetACLManager()->AddACL(GetAutoAclName()); } @@ -55,7 +55,7 @@ CAccessControlList* CResource::GetAutoAcl(void) // Will return NULL if it does not exist // /////////////////////////////////////////////////////////////// -CAccessControlList* CResource::FindAutoAcl(void) +CAccessControlList* CResource::FindAutoAcl() { return g_pGame->GetACLManager()->GetACL(GetAutoAclName()); } @@ -67,7 +67,7 @@ CAccessControlList* CResource::FindAutoAcl(void) // Remove group and acl used for aclrequest items // /////////////////////////////////////////////////////////////// -void CResource::RemoveAutoPermissions(void) +void CResource::RemoveAutoPermissions() { CAccessControlListManager* pACLManager = g_pGame->GetACLManager(); diff --git a/Server/mods/deathmatch/logic/CResourceClientConfigItem.cpp b/Server/mods/deathmatch/logic/CResourceClientConfigItem.cpp index 757ab83cfc5..930652f0bca 100644 --- a/Server/mods/deathmatch/logic/CResourceClientConfigItem.cpp +++ b/Server/mods/deathmatch/logic/CResourceClientConfigItem.cpp @@ -29,16 +29,16 @@ CResourceClientConfigItem::CResourceClientConfigItem(CResource* resource, const m_type = RESOURCE_FILE_TYPE_CLIENT_CONFIG; } -CResourceClientConfigItem::~CResourceClientConfigItem(void) +CResourceClientConfigItem::~CResourceClientConfigItem() { } -bool CResourceClientConfigItem::Start(void) +bool CResourceClientConfigItem::Start() { return true; } -bool CResourceClientConfigItem::Stop(void) +bool CResourceClientConfigItem::Stop() { return true; } diff --git a/Server/mods/deathmatch/logic/CResourceClientConfigItem.h b/Server/mods/deathmatch/logic/CResourceClientConfigItem.h index 47226e02352..f23e4beaf5a 100644 --- a/Server/mods/deathmatch/logic/CResourceClientConfigItem.h +++ b/Server/mods/deathmatch/logic/CResourceClientConfigItem.h @@ -19,11 +19,11 @@ class CResourceClientConfigItem : public CResourceFile { public: CResourceClientConfigItem(class CResource* resource, const char* szShortName, const char* szResourceFileName, CXMLAttributes* xmlAttributes); - ~CResourceClientConfigItem(void); + ~CResourceClientConfigItem(); - bool Start(void); - bool Stop(void); - class CXMLNode* GetRoot(void) { return m_pXMLRootNode; } + bool Start(); + bool Stop(); + class CXMLNode* GetRoot() { return m_pXMLRootNode; } private: class CXMLFile* m_pXMLFile; diff --git a/Server/mods/deathmatch/logic/CResourceClientFileItem.cpp b/Server/mods/deathmatch/logic/CResourceClientFileItem.cpp index 15b86671bd5..1e00e111081 100644 --- a/Server/mods/deathmatch/logic/CResourceClientFileItem.cpp +++ b/Server/mods/deathmatch/logic/CResourceClientFileItem.cpp @@ -24,17 +24,17 @@ CResourceClientFileItem::CResourceClientFileItem(CResource* resource, const char m_bClientAutoDownload = bClientAutoDownload; } -CResourceClientFileItem::~CResourceClientFileItem(void) +CResourceClientFileItem::~CResourceClientFileItem() { } -bool CResourceClientFileItem::Start(void) +bool CResourceClientFileItem::Start() { // start somehow return true; } -bool CResourceClientFileItem::Stop(void) +bool CResourceClientFileItem::Stop() { return true; } diff --git a/Server/mods/deathmatch/logic/CResourceClientFileItem.h b/Server/mods/deathmatch/logic/CResourceClientFileItem.h index 0b1ba09e2bc..36d3e7feb4f 100644 --- a/Server/mods/deathmatch/logic/CResourceClientFileItem.h +++ b/Server/mods/deathmatch/logic/CResourceClientFileItem.h @@ -18,12 +18,12 @@ class CResourceClientFileItem : public CResourceFile public: CResourceClientFileItem(class CResource* resource, const char* szShortName, const char* szResourceFileName, CXMLAttributes* xmlAttributes, bool bClientAutoDownload = true); - ~CResourceClientFileItem(void); + ~CResourceClientFileItem(); - bool Start(void); - bool Stop(void); + bool Start(); + bool Stop(); - bool IsAutoDownload(void) { return m_bClientAutoDownload; }; + bool IsAutoDownload() { return m_bClientAutoDownload; }; private: bool m_bClientAutoDownload; diff --git a/Server/mods/deathmatch/logic/CResourceClientScriptItem.cpp b/Server/mods/deathmatch/logic/CResourceClientScriptItem.cpp index 3cc945a3e4f..85f63107395 100644 --- a/Server/mods/deathmatch/logic/CResourceClientScriptItem.cpp +++ b/Server/mods/deathmatch/logic/CResourceClientScriptItem.cpp @@ -29,7 +29,7 @@ CResourceClientScriptItem::CResourceClientScriptItem(CResource* resource, const m_bIsNoClientCache = false; } -CResourceClientScriptItem::~CResourceClientScriptItem(void) +CResourceClientScriptItem::~CResourceClientScriptItem() { } @@ -45,7 +45,7 @@ ResponseCode CResourceClientScriptItem::Request(HttpRequest* ipoHttpRequest, Htt return CResourceFile::Request(ipoHttpRequest, ipoHttpResponse); } -bool CResourceClientScriptItem::Start(void) +bool CResourceClientScriptItem::Start() { // Pre-load the script if (IsNoClientCache() == true) @@ -79,7 +79,7 @@ bool CResourceClientScriptItem::Start(void) return true; } -bool CResourceClientScriptItem::Stop(void) +bool CResourceClientScriptItem::Stop() { return true; } diff --git a/Server/mods/deathmatch/logic/CResourceClientScriptItem.h b/Server/mods/deathmatch/logic/CResourceClientScriptItem.h index d5e9c7ca220..a869eae562a 100644 --- a/Server/mods/deathmatch/logic/CResourceClientScriptItem.h +++ b/Server/mods/deathmatch/logic/CResourceClientScriptItem.h @@ -17,10 +17,10 @@ class CResourceClientScriptItem : public CResourceFile { public: CResourceClientScriptItem(class CResource* resource, const char* szShortName, const char* szResourceFileName, CXMLAttributes* xmlAttributes); - ~CResourceClientScriptItem(void); + ~CResourceClientScriptItem(); - bool Start(void); - bool Stop(void); + bool Start(); + bool Stop(); bool IsNoClientCache() const { return m_bIsNoClientCache; } const SString& GetSourceCode() const { return m_sourceCode; } diff --git a/Server/mods/deathmatch/logic/CResourceConfigItem.cpp b/Server/mods/deathmatch/logic/CResourceConfigItem.cpp index db4fe0b62ae..c072f67cfbf 100644 --- a/Server/mods/deathmatch/logic/CResourceConfigItem.cpp +++ b/Server/mods/deathmatch/logic/CResourceConfigItem.cpp @@ -28,7 +28,7 @@ CResourceConfigItem::CResourceConfigItem(CResource* resource, const char* szShor m_type = RESOURCE_FILE_TYPE_CONFIG; } -CResourceConfigItem::~CResourceConfigItem(void) +CResourceConfigItem::~CResourceConfigItem() { if (m_pXMLFile) { @@ -37,7 +37,7 @@ CResourceConfigItem::~CResourceConfigItem(void) } } -bool CResourceConfigItem::Start(void) +bool CResourceConfigItem::Start() { // Already started? if (m_pXMLFile) @@ -71,7 +71,7 @@ bool CResourceConfigItem::Start(void) return !m_bInvalid; } -bool CResourceConfigItem::Stop(void) +bool CResourceConfigItem::Stop() { if (m_pXMLFile) { diff --git a/Server/mods/deathmatch/logic/CResourceConfigItem.h b/Server/mods/deathmatch/logic/CResourceConfigItem.h index b44b48574cc..a2b320a7abc 100644 --- a/Server/mods/deathmatch/logic/CResourceConfigItem.h +++ b/Server/mods/deathmatch/logic/CResourceConfigItem.h @@ -22,12 +22,12 @@ class CResourceConfigItem : public CResourceFile { public: CResourceConfigItem(class CResource* resource, const char* szShortName, const char* szResourceFileName, CXMLAttributes* xmlAttributes); - ~CResourceConfigItem(void); + ~CResourceConfigItem(); - bool Start(void); - bool Stop(void); - class CXMLFile* GetFile(void) { return m_pXMLFile; } - class CXMLNode* GetRoot(void) { return m_pXMLRootNode; } + bool Start(); + bool Stop(); + class CXMLFile* GetFile() { return m_pXMLFile; } + class CXMLNode* GetRoot() { return m_pXMLRootNode; } private: class CXMLFile* m_pXMLFile; diff --git a/Server/mods/deathmatch/logic/CResourceFile.cpp b/Server/mods/deathmatch/logic/CResourceFile.cpp index 11a0bd4ec52..756dff8351e 100644 --- a/Server/mods/deathmatch/logic/CResourceFile.cpp +++ b/Server/mods/deathmatch/logic/CResourceFile.cpp @@ -47,7 +47,7 @@ CResourceFile::CResourceFile(CResource* resource, const char* szShortName, const m_attributeMap[(*iter)->GetName()] = (*iter)->GetValue(); } -CResourceFile::~CResourceFile(void) +CResourceFile::~CResourceFile() { } diff --git a/Server/mods/deathmatch/logic/CResourceFile.h b/Server/mods/deathmatch/logic/CResourceFile.h index e4cf54dde51..413c19bb145 100644 --- a/Server/mods/deathmatch/logic/CResourceFile.h +++ b/Server/mods/deathmatch/logic/CResourceFile.h @@ -48,24 +48,24 @@ class CResourceFile public: CResourceFile(class CResource* resource, const char* szShortName, const char* szResourceFileName, CXMLAttributes* xmlAttributes); - virtual ~CResourceFile(void); + virtual ~CResourceFile(); virtual ResponseCode Request(HttpRequest* ipoHttpRequest, HttpResponse* ipoHttpResponse); - virtual bool Start(void) = 0; - virtual bool Stop(void) = 0; - virtual bool IsNoClientCache(void) const { return false; } + virtual bool Start() = 0; + virtual bool Stop() = 0; + virtual bool IsNoClientCache() const { return false; } eResourceType GetType() { return m_type; } const char* GetName() { return m_strShortName.c_str(); } const char* GetFullName() { return m_strResourceFileName.c_str(); } const char* GetWindowsName() { return m_strWindowsName.c_str(); } - CChecksum GetLastChecksum(void) { return m_checksum; } + CChecksum GetLastChecksum() { return m_checksum; } void SetLastChecksum(CChecksum checksum) { m_checksum = checksum; } void SetLastFileSize(uint uiFileSize) { m_uiFileSize = uiFileSize; } - double GetApproxSize(void) { return m_uiFileSize; } // Only used by download counters + double GetApproxSize() { return m_uiFileSize; } // Only used by download counters string GetMetaFileAttribute(const string& key) { return m_attributeMap[key]; } SString GetCachedPathFilename(bool bForceClientCachePath = false); }; diff --git a/Server/mods/deathmatch/logic/CResourceHTMLItem.cpp b/Server/mods/deathmatch/logic/CResourceHTMLItem.cpp index af3ccb70a1e..80f152ba545 100644 --- a/Server/mods/deathmatch/logic/CResourceHTMLItem.cpp +++ b/Server/mods/deathmatch/logic/CResourceHTMLItem.cpp @@ -30,7 +30,7 @@ CResourceHTMLItem::CResourceHTMLItem(CResource* resource, const char* szShortNam m_bOOPEnabled = bOOPEnabled; } -CResourceHTMLItem::~CResourceHTMLItem(void) +CResourceHTMLItem::~CResourceHTMLItem() { Stop(); } @@ -149,7 +149,7 @@ bool CResourceHTMLItem::AppendToPageBuffer(const char* szText, size_t length) return true; } -bool CResourceHTMLItem::Start(void) +bool CResourceHTMLItem::Start() { if (!m_bIsRaw) { @@ -305,7 +305,7 @@ void CResourceHTMLItem::GetMimeType(const char* szFilename) m_strMime = "text/html"; } -bool CResourceHTMLItem::Stop(void) +bool CResourceHTMLItem::Stop() { if (m_pVM) { diff --git a/Server/mods/deathmatch/logic/CResourceHTMLItem.h b/Server/mods/deathmatch/logic/CResourceHTMLItem.h index 3ba1d52332e..7d15ebbcd1b 100644 --- a/Server/mods/deathmatch/logic/CResourceHTMLItem.h +++ b/Server/mods/deathmatch/logic/CResourceHTMLItem.h @@ -23,21 +23,21 @@ class CResourceHTMLItem : public CResourceFile public: CResourceHTMLItem(class CResource* resource, const char* szShortName, const char* szResourceFileName, CXMLAttributes* xmlAttributes, bool bIsDefault, bool bIsRaw, bool bRestricted, bool bOOPEnabled); - ~CResourceHTMLItem(void); + ~CResourceHTMLItem(); - bool Start(void); - bool Stop(void); + bool Start(); + bool Stop(); ResponseCode Request(HttpRequest* ipoHttpRequest, HttpResponse* ipoHttpResponse, class CAccount* account); bool AppendToPageBuffer(const char* szText, size_t length = 0); void SetResponseHeader(const char* szHeaderName, const char* szHeaderValue); void SetResponseCode(int responseCode); void SetResponseCookie(const char* szCookieName, const char* szCookieValue); - void ClearPageBuffer(void); + void ClearPageBuffer(); - bool IsDefaultPage(void) { return m_bDefault; } + bool IsDefaultPage() { return m_bDefault; } void SetDefaultPage(bool bDefault) { m_bDefault = bDefault; } - bool IsRestricted(void) { return m_bRestricted; }; + bool IsRestricted() { return m_bRestricted; }; private: char ReadChar(FILE* pFile) { return (unsigned char)fgetc(pFile); } diff --git a/Server/mods/deathmatch/logic/CResourceManager.cpp b/Server/mods/deathmatch/logic/CResourceManager.cpp index 0faa74e7d4c..a3d7dd97d6e 100644 --- a/Server/mods/deathmatch/logic/CResourceManager.cpp +++ b/Server/mods/deathmatch/logic/CResourceManager.cpp @@ -26,7 +26,7 @@ struct SResInfo SString strAbsPathDup; }; -CResourceManager::CResourceManager(void) +CResourceManager::CResourceManager() { m_bResourceListChanged = false; m_uiResourceLoadedCount = 0; @@ -36,7 +36,7 @@ CResourceManager::CResourceManager(void) LoadBlockedFileReasons(); } -CResourceManager::~CResourceManager(void) +CResourceManager::~CResourceManager() { // First process the queue to make sure all queued up tasks are done ProcessQueue(); @@ -258,14 +258,14 @@ void CResourceManager::CheckResources(CResource* pResource) } } -const char* CResourceManager::GetResourceDirectory(void) +const char* CResourceManager::GetResourceDirectory() { return m_strResourceDirectory; } // first, go through each resource then link up to other resources, any that fail are noted // then go through each resource and perform a recursive check -void CResourceManager::CheckResourceDependencies(void) +void CResourceManager::CheckResourceDependencies() { m_uiResourceLoadedCount = 0; m_uiResourceFailedCount = 0; @@ -431,7 +431,7 @@ CResource* CResourceManager::GetResourceFromScriptID(uint uiScriptID) } // Get net id for resource. (0xFFFF is never used) -unsigned short CResourceManager::GenerateID(void) +unsigned short CResourceManager::GenerateID() { static bool bHasWrapped = false; @@ -667,7 +667,7 @@ bool CResourceManager::Reload(CResource* pResource) return true; } -bool CResourceManager::StopAllResources(void) +bool CResourceManager::StopAllResources() { CLogger::SetMinLogLevel(LOGLEVEL_MEDIUM); CLogger::LogPrint("Stopping resources..."); @@ -712,7 +712,7 @@ void CResourceManager::QueueResource(CResource* pResource, eResourceQueue eQueue m_resourceQueue.push_back(Item); } -void CResourceManager::ProcessQueue(void) +void CResourceManager::ProcessQueue() { // While we have queuestuff to process while (m_resourceQueue.size() > 0) @@ -1106,7 +1106,7 @@ bool CResourceManager::DeleteResource(const SString& strResourceName, SString& s // CResourceManager::GetResourceTrashDir // ///////////////////////////////// -SString CResourceManager::GetResourceTrashDir(void) +SString CResourceManager::GetResourceTrashDir() { return PathJoin(g_pServerInterface->GetServerModPath(), "resource-cache", "trash"); } @@ -1229,7 +1229,7 @@ void CResourceManager::RemoveMinClientRequirement(CResource* pResource) // Recalculate highest client version requirement from all running resources // ///////////////////////////////////////////////////////////////////////////// -void CResourceManager::ReevaluateMinClientRequirement(void) +void CResourceManager::ReevaluateMinClientRequirement() { // Calc highest requirement m_strMinClientRequirement = ""; @@ -1277,7 +1277,7 @@ void CResourceManager::RemoveSyncMapElementDataOption(CResource* pResource) // and tell the config to apply it // ///////////////////////////////////////////////////////////////////////////// -void CResourceManager::ReevaluateSyncMapElementDataOption(void) +void CResourceManager::ReevaluateSyncMapElementDataOption() { bool bSyncMapElementData = true; for (CFastHashMap::iterator iter = m_SyncMapElementDataOptionMap.begin(); iter != m_SyncMapElementDataOptionMap.end(); ++iter) @@ -1308,7 +1308,7 @@ void CResourceManager::ReevaluateSyncMapElementDataOption(void) // Load blocked file hashes from database // ///////////////////////////////////////////////////////////////////////////// -void CResourceManager::LoadBlockedFileReasons(void) +void CResourceManager::LoadBlockedFileReasons() { CDatabaseManager* pDatabaseManager = g_pGame->GetDatabaseManager(); SString strDatabaseFilename = PathJoin(g_pGame->GetConfig()->GetSystemDatabasesPath(), BLOCKED_DB_FILE_NAME); @@ -1342,7 +1342,7 @@ void CResourceManager::LoadBlockedFileReasons(void) // Save blocked file hashes to database // ///////////////////////////////////////////////////////////////////////////// -void CResourceManager::SaveBlockedFileReasons(void) +void CResourceManager::SaveBlockedFileReasons() { CDatabaseManager* pDatabaseManager = g_pGame->GetDatabaseManager(); SString strDatabaseFilename = PathJoin(g_pGame->GetConfig()->GetSystemDatabasesPath(), BLOCKED_DB_FILE_NAME); diff --git a/Server/mods/deathmatch/logic/CResourceManager.h b/Server/mods/deathmatch/logic/CResourceManager.h index 9e4698d5b62..1735b4e9eff 100644 --- a/Server/mods/deathmatch/logic/CResourceManager.h +++ b/Server/mods/deathmatch/logic/CResourceManager.h @@ -46,41 +46,41 @@ class CResourceManager public: ZERO_ON_NEW - CResourceManager(void); - ~CResourceManager(void); + CResourceManager(); + ~CResourceManager(); CResource* Load(bool bIsZipped, const char* szAbsPath, const char* szResourceName); void UnloadAndDelete(CResource* pResource); CResource* GetResource(const char* szResourceName); CResource* GetResourceFromScriptID(uint uiScriptID); void UnloadRemovedResources(); - void CheckResourceDependencies(void); + void CheckResourceDependencies(); void ListResourcesLoaded(const SString& strListType); - std::list::const_iterator IterBegin(void) { return m_resources.begin(); }; - std::list::const_iterator IterEnd(void) { return m_resources.end(); }; + std::list::const_iterator IterBegin() { return m_resources.begin(); }; + std::list::const_iterator IterEnd() { return m_resources.end(); }; bool Refresh(bool bRefreshAll = false, const SString strJustThisResource = "", bool bShowTiming = false); void UpgradeResources(CResource* pResource = NULL); void CheckResources(CResource* pResource = NULL); - unsigned int GetResourceLoadedCount(void) { return m_uiResourceLoadedCount; } - unsigned int GetResourceFailedCount(void) { return m_uiResourceFailedCount; } + unsigned int GetResourceLoadedCount() { return m_uiResourceLoadedCount; } + unsigned int GetResourceFailedCount() { return m_uiResourceFailedCount; } void OnPlayerJoin(CPlayer& Player); - const char* GetResourceDirectory(void); + const char* GetResourceDirectory(); bool StartResource(CResource* pResource, std::list* pDependents = nullptr, bool bManualStart = false, const SResourceStartOptions& StartOptions = SResourceStartOptions()); bool Reload(CResource* pResource); - bool StopAllResources(void); + bool StopAllResources(); void QueueResource(CResource* pResource, eResourceQueue eQueueType, const SResourceStartOptions* pStartOptions, std::list* pDependents = nullptr); - void ProcessQueue(void); + void ProcessQueue(); void RemoveFromQueue(CResource* pResource); bool IsAResourceElement(CElement* pElement); - unsigned short GenerateID(void); + unsigned short GenerateID(); CResource* GetResourceFromNetID(unsigned short usNetID); CResource* GetResourceFromLuaState(struct lua_State* luaVM); @@ -91,7 +91,7 @@ class CResourceManager CResource* RenameResource(CResource* pSourceResource, const SString& strNewResourceName, const SString& strNewOrganizationalPath, SString& strOutStatus); bool DeleteResource(const SString& strResourceName, SString& strOutStatus); - SString GetResourceTrashDir(void); + SString GetResourceTrashDir(); bool MoveDirToTrash(const SString& strPathDirName); SString GetResourceOrganizationalPath(CResource* pResource); @@ -105,15 +105,15 @@ class CResourceManager void ApplyMinClientRequirement(CResource* pResource, const SString& strMinClientRequirement); void RemoveMinClientRequirement(CResource* pResource); - void ReevaluateMinClientRequirement(void); - SString GetMinClientRequirement(void) { return m_strMinClientRequirement; } + void ReevaluateMinClientRequirement(); + SString GetMinClientRequirement() { return m_strMinClientRequirement; } void ApplySyncMapElementDataOption(CResource* pResource, bool bSyncMapElementData); void RemoveSyncMapElementDataOption(CResource* pResource); - void ReevaluateSyncMapElementDataOption(void); + void ReevaluateSyncMapElementDataOption(); - void LoadBlockedFileReasons(void); - void SaveBlockedFileReasons(void); + void LoadBlockedFileReasons(); + void SaveBlockedFileReasons(); void ClearBlockedFileReason(const SString& strFileHash); void AddBlockedFileReason(const SString& strFileHash, const SString& strReason); SString GetBlockedFileReason(const SString& strFileHash); diff --git a/Server/mods/deathmatch/logic/CResourceScriptItem.cpp b/Server/mods/deathmatch/logic/CResourceScriptItem.cpp index e655f609eb7..d63a270584b 100644 --- a/Server/mods/deathmatch/logic/CResourceScriptItem.cpp +++ b/Server/mods/deathmatch/logic/CResourceScriptItem.cpp @@ -22,11 +22,11 @@ CResourceScriptItem::CResourceScriptItem(CResource* resource, const char* szShor m_type = RESOURCE_FILE_TYPE_SCRIPT; } -CResourceScriptItem::~CResourceScriptItem(void) +CResourceScriptItem::~CResourceScriptItem() { } -bool CResourceScriptItem::Start(void) +bool CResourceScriptItem::Start() { m_pVM = m_resource->GetVirtualMachine(); @@ -43,7 +43,7 @@ bool CResourceScriptItem::Start(void) return true; } -bool CResourceScriptItem::Stop(void) +bool CResourceScriptItem::Stop() { return true; } diff --git a/Server/mods/deathmatch/logic/CResourceScriptItem.h b/Server/mods/deathmatch/logic/CResourceScriptItem.h index 9376d61b5bd..d94af8e72c9 100644 --- a/Server/mods/deathmatch/logic/CResourceScriptItem.h +++ b/Server/mods/deathmatch/logic/CResourceScriptItem.h @@ -17,10 +17,10 @@ class CResourceScriptItem : public CResourceFile { public: CResourceScriptItem(class CResource* resource, const char* szShortName, const char* szResourceFileName, CXMLAttributes* xmlAttributes); - ~CResourceScriptItem(void); + ~CResourceScriptItem(); - bool Start(void); - bool Stop(void); + bool Start(); + bool Stop(); private: }; diff --git a/Server/mods/deathmatch/logic/CScriptDebugging.cpp b/Server/mods/deathmatch/logic/CScriptDebugging.cpp index 7a2735a01f9..aed9c39aeb9 100644 --- a/Server/mods/deathmatch/logic/CScriptDebugging.cpp +++ b/Server/mods/deathmatch/logic/CScriptDebugging.cpp @@ -22,7 +22,7 @@ CScriptDebugging::CScriptDebugging(CLuaManager* pLuaManager) m_bTriggeringMessageEvent = false; } -CScriptDebugging::~CScriptDebugging(void) +CScriptDebugging::~CScriptDebugging() { // Flush any pending duplicate loggings m_DuplicateLineFilter.Flush(); @@ -71,7 +71,7 @@ bool CScriptDebugging::RemovePlayer(CPlayer& Player) return false; } -void CScriptDebugging::ClearPlayers(void) +void CScriptDebugging::ClearPlayers() { // Unreference us from all players that we are script logging to list::const_iterator iter = m_Players.begin(); @@ -113,7 +113,7 @@ bool CScriptDebugging::SetLogfile(const char* szFilename, unsigned int uiLevel) return false; } -void CScriptDebugging::UpdateLogOutput(void) +void CScriptDebugging::UpdateLogOutput() { SLogLine line; while (m_DuplicateLineFilter.PopOutputLine(line)) diff --git a/Server/mods/deathmatch/logic/CScriptDebugging.h b/Server/mods/deathmatch/logic/CScriptDebugging.h index 55f9760545e..e7011f89795 100644 --- a/Server/mods/deathmatch/logic/CScriptDebugging.h +++ b/Server/mods/deathmatch/logic/CScriptDebugging.h @@ -23,7 +23,7 @@ struct SLogLine unsigned char ucRed; unsigned char ucGreen; unsigned char ucBlue; - operator SString&(void) { return strText; } + operator SString&() { return strText; } bool operator==(const SLogLine& other) const { return strText == other.strText && uiMinimumDebugLevel == other.uiMinimumDebugLevel && ucRed == other.ucRed && ucGreen == other.ucGreen && @@ -35,11 +35,11 @@ class CScriptDebugging { public: CScriptDebugging(CLuaManager* pLuaManager); - ~CScriptDebugging(void); + ~CScriptDebugging(); bool AddPlayer(class CPlayer& Player, unsigned int uiLevel); bool RemovePlayer(class CPlayer& Player); - void ClearPlayers(void); + void ClearPlayers(); void LogCustom(lua_State* luaVM, unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue, const char* szFormat, ...); void LogInformation(lua_State* luaVM, const char* szFormat, ...); @@ -62,8 +62,8 @@ class CScriptDebugging void PushLuaMain(CLuaMain* pLuaMain); void PopLuaMain(CLuaMain* pLuaMain); void OnLuaMainDestroy(CLuaMain* pLuaMain); - CLuaMain* GetTopLuaMain(void); - void UpdateLogOutput(void); + CLuaMain* GetTopLuaMain(); + void UpdateLogOutput(); private: SString ComposeErrorMessage(const char* szPrePend, const SLuaDebugInfo& luaDebugInfo, const char* szMessage); diff --git a/Server/mods/deathmatch/logic/CScriptFile.cpp b/Server/mods/deathmatch/logic/CScriptFile.cpp index d2461f5e0d4..d8171612cfa 100644 --- a/Server/mods/deathmatch/logic/CScriptFile.cpp +++ b/Server/mods/deathmatch/logic/CScriptFile.cpp @@ -23,7 +23,7 @@ CScriptFile::CScriptFile(uint uiScriptId, const char* szFilename, unsigned long m_pResource = nullptr; } -CScriptFile::~CScriptFile(void) +CScriptFile::~CScriptFile() { // Close the file Unload(); @@ -75,7 +75,7 @@ bool CScriptFile::Load(CResource* pResourceForFilePath, eMode Mode) return false; } -void CScriptFile::Unload(void) +void CScriptFile::Unload() { // Loaded? if (m_pFile) @@ -89,7 +89,7 @@ void CScriptFile::Unload(void) } } -bool CScriptFile::IsEOF(void) +bool CScriptFile::IsEOF() { if (!m_pFile) return true; @@ -98,7 +98,7 @@ bool CScriptFile::IsEOF(void) return feof(m_pFile) != 0; } -long CScriptFile::GetPointer(void) +long CScriptFile::GetPointer() { if (!m_pFile) return -1; @@ -106,7 +106,7 @@ long CScriptFile::GetPointer(void) return ftell(m_pFile); } -long CScriptFile::GetSize(void) +long CScriptFile::GetSize() { if (!m_pFile) return -1; @@ -161,7 +161,7 @@ void CScriptFile::SetSize(unsigned long ulNewSize) return; } -void CScriptFile::Flush(void) +void CScriptFile::Flush() { if (!m_pFile) return; @@ -198,7 +198,7 @@ long CScriptFile::Write(unsigned long ulSize, const char* pData) return fwrite(pData, 1, ulSize, m_pFile); } -CResource* CScriptFile::GetResource(void) +CResource* CScriptFile::GetResource() { return m_pResource; } diff --git a/Server/mods/deathmatch/logic/CScriptFile.h b/Server/mods/deathmatch/logic/CScriptFile.h index eba8df68190..abcb4434b35 100644 --- a/Server/mods/deathmatch/logic/CScriptFile.h +++ b/Server/mods/deathmatch/logic/CScriptFile.h @@ -26,35 +26,35 @@ class CScriptFile : public CElement }; CScriptFile(uint uiScriptId, const char* szFilename, unsigned long ulMaxSize); - ~CScriptFile(void); + ~CScriptFile(); // Functions required by CElement - void Unlink(void){}; + void Unlink(){}; // Load and unload routines bool Load(CResource* pResourceForFilePath, eMode Mode); - void Unload(void); - bool IsLoaded(void) { return m_pFile != NULL; }; - const SString& GetFilePath(void) { return m_strFilename; }; + void Unload(); + bool IsLoaded() { return m_pFile != NULL; }; + const SString& GetFilePath() { return m_strFilename; }; // Get the owning resource - CResource* GetResource(void); + CResource* GetResource(); // Only call functions belw this if you're sure that the file is loaded. // Or you will crash. - bool IsEOF(void); - long GetPointer(void); - long GetSize(void); + bool IsEOF(); + long GetPointer(); + long GetSize(); long SetPointer(unsigned long ulPosition); void SetSize(unsigned long ulNewSize); - void Flush(void); + void Flush(); long Read(unsigned long ulSize, CBuffer& outBuffer); long Write(unsigned long ulSize, const char* pData); // Debug info for garbage collected files - const SLuaDebugInfo& GetLuaDebugInfo(void) { return m_LuaDebugInfo; }; + const SLuaDebugInfo& GetLuaDebugInfo() { return m_LuaDebugInfo; }; void SetLuaDebugInfo(const SLuaDebugInfo& luaDebugInfo) { m_LuaDebugInfo = luaDebugInfo; }; protected: diff --git a/Server/mods/deathmatch/logic/CSettings.cpp b/Server/mods/deathmatch/logic/CSettings.cpp index 47d3da0a61d..d0b4ef0777c 100644 --- a/Server/mods/deathmatch/logic/CSettings.cpp +++ b/Server/mods/deathmatch/logic/CSettings.cpp @@ -46,7 +46,7 @@ CSettings::CSettings(CResourceManager* pResourceManager) } } -CSettings::~CSettings(void) +CSettings::~CSettings() { if (m_pNodeGlobalSettings) delete m_pNodeGlobalSettings; diff --git a/Server/mods/deathmatch/logic/CSettings.h b/Server/mods/deathmatch/logic/CSettings.h index f4f3e3bcb16..2ee5df4ebd8 100644 --- a/Server/mods/deathmatch/logic/CSettings.h +++ b/Server/mods/deathmatch/logic/CSettings.h @@ -29,7 +29,7 @@ class CSettings Public }; CSettings(CResourceManager* pResourceManager); - ~CSettings(void); + ~CSettings(); CXMLNode* Get(const char* szLocalResource, const char* szSetting, bool& bDeleteNode); bool Set(const char* szLocalResource, const char* szSetting, const char* szContent); diff --git a/Server/mods/deathmatch/logic/CSpatialDatabase.cpp b/Server/mods/deathmatch/logic/CSpatialDatabase.cpp index e5ef51a5c6a..0b56990eaa1 100644 --- a/Server/mods/deathmatch/logic/CSpatialDatabase.cpp +++ b/Server/mods/deathmatch/logic/CSpatialDatabase.cpp @@ -38,7 +38,7 @@ class CSpatialDatabaseImpl : public CSpatialDatabase virtual void AllQuery(CElementResult& outResult); // CSpatialDatabaseImpl functions - void FlushUpdateQueue(void); + void FlushUpdateQueue(); bool IsValidSphere(const CSphere& sphere); CElementTree m_Tree; @@ -157,7 +157,7 @@ void CSpatialDatabaseImpl::AllQuery(CElementResult& outResult) // Process all entities that have changed since the last call // /////////////////////////////////////////////////////////////// -void CSpatialDatabaseImpl::FlushUpdateQueue(void) +void CSpatialDatabaseImpl::FlushUpdateQueue() { std::map updateQueueCopy = m_UpdateQueue; m_UpdateQueue.clear(); diff --git a/Server/mods/deathmatch/logic/CSpatialDatabase.h b/Server/mods/deathmatch/logic/CSpatialDatabase.h index c15092c7d44..250b4f9ff26 100644 --- a/Server/mods/deathmatch/logic/CSpatialDatabase.h +++ b/Server/mods/deathmatch/logic/CSpatialDatabase.h @@ -27,7 +27,7 @@ class CElementResult : public std::vector class CSpatialDatabase { public: - virtual ~CSpatialDatabase(void) {} + virtual ~CSpatialDatabase() {} virtual void UpdateEntity(CElement* pEntity) = 0; virtual void RemoveEntity(CElement* pEntity) = 0; diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp index 2cfcab24282..c036b134757 100644 --- a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp +++ b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp @@ -72,7 +72,7 @@ CStaticFunctionDefinitions::CStaticFunctionDefinitions(CGame* pGame) m_pCustomWeaponManager = pGame->GetCustomWeaponManager(); } -CStaticFunctionDefinitions::~CStaticFunctionDefinitions(void) +CStaticFunctionDefinitions::~CStaticFunctionDefinitions() { } @@ -190,7 +190,7 @@ const char* CStaticFunctionDefinitions::GetCancelReason() return m_pEvents->GetLastError(); } -bool CStaticFunctionDefinitions::WasEventCancelled(void) +bool CStaticFunctionDefinitions::WasEventCancelled() { return m_pEvents->WasEventCancelled(); } @@ -1985,7 +1985,7 @@ CPed* CStaticFunctionDefinitions::CreatePed(CResource* pResource, unsigned short return NULL; } -unsigned int CStaticFunctionDefinitions::GetPlayerCount(void) +unsigned int CStaticFunctionDefinitions::GetPlayerCount() { return m_pPlayerManager->CountJoined(); } @@ -2727,7 +2727,7 @@ bool CStaticFunctionDefinitions::GetPlayerSourceIP(CPlayer* pPlayer, SString& st return true; } -CPlayer* CStaticFunctionDefinitions::GetRandomPlayer(void) +CPlayer* CStaticFunctionDefinitions::GetRandomPlayer() { unsigned int uiJoinedCount = m_pPlayerManager->CountJoined(); if (uiJoinedCount > 0) @@ -9115,7 +9115,7 @@ bool CStaticFunctionDefinitions::SetWorldWaterLevel(float fLevel, bool bIncludeW return true; } -bool CStaticFunctionDefinitions::ResetWorldWaterLevel(void) +bool CStaticFunctionDefinitions::ResetWorldWaterLevel() { CBitStream BitStream; g_pGame->GetWaterManager()->ResetWorldWaterLevel(); @@ -9785,7 +9785,7 @@ bool CStaticFunctionDefinitions::GetClothesTypeName(unsigned char ucType, char* return false; } -unsigned int CStaticFunctionDefinitions::GetMaxPlayers(void) +unsigned int CStaticFunctionDefinitions::GetMaxPlayers() { return m_pMainConfig->GetMaxPlayers(); } @@ -10359,7 +10359,7 @@ bool CStaticFunctionDefinitions::RestoreWorldModel(unsigned short usModel, float return true; } -bool CStaticFunctionDefinitions::RestoreAllWorldModels(void) +bool CStaticFunctionDefinitions::RestoreAllWorldModels() { g_pGame->GetBuildingRemovalManager()->ClearBuildingRemovals(); CBitStream BitStream; @@ -10368,7 +10368,7 @@ bool CStaticFunctionDefinitions::RestoreAllWorldModels(void) return true; } -bool CStaticFunctionDefinitions::ResetMoonSize(void) +bool CStaticFunctionDefinitions::ResetMoonSize() { CBitStream BitStream; g_pGame->SetHasMoonSize(false); @@ -10576,7 +10576,7 @@ bool CStaticFunctionDefinitions::SetSkyGradient(unsigned char ucTopRed, unsigned return true; } -bool CStaticFunctionDefinitions::ResetSkyGradient(void) +bool CStaticFunctionDefinitions::ResetSkyGradient() { g_pGame->SetHasSkyGradient(false); @@ -10607,7 +10607,7 @@ bool CStaticFunctionDefinitions::SetHeatHaze(const SHeatHazeSettings& settings) return true; } -bool CStaticFunctionDefinitions::ResetHeatHaze(void) +bool CStaticFunctionDefinitions::ResetHeatHaze() { g_pGame->SetHasHeatHaze(false); @@ -10675,12 +10675,12 @@ bool CStaticFunctionDefinitions::SetCloudsEnabled(bool bEnabled) g_pGame->SetCloudsEnabled(bEnabled); return true; } -bool CStaticFunctionDefinitions::GetCloudsEnabled(void) +bool CStaticFunctionDefinitions::GetCloudsEnabled() { return g_pGame->GetCloudsEnabled(); } -CElement* CStaticFunctionDefinitions::GetRootElement(void) +CElement* CStaticFunctionDefinitions::GetRootElement() { return m_pMapManager->GetRootElement(); } @@ -10840,7 +10840,7 @@ bool CStaticFunctionDefinitions::ExecuteSQLQuery(const std::string& strQuery, CL return m_pRegistry->Query(strQuery, pArgs, pResult); } -const std::string& CStaticFunctionDefinitions::SQLGetLastError(void) +const std::string& CStaticFunctionDefinitions::SQLGetLastError() { return m_pRegistry->GetLastError(); } @@ -11488,7 +11488,7 @@ bool CStaticFunctionDefinitions::GetBans(lua_State* pLua) return true; } -bool CStaticFunctionDefinitions::ReloadBanList(void) +bool CStaticFunctionDefinitions::ReloadBanList() { return m_pBanManager->ReloadBanList(); } diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h index 4d18c1cface..fd994e9431d 100644 --- a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h +++ b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h @@ -17,7 +17,7 @@ class CStaticFunctionDefinitions { public: CStaticFunctionDefinitions(CGame* pGame); - ~CStaticFunctionDefinitions(void); + ~CStaticFunctionDefinitions(); // Event funcs static bool AddEvent(CLuaMain* pLuaMain, const char* szName, const char* szArguments, bool bAllowRemoteTrigger); @@ -31,7 +31,7 @@ class CStaticFunctionDefinitions static bool CancelEvent(bool bCancel, const char* szReason); static const char* GetCancelReason(); - static bool WasEventCancelled(void); + static bool WasEventCancelled(); // Element create/destroy static CDummy* CreateElement(CResource* pResource, const char* szTypeName, const char* szID); @@ -100,12 +100,12 @@ class CStaticFunctionDefinitions static bool SetElementCallPropagationEnabled(CElement* pElement, bool bEnable); // Player get funcs - static unsigned int GetPlayerCount(void); + static unsigned int GetPlayerCount(); static CPlayer* GetPlayerFromName(const char* szNick); static bool GetPlayerPing(CPlayer* pPlayer, unsigned int& uiPing); static bool GetPlayerMoney(CPlayer* pPlayer, long& lMoney); static bool GetPlayerSourceIP(CPlayer* pPlayer, SString& strOutIP); - static CPlayer* GetRandomPlayer(void); + static CPlayer* GetRandomPlayer(); static bool IsPlayerMuted(CPlayer* pPlayer, bool& bMuted); static CTeam* GetPlayerTeam(CPlayer* pPlayer); static bool CanPlayerUseFunction(CPlayer* pPlayer, const char* szFunction, bool& bCanUse); @@ -532,7 +532,7 @@ class CStaticFunctionDefinitions static bool SetElementWaterLevel(CWater* pWater, float fLevel); static bool SetAllElementWaterLevel(float fLevel); static bool SetWorldWaterLevel(float fLevel, bool bIncludeWorldNonSeaLevel); - static bool ResetWorldWaterLevel(void); + static bool ResetWorldWaterLevel(); static bool GetWaterVertexPosition(CWater* pWater, int iVertexIndex, CVector& vecPosition); static bool SetWaterVertexPosition(CWater* pWater, int iVertexIndex, CVector& vecPosition); static bool GetWaterColor(unsigned char& ucRed, unsigned char& ucGreen, unsigned char& ucBlue, unsigned char& ucAlpha); @@ -540,7 +540,7 @@ class CStaticFunctionDefinitions static bool ResetWaterColor(); // Standard server functions - static unsigned int GetMaxPlayers(void); + static unsigned int GetMaxPlayers(); static bool SetMaxPlayers(unsigned int uiMax); static bool OutputChatBox(const char* szText, CElement* pElement, unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue, bool bColorCoded, CLuaMain* pLuaMain); @@ -585,10 +585,10 @@ class CStaticFunctionDefinitions unsigned char& ucBottomGreen, unsigned char& ucBottomBlue); static bool SetSkyGradient(unsigned char ucTopRed, unsigned char ucTopGreen, unsigned char ucTopBlue, unsigned char ucBottomRed, unsigned char ucBottomGreen, unsigned char ucBottomBlue); - static bool ResetSkyGradient(void); + static bool ResetSkyGradient(); static bool GetHeatHaze(SHeatHazeSettings& heatHazeSettings); static bool SetHeatHaze(const SHeatHazeSettings& heatHazeSettings); - static bool ResetHeatHaze(void); + static bool ResetHeatHaze(); static bool SetFPSLimit(unsigned short usLimit, bool bSave); static bool SetMinuteDuration(unsigned long ulDuration); static bool SetGarageOpen(unsigned char ucGarageID, bool bIsOpen); @@ -597,7 +597,7 @@ class CStaticFunctionDefinitions static bool GetJetpackWeaponEnabled(eWeaponType weaponType, bool& bEnabled); static bool SetJetpackWeaponEnabled(eWeaponType weaponType, bool bEnabled); static bool SetCloudsEnabled(bool bEnabled); - static bool GetCloudsEnabled(void); + static bool GetCloudsEnabled(); static bool SetTrafficLightState(unsigned char ucState, bool bForced = false); static bool SetTrafficLightsLocked(bool bLocked); static bool SetJetpackMaxHeight(float fMaxHeight); @@ -612,21 +612,21 @@ class CStaticFunctionDefinitions static bool SetAircraftMaxHeight(float fMaxHeight); static bool SetAircraftMaxVelocity(float fVelocity); static bool SetOcclusionsEnabled(bool bEnabled); - static bool ResetRainLevel(void); - static bool ResetSunSize(void); - static bool ResetSunColor(void); - static bool ResetWindVelocity(void); - static bool ResetFarClipDistance(void); - static bool ResetFogDistance(void); + static bool ResetRainLevel(); + static bool ResetSunSize(); + static bool ResetSunColor(); + static bool ResetWindVelocity(); + static bool ResetFarClipDistance(); + static bool ResetFogDistance(); static bool RemoveWorldModel(unsigned short usModel, float fRadius, const CVector& vecPosition, char cInterior); static bool RestoreWorldModel(unsigned short usModel, float fRadius, const CVector& vecPosition, char cInterior); - static bool RestoreAllWorldModels(void); + static bool RestoreAllWorldModels(); static bool SendSyncIntervals(CPlayer* pPlayer = NULL); static bool SetMoonSize(int iMoonSize); - static bool ResetMoonSize(void); + static bool ResetMoonSize(); // Loaded Map Functions - static CElement* GetRootElement(void); + static CElement* GetRootElement(); static CElement* LoadMapData(CLuaMain* pLuaMain, CElement* pParent, CXMLNode* pNode); static CXMLNode* SaveMapData(CElement* pElement, CXMLNode* pNode, bool bChildren); @@ -640,7 +640,7 @@ class CStaticFunctionDefinitions static bool SetPlayerAnnounceValue(CElement* pElement, const std::string& strKey, const std::string& strValue); // Registry funcs - static const std::string& SQLGetLastError(void); + static const std::string& SQLGetLastError(); static void ExecuteSQLCreateTable(const std::string& strTable, const std::string& strDefinition); static void ExecuteSQLDropTable(const std::string& strTable); static bool ExecuteSQLDelete(const std::string& strTable, const std::string& strWhere); @@ -687,7 +687,7 @@ class CStaticFunctionDefinitions static bool RemoveBan(CBan* pBan, CPlayer* pResponsible = NULL); static bool GetBans(lua_State* luaVM); - static bool ReloadBanList(void); + static bool ReloadBanList(); static bool GetBanIP(CBan* pBan, SString& strOutIP); static bool GetBanSerial(CBan* pBan, SString& strOutSerial); diff --git a/Server/mods/deathmatch/logic/CTeam.cpp b/Server/mods/deathmatch/logic/CTeam.cpp index 7a585748873..6e0686c578a 100644 --- a/Server/mods/deathmatch/logic/CTeam.cpp +++ b/Server/mods/deathmatch/logic/CTeam.cpp @@ -26,13 +26,13 @@ CTeam::CTeam(CTeamManager* pTeamManager, CElement* pParent, const char* szName, m_pTeamManager->AddToList(this); } -CTeam::~CTeam(void) +CTeam::~CTeam() { RemoveAllPlayers(); Unlink(); } -void CTeam::Unlink(void) +void CTeam::Unlink() { m_pTeamManager->RemoveFromList(this); } @@ -112,7 +112,7 @@ void CTeam::RemovePlayer(CPlayer* pPlayer, bool bChangePlayer) pPlayer->SetTeam(NULL, false); } -void CTeam::RemoveAllPlayers(void) +void CTeam::RemoveAllPlayers() { list::const_iterator iter = m_Players.begin(); for (; iter != m_Players.end(); ++iter) diff --git a/Server/mods/deathmatch/logic/CTeam.h b/Server/mods/deathmatch/logic/CTeam.h index ad10842b5ce..7b7c6c93ac9 100644 --- a/Server/mods/deathmatch/logic/CTeam.h +++ b/Server/mods/deathmatch/logic/CTeam.h @@ -26,28 +26,28 @@ class CTeam : public CElement public: CTeam(CTeamManager* pTeamManager, CElement* pParent, const char* szName = NULL, unsigned char ucRed = 0, unsigned char ucGreen = 0, unsigned char ucBlue = 0); - ~CTeam(void); + ~CTeam(); - void Unlink(void); + void Unlink(); - const char* GetTeamName(void) { return m_strTeamName; } + const char* GetTeamName() { return m_strTeamName; } void SetTeamName(const char* szName); void AddPlayer(CPlayer* pPlayer, bool bChangePlayer = false); void RemovePlayer(CPlayer* pPlayer, bool bChangePlayer = false); - void RemoveAllPlayers(void); + void RemoveAllPlayers(); void GetPlayers(lua_State* luaVM); void GetColor(unsigned char& ucRed, unsigned char& ucGreen, unsigned char& ucBlue); void SetColor(unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue); - bool GetFriendlyFire(void) { return m_bFriendlyFire; } + bool GetFriendlyFire() { return m_bFriendlyFire; } void SetFriendlyFire(bool bFriendlyFire) { m_bFriendlyFire = bFriendlyFire; } - unsigned int CountPlayers(void) { return static_cast(m_Players.size()); } + unsigned int CountPlayers() { return static_cast(m_Players.size()); } - std::list::const_iterator PlayersBegin(void) { return m_Players.begin(); } - std::list::const_iterator PlayersEnd(void) { return m_Players.end(); } + std::list::const_iterator PlayersBegin() { return m_Players.begin(); } + std::list::const_iterator PlayersEnd() { return m_Players.end(); } protected: bool ReadSpecialData(const int iLine) override; diff --git a/Server/mods/deathmatch/logic/CTeamManager.cpp b/Server/mods/deathmatch/logic/CTeamManager.cpp index 5bde4fd89b9..b0648dd9d68 100644 --- a/Server/mods/deathmatch/logic/CTeamManager.cpp +++ b/Server/mods/deathmatch/logic/CTeamManager.cpp @@ -11,11 +11,11 @@ #include "StdInc.h" -CTeamManager::CTeamManager(void) +CTeamManager::CTeamManager() { } -CTeamManager::~CTeamManager(void) +CTeamManager::~CTeamManager() { RemoveAll(); } @@ -25,7 +25,7 @@ void CTeamManager::RemoveFromList(CTeam* pTeam) m_List.remove(pTeam); } -void CTeamManager::RemoveAll(void) +void CTeamManager::RemoveAll() { DeletePointersAndClearList(m_List); } diff --git a/Server/mods/deathmatch/logic/CTeamManager.h b/Server/mods/deathmatch/logic/CTeamManager.h index 49761c7a23a..1bbbade44fe 100644 --- a/Server/mods/deathmatch/logic/CTeamManager.h +++ b/Server/mods/deathmatch/logic/CTeamManager.h @@ -19,20 +19,20 @@ class CTeamManager; class CTeamManager { public: - CTeamManager(void); - ~CTeamManager(void); + CTeamManager(); + ~CTeamManager(); void AddToList(CTeam* pTeam) { m_List.push_back(pTeam); } void RemoveFromList(CTeam* pTeam); - void RemoveAll(void); + void RemoveAll(); CTeam* GetTeam(const char* szName); bool Exists(CTeam* pTeam); CTeam* Create(CElement* pParent, char* szName, unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue); CTeam* CreateFromXML(CElement* pParent, CXMLNode& Node, CEvents* pEvents); - std::list::const_iterator IterBegin(void) { return m_List.begin(); } - std::list::const_iterator IterEnd(void) { return m_List.end(); } + std::list::const_iterator IterBegin() { return m_List.begin(); } + std::list::const_iterator IterEnd() { return m_List.end(); } private: std::list m_List; diff --git a/Server/mods/deathmatch/logic/CTextDisplay.cpp b/Server/mods/deathmatch/logic/CTextDisplay.cpp index 31245bb955c..7c61023e4cc 100644 --- a/Server/mods/deathmatch/logic/CTextDisplay.cpp +++ b/Server/mods/deathmatch/logic/CTextDisplay.cpp @@ -11,12 +11,12 @@ #include "StdInc.h" -CTextDisplay::CTextDisplay(void) +CTextDisplay::CTextDisplay() { m_uiScriptID = CIdArray::PopUniqueId(this, EIdClass::TEXT_DISPLAY); } -CTextDisplay::~CTextDisplay(void) +CTextDisplay::~CTextDisplay() { CIdArray::PushUniqueId(this, EIdClass::TEXT_DISPLAY, m_uiScriptID); // Delete all our text items diff --git a/Server/mods/deathmatch/logic/CTextDisplay.h b/Server/mods/deathmatch/logic/CTextDisplay.h index 8f3ec2c1d0b..056acda3dcd 100644 --- a/Server/mods/deathmatch/logic/CTextDisplay.h +++ b/Server/mods/deathmatch/logic/CTextDisplay.h @@ -20,8 +20,8 @@ class CTextDisplay; class CTextDisplay { public: - CTextDisplay(void); - ~CTextDisplay(void); + CTextDisplay(); + ~CTextDisplay(); void AddObserver(CPlayer* pPlayer); void RemoveObserver(CPlayer* pPlayer); @@ -33,7 +33,7 @@ class CTextDisplay void Add(CTextItem* pTextItem); void Remove(CTextItem* pTextItem, bool bRemoveFromList = true); - uint GetScriptID(void) { return m_uiScriptID; } + uint GetScriptID() { return m_uiScriptID; } private: std::list m_observers; diff --git a/Server/mods/deathmatch/logic/CTextItem.cpp b/Server/mods/deathmatch/logic/CTextItem.cpp index cb14640b7a5..07b09d3fa1e 100644 --- a/Server/mods/deathmatch/logic/CTextItem.cpp +++ b/Server/mods/deathmatch/logic/CTextItem.cpp @@ -86,7 +86,7 @@ void CTextItem::AddObserver(CTextDisplay* pObserver) m_Observers.push_back(pObserver); } -void CTextItem::NotifyObservers(void) +void CTextItem::NotifyObservers() { // Update all our observers list::iterator iter = m_Observers.begin(); diff --git a/Server/mods/deathmatch/logic/CTextItem.h b/Server/mods/deathmatch/logic/CTextItem.h index 6eba4e00953..cb94c63c985 100644 --- a/Server/mods/deathmatch/logic/CTextItem.h +++ b/Server/mods/deathmatch/logic/CTextItem.h @@ -33,31 +33,31 @@ class CTextItem CTextItem(const char* szText, const CVector2D& vecPosition, eTextPriority Priority = PRIORITY_LOW, const SColor color = -1, float fScale = 1.0f, unsigned char ucFormat = 0, unsigned char ucShadowAlpha = 0); CTextItem(const CTextItem& TextItem); - ~CTextItem(void); + ~CTextItem(); bool operator=(const CTextItem& TextItem); void SetText(const char* szText); - const SString& GetText(void) { return m_strText; }; + const SString& GetText() { return m_strText; }; - const CVector2D& GetPosition(void) { return m_vecPosition; }; + const CVector2D& GetPosition() { return m_vecPosition; }; void SetPosition(const CVector2D& vecPosition); void SetColor(const SColor color); - SColor GetColor(void) const { return m_Color; } + SColor GetColor() const { return m_Color; } - float GetScale(void) { return m_fScale; }; + float GetScale() { return m_fScale; }; void SetScale(float fScale); - unsigned char GetFormat(void) { return m_ucFormat; } + unsigned char GetFormat() { return m_ucFormat; } void SetFormat(unsigned char ucFormat) { m_ucFormat = ucFormat; } void SetPriority(eTextPriority Priority) { m_Priority = Priority; }; - eTextPriority GetPriority(void) { return m_Priority; }; + eTextPriority GetPriority() { return m_Priority; }; - unsigned long GetUniqueID(void) { return m_ulUniqueId; }; - bool IsBeingDeleted(void) { return m_bDeletable; }; - uint GetScriptID(void) const { return m_uiScriptID; } + unsigned long GetUniqueID() { return m_ulUniqueId; }; + bool IsBeingDeleted() { return m_bDeletable; }; + uint GetScriptID() const { return m_uiScriptID; } private: SString m_strText; @@ -75,5 +75,5 @@ class CTextItem void AddObserver(CTextDisplay* pObserver); void RemoveObserver(CTextDisplay* pObserver) { m_Observers.remove(pObserver); }; - void NotifyObservers(void); + void NotifyObservers(); }; diff --git a/Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp b/Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp index 5ea613d5e18..5483a7e22e4 100644 --- a/Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp +++ b/Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.cpp @@ -17,7 +17,7 @@ CUnoccupiedVehicleSync::CUnoccupiedVehicleSync(CPlayerManager* pPlayerManager, C m_pVehicleManager = pVehicleManager; } -void CUnoccupiedVehicleSync::DoPulse(void) +void CUnoccupiedVehicleSync::DoPulse() { // Time to check for players that should no longer be syncing a vehicle or vehicles that should be synced? if (m_UpdateTimer.Get() > 500) @@ -58,7 +58,7 @@ void CUnoccupiedVehicleSync::OverrideSyncer(CVehicle* pVehicle, CPlayer* pPlayer StartSync(pPlayer, pVehicle); } -void CUnoccupiedVehicleSync::Update(void) +void CUnoccupiedVehicleSync::Update() { // Update all the vehicle's sync states list::const_iterator iter = m_pVehicleManager->IterBegin(); diff --git a/Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.h b/Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.h index e6671a230d0..bb74dbc063f 100644 --- a/Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.h +++ b/Server/mods/deathmatch/logic/CUnoccupiedVehicleSync.h @@ -21,7 +21,7 @@ class CUnoccupiedVehicleSync public: CUnoccupiedVehicleSync(CPlayerManager* pPlayerManager, CVehicleManager* pVehicleManager); - void DoPulse(void); + void DoPulse(); bool ProcessPacket(CPacket& Packet); void OverrideSyncer(CVehicle* pVehicle, CPlayer* pPlayer); @@ -29,7 +29,7 @@ class CUnoccupiedVehicleSync void ResyncForPlayer(CPlayer* pPlayer); private: - void Update(void); + void Update(); void UpdateVehicle(CVehicle* pVehicle); void FindSyncer(CVehicle* pVehicle); diff --git a/Server/mods/deathmatch/logic/CVehicle.cpp b/Server/mods/deathmatch/logic/CVehicle.cpp index 50b20ce78ef..814f8d170d6 100644 --- a/Server/mods/deathmatch/logic/CVehicle.cpp +++ b/Server/mods/deathmatch/logic/CVehicle.cpp @@ -103,7 +103,7 @@ CVehicle::CVehicle(CVehicleManager* pVehicleManager, CElement* pParent, unsigned m_tSirenBeaconInfo.m_bOverrideSirens = false; } -CVehicle::~CVehicle(void) +CVehicle::~CVehicle() { if (m_pJackingPlayer && m_pJackingPlayer->GetJackingVehicle() == this) { @@ -196,7 +196,7 @@ CElement* CVehicle::Clone(bool* bAddEntity, CResource* pResource) return pTemp; } -void CVehicle::Unlink(void) +void CVehicle::Unlink() { // Remove us from the vehicle manager m_pVehicleManager->RemoveFromList(this); @@ -416,7 +416,7 @@ void CVehicle::SetMatrix(const CMatrix& matrix) SetRotationDegrees(vecRotation); } -const CVector& CVehicle::GetPosition(void) +const CVector& CVehicle::GetPosition() { // Are we attached to something? if (m_pAttachedTo) @@ -483,7 +483,7 @@ void CVehicle::SetModel(unsigned short usModel) } } -bool CVehicle::HasValidModel(void) +bool CVehicle::HasValidModel() { return CVehicleManager::IsValidModel(m_usModel); } @@ -494,7 +494,7 @@ void CVehicle::SetVariants(unsigned char ucVariant, unsigned char ucVariant2) m_ucVariant2 = ucVariant2; } -CVehicleColor& CVehicle::RandomizeColor(void) +CVehicleColor& CVehicle::RandomizeColor() { // Grab a random color for this vehicle and return it m_Color = m_pVehicleManager->GetRandomColor(m_usModel); @@ -534,7 +534,7 @@ CPed* CVehicle::GetOccupant(unsigned int uiSeat) return NULL; } -CPed* CVehicle::GetFirstOccupant(void) +CPed* CVehicle::GetFirstOccupant() { // Try finding a seat with a Player in it unsigned int i = 0; @@ -550,7 +550,7 @@ CPed* CVehicle::GetFirstOccupant(void) return NULL; } -CPed* CVehicle::GetController(void) +CPed* CVehicle::GetController() { CPed* pController = m_pOccupants[0]; @@ -632,12 +632,12 @@ void CVehicle::SetSyncer(CPlayer* pPlayer) } } -unsigned char CVehicle::GetMaxPassengers(void) +unsigned char CVehicle::GetMaxPassengers() { return ((m_ucMaxPassengersOverride == VEHICLE_PASSENGERS_UNDEFINED) ? CVehicleManager::GetMaxPassengers(m_usModel) : m_ucMaxPassengersOverride); } -unsigned char CVehicle::GetFreePassengerSeat(void) +unsigned char CVehicle::GetFreePassengerSeat() { // Grab the max passengers this vehicle can have and check the rage unsigned char ucMaxPassengers = GetMaxPassengers(); @@ -745,7 +745,7 @@ void CVehicle::SetRegPlate(const char* szRegPlate) STRNCPY(m_szRegPlate, szRegPlate, 9); } -void CVehicle::GenerateRegPlate(void) +void CVehicle::GenerateRegPlate() { // For all our 8 letters for (int i = 0; i < 8; i++) @@ -805,7 +805,7 @@ void CVehicle::GetInitialDoorStates(SFixedArray& ucOut } } -void CVehicle::GenerateHandlingData(void) +void CVehicle::GenerateHandlingData() { // Make a new CHandlingEntry if (m_pHandlingEntry == NULL) @@ -838,7 +838,7 @@ void CVehicle::SetVehicleFlags(bool bEnable360, bool bEnableRandomiser, bool bEn m_tSirenBeaconInfo.m_bUseRandomiser = bEnableRandomiser; m_tSirenBeaconInfo.m_bSirenSilent = bEnableSilent; } -void CVehicle::RemoveVehicleSirens(void) +void CVehicle::RemoveVehicleSirens() { for (int i = 0; i <= 7; i++) { @@ -851,14 +851,14 @@ void CVehicle::RemoveVehicleSirens(void) m_tSirenBeaconInfo.m_ucSirenCount = 0; } -void CVehicle::ResetDoors(void) +void CVehicle::ResetDoors() { GetInitialDoorStates(m_ucDoorStates); for (unsigned int i = 0; i < 6; ++i) m_fDoorOpenRatio[i] = 0.0f; } -void CVehicle::ResetDoorsWheelsPanelsLights(void) +void CVehicle::ResetDoorsWheelsPanelsLights() { ResetDoors(); memset(&m_ucWheelStates[0], 0, sizeof(m_ucWheelStates)); @@ -875,38 +875,38 @@ void CVehicle::SetIsBlown(bool bBlown) m_llBlowTime = CTickCount::Now(); } -bool CVehicle::GetIsBlown(void) +bool CVehicle::GetIsBlown() { return m_llBlowTime.ToLongLong() != 0; } -bool CVehicle::IsBlowTimerFinished(void) +bool CVehicle::IsBlowTimerFinished() { return GetIsBlown() && CTickCount::Now() > m_llBlowTime + CTickCount((long long)m_ulBlowRespawnInterval); } -void CVehicle::StopIdleTimer(void) +void CVehicle::StopIdleTimer() { m_llIdleTime = CTickCount(0LL); } -void CVehicle::RestartIdleTimer(void) +void CVehicle::RestartIdleTimer() { m_llIdleTime = CTickCount::Now(); } -bool CVehicle::IsIdleTimerRunning(void) +bool CVehicle::IsIdleTimerRunning() { return m_llIdleTime.ToLongLong() != 0; } -bool CVehicle::IsIdleTimerFinished(void) +bool CVehicle::IsIdleTimerFinished() { return IsIdleTimerRunning() && CTickCount::Now() > m_llIdleTime + CTickCount((long long)m_ulIdleRespawnInterval); } // Check if vehicle has not moved (much) since the last call -bool CVehicle::IsStationary(void) +bool CVehicle::IsStationary() { const CVector& vecPosition = GetPosition(); if ((vecPosition - m_vecStationaryCheckPosition).LengthSquared() < 0.1f * 0.1f) @@ -936,14 +936,14 @@ void CVehicle::SetJackingPlayer(CPlayer* pPlayer) m_pJackingPlayer->SetJackingVehicle(this); } -void CVehicle::OnRelayUnoccupiedSync(void) +void CVehicle::OnRelayUnoccupiedSync() { // Detect dimension change m_bNeedsDimensionResync |= (GetDimension() != m_usLastUnoccupiedSyncDimension); m_usLastUnoccupiedSyncDimension = GetDimension(); } -void CVehicle::HandleDimensionResync(void) +void CVehicle::HandleDimensionResync() { if (m_bNeedsDimensionResync) { diff --git a/Server/mods/deathmatch/logic/CVehicle.h b/Server/mods/deathmatch/logic/CVehicle.h index 642781fd271..6b6ef3f27ef 100644 --- a/Server/mods/deathmatch/logic/CVehicle.h +++ b/Server/mods/deathmatch/logic/CVehicle.h @@ -143,33 +143,33 @@ class CVehicle : public CElement public: ZERO_ON_NEW CVehicle(class CVehicleManager* pVehicleManager, CElement* pParent, unsigned short usModel, unsigned char ucVariant, unsigned char ucVariant2); - ~CVehicle(void); + ~CVehicle(); CElement* Clone(bool* bAddEntity, CResource* pResource) override; - bool IsEntity(void) { return true; } + bool IsEntity() { return true; } - void Unlink(void); + void Unlink(); - void DoPulse(void); + void DoPulse(); - unsigned short GetModel(void) { return m_usModel; }; + unsigned short GetModel() { return m_usModel; }; void SetModel(unsigned short usModel); - bool HasValidModel(void); + bool HasValidModel(); - unsigned char GetVariant(void) { return m_ucVariant; }; - unsigned char GetVariant2(void) { return m_ucVariant2; }; + unsigned char GetVariant() { return m_ucVariant; }; + unsigned char GetVariant2() { return m_ucVariant2; }; void SetVariants(unsigned char ucVariant, unsigned char ucVariant2); - eVehicleType GetVehicleType(void) { return m_eVehicleType; }; + eVehicleType GetVehicleType() { return m_eVehicleType; }; - CVehicleColor& GetColor(void) { return m_Color; }; + CVehicleColor& GetColor() { return m_Color; }; void SetColor(const CVehicleColor& Color) { m_Color = Color; }; - bool IsFrozen(void) { return m_bIsFrozen; }; + bool IsFrozen() { return m_bIsFrozen; }; void SetFrozen(bool bIsFrozen) { m_bIsFrozen = bIsFrozen; }; - const CVector& GetPosition(void); + const CVector& GetPosition(); void SetPosition(const CVector& vecPosition); void GetRotation(CVector& vecRotation); void GetRotationDegrees(CVector& vecRotation); @@ -177,174 +177,174 @@ class CVehicle : public CElement void GetMatrix(CMatrix& matrix); void SetMatrix(const CMatrix& matrix); - const CVector& GetVelocity(void) { return m_vecVelocity; }; + const CVector& GetVelocity() { return m_vecVelocity; }; void SetVelocity(const CVector& vecVelocity) { m_vecVelocity = vecVelocity; }; - const CVector& GetVelocityMeters(void) { return m_vecVelocityMeters; }; + const CVector& GetVelocityMeters() { return m_vecVelocityMeters; }; void SetVelocityMeters(const CVector& vecVelocityMeters) { m_vecVelocityMeters = vecVelocityMeters; }; - const CVector& GetTurnSpeed(void) { return m_vecTurnSpeed; }; + const CVector& GetTurnSpeed() { return m_vecTurnSpeed; }; void SetTurnSpeed(const CVector& vecTurnSpeed) { m_vecTurnSpeed = vecTurnSpeed; }; - float GetHealth(void) { return m_fHealth; }; + float GetHealth() { return m_fHealth; }; void SetHealth(float fHealth) { m_fHealth = fHealth; }; - float GetLastSyncedHealth(void) { return m_fLastSyncedHealthHealth; }; + float GetLastSyncedHealth() { return m_fLastSyncedHealthHealth; }; void SetLastSyncedHealth(float fHealth) { m_fLastSyncedHealthHealth = fHealth; }; - CVehicleColor& RandomizeColor(void); + CVehicleColor& RandomizeColor(); float GetDoorOpenRatio(unsigned char ucDoor) const; void SetDoorOpenRatio(unsigned char ucDoor, float fRatio); - bool IsLocked(void) { return m_bLocked; }; + bool IsLocked() { return m_bLocked; }; void SetLocked(bool bLocked) { m_bLocked = bLocked; }; - bool AreDoorsUndamageable(void) { return m_bDoorsUndamageable; }; + bool AreDoorsUndamageable() { return m_bDoorsUndamageable; }; void SetDoorsUndamageable(bool bUndamageable) { m_bDoorsUndamageable = bUndamageable; }; - float GetTurretPositionX(void) { return m_fTurretPositionX; }; - float GetTurretPositionY(void) { return m_fTurretPositionY; }; + float GetTurretPositionX() { return m_fTurretPositionX; }; + float GetTurretPositionY() { return m_fTurretPositionY; }; void GetTurretPosition(float& fPositionX, float& fPositionY); void SetTurretPosition(float fPositionX, float fPositionY); - bool IsSirenActive(void) { return m_bSirenActive; }; + bool IsSirenActive() { return m_bSirenActive; }; void SetSirenActive(bool bSirenActive) { m_bSirenActive = bSirenActive; }; void SetTaxiLightOn(bool bTaxiLightState) { m_bTaxiLightState = bTaxiLightState; }; - bool IsTaxiLightOn(void) { return m_bTaxiLightState; }; + bool IsTaxiLightOn() { return m_bTaxiLightState; }; - bool IsLandingGearDown(void) { return m_bLandingGearDown; }; + bool IsLandingGearDown() { return m_bLandingGearDown; }; void SetLandingGearDown(bool bLandingGearDown) { m_bLandingGearDown = bLandingGearDown; }; - unsigned short GetAdjustableProperty(void) { return m_usAdjustableProperty; }; + unsigned short GetAdjustableProperty() { return m_usAdjustableProperty; }; void SetAdjustableProperty(unsigned short usAdjustable) { m_usAdjustableProperty = usAdjustable; }; CPed* GetOccupant(unsigned int uiSeat); - CPed* GetFirstOccupant(void); + CPed* GetFirstOccupant(); bool SetOccupant(CPed* pPed, unsigned int uiSeat); - CPed* GetController(void); + CPed* GetController(); - class CPlayer* GetSyncer(void) { return m_pSyncer; }; + class CPlayer* GetSyncer() { return m_pSyncer; }; void SetSyncer(class CPlayer* pPlayer); - bool IsUnoccupiedSyncable(void) { return m_bUnoccupiedSyncable; }; + bool IsUnoccupiedSyncable() { return m_bUnoccupiedSyncable; }; void SetUnoccupiedSyncable(bool bUnoccupiedSynced) { m_bUnoccupiedSyncable = bUnoccupiedSynced; }; - unsigned char GetMaxPassengers(void); - unsigned char GetFreePassengerSeat(void); + unsigned char GetMaxPassengers(); + unsigned char GetFreePassengerSeat(); void SetMaxPassengers(unsigned char ucPassengers) { m_ucMaxPassengersOverride = ucPassengers; }; - CVehicleUpgrades* GetUpgrades(void) { return m_pUpgrades; } + CVehicleUpgrades* GetUpgrades() { return m_pUpgrades; } void SetUpgrades(CVehicleUpgrades* pUpgrades); - unsigned char GetOverrideLights(void) { return m_ucOverrideLights; } + unsigned char GetOverrideLights() { return m_ucOverrideLights; } void SetOverrideLights(unsigned char ucLights) { m_ucOverrideLights = ucLights; } - CVehicle* GetTowedVehicle(void) { return m_pTowedVehicle; } + CVehicle* GetTowedVehicle() { return m_pTowedVehicle; } bool SetTowedVehicle(CVehicle* pVehicle); - CVehicle* GetTowedByVehicle(void) { return m_pTowedByVehicle; } + CVehicle* GetTowedByVehicle() { return m_pTowedByVehicle; } bool SetTowedByVehicle(CVehicle* pVehicle); - const char* GetRegPlate(void) { return m_szRegPlate; } + const char* GetRegPlate() { return m_szRegPlate; } void SetRegPlate(const char* szRegPlate); - void GenerateRegPlate(void); + void GenerateRegPlate(); - unsigned char GetPaintjob(void) { return m_ucPaintjob; } + unsigned char GetPaintjob() { return m_ucPaintjob; } void SetPaintjob(unsigned char ucPaintjob); - bool GetGunsEnabled(void) { return m_bGunsEnabled; } + bool GetGunsEnabled() { return m_bGunsEnabled; } void SetGunsEnabled(bool bGunsEnabled) { m_bGunsEnabled = bGunsEnabled; } - bool IsFuelTankExplodable(void) { return m_bFuelTankExplodable; } + bool IsFuelTankExplodable() { return m_bFuelTankExplodable; } void SetFuelTankExplodable(bool bFuelTankExplodable) { m_bFuelTankExplodable = bFuelTankExplodable; } - bool IsEngineOn(void) { return m_bEngineOn; } + bool IsEngineOn() { return m_bEngineOn; } void SetEngineOn(bool bEngineOn) { m_bEngineOn = bEngineOn; } - bool IsOnGround(void) { return m_bOnGround; }; + bool IsOnGround() { return m_bOnGround; }; void SetOnGround(bool bOnGround) { m_bOnGround = bOnGround; }; - bool IsSmokeTrailEnabled(void) { return m_bSmokeTrail; } + bool IsSmokeTrailEnabled() { return m_bSmokeTrail; } void SetSmokeTrailEnabled(bool bEnabled) { m_bSmokeTrail = bEnabled; } - unsigned char GetAlpha(void) { return m_ucAlpha; } + unsigned char GetAlpha() { return m_ucAlpha; } void SetAlpha(unsigned char ucAlpha) { m_ucAlpha = ucAlpha; } void GetInitialDoorStates(SFixedArray& ucOutDoorStates); - CPlayer* GetJackingPlayer(void) { return m_pJackingPlayer; } + CPlayer* GetJackingPlayer() { return m_pJackingPlayer; } void SetJackingPlayer(CPlayer* pPlayer); - bool IsInWater(void) { return m_bInWater; } + bool IsInWater() { return m_bInWater; } void SetInWater(bool bInWater) { m_bInWater = bInWater; } - bool IsDamageProof(void) { return m_bDamageProof; } + bool IsDamageProof() { return m_bDamageProof; } void SetDamageProof(bool bDamageProof) { m_bDamageProof = bDamageProof; } - bool IsDerailed(void) { return m_bDerailed; } + bool IsDerailed() { return m_bDerailed; } void SetDerailed(bool bDerailed) { m_bDerailed = bDerailed; } - bool IsDerailable(void) { return m_bIsDerailable; } + bool IsDerailable() { return m_bIsDerailable; } void SetDerailable(bool bDerailable) { m_bIsDerailable = bDerailable; } - bool GetTrainDirection(void) { return m_bTrainDirection; } + bool GetTrainDirection() { return m_bTrainDirection; } void SetTrainDirection(bool bDirection) { m_bTrainDirection = bDirection; } - float GetTrainSpeed(void) { return m_fTrainSpeed; } + float GetTrainSpeed() { return m_fTrainSpeed; } void SetTrainSpeed(float fSpeed) { m_fTrainSpeed = fSpeed; } - float GetTrainPosition(void) { return m_fTrainPosition; } + float GetTrainPosition() { return m_fTrainPosition; } void SetTrainPosition(float fPosition) { m_fTrainPosition = fPosition; } - uchar GetTrainTrack(void) { return m_ucTrackID; } + uchar GetTrainTrack() { return m_ucTrackID; } void SetTrainTrack(uchar ucTrack) { m_ucTrackID = ucTrack; } - SColor GetHeadLightColor(void) { return m_HeadLightColor; } + SColor GetHeadLightColor() { return m_HeadLightColor; } void SetHeadLightColor(const SColor color) { m_HeadLightColor = color; } - bool IsHeliSearchLightVisible(void) { return m_bHeliSearchLightVisible; } + bool IsHeliSearchLightVisible() { return m_bHeliSearchLightVisible; } void SetHeliSearchLightVisible(bool bVisible) { m_bHeliSearchLightVisible = bVisible; } - bool HasHandlingChanged(void) { return m_bHandlingChanged; } + bool HasHandlingChanged() { return m_bHandlingChanged; } void SetHasHandlingChanged(bool bChanged) { m_bHandlingChanged = bChanged; } - bool GetCollisionEnabled(void) { return m_bCollisionsEnabled; } + bool GetCollisionEnabled() { return m_bCollisionsEnabled; } void SetCollisionEnabled(bool bCollisionEnabled) { m_bCollisionsEnabled = bCollisionEnabled; } // Functions used to remember where this vehicle spawns - const CVector& GetRespawnPosition(void) { return m_vecRespawnPosition; }; - const CVector& GetRespawnRotationDegrees(void) { return m_vecRespawnRotationDegrees; }; + const CVector& GetRespawnPosition() { return m_vecRespawnPosition; }; + const CVector& GetRespawnRotationDegrees() { return m_vecRespawnRotationDegrees; }; void SetRespawnPosition(const CVector& vecPosition) { m_vecRespawnPosition = vecPosition; }; void SetRespawnRotationDegrees(const CVector& vecRotation) { m_vecRespawnRotationDegrees = vecRotation; }; - float GetRespawnHealth(void) { return m_fRespawnHealth; }; + float GetRespawnHealth() { return m_fRespawnHealth; }; void SetRespawnHealth(float fHealth) { m_fRespawnHealth = fHealth; }; - bool GetRespawnEnabled(void) { return m_bRespawnEnabled; } + bool GetRespawnEnabled() { return m_bRespawnEnabled; } void SetRespawnEnabled(bool bEnabled); void SetBlowRespawnInterval(unsigned long ulTime) { m_ulBlowRespawnInterval = ulTime; } void SetIdleRespawnInterval(unsigned long ulTime) { m_ulIdleRespawnInterval = ulTime; } void SpawnAt(const CVector& vecPosition, const CVector& vecRotation); - void Respawn(void); + void Respawn(); - void GenerateHandlingData(void); - CHandlingEntry* GetHandlingData(void) { return m_pHandlingEntry; } + void GenerateHandlingData(); + CHandlingEntry* GetHandlingData() { return m_pHandlingEntry; } - uint GetTimeSinceLastPush(void) { return (uint)(CTickCount::Now(true) - m_LastPushedTime).ToLongLong(); } - void ResetLastPushTime(void) { m_LastPushedTime = CTickCount::Now(true); } + uint GetTimeSinceLastPush() { return (uint)(CTickCount::Now(true) - m_LastPushedTime).ToLongLong(); } + void ResetLastPushTime() { m_LastPushedTime = CTickCount::Now(true); } - bool DoesVehicleHaveSirens(void) { return m_tSirenBeaconInfo.m_bOverrideSirens; } - void RemoveVehicleSirens(void); + bool DoesVehicleHaveSirens() { return m_tSirenBeaconInfo.m_bOverrideSirens; } + void RemoveVehicleSirens(); void SetVehicleSirenPosition(unsigned char ucSirenID, CVector vecPos); void SetVehicleSirenMinimumAlpha(unsigned char ucSirenID, DWORD dwPercentage); void SetVehicleSirenColour(unsigned char ucSirenID, SColor tVehicleSirenColour); void SetVehicleFlags(bool bEnable360, bool bEnableRandomiser, bool bEnableLOSCheck, bool bEnableSilent); - void ResetDoors(void); - void ResetDoorsWheelsPanelsLights(void); + void ResetDoors(); + void ResetDoorsWheelsPanelsLights(); void SetIsBlown(bool bBlown); - bool GetIsBlown(void); - bool IsBlowTimerFinished(void); - void StopIdleTimer(void); - void RestartIdleTimer(void); - bool IsIdleTimerRunning(void); - bool IsIdleTimerFinished(void); - bool IsStationary(void); - void OnRelayUnoccupiedSync(void); - void HandleDimensionResync(void); + bool GetIsBlown(); + bool IsBlowTimerFinished(); + void StopIdleTimer(); + void RestartIdleTimer(); + bool IsIdleTimerRunning(); + bool IsIdleTimerFinished(); + bool IsStationary(); + void OnRelayUnoccupiedSync(); + void HandleDimensionResync(); protected: bool ReadSpecialData(const int iLine) override; diff --git a/Server/mods/deathmatch/logic/CVehicleColorManager.cpp b/Server/mods/deathmatch/logic/CVehicleColorManager.cpp index e90c189c23b..419ca9f7548 100644 --- a/Server/mods/deathmatch/logic/CVehicleColorManager.cpp +++ b/Server/mods/deathmatch/logic/CVehicleColorManager.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CVehicleColor CVehicleColors::GetRandomColor(void) +CVehicleColor CVehicleColors::GetRandomColor() { // Grab a random index unsigned int uiSize = CountColors(); @@ -129,7 +129,7 @@ bool CVehicleColorManager::Generate(const char* szFilename) return false; } -void CVehicleColorManager::Reset(void) +void CVehicleColorManager::Reset() { // Remove all colors from all vehicles for (int i = 0; i < 212; i++) diff --git a/Server/mods/deathmatch/logic/CVehicleColorManager.h b/Server/mods/deathmatch/logic/CVehicleColorManager.h index 8bff7661567..93d144e4f18 100644 --- a/Server/mods/deathmatch/logic/CVehicleColorManager.h +++ b/Server/mods/deathmatch/logic/CVehicleColorManager.h @@ -17,10 +17,10 @@ class CVehicleColors { public: void AddColor(const CVehicleColor& colVehicle) { m_Colors.push_back(colVehicle); }; - unsigned int CountColors(void) { return static_cast(m_Colors.size()); }; - void RemoveAllColors(void) { m_Colors.clear(); }; + unsigned int CountColors() { return static_cast(m_Colors.size()); }; + void RemoveAllColors() { m_Colors.clear(); }; - CVehicleColor GetRandomColor(void); + CVehicleColor GetRandomColor(); private: list m_Colors; @@ -31,7 +31,7 @@ class CVehicleColorManager public: bool Load(const char* szFilename); bool Generate(const char* szFilename); - void Reset(void); + void Reset(); void AddColor(unsigned short usModel, const CVehicleColor& colVehicle); CVehicleColor GetRandomColor(unsigned short usModel); diff --git a/Server/mods/deathmatch/logic/CVehicleManager.cpp b/Server/mods/deathmatch/logic/CVehicleManager.cpp index edd20b1a41d..3fcca37f2d3 100644 --- a/Server/mods/deathmatch/logic/CVehicleManager.cpp +++ b/Server/mods/deathmatch/logic/CVehicleManager.cpp @@ -78,7 +78,7 @@ static const SFixedArray gs_vehicleTypes = { static SFixedArray g_ucVariants; -CVehicleManager::CVehicleManager(void) +CVehicleManager::CVehicleManager() { assert(NUMELMS(g_ucMaxPassengers) == 212); assert(NUMELMS(g_ulVehicleAttributes) == 212); @@ -370,7 +370,7 @@ CVehicleManager::CVehicleManager(void) } } -CVehicleManager::~CVehicleManager(void) +CVehicleManager::~CVehicleManager() { DeleteAll(); } @@ -402,7 +402,7 @@ CVehicle* CVehicleManager::CreateFromXML(CElement* pParent, CXMLNode& Node, CEve return pVehicle; } -void CVehicleManager::DeleteAll(void) +void CVehicleManager::DeleteAll() { // Delete all items DeletePointersAndClearList(m_List); diff --git a/Server/mods/deathmatch/logic/CVehicleManager.h b/Server/mods/deathmatch/logic/CVehicleManager.h index dddf6ee5952..bb851dff37d 100644 --- a/Server/mods/deathmatch/logic/CVehicleManager.h +++ b/Server/mods/deathmatch/logic/CVehicleManager.h @@ -26,14 +26,14 @@ class CVehicleManager friend class CVehicle; public: - CVehicleManager(void); - ~CVehicleManager(void); + CVehicleManager(); + ~CVehicleManager(); CVehicle* Create(CElement* pParent, unsigned short usModel, unsigned char ucVariant, unsigned char ucVariant2); CVehicle* CreateFromXML(CElement* pParent, CXMLNode& Node, CEvents* pEvents); - void DeleteAll(void); + void DeleteAll(); - unsigned int Count(void) { return static_cast(m_List.size()); }; + unsigned int Count() { return static_cast(m_List.size()); }; bool Exists(CVehicle* pVehicle); static bool IsValidModel(unsigned int uiVehicleModel); @@ -52,15 +52,15 @@ class CVehicleManager static bool HasDoors(unsigned short usModel); static void GetRandomVariation(unsigned short usModel, unsigned char& ucVariant, unsigned char& ucVariant2); - CVehicleColorManager* GetColorManager(void) { return &m_ColorManager; }; + CVehicleColorManager* GetColorManager() { return &m_ColorManager; }; CVehicleColor GetRandomColor(unsigned short usModel); void GetVehiclesOfType(unsigned int uiModel, lua_State* luaVM); - list::const_iterator IterBegin(void) { return m_List.begin(); }; - list::const_iterator IterEnd(void) { return m_List.end(); }; + list::const_iterator IterBegin() { return m_List.begin(); }; + list::const_iterator IterEnd() { return m_List.end(); }; - list& GetRespawnEnabledVehicles(void) { return m_RespawnEnabledVehicles; }; + list& GetRespawnEnabledVehicles() { return m_RespawnEnabledVehicles; }; private: void AddToList(CVehicle* pVehicle) { m_List.push_back(pVehicle); }; diff --git a/Server/mods/deathmatch/logic/CVehicleUpgrades.cpp b/Server/mods/deathmatch/logic/CVehicleUpgrades.cpp index c8c96b71790..c231d645c8c 100644 --- a/Server/mods/deathmatch/logic/CVehicleUpgrades.cpp +++ b/Server/mods/deathmatch/logic/CVehicleUpgrades.cpp @@ -424,7 +424,7 @@ bool CVehicleUpgrades::AddUpgrade(unsigned short usUpgrade) return false; } -void CVehicleUpgrades::AddAllUpgrades(void) +void CVehicleUpgrades::AddAllUpgrades() { unsigned short usUpgrade = 1000; for (; usUpgrade <= 1193; usUpgrade++) @@ -445,7 +445,7 @@ bool CVehicleUpgrades::HasUpgrade(unsigned short usUpgrade) return false; } -unsigned char CVehicleUpgrades::Count(void) +unsigned char CVehicleUpgrades::Count() { unsigned char ucSlot = 0, ucCount = 0; for (; ucSlot < VEHICLE_UPGRADE_SLOTS; ucSlot++) diff --git a/Server/mods/deathmatch/logic/CVehicleUpgrades.h b/Server/mods/deathmatch/logic/CVehicleUpgrades.h index 8760a300835..f33c754aad0 100644 --- a/Server/mods/deathmatch/logic/CVehicleUpgrades.h +++ b/Server/mods/deathmatch/logic/CVehicleUpgrades.h @@ -38,10 +38,10 @@ class CVehicleUpgrades void SetSlotState(unsigned char ucSlot, unsigned short usUpgrade); unsigned short GetSlotState(unsigned char ucSlot); bool AddUpgrade(unsigned short usUpgrade); - void AddAllUpgrades(void); + void AddAllUpgrades(); bool HasUpgrade(unsigned short usUpgrade); - const SSlotStates& GetSlotStates(void) { return m_SlotStates; } - unsigned char Count(void); + const SSlotStates& GetSlotStates() { return m_SlotStates; } + unsigned char Count(); static const char* GetSlotName(unsigned char ucSlot); static bool IsValidUpgrade(unsigned short usUpgrade); diff --git a/Server/mods/deathmatch/logic/CWaterManager.cpp b/Server/mods/deathmatch/logic/CWaterManager.cpp index a4e0ec22980..d53d330de7d 100644 --- a/Server/mods/deathmatch/logic/CWaterManager.cpp +++ b/Server/mods/deathmatch/logic/CWaterManager.cpp @@ -74,7 +74,7 @@ void CWaterManager::SetWorldWaterLevel(float fLevel, bool bIncludeWorldNonSeaLev } } -void CWaterManager::ResetWorldWaterLevel(void) +void CWaterManager::ResetWorldWaterLevel() { m_WorldWaterLevelInfo.bNonSeaLevelSet = false; m_WorldWaterLevelInfo.fSeaLevel = 0; diff --git a/Server/mods/deathmatch/logic/CWaterManager.h b/Server/mods/deathmatch/logic/CWaterManager.h index c325b75f08c..e4b52c2f93d 100644 --- a/Server/mods/deathmatch/logic/CWaterManager.h +++ b/Server/mods/deathmatch/logic/CWaterManager.h @@ -33,7 +33,7 @@ class CWaterManager const SWorldWaterLevelInfo& GetWorldWaterLevelInfo() const { return m_WorldWaterLevelInfo; } void SetWorldWaterLevel(float fLevel, bool bIncludeWorldNonSeaLevel); - void ResetWorldWaterLevel(void); + void ResetWorldWaterLevel(); void SetElementWaterLevel(CWater* pWater, float fLevel); void SetAllElementWaterLevel(float fLevel); diff --git a/Server/mods/deathmatch/logic/CWeaponStat.h b/Server/mods/deathmatch/logic/CWeaponStat.h index afc252ae238..d91f464e558 100644 --- a/Server/mods/deathmatch/logic/CWeaponStat.h +++ b/Server/mods/deathmatch/logic/CWeaponStat.h @@ -66,12 +66,12 @@ struct sWeaponStats class CWeaponStat { public: - CWeaponStat(void); + CWeaponStat(); CWeaponStat(eWeaponType weaponType, eWeaponSkill skillLevel); - ~CWeaponStat(void); + ~CWeaponStat(); - eWeaponType GetWeaponType(void); - eWeaponSkill GetWeaponSkillLevel(void); + eWeaponType GetWeaponType(); + eWeaponSkill GetWeaponSkillLevel(); void SetWeaponType(eWeaponType weaponType); void SetWeaponSkillLevel(eWeaponSkill skillLevel); @@ -90,67 +90,67 @@ class CWeaponStat tWeaponStats.m_nFlags = iFlags; } bool IsFlagSet(DWORD flag) { return ((tWeaponStats.m_nFlags & flag) > 0 ? true : false); } - int GetFlags(void) { return tWeaponStats.m_nFlags; } + int GetFlags() { return tWeaponStats.m_nFlags; } - eWeaponModel GetModel(void) { return (eWeaponModel)tWeaponStats.m_modelId; } + eWeaponModel GetModel() { return (eWeaponModel)tWeaponStats.m_modelId; } void SetModel(int iModel) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_modelId = (int)iModel; } - eWeaponModel GetModel2(void) { return (eWeaponModel)tWeaponStats.m_modelId2; } + eWeaponModel GetModel2() { return (eWeaponModel)tWeaponStats.m_modelId2; } void SetModel2(int iModel) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_modelId2 = (int)iModel; } - sWeaponStats* GetInterface(void) { return &tWeaponStats; }; + sWeaponStats* GetInterface() { return &tWeaponStats; }; - float GetWeaponRange(void) { return tWeaponStats.m_fWeaponRange; }; + float GetWeaponRange() { return tWeaponStats.m_fWeaponRange; }; void SetWeaponRange(float fRange) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_fWeaponRange = fRange; }; - float GetTargetRange(void) { return tWeaponStats.m_fTargetRange; }; + float GetTargetRange() { return tWeaponStats.m_fTargetRange; }; void SetTargetRange(float fRange) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_fTargetRange = fRange; }; - CVector* GetFireOffset(void) { return &tWeaponStats.m_vecFireOffset; }; + CVector* GetFireOffset() { return &tWeaponStats.m_vecFireOffset; }; void SetFireOffset(CVector* vecFireOffset) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_vecFireOffset = *vecFireOffset; }; - short GetDamagePerHit(void) { return tWeaponStats.m_nDamage; }; + short GetDamagePerHit() { return tWeaponStats.m_nDamage; }; void SetDamagePerHit(short sDamagePerHit) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_nDamage = sDamagePerHit; }; - float GetAccuracy(void) { return tWeaponStats.m_fAccuracy; }; + float GetAccuracy() { return tWeaponStats.m_fAccuracy; }; void SetAccuracy(float fAccuracy) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_fAccuracy = fAccuracy; }; - short GetMaximumClipAmmo(void) { return tWeaponStats.m_nAmmo; }; + short GetMaximumClipAmmo() { return tWeaponStats.m_nAmmo; }; void SetMaximumClipAmmo(short sAccuracy) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_nAmmo = sAccuracy; }; - float GetMoveSpeed(void) { return tWeaponStats.m_fMoveSpeed; }; + float GetMoveSpeed() { return tWeaponStats.m_fMoveSpeed; }; void SetMoveSpeed(float fMoveSpeed) { ms_uiAllWeaponStatsRevision++; @@ -158,7 +158,7 @@ class CWeaponStat }; // projectile/areaeffect only - float GetFiringSpeed(void) { return tWeaponStats.m_fSpeed; }; + float GetFiringSpeed() { return tWeaponStats.m_fSpeed; }; void SetFiringSpeed(float fFiringSpeed) { ms_uiAllWeaponStatsRevision++; @@ -166,49 +166,49 @@ class CWeaponStat }; // area effect only - float GetRadius(void) { return tWeaponStats.m_fRadius; }; + float GetRadius() { return tWeaponStats.m_fRadius; }; void SetRadius(float fRadius) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_fRadius = fRadius; }; - float GetLifeSpan(void) { return tWeaponStats.m_fLifeSpan; }; + float GetLifeSpan() { return tWeaponStats.m_fLifeSpan; }; void SetLifeSpan(float fLifeSpan) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_fLifeSpan = fLifeSpan; }; - float GetSpread(void) { return tWeaponStats.m_fSpread; }; + float GetSpread() { return tWeaponStats.m_fSpread; }; void SetSpread(float fSpread) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_fSpread = fSpread; }; - float GetAnimBreakoutTime(void) { return tWeaponStats.m_animBreakoutTime; }; + float GetAnimBreakoutTime() { return tWeaponStats.m_animBreakoutTime; }; void SetAnimBreakoutTime(float fBreakoutTime) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_animBreakoutTime = fBreakoutTime; }; - eWeaponSlot GetSlot(void) { return (eWeaponSlot)tWeaponStats.m_nWeaponSlot; }; + eWeaponSlot GetSlot() { return (eWeaponSlot)tWeaponStats.m_nWeaponSlot; }; void SetSlot(eWeaponSlot dwSlot) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_nWeaponSlot = (eWeaponSlot)dwSlot; }; - eWeaponSkill GetSkill(void) { return tWeaponStats.m_SkillLevel; } + eWeaponSkill GetSkill() { return tWeaponStats.m_SkillLevel; } void SetSkill(eWeaponSkill weaponSkill) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_SkillLevel = weaponSkill; } - float GetRequiredStatLevel(void) { return static_cast(tWeaponStats.m_nReqStatLevel); } + float GetRequiredStatLevel() { return static_cast(tWeaponStats.m_nReqStatLevel); } void SetRequiredStatLevel(float fStatLevel) { ms_uiAllWeaponStatsRevision++; @@ -220,14 +220,14 @@ class CWeaponStat tWeaponStats.m_nReqStatLevel = iStatLevel; } - DWORD GetAnimGroup(void) { return tWeaponStats.m_animGroup; } + DWORD GetAnimGroup() { return tWeaponStats.m_animGroup; } void SetAnimGroup(DWORD dwAnimGroup) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_animGroup = dwAnimGroup; } - eFireType GetFireType(void) { return tWeaponStats.m_eFireType; } + eFireType GetFireType() { return tWeaponStats.m_eFireType; } void SetFireType(eFireType type) { ms_uiAllWeaponStatsRevision++; @@ -235,63 +235,63 @@ class CWeaponStat } // Floats - float GetWeaponAnimLoopStart(void) { return tWeaponStats.m_animLoopStart; } + float GetWeaponAnimLoopStart() { return tWeaponStats.m_animLoopStart; } void SetWeaponAnimLoopStart(float animLoopStart) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_animLoopStart = animLoopStart; } - float GetWeaponAnimLoopStop(void) { return tWeaponStats.m_animLoopEnd; } + float GetWeaponAnimLoopStop() { return tWeaponStats.m_animLoopEnd; } void SetWeaponAnimLoopStop(float animLoopEnd) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_animLoopEnd = animLoopEnd; } - float GetWeaponAnimLoopFireTime(void) { return tWeaponStats.m_animFireTime; } + float GetWeaponAnimLoopFireTime() { return tWeaponStats.m_animFireTime; } void SetWeaponAnimLoopFireTime(float animFireTime) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_animFireTime = animFireTime; } - float GetWeaponAnim2LoopStart(void) { return tWeaponStats.m_anim2LoopStart; } + float GetWeaponAnim2LoopStart() { return tWeaponStats.m_anim2LoopStart; } void SetWeaponAnim2LoopStart(float anim2LoopStart) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_anim2LoopStart = anim2LoopStart; } - float GetWeaponAnim2LoopStop(void) { return tWeaponStats.m_anim2LoopEnd; } + float GetWeaponAnim2LoopStop() { return tWeaponStats.m_anim2LoopEnd; } void SetWeaponAnim2LoopStop(float anim2LoopEnd) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_anim2LoopEnd = anim2LoopEnd; } - float GetWeaponAnim2LoopFireTime(void) { return tWeaponStats.m_anim2FireTime; } + float GetWeaponAnim2LoopFireTime() { return tWeaponStats.m_anim2FireTime; } void SetWeaponAnim2LoopFireTime(float anim2FireTime) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_anim2FireTime = anim2FireTime; } - float GetWeaponAnimBreakoutTime(void) { return tWeaponStats.m_animBreakoutTime; } + float GetWeaponAnimBreakoutTime() { return tWeaponStats.m_animBreakoutTime; } void SetWeaponAnimBreakoutTime(float animBreakoutTime) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_animBreakoutTime = animBreakoutTime; } - float GetWeaponSpeed(void) { return tWeaponStats.m_fSpeed; } + float GetWeaponSpeed() { return tWeaponStats.m_fSpeed; } void SetWeaponSpeed(float fSpeed) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_fSpeed = fSpeed; } - float GetWeaponRadius(void) { return tWeaponStats.m_fRadius; } + float GetWeaponRadius() { return tWeaponStats.m_fRadius; } void SetWeaponRadius(float fRadius) { ms_uiAllWeaponStatsRevision++; @@ -299,21 +299,21 @@ class CWeaponStat } // Ints - short GetAimOffsetIndex(void) { return tWeaponStats.m_nAimOffsetIndex; } + short GetAimOffsetIndex() { return tWeaponStats.m_nAimOffsetIndex; } void SetAimOffsetIndex(short sIndex) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_nAimOffsetIndex = sIndex; } - BYTE GetDefaultCombo(void) { return tWeaponStats.m_defaultCombo; } + BYTE GetDefaultCombo() { return tWeaponStats.m_defaultCombo; } void SetDefaultCombo(BYTE defaultCombo) { ms_uiAllWeaponStatsRevision++; tWeaponStats.m_defaultCombo = defaultCombo; } - BYTE GetCombosAvailable(void) { return tWeaponStats.m_nCombosAvailable; } + BYTE GetCombosAvailable() { return tWeaponStats.m_nCombosAvailable; } void SetCombosAvailable(BYTE nCombosAvailable) { ms_uiAllWeaponStatsRevision++; @@ -321,9 +321,9 @@ class CWeaponStat } void SetChanged(bool bChanged) { m_bChanged = bChanged; } - bool HasChanged(void) { return m_bChanged; } + bool HasChanged() { return m_bChanged; } - static uint GetAllWeaponStatsRevision(void) { return ms_uiAllWeaponStatsRevision; } + static uint GetAllWeaponStatsRevision() { return ms_uiAllWeaponStatsRevision; } private: void HandleFlagsValueChange(DWORD newValue); diff --git a/Server/mods/deathmatch/logic/CWeaponStatManager.cpp b/Server/mods/deathmatch/logic/CWeaponStatManager.cpp index 78994a4c8d7..8ca1a1ea407 100644 --- a/Server/mods/deathmatch/logic/CWeaponStatManager.cpp +++ b/Server/mods/deathmatch/logic/CWeaponStatManager.cpp @@ -114,7 +114,7 @@ CWeaponStat* CWeaponStatManager::GetOriginalWeaponStats(eWeaponType type, eWeapo } return NULL; } -void CWeaponStatManager::Init(void) +void CWeaponStatManager::Init() { // Load SA Defaults // Script to Dump: diff --git a/Server/mods/deathmatch/logic/CWeaponStatManager.h b/Server/mods/deathmatch/logic/CWeaponStatManager.h index 74756f66643..faec1f82d7f 100644 --- a/Server/mods/deathmatch/logic/CWeaponStatManager.h +++ b/Server/mods/deathmatch/logic/CWeaponStatManager.h @@ -76,12 +76,12 @@ struct sWeaponInfo class CWeaponStatManager { public: - CWeaponStatManager(void); - ~CWeaponStatManager(void); + CWeaponStatManager(); + ~CWeaponStatManager(); CWeaponStat* GetWeaponStats(eWeaponType type, eWeaponSkill skill = WEAPONSKILL_STD); CWeaponStat* GetWeaponStatsFromSkillLevel(eWeaponType type, float fSkillLevel); CWeaponStat* GetOriginalWeaponStats(eWeaponType type, eWeaponSkill skill = WEAPONSKILL_STD); - void Init(void); + void Init(); bool LoadDefault(CWeaponStat* pDest, eWeaponType weaponType, eWeaponSkill skill = WEAPONSKILL_STD); float GetWeaponRangeFromSkillLevel(eWeaponType eWeapon, float fSkillLevel); diff --git a/Server/mods/deathmatch/logic/CXMLConfig.cpp b/Server/mods/deathmatch/logic/CXMLConfig.cpp index 4c3f5147bb0..6a74882c60e 100644 --- a/Server/mods/deathmatch/logic/CXMLConfig.cpp +++ b/Server/mods/deathmatch/logic/CXMLConfig.cpp @@ -18,7 +18,7 @@ CXMLConfig::CXMLConfig(const char* szFileName) SetFileName(szFileName); } -CXMLConfig::~CXMLConfig(void) +CXMLConfig::~CXMLConfig() { delete m_pFile; } diff --git a/Server/mods/deathmatch/logic/CXMLConfig.h b/Server/mods/deathmatch/logic/CXMLConfig.h index faaac9c76d0..c1a40150221 100644 --- a/Server/mods/deathmatch/logic/CXMLConfig.h +++ b/Server/mods/deathmatch/logic/CXMLConfig.h @@ -18,14 +18,14 @@ class CXMLConfig { public: CXMLConfig(const char* szFileName); - virtual ~CXMLConfig(void); + virtual ~CXMLConfig(); - std::string& GetFileName(void) { return m_strFileName; } + std::string& GetFileName() { return m_strFileName; } void SetFileName(const char* szFileName); - CXMLFile* GetFile(void) { return m_pFile; } + CXMLFile* GetFile() { return m_pFile; } - virtual bool Load(void) = 0; - virtual bool Save(void) = 0; + virtual bool Load() = 0; + virtual bool Save() = 0; protected: enum diff --git a/Server/mods/deathmatch/logic/Utils.cpp b/Server/mods/deathmatch/logic/Utils.cpp index 1aac6cd1ed5..0eee789ac6f 100644 --- a/Server/mods/deathmatch/logic/Utils.cpp +++ b/Server/mods/deathmatch/logic/Utils.cpp @@ -294,7 +294,7 @@ void DisconnectConnectionDesync(CGame* pGame, CPlayer& Player, unsigned int uiCo pGame->QuitPlayer(Player, CClient::QUIT_CONNECTION_DESYNC); } -bool InitializeSockets(void) +bool InitializeSockets() { #ifdef WIN32 WSADATA wsaData; @@ -307,7 +307,7 @@ bool InitializeSockets(void) return true; } -bool CleanupSockets(void) +bool CleanupSockets() { #ifdef WIN32 WSACleanup(); @@ -315,12 +315,12 @@ bool CleanupSockets(void) return true; } -float GetRandomFloat(void) +float GetRandomFloat() { return static_cast(rand()) / (static_cast(RAND_MAX) + 1.0f); } -double GetRandomDouble(void) +double GetRandomDouble() { return static_cast(rand()) / (static_cast(RAND_MAX) + 1.0); } diff --git a/Server/mods/deathmatch/logic/Utils.h b/Server/mods/deathmatch/logic/Utils.h index 266729ea224..d1ac276f6bc 100644 --- a/Server/mods/deathmatch/logic/Utils.h +++ b/Server/mods/deathmatch/logic/Utils.h @@ -44,11 +44,11 @@ void DisconnectPlayer(class CGame* pGame, class CPlayer& Player, CPlayerDisconne const char* szMessage = ""); void DisconnectConnectionDesync(class CGame* pGame, class CPlayer& Player, unsigned int uiCode); -bool InitializeSockets(void); -bool CleanupSockets(void); +bool InitializeSockets(); +bool CleanupSockets(); -float GetRandomFloat(void); -double GetRandomDouble(void); +float GetRandomFloat(); +double GetRandomDouble(); int GetRandom(int iLow, int iHigh); bool IsValidFilePath(const char* szPath); diff --git a/Server/mods/deathmatch/logic/common/CBitStream.h b/Server/mods/deathmatch/logic/common/CBitStream.h index 6e214848e78..3acf1d15298 100644 --- a/Server/mods/deathmatch/logic/common/CBitStream.h +++ b/Server/mods/deathmatch/logic/common/CBitStream.h @@ -20,8 +20,8 @@ class CBitStream { pBitStream = g_pNetServer->AllocateNetServerBitStream(0, pData, uiDataSize, bCopyData); } - ~CBitStream(void) { g_pNetServer->DeallocateNetServerBitStream((NetBitStreamInterface*)pBitStream); }; - NetBitStreamInterfaceNoVersion* operator->(void) { return pBitStream; } + ~CBitStream() { g_pNetServer->DeallocateNetServerBitStream((NetBitStreamInterface*)pBitStream); }; + NetBitStreamInterfaceNoVersion* operator->() { return pBitStream; } NetBitStreamInterfaceNoVersion* pBitStream; }; @@ -31,8 +31,8 @@ class CPlayerBitStream { public: CPlayerBitStream(class CPlayer* pPlayer); // { pBitStream = g_pNetServer->AllocateNetServerBitStream ( pPlayer->GetBitStreamVersion() ); }; - ~CPlayerBitStream(void) { g_pNetServer->DeallocateNetServerBitStream((NetBitStreamInterface*)pBitStream); }; - NetBitStreamInterface* operator->(void) { return pBitStream; } + ~CPlayerBitStream() { g_pNetServer->DeallocateNetServerBitStream((NetBitStreamInterface*)pBitStream); }; + NetBitStreamInterface* operator->() { return pBitStream; } NetBitStreamInterface* pBitStream; }; diff --git a/Server/mods/deathmatch/logic/lua/CLuaArgument.cpp b/Server/mods/deathmatch/logic/lua/CLuaArgument.cpp index ce44e12d95a..5f3e9705a86 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaArgument.cpp +++ b/Server/mods/deathmatch/logic/lua/CLuaArgument.cpp @@ -19,7 +19,7 @@ extern CGame* g_pGame; using namespace std; -CLuaArgument::CLuaArgument(void) +CLuaArgument::CLuaArgument() { m_iType = LUA_TNIL; m_pTableData = NULL; @@ -40,7 +40,7 @@ CLuaArgument::CLuaArgument(lua_State* luaVM, int iArgument, CFastHashMap(uiScriptID); } -CElement* CLuaArgument::GetElement(void) const +CElement* CLuaArgument::GetElement() const { ElementID ID = TO_ELEMENTID(m_pUserData); return CElementIDs::GetElement(ID); diff --git a/Server/mods/deathmatch/logic/lua/CLuaArgument.h b/Server/mods/deathmatch/logic/lua/CLuaArgument.h index a070fefe01b..7bd8053554a 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaArgument.h +++ b/Server/mods/deathmatch/logic/lua/CLuaArgument.h @@ -29,10 +29,10 @@ class CLuaArguments; class CLuaArgument { public: - CLuaArgument(void); + CLuaArgument(); CLuaArgument(const CLuaArgument& Argument, CFastHashMap* pKnownTables = NULL); CLuaArgument(lua_State* luaVM, int iArgument, CFastHashMap* pKnownTables = NULL); - ~CLuaArgument(void); + ~CLuaArgument(); const CLuaArgument& operator=(const CLuaArgument& Argument); bool operator==(const CLuaArgument& Argument); @@ -49,13 +49,13 @@ class CLuaArgument void ReadScriptID(uint uiScriptID); void ReadTable(class CLuaArguments* table); - int GetType(void) const { return m_iType; }; + int GetType() const { return m_iType; }; - bool GetBoolean(void) const { return m_bBoolean; }; - lua_Number GetNumber(void) const { return m_Number; }; - const std::string& GetString(void) { return m_strString; }; - void* GetUserData(void) const { return m_pUserData; }; - CElement* GetElement(void) const; + bool GetBoolean() const { return m_bBoolean; }; + lua_Number GetNumber() const { return m_Number; }; + const std::string& GetString() { return m_strString; }; + void* GetUserData() const { return m_pUserData; }; + CElement* GetElement() const; bool GetAsString(SString& strBuffer); @@ -83,5 +83,5 @@ class CLuaArgument void CopyRecursive(const CLuaArgument& Argument, CFastHashMap* pKnownTables = NULL); bool CompareRecursive(const CLuaArgument& Argument, std::set* pKnownTables = NULL); - void DeleteTableData(void); + void DeleteTableData(); }; diff --git a/Server/mods/deathmatch/logic/lua/CLuaArguments.cpp b/Server/mods/deathmatch/logic/lua/CLuaArguments.cpp index a3ee20cbdef..0981787e6f0 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaArguments.cpp +++ b/Server/mods/deathmatch/logic/lua/CLuaArguments.cpp @@ -310,7 +310,7 @@ bool CLuaArguments::CallGlobal(CLuaMain* pLuaMain, const char* szFunction, CLuaA return true; } -CLuaArgument* CLuaArguments::PushNil(void) +CLuaArgument* CLuaArguments::PushNil() { CLuaArgument* pArgument = new CLuaArgument; m_Arguments.push_back(pArgument); @@ -436,7 +436,7 @@ CLuaArgument* CLuaArguments::PushDbQuery(CDbJobData* pJobData) return pArgument; } -void CLuaArguments::DeleteArguments(void) +void CLuaArguments::DeleteArguments() { // Delete each item vector::iterator iter = m_Arguments.begin(); @@ -449,7 +449,7 @@ void CLuaArguments::DeleteArguments(void) m_Arguments.clear(); } -void CLuaArguments::ValidateTableKeys(void) +void CLuaArguments::ValidateTableKeys() { // Iterate over m_Arguments as pairs // If first is LUA_TNIL, then remove pair diff --git a/Server/mods/deathmatch/logic/lua/CLuaArguments.h b/Server/mods/deathmatch/logic/lua/CLuaArguments.h index c7b07a03ed2..4a1ada8627d 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaArguments.h +++ b/Server/mods/deathmatch/logic/lua/CLuaArguments.h @@ -44,10 +44,10 @@ class CLuaArguments; class CLuaArguments { public: - CLuaArguments(void) {} + CLuaArguments() {} CLuaArguments(const CLuaArguments& Arguments, CFastHashMap* pKnownTables = NULL); - ~CLuaArguments(void) { DeleteArguments(); }; + ~CLuaArguments() { DeleteArguments(); }; void CopyRecursive(const CLuaArguments& Arguments, CFastHashMap* pKnownTables = NULL); @@ -64,7 +64,7 @@ class CLuaArguments void ReadTable(lua_State* luaVM, int iIndexBegin, CFastHashMap* pKnownTables = NULL); void PushAsTable(lua_State* luaVM, CFastHashMap* pKnownTables = NULL); - CLuaArgument* PushNil(void); + CLuaArgument* PushNil(); CLuaArgument* PushBoolean(bool bBool); CLuaArgument* PushNumber(double dNumber); CLuaArgument* PushString(const std::string& strString); @@ -82,8 +82,8 @@ class CLuaArguments CLuaArgument* PushArgument(const CLuaArgument& argument); CLuaArgument* PushTable(CLuaArguments* table); - void DeleteArguments(void); - void ValidateTableKeys(void); + void DeleteArguments(); + void ValidateTableKeys(); bool ReadFromBitStream(NetBitStreamInterface& bitStream, std::vector* pKnownTables = NULL); bool ReadFromJSONString(const char* szJSON); @@ -94,9 +94,9 @@ class CLuaArguments bool ReadFromJSONObject(json_object* object, std::vector* pKnownTables = NULL); bool ReadFromJSONArray(json_object* object, std::vector* pKnownTables = NULL); - unsigned int Count(void) const { return static_cast(m_Arguments.size()); }; - std::vector::const_iterator IterBegin(void) const { return m_Arguments.begin(); }; - std::vector::const_iterator IterEnd(void) const { return m_Arguments.end(); }; + unsigned int Count() const { return static_cast(m_Arguments.size()); }; + std::vector::const_iterator IterBegin() const { return m_Arguments.begin(); }; + std::vector::const_iterator IterEnd() const { return m_Arguments.end(); }; private: std::vector m_Arguments; diff --git a/Server/mods/deathmatch/logic/lua/CLuaCFunctions.cpp b/Server/mods/deathmatch/logic/lua/CLuaCFunctions.cpp index 74b27f08ead..7ee0f43997a 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaCFunctions.cpp +++ b/Server/mods/deathmatch/logic/lua/CLuaCFunctions.cpp @@ -120,7 +120,7 @@ void CLuaCFunctions::RegisterFunctionsWithVM(lua_State* luaVM) } } -void CLuaCFunctions::RemoveAllFunctions(void) +void CLuaCFunctions::RemoveAllFunctions() { // Delete all functions CFastHashMap::iterator it; diff --git a/Server/mods/deathmatch/logic/lua/CLuaCFunctions.h b/Server/mods/deathmatch/logic/lua/CLuaCFunctions.h index 01c00c29108..e7f553286b3 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaCFunctions.h +++ b/Server/mods/deathmatch/logic/lua/CLuaCFunctions.h @@ -20,12 +20,12 @@ class CLuaCFunction public: CLuaCFunction(const char* szName, lua_CFunction f, bool bRestricted); - lua_CFunction GetAddress(void) { return m_Function; } + lua_CFunction GetAddress() { return m_Function; } - const SString& GetName(void) { return m_strName; } + const SString& GetName() { return m_strName; } void SetName(std::string& strName) { m_strName = strName; } - bool IsRestricted(void) { return m_bRestricted; } + bool IsRestricted() { return m_bRestricted; } private: lua_CFunction m_Function; @@ -47,7 +47,7 @@ class CLuaCFunctions static void RegisterFunctionsWithVM(lua_State* luaVM); - static void RemoveAllFunctions(void); + static void RemoveAllFunctions(); private: static CFastHashMap ms_Functions; diff --git a/Server/mods/deathmatch/logic/lua/CLuaCallback.h b/Server/mods/deathmatch/logic/lua/CLuaCallback.h index 9e9e08e9293..5a0f341c54b 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaCallback.h +++ b/Server/mods/deathmatch/logic/lua/CLuaCallback.h @@ -21,7 +21,7 @@ class CLuaCallback { } - void Call(void) + void Call() { if (m_pLuaMain) m_Arguments.Call(m_pLuaMain, m_iLuaFunction); diff --git a/Server/mods/deathmatch/logic/lua/CLuaFunctionRef.cpp b/Server/mods/deathmatch/logic/lua/CLuaFunctionRef.cpp index 35be1324628..948e1bcf7d8 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaFunctionRef.cpp +++ b/Server/mods/deathmatch/logic/lua/CLuaFunctionRef.cpp @@ -87,7 +87,7 @@ void luaM_dec_use(lua_State* luaVM, int iFunction, const void* pFuncPtr) // CLuaFunctionRef implementation // -CLuaFunctionRef::CLuaFunctionRef(void) : m_ListNode(this) +CLuaFunctionRef::CLuaFunctionRef() : m_ListNode(this) { m_luaVM = NULL; m_iFunction = LUA_REFNIL; @@ -112,7 +112,7 @@ CLuaFunctionRef::CLuaFunctionRef(const CLuaFunctionRef& other) : m_ListNode(this luaM_inc_use(m_luaVM, m_iFunction, m_pFuncPtr); } -CLuaFunctionRef::~CLuaFunctionRef(void) +CLuaFunctionRef::~CLuaFunctionRef() { luaM_dec_use(m_luaVM, m_iFunction, m_pFuncPtr); dassert(ms_AllRefList.contains(this)); @@ -130,12 +130,12 @@ CLuaFunctionRef& CLuaFunctionRef::operator=(const CLuaFunctionRef& other) return *this; } -int CLuaFunctionRef::ToInt(void) const +int CLuaFunctionRef::ToInt() const { return m_iFunction; } -lua_State* CLuaFunctionRef::GetLuaVM(void) const +lua_State* CLuaFunctionRef::GetLuaVM() const { return m_luaVM; } diff --git a/Server/mods/deathmatch/logic/lua/CLuaFunctionRef.h b/Server/mods/deathmatch/logic/lua/CLuaFunctionRef.h index 9ccd34799fe..e97a3781e05 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaFunctionRef.h +++ b/Server/mods/deathmatch/logic/lua/CLuaFunctionRef.h @@ -18,13 +18,13 @@ class CLuaFunctionRef { public: - CLuaFunctionRef(void); + CLuaFunctionRef(); CLuaFunctionRef(lua_State* luaVM, int iFunction, const void* pFuncPtr); CLuaFunctionRef(const CLuaFunctionRef& other); - ~CLuaFunctionRef(void); + ~CLuaFunctionRef(); CLuaFunctionRef& operator=(const CLuaFunctionRef& other); - int ToInt(void) const; - lua_State* GetLuaVM(void) const; + int ToInt() const; + lua_State* GetLuaVM() const; bool operator==(const CLuaFunctionRef& other) const; bool operator!=(const CLuaFunctionRef& other) const; static void RemoveLuaFunctionRefsForVM(lua_State* luaVM); diff --git a/Server/mods/deathmatch/logic/lua/CLuaMain.cpp b/Server/mods/deathmatch/logic/lua/CLuaMain.cpp index e433c4d6cc5..73f47b2aa53 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaMain.cpp +++ b/Server/mods/deathmatch/logic/lua/CLuaMain.cpp @@ -55,7 +55,7 @@ CLuaMain::CLuaMain(CLuaManager* pLuaManager, CObjectManager* pObjectManager, CPl CPerfStatLuaTiming::GetSingleton()->OnLuaMainCreate(this); } -CLuaMain::~CLuaMain(void) +CLuaMain::~CLuaMain() { // remove all current remote calls originating from this VM g_pGame->GetRemoteCalls()->Remove(this); @@ -96,17 +96,17 @@ CLuaMain::~CLuaMain(void) CPerfStatLuaTiming::GetSingleton()->OnLuaMainDestroy(this); } -bool CLuaMain::BeingDeleted(void) +bool CLuaMain::BeingDeleted() { return m_bBeingDeleted; } -void CLuaMain::ResetInstructionCount(void) +void CLuaMain::ResetInstructionCount() { m_FunctionEnterTimer.Reset(); } -void CLuaMain::InitSecurity(void) +void CLuaMain::InitSecurity() { // Disable dangerous Lua Os library functions static const luaL_reg osfuncs[] = @@ -168,7 +168,7 @@ void CLuaMain::InitClasses(lua_State* luaVM) CLuaShared::AddClasses(luaVM); } -void CLuaMain::InitVM(void) +void CLuaMain::InitVM() { assert(!m_luaVM); @@ -216,7 +216,7 @@ void CLuaMain::InitVM(void) } // Special function(s) that are only visible to HTMLD scripts -void CLuaMain::RegisterHTMLDFunctions(void) +void CLuaMain::RegisterHTMLDFunctions() { CLuaHTTPDefs::LoadFunctions(m_luaVM); } @@ -354,11 +354,11 @@ bool CLuaMain::LoadScript(const char* szLUAScript) } // TODO: Check the purpose of this function -void CLuaMain::Start(void) +void CLuaMain::Start() { } -void CLuaMain::UnloadScript(void) +void CLuaMain::UnloadScript() { // Delete all timers and events m_pLuaTimerManager->RemoveAllTimers(); @@ -381,7 +381,7 @@ void CLuaMain::UnloadScript(void) } } -void CLuaMain::DoPulse(void) +void CLuaMain::DoPulse() { m_pLuaTimerManager->DoPulse(this); } @@ -604,7 +604,7 @@ int CLuaMain::PCall(lua_State* L, int nargs, int nresults, int errfunc) // Issue warning if execution time is too long // /////////////////////////////////////////////////////////////// -void CLuaMain::CheckExecutionTime(void) +void CLuaMain::CheckExecutionTime() { // Do time check if (m_WarningTimer.Get() < 5000) diff --git a/Server/mods/deathmatch/logic/lua/CLuaMain.h b/Server/mods/deathmatch/logic/lua/CLuaMain.h index 315d0d41f78..a1450377d2e 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaMain.h +++ b/Server/mods/deathmatch/logic/lua/CLuaMain.h @@ -44,43 +44,43 @@ class CLuaMain //: public CClient CLuaMain(class CLuaManager* pLuaManager, CObjectManager* pObjectManager, CPlayerManager* pPlayerManager, CVehicleManager* pVehicleManager, CBlipManager* pBlipManager, CRadarAreaManager* pRadarAreaManager, CMapManager* pMapManager, CResource* pResourceOwner, bool bEnableOOP); - ~CLuaMain(void); + ~CLuaMain(); bool LoadScriptFromBuffer(const char* cpBuffer, unsigned int uiSize, const char* szFileName); bool LoadScript(const char* szLUAScript); - void UnloadScript(void); + void UnloadScript(); - void Start(void); + void Start(); - void DoPulse(void); + void DoPulse(); - const char* GetScriptName(void) const { return m_strScriptName; } + const char* GetScriptName() const { return m_strScriptName; } void SetScriptName(const char* szName) { m_strScriptName.AssignLeft(szName, MAX_SCRIPTNAME_LENGTH); } - lua_State* GetVM(void) { return m_luaVM; }; - CLuaTimerManager* GetTimerManager(void) const { return m_pLuaTimerManager; }; + lua_State* GetVM() { return m_luaVM; }; + CLuaTimerManager* GetTimerManager() const { return m_pLuaTimerManager; }; - CBlipManager* GetBlipManager(void) const { return m_pBlipManager; }; - CObjectManager* GetObjectManager(void) const { return m_pObjectManager; }; - CPlayerManager* GetPlayerManager(void) const { return m_pPlayerManager; }; - CVehicleManager* GetVehicleManager(void) const { return m_pVehicleManager; }; - CMapManager* GetMapManager(void) const { return m_pMapManager; }; + CBlipManager* GetBlipManager() const { return m_pBlipManager; }; + CObjectManager* GetObjectManager() const { return m_pObjectManager; }; + CPlayerManager* GetPlayerManager() const { return m_pPlayerManager; }; + CVehicleManager* GetVehicleManager() const { return m_pVehicleManager; }; + CMapManager* GetMapManager() const { return m_pMapManager; }; CXMLFile* CreateXML(const char* szFilename, bool bUseIDs = true, bool bReadOnly = false); void DestroyXML(CXMLFile* pFile); void DestroyXML(CXMLNode* pRootNode); bool SaveXML(CXMLNode* pRootNode); bool XMLExists(CXMLFile* pFile); - unsigned long GetXMLFileCount(void) const { return m_XMLFiles.size(); }; - unsigned long GetOpenFileCount(void) const { return m_OpenFilenameList.size(); }; - unsigned long GetTimerCount(void) const { return m_pLuaTimerManager ? m_pLuaTimerManager->GetTimerCount() : 0; }; - unsigned long GetElementCount(void) const { return m_pResource && m_pResource->GetElementGroup() ? m_pResource->GetElementGroup()->GetCount() : 0; }; - unsigned long GetTextDisplayCount(void) const { return m_Displays.size(); }; - unsigned long GetTextItemCount(void) const { return m_TextItems.size(); }; + unsigned long GetXMLFileCount() const { return m_XMLFiles.size(); }; + unsigned long GetOpenFileCount() const { return m_OpenFilenameList.size(); }; + unsigned long GetTimerCount() const { return m_pLuaTimerManager ? m_pLuaTimerManager->GetTimerCount() : 0; }; + unsigned long GetElementCount() const { return m_pResource && m_pResource->GetElementGroup() ? m_pResource->GetElementGroup()->GetCount() : 0; }; + unsigned long GetTextDisplayCount() const { return m_Displays.size(); }; + unsigned long GetTextItemCount() const { return m_TextItems.size(); }; void OnOpenFile(const SString& strFilename); void OnCloseFile(const SString& strFilename); - CTextDisplay* CreateDisplay(void); + CTextDisplay* CreateDisplay(); void DestroyDisplay(CTextDisplay* pDisplay); CTextItem* CreateTextItem(const char* szText, float fX, float fY, eTextPriority priority = PRIORITY_LOW, const SColor color = -1, float fScale = 1.0f, unsigned char format = 0, unsigned char ucShadowAlpha = 0); @@ -89,31 +89,31 @@ class CLuaMain //: public CClient CTextDisplay* GetTextDisplayFromScriptID(uint uiScriptID); CTextItem* GetTextItemFromScriptID(uint uiScriptID); - bool BeingDeleted(void); - lua_State* GetVirtualMachine(void) const { return m_luaVM; }; + bool BeingDeleted(); + lua_State* GetVirtualMachine() const { return m_luaVM; }; - void ResetInstructionCount(void); + void ResetInstructionCount(); - CResource* GetResource(void) { return m_pResource; } + CResource* GetResource() { return m_pResource; } void SetResourceFile(class CResourceFile* resourceFile) { m_pResourceFile = resourceFile; } - CResourceFile* GetResourceFile(void) { return m_pResourceFile; } + CResourceFile* GetResourceFile() { return m_pResourceFile; } - void RegisterHTMLDFunctions(void); + void RegisterHTMLDFunctions(); - void InitVM(void); + void InitVM(); const SString& GetFunctionTag(int iFunctionNumber); int PCall(lua_State* L, int nargs, int nresults, int errfunc); - void CheckExecutionTime(void); + void CheckExecutionTime(); static int LuaLoadBuffer(lua_State* L, const char* buff, size_t sz, const char* name); static int OnUndump(const char* p, size_t n); private: - void InitSecurity(void); + void InitSecurity(); void InitClasses(lua_State* luaVM); public: - bool IsOOPEnabled(void) { return m_bEnableOOP; } + bool IsOOPEnabled() { return m_bEnableOOP; } private: static void InstructionCountHook(lua_State* luaVM, lua_Debug* pDebug); diff --git a/Server/mods/deathmatch/logic/lua/CLuaManager.cpp b/Server/mods/deathmatch/logic/lua/CLuaManager.cpp index 1005c036cb5..ee264e086a1 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaManager.cpp +++ b/Server/mods/deathmatch/logic/lua/CLuaManager.cpp @@ -43,7 +43,7 @@ CLuaManager::CLuaManager(CObjectManager* pObjectManager, CPlayerManager* pPlayer #endif } -CLuaManager::~CLuaManager(void) +CLuaManager::~CLuaManager() { CLuaCFunctions::RemoveAllFunctions(); list::iterator iter; @@ -101,7 +101,7 @@ void CLuaManager::OnLuaMainCloseVM(CLuaMain* pLuaMain, lua_State* luaVM) MapRemove(m_VirtualMachineMap, pLuaMain->GetVirtualMachine()); } -void CLuaManager::DoPulse(void) +void CLuaManager::DoPulse() { list::iterator iter; for (iter = m_virtualMachines.begin(); iter != m_virtualMachines.end(); ++iter) @@ -153,7 +153,7 @@ CResource* CLuaManager::GetVirtualMachineResource(lua_State* luaVM) return NULL; } -void CLuaManager::LoadCFunctions(void) +void CLuaManager::LoadCFunctions() { std::map functions{ {"addEvent", CLuaFunctionDefs::AddEvent}, diff --git a/Server/mods/deathmatch/logic/lua/CLuaManager.h b/Server/mods/deathmatch/logic/lua/CLuaManager.h index 50bfa5c886d..59be283db98 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaManager.h +++ b/Server/mods/deathmatch/logic/lua/CLuaManager.h @@ -34,7 +34,7 @@ class CLuaManager public: CLuaManager(CObjectManager* pObjectManager, CPlayerManager* pPlayerManager, CVehicleManager* pVehicleManager, CBlipManager* pBlipManager, CRadarAreaManager* pRadarAreaManager, CRegisteredCommands* pRegisteredCommands, CMapManager* pMapManager, CEvents* pEvents); - ~CLuaManager(void); + ~CLuaManager(); CLuaMain* CreateVirtualMachine(CResource* pResourceOwner, bool bEnableOOP); bool RemoveVirtualMachine(CLuaMain* vm); @@ -43,14 +43,14 @@ class CLuaManager void OnLuaMainOpenVM(CLuaMain* pLuaMain, lua_State* luaVM); void OnLuaMainCloseVM(CLuaMain* pLuaMain, lua_State* luaVM); - CLuaModuleManager* GetLuaModuleManager(void) const { return m_pLuaModuleManager; }; + CLuaModuleManager* GetLuaModuleManager() const { return m_pLuaModuleManager; }; - list::const_iterator IterBegin(void) { return m_virtualMachines.begin(); }; - list::const_iterator IterEnd(void) { return m_virtualMachines.end(); }; + list::const_iterator IterBegin() { return m_virtualMachines.begin(); }; + list::const_iterator IterEnd() { return m_virtualMachines.end(); }; - void DoPulse(void); + void DoPulse(); - void LoadCFunctions(void); + void LoadCFunctions(); private: CBlipManager* m_pBlipManager; diff --git a/Server/mods/deathmatch/logic/lua/CLuaModule.cpp b/Server/mods/deathmatch/logic/lua/CLuaModule.cpp index f34c2d6a710..98fd0540e5d 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaModule.cpp +++ b/Server/mods/deathmatch/logic/lua/CLuaModule.cpp @@ -26,7 +26,7 @@ CLuaModule::CLuaModule(CLuaModuleManager* pLuaModuleManager, CScriptDebugging* p m_bInitialised = false; } -CLuaModule::~CLuaModule(void) +CLuaModule::~CLuaModule() { if (m_hModule) { @@ -61,7 +61,7 @@ bool IsModule32Bit(const SString& strExpectedPathFilename) } #endif -int CLuaModule::_LoadModule(void) +int CLuaModule::_LoadModule() { InitModuleFunc pfnInitFunc; // Load Module @@ -173,7 +173,7 @@ int CLuaModule::_LoadModule(void) return 0; } -void CLuaModule::_UnloadModule(void) +void CLuaModule::_UnloadModule() { // Unload from memory #ifdef WIN32 @@ -188,7 +188,7 @@ void CLuaModule::_RegisterFunctions(lua_State* luaVM) m_FunctionInfo.RegisterFunctions(luaVM); } -void CLuaModule::_UnregisterFunctions(void) +void CLuaModule::_UnregisterFunctions() { list::const_iterator liter = m_pLuaModuleManager->GetLuaManager()->IterBegin(); for (; liter != m_pLuaModuleManager->GetLuaManager()->IterEnd(); ++liter) @@ -207,7 +207,7 @@ void CLuaModule::_UnregisterFunctions(void) } } -void CLuaModule::_DoPulse(void) +void CLuaModule::_DoPulse() { m_FunctionInfo.DoPulse(); } diff --git a/Server/mods/deathmatch/logic/lua/CLuaModule.h b/Server/mods/deathmatch/logic/lua/CLuaModule.h index aa0d2187165..0d0381845f0 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaModule.h +++ b/Server/mods/deathmatch/logic/lua/CLuaModule.h @@ -19,7 +19,7 @@ class CLuaModule; #pragma once -typedef bool (*DefaultModuleFunc)(void); +typedef bool (*DefaultModuleFunc)(); typedef void (*RegisterModuleFunc)(lua_State*); typedef bool (*InitModuleFunc)(ILuaModuleManager*, char*, char*, float*); @@ -44,7 +44,7 @@ class CLuaModule : public ILuaModuleManager10 { public: CLuaModule(CLuaModuleManager* pLuaModuleManager, CScriptDebugging* pScriptDebugging, const char* szFileName, const char* szShortFileName); - virtual ~CLuaModule(void); + virtual ~CLuaModule(); // functions for external modules until DP2.3 void Printf(const char* szFormat, ...); @@ -68,18 +68,18 @@ class CLuaModule : public ILuaModuleManager10 bool GetResourceFilePath(lua_State* luaVM, const char* fileName, char* path, size_t length) override; // functions for deathmatch - int _LoadModule(void); - void _UnloadModule(void); + int _LoadModule(); + void _UnloadModule(); void _RegisterFunctions(lua_State* luaVM); - void _UnregisterFunctions(void); - void _DoPulse(void); + void _UnregisterFunctions(); + void _DoPulse(); void _ResourceStopping(lua_State* luaVM); void _ResourceStopped(lua_State* luaVM); bool _DoesFunctionExist(const char* szFunctionName); - HMODULE _GetHandle(void) { return m_hModule; }; - SString _GetName(void) { return m_szShortFileName; }; - FunctionInfo _GetFunctions(void) { return m_FunctionInfo; }; + HMODULE _GetHandle() { return m_hModule; }; + SString _GetName() { return m_szShortFileName; }; + FunctionInfo _GetFunctions() { return m_FunctionInfo; }; private: SString m_szFileName; diff --git a/Server/mods/deathmatch/logic/lua/CLuaModuleManager.cpp b/Server/mods/deathmatch/logic/lua/CLuaModuleManager.cpp index 222edab3390..57c4c6e25db 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaModuleManager.cpp +++ b/Server/mods/deathmatch/logic/lua/CLuaModuleManager.cpp @@ -20,7 +20,7 @@ CLuaModuleManager::CLuaModuleManager(CLuaManager* pLuaManager) m_pLuaManager = pLuaManager; } -CLuaModuleManager::~CLuaModuleManager(void) +CLuaModuleManager::~CLuaModuleManager() { // Shutdown all our modules list::iterator iter = m_Modules.begin(); @@ -44,7 +44,7 @@ void CLuaModuleManager::RegisterFunctions(lua_State* luaVM) } } -void CLuaModuleManager::DoPulse(void) +void CLuaModuleManager::DoPulse() { list::iterator iter = m_Modules.begin(); for (; iter != m_Modules.end(); iter++) diff --git a/Server/mods/deathmatch/logic/lua/CLuaModuleManager.h b/Server/mods/deathmatch/logic/lua/CLuaModuleManager.h index b559ef21e04..a5cb8c2c937 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaModuleManager.h +++ b/Server/mods/deathmatch/logic/lua/CLuaModuleManager.h @@ -28,10 +28,10 @@ class CLuaModuleManager { public: CLuaModuleManager(CLuaManager* pLuaManager); - ~CLuaModuleManager(void); + ~CLuaModuleManager(); // functions for deathmatch - void DoPulse(void); + void DoPulse(); int LoadModule(const char* szShortFileName, const char* szFileName, bool bLateLoad); void SetScriptDebugging(CScriptDebugging* pScriptDebugging); void RegisterFunctions(lua_State* luaVM); @@ -40,8 +40,8 @@ class CLuaModuleManager void ResourceStopping(lua_State* luaVM); void ResourceStopped(lua_State* luaVM); - CLuaManager* GetLuaManager(void) { return m_pLuaManager; }; - list GetLoadedModules(void) { return m_Modules; }; + CLuaManager* GetLuaManager() { return m_pLuaManager; }; + list GetLoadedModules() { return m_Modules; }; private: CScriptDebugging* m_pScriptDebugging; diff --git a/Server/mods/deathmatch/logic/lua/CLuaTimer.cpp b/Server/mods/deathmatch/logic/lua/CLuaTimer.cpp index 7652a575ccb..b1369ff2ffb 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaTimer.cpp +++ b/Server/mods/deathmatch/logic/lua/CLuaTimer.cpp @@ -19,12 +19,12 @@ CLuaTimer::CLuaTimer(const CLuaFunctionRef& iLuaFunction, const CLuaArguments& A m_Arguments = Arguments; } -CLuaTimer::~CLuaTimer(void) +CLuaTimer::~CLuaTimer() { RemoveScriptID(); } -void CLuaTimer::RemoveScriptID(void) +void CLuaTimer::RemoveScriptID() { if (m_uiScriptID != INVALID_ARRAY_ID) { @@ -58,7 +58,7 @@ void CLuaTimer::ExecuteTimer(CLuaMain* pLuaMain) } } -CTickCount CLuaTimer::GetTimeLeft(void) +CTickCount CLuaTimer::GetTimeLeft() { CTickCount llCurrentTime = CTickCount::Now(); CTickCount llTimeLeft = m_llStartTime + m_llDelay - llCurrentTime; diff --git a/Server/mods/deathmatch/logic/lua/CLuaTimer.h b/Server/mods/deathmatch/logic/lua/CLuaTimer.h index 1c3913fc6a4..6ab3036b552 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaTimer.h +++ b/Server/mods/deathmatch/logic/lua/CLuaTimer.h @@ -23,25 +23,25 @@ class CLuaTimer { public: CLuaTimer(const CLuaFunctionRef& iLuaFunction, const CLuaArguments& Arguments); - ~CLuaTimer(void); + ~CLuaTimer(); - void RemoveScriptID(void); + void RemoveScriptID(); - CTickCount GetStartTime(void) const { return m_llStartTime; }; + CTickCount GetStartTime() const { return m_llStartTime; }; void SetStartTime(CTickCount llStartTime) { m_llStartTime = llStartTime; }; - CTickCount GetDelay(void) const { return m_llDelay; }; + CTickCount GetDelay() const { return m_llDelay; }; void SetDelay(CTickCount llDelay) { m_llDelay = llDelay; }; - unsigned int GetRepeats(void) const { return m_uiRepeats; }; + unsigned int GetRepeats() const { return m_uiRepeats; }; void SetRepeats(unsigned int uiRepeats) { m_uiRepeats = uiRepeats; } void ExecuteTimer(class CLuaMain* pLuaMain); - CTickCount GetTimeLeft(void); + CTickCount GetTimeLeft(); - uint GetScriptID(void) const { return m_uiScriptID; } - const SLuaDebugInfo& GetLuaDebugInfo(void) { return m_LuaDebugInfo; } + uint GetScriptID() const { return m_uiScriptID; } + const SLuaDebugInfo& GetLuaDebugInfo() { return m_LuaDebugInfo; } void SetLuaDebugInfo(const SLuaDebugInfo& luaDebugInfo) { m_LuaDebugInfo = luaDebugInfo; } private: diff --git a/Server/mods/deathmatch/logic/lua/CLuaTimerManager.cpp b/Server/mods/deathmatch/logic/lua/CLuaTimerManager.cpp index 4dff5ad2bb6..626e97b2c78 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaTimerManager.cpp +++ b/Server/mods/deathmatch/logic/lua/CLuaTimerManager.cpp @@ -93,7 +93,7 @@ void CLuaTimerManager::RemoveTimer(CLuaTimer* pLuaTimer) delete pLuaTimer; } -void CLuaTimerManager::RemoveAllTimers(void) +void CLuaTimerManager::RemoveAllTimers() { // Delete all the timers CFastList::const_iterator iter = m_TimerList.begin(); diff --git a/Server/mods/deathmatch/logic/lua/CLuaTimerManager.h b/Server/mods/deathmatch/logic/lua/CLuaTimerManager.h index bc2fddf5c47..c95a1395164 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaTimerManager.h +++ b/Server/mods/deathmatch/logic/lua/CLuaTimerManager.h @@ -20,12 +20,12 @@ class CLuaTimerManager; class CLuaTimerManager { public: - CLuaTimerManager(void) + CLuaTimerManager() { m_pPendingDelete = NULL; m_pProcessingTimer = NULL; } - ~CLuaTimerManager(void) { RemoveAllTimers(); }; + ~CLuaTimerManager() { RemoveAllTimers(); }; void DoPulse(CLuaMain* pLuaMain); @@ -33,13 +33,13 @@ class CLuaTimerManager CLuaTimer* AddTimer(const CLuaFunctionRef& iLuaFunction, CTickCount llTimeDelay, unsigned int uiRepeats, const CLuaArguments& Arguments); void RemoveTimer(CLuaTimer* pLuaTimer); - void RemoveAllTimers(void); - unsigned long GetTimerCount(void) const { return m_TimerList.size(); } + void RemoveAllTimers(); + unsigned long GetTimerCount() const { return m_TimerList.size(); } void ResetTimer(CLuaTimer* pLuaTimer); - CFastList::const_iterator IterBegin(void) { return m_TimerList.begin(); } - CFastList::const_iterator IterEnd(void) { return m_TimerList.end(); } + CFastList::const_iterator IterBegin() { return m_TimerList.begin(); } + CFastList::const_iterator IterEnd() { return m_TimerList.end(); } private: CFastList m_TimerList; diff --git a/Server/mods/deathmatch/logic/lua/LuaCommon.h b/Server/mods/deathmatch/logic/lua/LuaCommon.h index 343a7aa568c..a671e23c66d 100644 --- a/Server/mods/deathmatch/logic/lua/LuaCommon.h +++ b/Server/mods/deathmatch/logic/lua/LuaCommon.h @@ -84,7 +84,7 @@ enum struct SLuaDebugInfo { - SLuaDebugInfo(void) : iLine(INVALID_LINE_NUMBER), infoType(DEBUG_INFO_NONE) {} + SLuaDebugInfo() : iLine(INVALID_LINE_NUMBER), infoType(DEBUG_INFO_NONE) {} SLuaDebugInfo(const SString& strFile, int iLine, const SString& strShortSrc = "") : strFile(strFile), strShortSrc(strShortSrc), iLine(iLine), infoType(DEBUG_INFO_FILE_AND_LINE) { diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp index 01456e52197..a6af77e4eb5 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp @@ -18,7 +18,7 @@ static const char* GetResourceName(lua_State* luaVM) return luaMain ? luaMain->GetScriptName() : ""; } -void CLuaACLDefs::LoadFunctions(void) +void CLuaACLDefs::LoadFunctions() { std::map functions{ {"aclReload", aclReload}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.h index 0b34852bd4c..44194f05ea9 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.h @@ -15,7 +15,7 @@ class CLuaACLDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(aclReload); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.h index 332315cd7eb..dead6074faf 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.h @@ -15,7 +15,7 @@ class CLuaAccountDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Log in/out diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.h index fff655e5719..b11827c5f38 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.h @@ -15,7 +15,7 @@ class CLuaBanDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(AddBan); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.h index 36c0c3c424f..2b448cdbcd6 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.h @@ -15,7 +15,7 @@ class CLuaBlipDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Blip create/destroy functions diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.h index feb0dc22665..06c2159b555 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.h @@ -15,7 +15,7 @@ class CLuaCameraDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); // Get functions LUA_DECLARE_OOP(getCameraMatrix); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.h index 06fb1ebd7bb..938fe898699 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.h @@ -15,7 +15,7 @@ class CLuaColShapeDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Shape create funcs diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.h index c1987c69b16..015ed4f76b7 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.h @@ -15,7 +15,7 @@ class CLuaDatabaseDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); static void DbQueryCallback(CDbJobData* pJobData, void* pContext); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h index 7985396f718..4d087ee94bf 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h @@ -15,7 +15,7 @@ class CLuaElementDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Create/destroy diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.h index cab87a32e69..5cc1065bc14 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.h @@ -15,7 +15,7 @@ class CLuaHandlingDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); // Set LUA_DECLARE(SetVehicleHandling); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.h index 6bdfb19c2d1..28e84e5ff56 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.h @@ -15,7 +15,7 @@ class CLuaMarkerDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Marker create/destroy functions diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.h index 858c6fcf5eb..f17f03c127c 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.h @@ -15,7 +15,7 @@ class CLuaObjectDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Object create/destroy functions diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.h index 1d19db0c40c..d458b7a3447 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.h @@ -15,7 +15,7 @@ class CLuaPedDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Helper diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.h index a1e4d60c429..319a8efbc4e 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.h @@ -15,7 +15,7 @@ class CLuaPickupDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Create/destroy diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.h index 2710b23fe2c..2be98ffc396 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.h @@ -15,7 +15,7 @@ class CLuaPlayerDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Player get functions diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.h index cdf80edc921..d95f4f9b757 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.h @@ -15,7 +15,7 @@ class CLuaRadarAreaDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Radar area create/destroy funcs diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h index 0302e5cae09..0a09c03b830 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h @@ -15,7 +15,7 @@ class CLuaResourceDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Create/edit functions diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h index b292aac8c96..0de7999a348 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h @@ -15,7 +15,7 @@ class CLuaTeamDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Team create/destroy functions diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.h index ce951929c5a..ffd2728a95b 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.h @@ -15,7 +15,7 @@ class CLuaTextDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(textCreateDisplay); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.h index bf73ccf21aa..fd37e2aaa48 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.h @@ -15,7 +15,7 @@ class CLuaTimerDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(SetTimer); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h index 88e85c3008d..7bc60f9b48a 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h @@ -15,7 +15,7 @@ class CLuaVehicleDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); // Vehicle create/destroy functions diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.h index 7c99e4b0901..f8a4ce2e3cc 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.h @@ -15,7 +15,7 @@ class CLuaVoiceDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); LUA_DECLARE(IsVoiceEnabled); LUA_DECLARE(SetPlayerVoiceBroadcastTo); LUA_DECLARE(setPlayerVoiceIgnoreFrom); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.h index a9e7da4af10..44bb6c0f39b 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.h @@ -15,7 +15,7 @@ class CLuaWaterDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(CreateWater); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.h index 1e47ec4e5c2..4b8fbc03d5d 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.h @@ -15,7 +15,7 @@ class CLuaWorldDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); // Get LUA_DECLARE(getTime); diff --git a/Server/mods/deathmatch/logic/net/CNetBuffer.cpp b/Server/mods/deathmatch/logic/net/CNetBuffer.cpp index 9b160b6f3aa..362e881b54e 100644 --- a/Server/mods/deathmatch/logic/net/CNetBuffer.cpp +++ b/Server/mods/deathmatch/logic/net/CNetBuffer.cpp @@ -48,7 +48,7 @@ namespace TIMEUS ms_StatsTimePoint3; // Sync thread stats helper functions - void UpdateStatsPreDoPulse(void) + void UpdateStatsPreDoPulse() { ms_StatsTimePoint1 = GetTimeUs(); ms_StatsRecvNumMessages = 0; @@ -61,7 +61,7 @@ namespace ms_StatsSendNumCommands = uiNumCommands; } - void UpdateStatsFinish(void) + void UpdateStatsFinish() { if (ms_StatsSendNumCommands != 0) ms_StatsTimePoint3 = GetTimeUs(); @@ -129,7 +129,7 @@ CNetServerBuffer::CNetServerBuffer(CSimPlayerManager* pSimPlayerManager) // // /////////////////////////////////////////////////////////////////////////// -CNetServerBuffer::~CNetServerBuffer(void) +CNetServerBuffer::~CNetServerBuffer() { // Stop the job queue processing thread StopThread(); @@ -164,7 +164,7 @@ void CNetServerBuffer::SetAutoPulseEnabled(bool bEnable) // Stop the job queue processing thread // /////////////////////////////////////////////////////////////// -void CNetServerBuffer::StopThread(void) +void CNetServerBuffer::StopThread() { // Stop the job queue processing thread shared.m_Mutex.Lock(); @@ -205,7 +205,7 @@ bool CNetServerBuffer::StartNetwork(const char* szIP, unsigned short usServerPor // BLOCKING // /////////////////////////////////////////////////////////////////////////// -void CNetServerBuffer::StopNetwork(void) +void CNetServerBuffer::StopNetwork() { SStopNetworkArgs* pArgs = new SStopNetworkArgs(); AddCommandAndWait(pArgs); @@ -218,7 +218,7 @@ void CNetServerBuffer::StopNetwork(void) // // /////////////////////////////////////////////////////////////////////////// -void CNetServerBuffer::DoPulse(void) +void CNetServerBuffer::DoPulse() { // Schedule a net pulse SDoPulseArgs* pArgs = new SDoPulseArgs(); @@ -323,7 +323,7 @@ bool CNetServerBuffer::GetNetworkStatistics(NetStatistics* pDest, const NetServe // Uses stats gathered here // /////////////////////////////////////////////////////////////////////////// -const SPacketStat* CNetServerBuffer::GetPacketStats(void) +const SPacketStat* CNetServerBuffer::GetPacketStats() { m_TimeSinceGetPacketStats.Reset(); return m_PacketStatList[0]; @@ -615,7 +615,7 @@ void CNetServerBuffer::SetChecks(const char* szDisableComboACMap, const char* sz // // /////////////////////////////////////////////////////////////////////////// -unsigned int CNetServerBuffer::GetPendingPacketCount(void) +unsigned int CNetServerBuffer::GetPendingPacketCount() { shared.m_Mutex.Lock(); uint uiCount = shared.m_InResultQueue.size(); @@ -763,7 +763,7 @@ void CNetServerBuffer::GenerateRandomData(void* pOutData, uint uiLength) // Return a new job data object // /////////////////////////////////////////////////////////////// -CNetJobData* CNetServerBuffer::GetNewJobData(void) +CNetJobData* CNetServerBuffer::GetNewJobData() { CNetJobData* pJobData = new CNetJobData(); return pJobData; @@ -915,7 +915,7 @@ void CNetServerBuffer::AddPacketStat(CNetServer::ENetworkUsageDirection eDirecti // Called during pulse // /////////////////////////////////////////////////////////////////////////// -void CNetServerBuffer::ProcessIncoming(void) +void CNetServerBuffer::ProcessIncoming() { bool bTimePacketHandler = m_TimeSinceGetPacketStats.Get() < 10000; @@ -1009,7 +1009,7 @@ void* CNetServerBuffer::StaticThreadProc(void* pContext) // Job service loop // /////////////////////////////////////////////////////////////// -void* CNetServerBuffer::ThreadProc(void) +void* CNetServerBuffer::ThreadProc() { shared.m_Mutex.Lock(); while (!shared.m_bTerminateThread) @@ -1308,7 +1308,7 @@ bool CNetJobData::SetCallback(PFN_NETRESULT pfnNetResult, void* pContext) // Returns true if callback has been set and has not been called yet // /////////////////////////////////////////////////////////////// -bool CNetJobData::HasCallback(void) +bool CNetJobData::HasCallback() { return callback.bSet && !callback.bDone; } @@ -1320,7 +1320,7 @@ bool CNetJobData::HasCallback(void) // Do callback // /////////////////////////////////////////////////////////////// -void CNetJobData::ProcessCallback(void) +void CNetJobData::ProcessCallback() { assert(HasCallback()); callback.bDone = true; diff --git a/Server/mods/deathmatch/logic/net/CNetBuffer.h b/Server/mods/deathmatch/logic/net/CNetBuffer.h index ea2bdcfc0e4..5d27479432d 100644 --- a/Server/mods/deathmatch/logic/net/CNetBuffer.h +++ b/Server/mods/deathmatch/logic/net/CNetBuffer.h @@ -10,8 +10,8 @@ // Base class for net function arguments struct SArgs { - SArgs(void) { DEBUG_CREATE_COUNT("SArgs"); } - virtual ~SArgs(void) { DEBUG_DESTROY_COUNT("SArgs"); } + SArgs() { DEBUG_CREATE_COUNT("SArgs"); } + virtual ~SArgs() { DEBUG_DESTROY_COUNT("SArgs"); } int type; }; @@ -25,11 +25,11 @@ class CNetJobData public: ZERO_ON_NEW bool SetCallback(PFN_NETRESULT pfnNetResult, void* pContext); - bool HasCallback(void); - void ProcessCallback(void); + bool HasCallback(); + void ProcessCallback(); - CNetJobData(void) { DEBUG_CREATE_COUNT("CNetJobData"); } - ~CNetJobData(void) + CNetJobData() { DEBUG_CREATE_COUNT("CNetJobData"); } + ~CNetJobData() { SAFE_DELETE(pArgs); DEBUG_DESTROY_COUNT("CNetJobData"); @@ -56,18 +56,18 @@ class CNetServerBuffer : public CNetServer public: ZERO_ON_NEW CNetServerBuffer(CSimPlayerManager* pSimPlayerManager); - virtual ~CNetServerBuffer(void); + virtual ~CNetServerBuffer(); // CNetServer interface virtual bool StartNetwork(const char* szIP, unsigned short usServerPort, unsigned int uiAllowedPlayers, const char* szServerName); - virtual void StopNetwork(void); + virtual void StopNetwork(); - virtual void DoPulse(void); + virtual void DoPulse(); virtual void RegisterPacketHandler(PPACKETHANDLER pfnPacketHandler); virtual bool GetNetworkStatistics(NetStatistics* pDest, const NetServerPlayerID& PlayerID); - virtual const SPacketStat* GetPacketStats(void); + virtual const SPacketStat* GetPacketStats(); virtual bool GetBandwidthStatistics(SBandwidthStatistics* pDest); virtual bool GetNetPerformanceStatistics(SNetPerformanceStatistics* pDest, bool bResetCounters); virtual void GetPingStatus(SFixedString<32>* pstrStatus); @@ -96,7 +96,7 @@ class CNetServerBuffer : public CNetServer virtual void SetChecks(const char* szDisableComboACMap, const char* szDisableACMap, const char* szEnableSDMap, int iEnableClientChecks, bool bHideAC, const char* szImgMods); - virtual unsigned int GetPendingPacketCount(void); + virtual unsigned int GetPendingPacketCount(); virtual void GetNetRoute(SFixedString<32>* pstrRoute); virtual bool InitServerId(const char* szPath); @@ -164,20 +164,20 @@ class CNetServerBuffer : public CNetServer pNetExtraInfo); // Main thread functions - void StopThread(void); + void StopThread(); CNetJobData* AddCommand(SArgs* pArgs, bool bAutoFree); void AddCommandAndFree(SArgs* pArgs); void AddCommandAndWait(SArgs* pArgs); void AddCommandAndCallback(SArgs* pArgs, PFN_NETRESULT pfnNetResult, void* pContext); bool PollCommand(CNetJobData* pJobData, uint uiTimeout); - CNetJobData* GetNewJobData(void); - void ProcessIncoming(void); + CNetJobData* GetNewJobData(); + void ProcessIncoming(); void SetAutoPulseEnabled(bool bEnable); void AddPacketStat(CNetServer::ENetworkUsageDirection eDirection, uchar ucPacketID, int iPacketSize, TIMEUS elapsedTime); // Sync thread functions static void* StaticThreadProc(void* pContext); - void* ThreadProc(void); + void* ThreadProc(); void ProcessCommand(CNetJobData* pJobData); static bool StaticProcessPacket(unsigned char ucPacketID, const NetServerPlayerID& Socket, NetBitStreamInterface* BitStream, SNetExtraInfo* pNetExtraInfo); void ProcessPacket(unsigned char ucPacketID, const NetServerPlayerID& Socket, NetBitStreamInterface* BitStream, SNetExtraInfo* pNetExtraInfo); diff --git a/Server/mods/deathmatch/logic/net/CNetBufferWatchDog.cpp b/Server/mods/deathmatch/logic/net/CNetBufferWatchDog.cpp index 716a4fcc3af..695de0a32cd 100644 --- a/Server/mods/deathmatch/logic/net/CNetBufferWatchDog.cpp +++ b/Server/mods/deathmatch/logic/net/CNetBufferWatchDog.cpp @@ -48,7 +48,7 @@ CNetBufferWatchDog::CNetBufferWatchDog(CNetServerBuffer* pNetBuffer, bool bVerbo // // /////////////////////////////////////////////////////////////////////////// -CNetBufferWatchDog::~CNetBufferWatchDog(void) +CNetBufferWatchDog::~CNetBufferWatchDog() { if (ms_bVerboseDebug) CLogger::LogPrintf("INFO: CNetBufferWatchDog stopped\n"); @@ -67,7 +67,7 @@ CNetBufferWatchDog::~CNetBufferWatchDog(void) // Stop the watch dog thread // /////////////////////////////////////////////////////////////// -void CNetBufferWatchDog::StopThread(void) +void CNetBufferWatchDog::StopThread() { // Stop the watch dog thread shared.m_Mutex.Lock(); @@ -116,7 +116,7 @@ void* CNetBufferWatchDog::StaticThreadProc(void* pContext) // Check thread loop // /////////////////////////////////////////////////////////////// -void* CNetBufferWatchDog::ThreadProc(void) +void* CNetBufferWatchDog::ThreadProc() { shared.m_Mutex.Lock(); while (!shared.m_bTerminateThread) @@ -139,7 +139,7 @@ void* CNetBufferWatchDog::ThreadProc(void) // Mutex should be locked: yes // /////////////////////////////////////////////////////////////// -void CNetBufferWatchDog::DoChecks(void) +void CNetBufferWatchDog::DoChecks() { // Get queue sizes now uint uiFinishedList; @@ -259,7 +259,7 @@ void CNetBufferWatchDog::UpdateQueueInfo(CQueueInfo& queueInfo, int iQueueSize, // // /////////////////////////////////////////////////////////////// -void CNetBufferWatchDog::BlockOutgoingSyncPackets(void) +void CNetBufferWatchDog::BlockOutgoingSyncPackets() { if (!ms_bBlockOutgoingSyncPackets) { @@ -275,7 +275,7 @@ void CNetBufferWatchDog::BlockOutgoingSyncPackets(void) // // /////////////////////////////////////////////////////////////// -void CNetBufferWatchDog::AllowOutgoingSyncPackets(void) +void CNetBufferWatchDog::AllowOutgoingSyncPackets() { if (ms_bBlockOutgoingSyncPackets) { @@ -291,7 +291,7 @@ void CNetBufferWatchDog::AllowOutgoingSyncPackets(void) // // /////////////////////////////////////////////////////////////// -void CNetBufferWatchDog::BlockIncomingSyncPackets(void) +void CNetBufferWatchDog::BlockIncomingSyncPackets() { if (!ms_bBlockIncomingSyncPackets) { @@ -307,7 +307,7 @@ void CNetBufferWatchDog::BlockIncomingSyncPackets(void) // // /////////////////////////////////////////////////////////////// -void CNetBufferWatchDog::AllowIncomingSyncPackets(void) +void CNetBufferWatchDog::AllowIncomingSyncPackets() { if (ms_bBlockIncomingSyncPackets) { @@ -324,7 +324,7 @@ void CNetBufferWatchDog::AllowIncomingSyncPackets(void) // Check for critical sitayshun // /////////////////////////////////////////////////////////////// -void CNetBufferWatchDog::DoPulse(void) +void CNetBufferWatchDog::DoPulse() { if (CSimControl::IsSimSystemEnabled()) { diff --git a/Server/mods/deathmatch/logic/net/CNetBufferWatchDog.h b/Server/mods/deathmatch/logic/net/CNetBufferWatchDog.h index 620957e50f6..d22007f3b83 100644 --- a/Server/mods/deathmatch/logic/net/CNetBufferWatchDog.h +++ b/Server/mods/deathmatch/logic/net/CNetBufferWatchDog.h @@ -65,20 +65,20 @@ class CNetBufferWatchDog public: ZERO_ON_NEW CNetBufferWatchDog(CNetServerBuffer* pNetBuffer, bool bVerboseDebug); - ~CNetBufferWatchDog(void); + ~CNetBufferWatchDog(); // Main thread functions - void StopThread(void); + void StopThread(); // Check thread functions static void* StaticThreadProc(void* pContext); - void* ThreadProc(void); - void DoChecks(void); + void* ThreadProc(); + void DoChecks(); void UpdateQueueInfo(CQueueInfo& queueInfo, int iQueueSize, const char* szTag); - void BlockOutgoingSyncPackets(void); - void AllowOutgoingSyncPackets(void); - void BlockIncomingSyncPackets(void); - void AllowIncomingSyncPackets(void); + void BlockOutgoingSyncPackets(); + void AllowOutgoingSyncPackets(); + void BlockIncomingSyncPackets(); + void AllowIncomingSyncPackets(); // Main thread variables CThreadHandle* m_pServiceThreadHandle; @@ -114,7 +114,7 @@ class CNetBufferWatchDog static uint ms_uiInResultQueueSize; // Static functions - static void DoPulse(void); + static void DoPulse(); static bool IsUnreliableSyncPacket(uchar ucPacketID); static bool CanSendPacket(uchar ucPacketID); static bool CanReceivePacket(uchar ucPacketID); diff --git a/Server/mods/deathmatch/logic/net/CSimBulletsyncPacket.h b/Server/mods/deathmatch/logic/net/CSimBulletsyncPacket.h index 423213f7ad4..b45babcb5da 100644 --- a/Server/mods/deathmatch/logic/net/CSimBulletsyncPacket.h +++ b/Server/mods/deathmatch/logic/net/CSimBulletsyncPacket.h @@ -17,8 +17,8 @@ class CSimBulletsyncPacket : public CSimPacket CSimBulletsyncPacket(ElementID PlayerID); - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_BULLETSYNC; }; - unsigned long GetFlags(void) const { return PACKET_MEDIUM_PRIORITY | PACKET_RELIABLE; }; + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_BULLETSYNC; }; + unsigned long GetFlags() const { return PACKET_MEDIUM_PRIORITY | PACKET_RELIABLE; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/net/CSimControl.cpp b/Server/mods/deathmatch/logic/net/CSimControl.cpp index 23cc7cc5cf0..7789ed5669c 100644 --- a/Server/mods/deathmatch/logic/net/CSimControl.cpp +++ b/Server/mods/deathmatch/logic/net/CSimControl.cpp @@ -25,7 +25,7 @@ namespace // // /////////////////////////////////////////////////////////////// -void CSimControl::Startup(void) +void CSimControl::Startup() { ms_pSimPlayerManager = new CSimPlayerManager(); @@ -43,7 +43,7 @@ void CSimControl::Startup(void) // // /////////////////////////////////////////////////////////////// -void CSimControl::Shutdown(void) +void CSimControl::Shutdown() { EnableSimSystem(false); SAFE_DELETE(ms_pSimPlayerManager); @@ -71,7 +71,7 @@ void CSimControl::EnableSimSystem(bool bEnable, bool bApplyNow) // // /////////////////////////////////////////////////////////////// -void CSimControl::DoPulse(void) +void CSimControl::DoPulse() { if (ms_bEnableRequest == ms_bEnabled) return; @@ -119,7 +119,7 @@ void CSimControl::DoPulse(void) // Check if sim system is on // /////////////////////////////////////////////////////////////// -bool CSimControl::IsSimSystemEnabled(void) +bool CSimControl::IsSimSystemEnabled() { return ms_bEnabled; } diff --git a/Server/mods/deathmatch/logic/net/CSimControl.h b/Server/mods/deathmatch/logic/net/CSimControl.h index 69f8d3032a0..50477f8dc09 100644 --- a/Server/mods/deathmatch/logic/net/CSimControl.h +++ b/Server/mods/deathmatch/logic/net/CSimControl.h @@ -14,11 +14,11 @@ class CSimControl { public: - static void Startup(void); - static void Shutdown(void); - static void DoPulse(void); + static void Startup(); + static void Shutdown(); + static void DoPulse(); static void EnableSimSystem(bool bEnable, bool bApplyNow = true); - static bool IsSimSystemEnabled(void); + static bool IsSimSystemEnabled(); static void AddSimPlayer(CPlayer* pPlayer); static void RemoveSimPlayer(CPlayer* pPlayer); static void UpdateSimPlayer(CPlayer* pPlayer); diff --git a/Server/mods/deathmatch/logic/net/CSimKeysyncPacket.h b/Server/mods/deathmatch/logic/net/CSimKeysyncPacket.h index d83fe3e3ce6..dd0e0a92181 100644 --- a/Server/mods/deathmatch/logic/net/CSimKeysyncPacket.h +++ b/Server/mods/deathmatch/logic/net/CSimKeysyncPacket.h @@ -18,8 +18,8 @@ class CSimKeysyncPacket : public CSimPacket CSimKeysyncPacket(ElementID PlayerID, bool bPlayerHasOccupiedVehicle, ushort usVehicleGotModel, uchar ucPlayerGotWeaponType, float fPlayerGotWeaponRange, bool bVehicleHasHydraulics, bool bVehicleIsPlaneOrHeli, CControllerState& sharedControllerState); - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_KEYSYNC; }; - unsigned long GetFlags(void) const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_KEYSYNC; }; + unsigned long GetFlags() const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/net/CSimPedTaskPacket.h b/Server/mods/deathmatch/logic/net/CSimPedTaskPacket.h index 78df6b7c258..3d80f862f99 100644 --- a/Server/mods/deathmatch/logic/net/CSimPedTaskPacket.h +++ b/Server/mods/deathmatch/logic/net/CSimPedTaskPacket.h @@ -17,8 +17,8 @@ class CSimPedTaskPacket : public CSimPacket CSimPedTaskPacket(ElementID PlayerID); - ePacketID GetPacketID(void) const { return PACKET_ID_PED_TASK; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE; }; + ePacketID GetPacketID() const { return PACKET_ID_PED_TASK; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/net/CSimPlayer.h b/Server/mods/deathmatch/logic/net/CSimPlayer.h index 0e5fc850494..5cc86d5ad02 100644 --- a/Server/mods/deathmatch/logic/net/CSimPlayer.h +++ b/Server/mods/deathmatch/logic/net/CSimPlayer.h @@ -22,13 +22,13 @@ class CSimPlayer { public: ZERO_ON_NEW - CSimPlayer(void) { DEBUG_CREATE_COUNT("CSimPlayer"); } - ~CSimPlayer(void) { DEBUG_DESTROY_COUNT("CSimPlayer"); } + CSimPlayer() { DEBUG_CREATE_COUNT("CSimPlayer"); } + ~CSimPlayer() { DEBUG_DESTROY_COUNT("CSimPlayer"); } - bool IsJoined(void) { return m_bIsJoined; }; - const std::multimap& GetPuresyncSendList(void); - unsigned short GetBitStreamVersion(void) { return m_usBitStreamVersion; }; - NetServerPlayerID& GetSocket(void) { return m_PlayerSocket; }; + bool IsJoined() { return m_bIsJoined; }; + const std::multimap& GetPuresyncSendList(); + unsigned short GetBitStreamVersion() { return m_usBitStreamVersion; }; + NetServerPlayerID& GetSocket() { return m_PlayerSocket; }; // General synced vars bool m_bIsJoined; diff --git a/Server/mods/deathmatch/logic/net/CSimPlayerManager.cpp b/Server/mods/deathmatch/logic/net/CSimPlayerManager.cpp index 9e6b6782de3..2f8fdd29577 100644 --- a/Server/mods/deathmatch/logic/net/CSimPlayerManager.cpp +++ b/Server/mods/deathmatch/logic/net/CSimPlayerManager.cpp @@ -181,7 +181,7 @@ void CSimPlayerManager::UpdateSimPlayer(CPlayer* pPlayer) // Lock all sim activity // /////////////////////////////////////////////////////////////////////////// -void CSimPlayerManager::LockSimSystem(void) +void CSimPlayerManager::LockSimSystem() { m_CS.Lock(); assert(!m_bIsLocked); @@ -198,7 +198,7 @@ void CSimPlayerManager::LockSimSystem(void) // Unlock all sim activity // /////////////////////////////////////////////////////////////////////////// -void CSimPlayerManager::UnlockSimSystem(void) +void CSimPlayerManager::UnlockSimSystem() { assert(m_bIsLocked); m_bIsLocked = false; @@ -517,7 +517,7 @@ void CSimPlayerManager::Broadcast(const CSimPacket& Packet, const std::multimap< // Returns list of players, grouped by bitstream version // /////////////////////////////////////////////////////////////////////////// -const std::multimap& CSimPlayer::GetPuresyncSendList(void) +const std::multimap& CSimPlayer::GetPuresyncSendList() { if (m_bSendListChanged) { diff --git a/Server/mods/deathmatch/logic/net/CSimPlayerManager.h b/Server/mods/deathmatch/logic/net/CSimPlayerManager.h index a9d04915a64..9fcca806951 100644 --- a/Server/mods/deathmatch/logic/net/CSimPlayerManager.h +++ b/Server/mods/deathmatch/logic/net/CSimPlayerManager.h @@ -18,8 +18,8 @@ class CSimPlayerManager void UpdateSimPlayer(CPlayer* pPlayer); // Any thread methods - void LockSimSystem(void); - void UnlockSimSystem(void); + void LockSimSystem(); + void UnlockSimSystem(); // Sync thread methods bool HandlePlayerPureSync(const NetServerPlayerID& Socket, NetBitStreamInterface* BitStream); diff --git a/Server/mods/deathmatch/logic/net/CSimPlayerPuresyncPacket.h b/Server/mods/deathmatch/logic/net/CSimPlayerPuresyncPacket.h index 75a351a1413..5afc3a7b4c9 100644 --- a/Server/mods/deathmatch/logic/net/CSimPlayerPuresyncPacket.h +++ b/Server/mods/deathmatch/logic/net/CSimPlayerPuresyncPacket.h @@ -10,12 +10,12 @@ class CSimPacket { public: - CSimPacket(void) { DEBUG_CREATE_COUNT("CSimPacket"); } - virtual ~CSimPacket(void) { DEBUG_DESTROY_COUNT("CSimPacket"); } + CSimPacket() { DEBUG_CREATE_COUNT("CSimPacket"); } + virtual ~CSimPacket() { DEBUG_DESTROY_COUNT("CSimPacket"); } - virtual ePacketID GetPacketID(void) const = 0; - virtual ePacketOrdering GetPacketOrdering(void) const { return PACKET_ORDERING_DEFAULT; } - virtual unsigned long GetFlags(void) const = 0; + virtual ePacketID GetPacketID() const = 0; + virtual ePacketOrdering GetPacketOrdering() const { return PACKET_ORDERING_DEFAULT; } + virtual unsigned long GetFlags() const = 0; virtual bool Read(NetBitStreamInterface& BitStream) { return false; }; virtual bool Write(NetBitStreamInterface& BitStream) const { return false; }; @@ -32,8 +32,8 @@ class CSimPlayerPuresyncPacket : public CSimPacket CSimPlayerPuresyncPacket(ElementID PlayerID, ushort PlayerLatency, uchar PlayerSyncTimeContext, uchar PlayerGotWeaponType, float WeaponRange, CControllerState& sharedControllerState); - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_PURESYNC; }; - unsigned long GetFlags(void) const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_PURESYNC; }; + unsigned long GetFlags() const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/net/CSimVehiclePuresyncPacket.h b/Server/mods/deathmatch/logic/net/CSimVehiclePuresyncPacket.h index 56715fa4673..c6f34747c09 100644 --- a/Server/mods/deathmatch/logic/net/CSimVehiclePuresyncPacket.h +++ b/Server/mods/deathmatch/logic/net/CSimVehiclePuresyncPacket.h @@ -22,8 +22,8 @@ class CSimVehiclePuresyncPacket : public CSimPacket ushort usVehicleGotModel, uchar ucPlayerGotOccupiedVehicleSeat, uchar ucPlayerGotWeaponType, float fPlayerGotWeaponRange, CControllerState& sharedControllerState, uint m_uiDamageInfoSendPhase, const SSimVehicleDamageInfo& damageInfo); - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_VEHICLE_PURESYNC; }; - unsigned long GetFlags(void) const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_VEHICLE_PURESYNC; }; + unsigned long GetFlags() const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CBulletsyncPacket.h b/Server/mods/deathmatch/logic/packets/CBulletsyncPacket.h index 87bd0e1f563..b0b9263f579 100644 --- a/Server/mods/deathmatch/logic/packets/CBulletsyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CBulletsyncPacket.h @@ -12,12 +12,12 @@ class CBulletsyncPacket : public CPacket { public: - CBulletsyncPacket(void){}; + CBulletsyncPacket(){}; CBulletsyncPacket(class CPlayer* pPlayer); - bool HasSimHandler(void) const { return true; } - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_BULLETSYNC; }; - unsigned long GetFlags(void) const { return PACKET_MEDIUM_PRIORITY | PACKET_RELIABLE; }; + bool HasSimHandler() const { return true; } + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_BULLETSYNC; }; + unsigned long GetFlags() const { return PACKET_MEDIUM_PRIORITY | PACKET_RELIABLE; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CCameraSyncPacket.h b/Server/mods/deathmatch/logic/packets/CCameraSyncPacket.h index 40610c01d23..846c54db28b 100644 --- a/Server/mods/deathmatch/logic/packets/CCameraSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CCameraSyncPacket.h @@ -18,8 +18,8 @@ class CCameraSyncPacket : public CPacket { public: - ePacketID GetPacketID(void) const { return PACKET_ID_CAMERA_SYNC; }; - unsigned long GetFlags(void) const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_CAMERA_SYNC; }; + unsigned long GetFlags() const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); diff --git a/Server/mods/deathmatch/logic/packets/CChatEchoPacket.h b/Server/mods/deathmatch/logic/packets/CChatEchoPacket.h index 1ac3fca10e7..8484ae7053d 100644 --- a/Server/mods/deathmatch/logic/packets/CChatEchoPacket.h +++ b/Server/mods/deathmatch/logic/packets/CChatEchoPacket.h @@ -35,9 +35,9 @@ class CChatEchoPacket : public CPacket }; // Chat uses low priority channel to avoid getting queued behind large map downloads #6877 - ePacketID GetPacketID(void) const { return PACKET_ID_CHAT_ECHO; }; - unsigned long GetFlags(void) const { return PACKET_LOW_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; - virtual ePacketOrdering GetPacketOrdering(void) const { return PACKET_ORDERING_CHAT; } + ePacketID GetPacketID() const { return PACKET_ID_CHAT_ECHO; }; + unsigned long GetFlags() const { return PACKET_LOW_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + virtual ePacketOrdering GetPacketOrdering() const { return PACKET_ORDERING_CHAT; } bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CCommandPacket.h b/Server/mods/deathmatch/logic/packets/CCommandPacket.h index e061084d12c..27b925dc78e 100644 --- a/Server/mods/deathmatch/logic/packets/CCommandPacket.h +++ b/Server/mods/deathmatch/logic/packets/CCommandPacket.h @@ -16,15 +16,15 @@ class CCommandPacket : public CPacket { public: - CCommandPacket(void) { m_strCommand = ""; }; + CCommandPacket() { m_strCommand = ""; }; - ePacketID GetPacketID(void) const { return static_cast(PACKET_ID_COMMAND); }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; - virtual ePacketOrdering GetPacketOrdering(void) const { return PACKET_ORDERING_CHAT; } + ePacketID GetPacketID() const { return static_cast(PACKET_ID_COMMAND); }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + virtual ePacketOrdering GetPacketOrdering() const { return PACKET_ORDERING_CHAT; } bool Read(NetBitStreamInterface& BitStream); - const char* GetCommand(void) const { return m_strCommand.c_str(); }; + const char* GetCommand() const { return m_strCommand.c_str(); }; private: std::string m_strCommand; diff --git a/Server/mods/deathmatch/logic/packets/CConsoleEchoPacket.h b/Server/mods/deathmatch/logic/packets/CConsoleEchoPacket.h index a4b279bdfe3..cf6ddef487e 100644 --- a/Server/mods/deathmatch/logic/packets/CConsoleEchoPacket.h +++ b/Server/mods/deathmatch/logic/packets/CConsoleEchoPacket.h @@ -19,13 +19,13 @@ class CConsoleEchoPacket : public CPacket public: CConsoleEchoPacket(const char* szMessage) { m_strMessage.AssignLeft(szMessage, MAX_CONSOLEECHO_LENGTH); } - ePacketID GetPacketID(void) const { return PACKET_ID_CONSOLE_ECHO; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; - virtual ePacketOrdering GetPacketOrdering(void) const { return PACKET_ORDERING_CHAT; } + ePacketID GetPacketID() const { return PACKET_ID_CONSOLE_ECHO; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + virtual ePacketOrdering GetPacketOrdering() const { return PACKET_ORDERING_CHAT; } bool Write(NetBitStreamInterface& BitStream) const; - const char* GetMessage(void) { return m_strMessage; }; + const char* GetMessage() { return m_strMessage; }; void SetMessage(const char* szMessage) { m_strMessage.AssignLeft(szMessage, MAX_CONSOLEECHO_LENGTH); } private: diff --git a/Server/mods/deathmatch/logic/packets/CCustomDataPacket.cpp b/Server/mods/deathmatch/logic/packets/CCustomDataPacket.cpp index 42e55ba1722..96752246be3 100644 --- a/Server/mods/deathmatch/logic/packets/CCustomDataPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CCustomDataPacket.cpp @@ -11,12 +11,12 @@ #include "StdInc.h" -CCustomDataPacket::CCustomDataPacket(void) +CCustomDataPacket::CCustomDataPacket() { m_szName = NULL; } -CCustomDataPacket::~CCustomDataPacket(void) +CCustomDataPacket::~CCustomDataPacket() { delete[] m_szName; m_szName = NULL; diff --git a/Server/mods/deathmatch/logic/packets/CCustomDataPacket.h b/Server/mods/deathmatch/logic/packets/CCustomDataPacket.h index 22431a84d18..4a4d57f0e24 100644 --- a/Server/mods/deathmatch/logic/packets/CCustomDataPacket.h +++ b/Server/mods/deathmatch/logic/packets/CCustomDataPacket.h @@ -17,18 +17,18 @@ class CCustomDataPacket : public CPacket { public: - CCustomDataPacket(void); - ~CCustomDataPacket(void); + CCustomDataPacket(); + ~CCustomDataPacket(); - ePacketID GetPacketID(void) const { return PACKET_ID_CUSTOM_DATA; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_CUSTOM_DATA; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; - ElementID GetElementID(void) { return m_ElementID; } - char* GetName(void) { return m_szName; } - CLuaArgument& GetValue(void) { return m_Value; } + ElementID GetElementID() { return m_ElementID; } + char* GetName() { return m_szName; } + CLuaArgument& GetValue() { return m_Value; } private: ElementID m_ElementID; diff --git a/Server/mods/deathmatch/logic/packets/CCustomWeaponBulletSyncPacket.h b/Server/mods/deathmatch/logic/packets/CCustomWeaponBulletSyncPacket.h index 906e1038dbd..f8aab8b00e6 100644 --- a/Server/mods/deathmatch/logic/packets/CCustomWeaponBulletSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CCustomWeaponBulletSyncPacket.h @@ -13,19 +13,19 @@ class CCustomWeaponBulletSyncPacket : public CPacket { public: - CCustomWeaponBulletSyncPacket(void){}; + CCustomWeaponBulletSyncPacket(){}; CCustomWeaponBulletSyncPacket(class CPlayer* pPlayer); - ePacketID GetPacketID(void) const { return PACKET_ID_WEAPON_BULLETSYNC; }; - unsigned long GetFlags(void) const { return PACKET_MEDIUM_PRIORITY | PACKET_RELIABLE; }; + ePacketID GetPacketID() const { return PACKET_ID_WEAPON_BULLETSYNC; }; + unsigned long GetFlags() const { return PACKET_MEDIUM_PRIORITY | PACKET_RELIABLE; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; - CPlayer* GetWeaponOwner(void) { return m_pWeapon != NULL ? m_pWeapon->GetOwner() : NULL; }; - CCustomWeapon* GetWeapon(void) { return m_pWeapon; }; - CVector GetStart(void) { return m_vecStart; }; - CVector GetEnd(void) { return m_vecEnd; }; + CPlayer* GetWeaponOwner() { return m_pWeapon != NULL ? m_pWeapon->GetOwner() : NULL; }; + CCustomWeapon* GetWeapon() { return m_pWeapon; }; + CVector GetStart() { return m_vecStart; }; + CVector GetEnd() { return m_vecEnd; }; CCustomWeapon* m_pWeapon; CVector m_vecStart; diff --git a/Server/mods/deathmatch/logic/packets/CDebugEchoPacket.h b/Server/mods/deathmatch/logic/packets/CDebugEchoPacket.h index 794911ecf61..8625f9c374d 100644 --- a/Server/mods/deathmatch/logic/packets/CDebugEchoPacket.h +++ b/Server/mods/deathmatch/logic/packets/CDebugEchoPacket.h @@ -30,9 +30,9 @@ class CDebugEchoPacket : public CPacket m_uiLevel = uiLevel; } - ePacketID GetPacketID(void) const { return PACKET_ID_DEBUG_ECHO; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; - virtual ePacketOrdering GetPacketOrdering(void) const { return PACKET_ORDERING_CHAT; } + ePacketID GetPacketID() const { return PACKET_ID_DEBUG_ECHO; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + virtual ePacketOrdering GetPacketOrdering() const { return PACKET_ORDERING_CHAT; } bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CDestroySatchelsPacket.cpp b/Server/mods/deathmatch/logic/packets/CDestroySatchelsPacket.cpp index c7867a0429e..f4de0a65ad6 100644 --- a/Server/mods/deathmatch/logic/packets/CDestroySatchelsPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CDestroySatchelsPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CDestroySatchelsPacket::CDestroySatchelsPacket(void) +CDestroySatchelsPacket::CDestroySatchelsPacket() { } diff --git a/Server/mods/deathmatch/logic/packets/CDestroySatchelsPacket.h b/Server/mods/deathmatch/logic/packets/CDestroySatchelsPacket.h index f7a39dcddd0..801b5eb600f 100644 --- a/Server/mods/deathmatch/logic/packets/CDestroySatchelsPacket.h +++ b/Server/mods/deathmatch/logic/packets/CDestroySatchelsPacket.h @@ -17,10 +17,10 @@ class CDestroySatchelsPacket : public CPacket { public: - CDestroySatchelsPacket(void); + CDestroySatchelsPacket(); - ePacketID GetPacketID(void) const { return PACKET_ID_DESTROY_SATCHELS; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_DESTROY_SATCHELS; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CDetonateSatchelsPacket.cpp b/Server/mods/deathmatch/logic/packets/CDetonateSatchelsPacket.cpp index 6dabc7d09b3..064857d86b2 100644 --- a/Server/mods/deathmatch/logic/packets/CDetonateSatchelsPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CDetonateSatchelsPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CDetonateSatchelsPacket::CDetonateSatchelsPacket(void) +CDetonateSatchelsPacket::CDetonateSatchelsPacket() { } diff --git a/Server/mods/deathmatch/logic/packets/CDetonateSatchelsPacket.h b/Server/mods/deathmatch/logic/packets/CDetonateSatchelsPacket.h index 1aebd32424c..ec33d27cd98 100644 --- a/Server/mods/deathmatch/logic/packets/CDetonateSatchelsPacket.h +++ b/Server/mods/deathmatch/logic/packets/CDetonateSatchelsPacket.h @@ -17,10 +17,10 @@ class CDetonateSatchelsPacket : public CPacket { public: - CDetonateSatchelsPacket(void); + CDetonateSatchelsPacket(); - ePacketID GetPacketID(void) const { return PACKET_ID_DETONATE_SATCHELS; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_DETONATE_SATCHELS; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CElementRPCPacket.h b/Server/mods/deathmatch/logic/packets/CElementRPCPacket.h index 7e7e804d8f6..caebfc452ed 100644 --- a/Server/mods/deathmatch/logic/packets/CElementRPCPacket.h +++ b/Server/mods/deathmatch/logic/packets/CElementRPCPacket.h @@ -19,8 +19,8 @@ class CElementRPCPacket : public CPacket CElementRPCPacket(CElement* pSourceElement, unsigned char ucActionID, NetBitStreamInterface& BitStream) : m_ucActionID(ucActionID), m_BitStream(BitStream), m_pSourceElement(pSourceElement){}; - ePacketID GetPacketID(void) const { return PACKET_ID_LUA_ELEMENT_RPC; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_LUA_ELEMENT_RPC; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CEntityAddPacket.h b/Server/mods/deathmatch/logic/packets/CEntityAddPacket.h index c8c3acf69c6..7ce1e4490a2 100644 --- a/Server/mods/deathmatch/logic/packets/CEntityAddPacket.h +++ b/Server/mods/deathmatch/logic/packets/CEntityAddPacket.h @@ -22,13 +22,13 @@ extern CGame* g_pGame; class CEntityAddPacket : public CPacket { public: - ePacketID GetPacketID(void) const { return PACKET_ID_ENTITY_ADD; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_ENTITY_ADD; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; void Add(class CElement* pElement); - void Clear(void) { m_Entities.clear(); }; + void Clear() { m_Entities.clear(); }; private: std::vector m_Entities; diff --git a/Server/mods/deathmatch/logic/packets/CEntityRemovePacket.h b/Server/mods/deathmatch/logic/packets/CEntityRemovePacket.h index 4e6b851e2d1..8cfeaf454c7 100644 --- a/Server/mods/deathmatch/logic/packets/CEntityRemovePacket.h +++ b/Server/mods/deathmatch/logic/packets/CEntityRemovePacket.h @@ -17,13 +17,13 @@ class CEntityRemovePacket : public CPacket { public: - ePacketID GetPacketID(void) const { return PACKET_ID_ENTITY_REMOVE; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_ENTITY_REMOVE; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; void Add(class CElement* pElement) { m_List.push_back(pElement); }; - void Clear(void) { m_List.clear(); }; + void Clear() { m_List.clear(); }; private: std::vector m_List; diff --git a/Server/mods/deathmatch/logic/packets/CExplosionSyncPacket.cpp b/Server/mods/deathmatch/logic/packets/CExplosionSyncPacket.cpp index f4122fccb6b..d033c0a2267 100644 --- a/Server/mods/deathmatch/logic/packets/CExplosionSyncPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CExplosionSyncPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CExplosionSyncPacket::CExplosionSyncPacket(void) +CExplosionSyncPacket::CExplosionSyncPacket() { m_OriginID = INVALID_ELEMENT_ID; m_ucType = EXPLOSION_SMALL; diff --git a/Server/mods/deathmatch/logic/packets/CExplosionSyncPacket.h b/Server/mods/deathmatch/logic/packets/CExplosionSyncPacket.h index ebe65cc550f..83db2ad1990 100644 --- a/Server/mods/deathmatch/logic/packets/CExplosionSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CExplosionSyncPacket.h @@ -34,11 +34,11 @@ class CExplosionSyncPacket : public CPacket EXPLOSION_TINY, }; - CExplosionSyncPacket(void); + CExplosionSyncPacket(); CExplosionSyncPacket(const CVector& vecPosition, unsigned char ucType); - ePacketID GetPacketID(void) const { return PACKET_ID_EXPLOSION; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_EXPLOSION; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CFireSyncPacket.cpp b/Server/mods/deathmatch/logic/packets/CFireSyncPacket.cpp index a3ac2d2b6cd..42ed7241040 100644 --- a/Server/mods/deathmatch/logic/packets/CFireSyncPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CFireSyncPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CFireSyncPacket::CFireSyncPacket(void) +CFireSyncPacket::CFireSyncPacket() { // Default size m_fSize = 1.8f; diff --git a/Server/mods/deathmatch/logic/packets/CFireSyncPacket.h b/Server/mods/deathmatch/logic/packets/CFireSyncPacket.h index 990967d6c46..cd03b2b6eb0 100644 --- a/Server/mods/deathmatch/logic/packets/CFireSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CFireSyncPacket.h @@ -17,11 +17,11 @@ class CFireSyncPacket : public CPacket { public: - CFireSyncPacket(void); + CFireSyncPacket(); CFireSyncPacket(const CVector& vecPosition, float fSize); - ePacketID GetPacketID(void) const { return PACKET_ID_FIRE; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_FIRE; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CKeysyncPacket.h b/Server/mods/deathmatch/logic/packets/CKeysyncPacket.h index cf7e8ac67a6..a272b27d82a 100644 --- a/Server/mods/deathmatch/logic/packets/CKeysyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CKeysyncPacket.h @@ -17,12 +17,12 @@ class CKeysyncPacket : public CPacket { public: - CKeysyncPacket(void){}; + CKeysyncPacket(){}; CKeysyncPacket(class CPlayer* pPlayer); - bool HasSimHandler(void) const { return true; } - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_KEYSYNC; }; - unsigned long GetFlags(void) const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; + bool HasSimHandler() const { return true; } + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_KEYSYNC; }; + unsigned long GetFlags() const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CLightsyncPacket.h b/Server/mods/deathmatch/logic/packets/CLightsyncPacket.h index 06554c98da3..e85ec9191c0 100644 --- a/Server/mods/deathmatch/logic/packets/CLightsyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CLightsyncPacket.h @@ -22,8 +22,8 @@ class CLightsyncPacket : public CPacket public: CLightsyncPacket() {} - ePacketID GetPacketID(void) const { return PACKET_ID_LIGHTSYNC; }; - unsigned long GetFlags(void) const { return PACKET_LOW_PRIORITY; }; + ePacketID GetPacketID() const { return PACKET_ID_LIGHTSYNC; }; + unsigned long GetFlags() const { return PACKET_LOW_PRIORITY; }; void AddPlayer(CPlayer* pPlayer) { m_players.push_back(pPlayer); } unsigned int Count() const { return m_players.size(); } diff --git a/Server/mods/deathmatch/logic/packets/CLuaEventPacket.cpp b/Server/mods/deathmatch/logic/packets/CLuaEventPacket.cpp index cbdae90fcd2..2161326bb72 100644 --- a/Server/mods/deathmatch/logic/packets/CLuaEventPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CLuaEventPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CLuaEventPacket::CLuaEventPacket(void) +CLuaEventPacket::CLuaEventPacket() { m_ElementID = INVALID_ELEMENT_ID; m_pArguments = &m_ArgumentsStore; diff --git a/Server/mods/deathmatch/logic/packets/CLuaEventPacket.h b/Server/mods/deathmatch/logic/packets/CLuaEventPacket.h index 4ff1d93a49f..7e54601c250 100644 --- a/Server/mods/deathmatch/logic/packets/CLuaEventPacket.h +++ b/Server/mods/deathmatch/logic/packets/CLuaEventPacket.h @@ -17,18 +17,18 @@ class CLuaEventPacket : public CPacket { public: - CLuaEventPacket(void); + CLuaEventPacket(); CLuaEventPacket(const char* szName, ElementID ID, CLuaArguments* pArguments); - ePacketID GetPacketID(void) const { return PACKET_ID_LUA_EVENT; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_LUA_EVENT; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; - const char* GetName(void) { return m_strName; } - ElementID GetElementID(void) { return m_ElementID; } - CLuaArguments* GetArguments(void) { return m_pArguments; } + const char* GetName() { return m_strName; } + ElementID GetElementID() { return m_ElementID; } + CLuaArguments* GetArguments() { return m_pArguments; } private: SString m_strName; diff --git a/Server/mods/deathmatch/logic/packets/CLuaPacket.h b/Server/mods/deathmatch/logic/packets/CLuaPacket.h index ac957b67f22..e248fa7a882 100644 --- a/Server/mods/deathmatch/logic/packets/CLuaPacket.h +++ b/Server/mods/deathmatch/logic/packets/CLuaPacket.h @@ -18,8 +18,8 @@ class CLuaPacket : public CPacket public: CLuaPacket(unsigned char ucActionID, NetBitStreamInterface& BitStream) : m_ucActionID(ucActionID), m_BitStream(BitStream){}; - ePacketID GetPacketID(void) const { return PACKET_ID_LUA; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_LUA; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CMapInfoPacket.h b/Server/mods/deathmatch/logic/packets/CMapInfoPacket.h index 531a8b9da05..fd2b20d5010 100644 --- a/Server/mods/deathmatch/logic/packets/CMapInfoPacket.h +++ b/Server/mods/deathmatch/logic/packets/CMapInfoPacket.h @@ -37,8 +37,8 @@ class CMapInfoPacket : public CPacket bool bOverrideFarClipDistance = false, float fFarClip = 0, bool bOverrideFogDistance = false, float fFogDistance = 0, float fAircraftMaxHeight = 800, float fAircraftMaxVelocity = 1.5f, bool bOverrideMoonSize = false, int iMoonSize = 3); - ePacketID GetPacketID(void) const { return PACKET_ID_MAP_INFO; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_MAP_INFO; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CObjectStartSyncPacket.h b/Server/mods/deathmatch/logic/packets/CObjectStartSyncPacket.h index a769fe17d93..36c7ac074ee 100644 --- a/Server/mods/deathmatch/logic/packets/CObjectStartSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CObjectStartSyncPacket.h @@ -18,8 +18,8 @@ class CObjectStartSyncPacket : public CPacket public: CObjectStartSyncPacket(CObject* pObject) { m_pObject = pObject; }; - ePacketID GetPacketID(void) const { return PACKET_ID_OBJECT_STARTSYNC; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_OBJECT_STARTSYNC; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CObjectStopSyncPacket.h b/Server/mods/deathmatch/logic/packets/CObjectStopSyncPacket.h index d8ca5fa1878..4cb1eb845fc 100644 --- a/Server/mods/deathmatch/logic/packets/CObjectStopSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CObjectStopSyncPacket.h @@ -18,8 +18,8 @@ class CObjectStopSyncPacket : public CPacket public: CObjectStopSyncPacket(CObject* pObject) { m_pObject = pObject; }; - ePacketID GetPacketID(void) const { return PACKET_ID_OBJECT_STOPSYNC; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_OBJECT_STOPSYNC; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const { diff --git a/Server/mods/deathmatch/logic/packets/CObjectSyncPacket.cpp b/Server/mods/deathmatch/logic/packets/CObjectSyncPacket.cpp index e77c31ca651..bb1810d0c46 100644 --- a/Server/mods/deathmatch/logic/packets/CObjectSyncPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CObjectSyncPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CObjectSyncPacket::~CObjectSyncPacket(void) +CObjectSyncPacket::~CObjectSyncPacket() { vector::const_iterator iter = m_Syncs.begin(); for (; iter != m_Syncs.end(); ++iter) diff --git a/Server/mods/deathmatch/logic/packets/CObjectSyncPacket.h b/Server/mods/deathmatch/logic/packets/CObjectSyncPacket.h index 1fde0eef5a3..caeab9fb6c0 100644 --- a/Server/mods/deathmatch/logic/packets/CObjectSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CObjectSyncPacket.h @@ -30,16 +30,16 @@ class CObjectSyncPacket : public CPacket }; public: - ~CObjectSyncPacket(void); + ~CObjectSyncPacket(); - ePacketID GetPacketID(void) const { return PACKET_ID_OBJECT_SYNC; }; - unsigned long GetFlags(void) const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_OBJECT_SYNC; }; + unsigned long GetFlags() const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; - std::vector::const_iterator IterBegin(void) { return m_Syncs.begin(); }; - std::vector::const_iterator IterEnd(void) { return m_Syncs.end(); }; + std::vector::const_iterator IterBegin() { return m_Syncs.begin(); }; + std::vector::const_iterator IterEnd() { return m_Syncs.end(); }; std::vector m_Syncs; }; diff --git a/Server/mods/deathmatch/logic/packets/CPacket.cpp b/Server/mods/deathmatch/logic/packets/CPacket.cpp index 98d91af3073..54dae46ac07 100644 --- a/Server/mods/deathmatch/logic/packets/CPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CPacket.cpp @@ -11,14 +11,14 @@ #include "StdInc.h" -CPacket::CPacket(void) +CPacket::CPacket() { // Init m_pSourceElement = NULL; m_Source = NetServerPlayerID(0, 0); } -CPlayer* CPacket::GetSourcePlayer(void) +CPlayer* CPacket::GetSourcePlayer() { return static_cast(m_pSourceElement); } diff --git a/Server/mods/deathmatch/logic/packets/CPacket.h b/Server/mods/deathmatch/logic/packets/CPacket.h index d107d223a0e..1330fc2f6e2 100644 --- a/Server/mods/deathmatch/logic/packets/CPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPacket.h @@ -33,25 +33,25 @@ enum class CPacket { public: - CPacket(void); - virtual ~CPacket(void){}; + CPacket(); + virtual ~CPacket(){}; - virtual bool RequiresSourcePlayer(void) const { return true; } - virtual bool HasSimHandler(void) const { return false; } - virtual ePacketID GetPacketID(void) const = 0; - virtual ePacketOrdering GetPacketOrdering(void) const { return PACKET_ORDERING_DEFAULT; } - virtual unsigned long GetFlags(void) const = 0; + virtual bool RequiresSourcePlayer() const { return true; } + virtual bool HasSimHandler() const { return false; } + virtual ePacketID GetPacketID() const = 0; + virtual ePacketOrdering GetPacketOrdering() const { return PACKET_ORDERING_DEFAULT; } + virtual unsigned long GetFlags() const = 0; virtual bool Read(NetBitStreamInterface& BitStream) { return false; }; virtual bool Write(NetBitStreamInterface& BitStream) const { return false; }; void SetSourceElement(CElement* pSource) { m_pSourceElement = pSource; }; - CElement* GetSourceElement(void) const { return m_pSourceElement; }; - CPlayer* GetSourcePlayer(void); + CElement* GetSourceElement() const { return m_pSourceElement; }; + CPlayer* GetSourcePlayer(); void SetSourceSocket(const NetServerPlayerID& Source) { m_Source = Source; }; - const NetServerPlayerID& GetSourceSocket(void) const { return m_Source; }; - unsigned long GetSourceIP(void) const { return m_Source.GetBinaryAddress(); }; - unsigned short GetSourcePort(void) const { return m_Source.GetPort(); }; + const NetServerPlayerID& GetSourceSocket() const { return m_Source; }; + unsigned long GetSourceIP() const { return m_Source.GetBinaryAddress(); }; + unsigned short GetSourcePort() const { return m_Source.GetPort(); }; protected: CElement* m_pSourceElement; diff --git a/Server/mods/deathmatch/logic/packets/CPedStartSyncPacket.h b/Server/mods/deathmatch/logic/packets/CPedStartSyncPacket.h index a08e5995d02..520be381419 100644 --- a/Server/mods/deathmatch/logic/packets/CPedStartSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPedStartSyncPacket.h @@ -19,8 +19,8 @@ class CPedStartSyncPacket : public CPacket public: CPedStartSyncPacket(CPed* pPed) { m_pPed = pPed; }; - ePacketID GetPacketID(void) const { return PACKET_ID_PED_STARTSYNC; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PED_STARTSYNC; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CPedStopSyncPacket.h b/Server/mods/deathmatch/logic/packets/CPedStopSyncPacket.h index ec27443e6e9..c028f379c23 100644 --- a/Server/mods/deathmatch/logic/packets/CPedStopSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPedStopSyncPacket.h @@ -18,8 +18,8 @@ class CPedStopSyncPacket : public CPacket public: CPedStopSyncPacket(ElementID ID) { m_ID = ID; }; - ePacketID GetPacketID(void) const { return PACKET_ID_PED_STOPSYNC; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PED_STOPSYNC; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const { diff --git a/Server/mods/deathmatch/logic/packets/CPedSyncPacket.cpp b/Server/mods/deathmatch/logic/packets/CPedSyncPacket.cpp index 22eda45632c..cb255545b15 100644 --- a/Server/mods/deathmatch/logic/packets/CPedSyncPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CPedSyncPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CPedSyncPacket::~CPedSyncPacket(void) +CPedSyncPacket::~CPedSyncPacket() { vector::const_iterator iter = m_Syncs.begin(); for (; iter != m_Syncs.end(); ++iter) diff --git a/Server/mods/deathmatch/logic/packets/CPedSyncPacket.h b/Server/mods/deathmatch/logic/packets/CPedSyncPacket.h index 6c140e58f9a..2002eccea9a 100644 --- a/Server/mods/deathmatch/logic/packets/CPedSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPedSyncPacket.h @@ -34,17 +34,17 @@ class CPedSyncPacket : public CPacket }; public: - CPedSyncPacket(void){}; - ~CPedSyncPacket(void); + CPedSyncPacket(){}; + ~CPedSyncPacket(); - ePacketID GetPacketID(void) const { return PACKET_ID_PED_SYNC; }; - unsigned long GetFlags(void) const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PED_SYNC; }; + unsigned long GetFlags() const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; - std::vector::const_iterator IterBegin(void) { return m_Syncs.begin(); }; - std::vector::const_iterator IterEnd(void) { return m_Syncs.end(); }; + std::vector::const_iterator IterBegin() { return m_Syncs.begin(); }; + std::vector::const_iterator IterEnd() { return m_Syncs.end(); }; std::vector m_Syncs; }; diff --git a/Server/mods/deathmatch/logic/packets/CPedTaskPacket.cpp b/Server/mods/deathmatch/logic/packets/CPedTaskPacket.cpp index 4841c2e1759..3cddb60fdb6 100644 --- a/Server/mods/deathmatch/logic/packets/CPedTaskPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CPedTaskPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" #include "net/SyncStructures.h" -CPedTaskPacket::CPedTaskPacket(void) +CPedTaskPacket::CPedTaskPacket() { m_uiNumBitsInPacketBody = 0; } diff --git a/Server/mods/deathmatch/logic/packets/CPedTaskPacket.h b/Server/mods/deathmatch/logic/packets/CPedTaskPacket.h index 246988664df..bd236971feb 100644 --- a/Server/mods/deathmatch/logic/packets/CPedTaskPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPedTaskPacket.h @@ -12,11 +12,11 @@ class CPedTaskPacket : public CPacket { public: - CPedTaskPacket(void); + CPedTaskPacket(); - bool HasSimHandler(void) const { return true; } - ePacketID GetPacketID(void) const { return PACKET_ID_PED_TASK; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE; }; + bool HasSimHandler() const { return true; } + ePacketID GetPacketID() const { return PACKET_ID_PED_TASK; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CPedWastedPacket.cpp b/Server/mods/deathmatch/logic/packets/CPedWastedPacket.cpp index 2c5669ab563..e77e820e2c6 100644 --- a/Server/mods/deathmatch/logic/packets/CPedWastedPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CPedWastedPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CPedWastedPacket::CPedWastedPacket(void) +CPedWastedPacket::CPedWastedPacket() { m_PedID = INVALID_ELEMENT_ID; m_Killer = INVALID_ELEMENT_ID; diff --git a/Server/mods/deathmatch/logic/packets/CPedWastedPacket.h b/Server/mods/deathmatch/logic/packets/CPedWastedPacket.h index b331b3910bd..a0eadf4ddc9 100644 --- a/Server/mods/deathmatch/logic/packets/CPedWastedPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPedWastedPacket.h @@ -21,12 +21,12 @@ typedef unsigned long AnimationId; class CPedWastedPacket : public CPacket { public: - CPedWastedPacket(void); + CPedWastedPacket(); CPedWastedPacket(CPed* pPed, CElement* pKiller, unsigned char ucKillerWeapon, unsigned char ucBodyPart, bool bStealth, AssocGroupId animGroup = 0, AnimationId animID = 15); - ePacketID GetPacketID(void) const { return PACKET_ID_PED_WASTED; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PED_WASTED; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CPickupHideShowPacket.h b/Server/mods/deathmatch/logic/packets/CPickupHideShowPacket.h index e10590032c8..573e1d63f0a 100644 --- a/Server/mods/deathmatch/logic/packets/CPickupHideShowPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPickupHideShowPacket.h @@ -19,17 +19,17 @@ class CPickupHideShowPacket : public CPacket public: CPickupHideShowPacket(bool bShow) { m_bShow = bShow; }; - ePacketID GetPacketID(void) const { return PACKET_ID_PICKUP_HIDESHOW; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PICKUP_HIDESHOW; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; - bool GetShow(void) { return m_bShow; }; + bool GetShow() { return m_bShow; }; void SetShow(bool bShow) { m_bShow = bShow; }; void Add(class CPickup* pPickup) { m_List.push_back(pPickup); }; - void Clear(void) { m_List.clear(); }; - unsigned int Count(void) { return static_cast(m_List.size()); }; + void Clear() { m_List.clear(); }; + unsigned int Count() { return static_cast(m_List.size()); }; private: bool m_bShow; diff --git a/Server/mods/deathmatch/logic/packets/CPickupHitConfirmPacket.h b/Server/mods/deathmatch/logic/packets/CPickupHitConfirmPacket.h index 826adb18d36..5fdd5d898a9 100644 --- a/Server/mods/deathmatch/logic/packets/CPickupHitConfirmPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPickupHitConfirmPacket.h @@ -22,8 +22,8 @@ class CPickupHitConfirmPacket : public CPacket m_bPlaySound = bPlaySound; }; - ePacketID GetPacketID(void) const { return PACKET_ID_PICKUP_HIT_CONFIRM; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PICKUP_HIT_CONFIRM; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerACInfoPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerACInfoPacket.h index 60c96a5848d..07808d8b4c0 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerACInfoPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerACInfoPacket.h @@ -13,8 +13,8 @@ class CPlayerACInfoPacket : public CPacket { public: - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_ACINFO; }; - unsigned long GetFlags(void) const { return 0; }; // Not used + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_ACINFO; }; + unsigned long GetFlags() const { return 0; }; // Not used bool Read(NetBitStreamInterface& BitStream); diff --git a/Server/mods/deathmatch/logic/packets/CPlayerChangeNickPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerChangeNickPacket.h index 50cd48a669c..e07d1eec191 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerChangeNickPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerChangeNickPacket.h @@ -19,12 +19,12 @@ class CPlayerChangeNickPacket : public CPacket public: explicit CPlayerChangeNickPacket(const char* szNewNick); - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_CHANGE_NICK; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_CHANGE_NICK; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; - const char* GetNewNick(void) { return m_strNewNick; } + const char* GetNewNick() { return m_strNewNick; } void SetNewNick(const char* szNewNick) { m_strNewNick.AssignLeft(szNewNick, MAX_PLAYER_NICK_LENGTH); } private: diff --git a/Server/mods/deathmatch/logic/packets/CPlayerClothesPacket.cpp b/Server/mods/deathmatch/logic/packets/CPlayerClothesPacket.cpp index e82a4db3ead..b2e718a97d9 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerClothesPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CPlayerClothesPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CPlayerClothesPacket::~CPlayerClothesPacket(void) +CPlayerClothesPacket::~CPlayerClothesPacket() { vector::iterator iter = m_List.begin(); for (; iter != m_List.end(); ++iter) diff --git a/Server/mods/deathmatch/logic/packets/CPlayerClothesPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerClothesPacket.h index c8bfd033b96..6a9ba509a07 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerClothesPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerClothesPacket.h @@ -24,16 +24,16 @@ struct SPlayerClothes class CPlayerClothesPacket : public CPacket { public: - ~CPlayerClothesPacket(void); + ~CPlayerClothesPacket(); - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_CLOTHES; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_CLOTHES; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; void Add(const char* szTexture, const char* szModel, unsigned char ucType); void Add(CPlayerClothes* pClothes); - unsigned int Count(void) { return static_cast(m_List.size()); } + unsigned int Count() { return static_cast(m_List.size()); } private: vector m_List; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerConnectCompletePacket.h b/Server/mods/deathmatch/logic/packets/CPlayerConnectCompletePacket.h index 6ba917f2e4e..32a9aebd240 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerConnectCompletePacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerConnectCompletePacket.h @@ -16,8 +16,8 @@ class CPlayerConnectCompletePacket : public CPacket { public: - ePacketID GetPacketID(void) const { return static_cast(PACKET_ID_SERVER_JOIN_COMPLETE); }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return static_cast(PACKET_ID_SERVER_JOIN_COMPLETE); }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; }; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerDiagnosticPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerDiagnosticPacket.h index 02fcdb78053..29d03b7d922 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerDiagnosticPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerDiagnosticPacket.h @@ -14,8 +14,8 @@ class CPlayerDiagnosticPacket : public CPacket { public: - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_DIAGNOSTIC; }; - unsigned long GetFlags(void) const { return 0; }; // Not used + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_DIAGNOSTIC; }; + unsigned long GetFlags() const { return 0; }; // Not used bool Read(NetBitStreamInterface& BitStream); diff --git a/Server/mods/deathmatch/logic/packets/CPlayerDisconnectedPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerDisconnectedPacket.h index c82c1f49320..a7f2c7a4a75 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerDisconnectedPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerDisconnectedPacket.h @@ -46,12 +46,12 @@ class CPlayerDisconnectedPacket : public CPacket CPlayerDisconnectedPacket(CPlayerDisconnectedPacket::ePlayerDisconnectType eType, const char* szReason = ""); CPlayerDisconnectedPacket(CPlayerDisconnectedPacket::ePlayerDisconnectType eType, time_t BanDuration = 0, const char* szReason = ""); - ePacketID GetPacketID(void) const { return PACKET_ID_SERVER_DISCONNECTED; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_SERVER_DISCONNECTED; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; - const char* GetReason(void) { return m_strReason; } + const char* GetReason() { return m_strReason; } void SetReason(const char* szReason) { m_strReason = szReason; } private: diff --git a/Server/mods/deathmatch/logic/packets/CPlayerJoinCompletePacket.cpp b/Server/mods/deathmatch/logic/packets/CPlayerJoinCompletePacket.cpp index 68622b0a87d..9ac23f45033 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerJoinCompletePacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CPlayerJoinCompletePacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CPlayerJoinCompletePacket::CPlayerJoinCompletePacket(void) +CPlayerJoinCompletePacket::CPlayerJoinCompletePacket() { m_PlayerID = INVALID_ELEMENT_ID; m_ucNumberOfPlayers = 0; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerJoinCompletePacket.h b/Server/mods/deathmatch/logic/packets/CPlayerJoinCompletePacket.h index d4fe2ac9eef..7ff8ca2a8ce 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerJoinCompletePacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerJoinCompletePacket.h @@ -18,13 +18,13 @@ class CPlayerJoinCompletePacket : public CPacket { public: - CPlayerJoinCompletePacket(void); + CPlayerJoinCompletePacket(); CPlayerJoinCompletePacket(ElementID PlayerID, unsigned char ucNumberOfPlayers, ElementID RootElementID, eHTTPDownloadType ucHTTPDownloadType, unsigned short usHTTPDownloadPort, const char* szHTTPDownloadURL, int iHTTPMaxConnectionsPerClient, int iEnableClientChecks, bool bVoiceEnabled, unsigned char ucSampleRate, unsigned char ucVoiceQuality, unsigned int uiBitrate); - ePacketID GetPacketID(void) const { return PACKET_ID_SERVER_JOINEDGAME; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_SERVER_JOINEDGAME; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerJoinDataPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerJoinDataPacket.h index cab4b777a5d..085a8f0303d 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerJoinDataPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerJoinDataPacket.h @@ -17,32 +17,32 @@ class CPlayerJoinDataPacket : public CPacket { public: - virtual bool RequiresSourcePlayer(void) const { return false; } - ePacketID GetPacketID(void) const { return static_cast(PACKET_ID_PLAYER_JOINDATA); }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + virtual bool RequiresSourcePlayer() const { return false; } + ePacketID GetPacketID() const { return static_cast(PACKET_ID_PLAYER_JOINDATA); }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); - unsigned short GetNetVersion(void) { return m_usNetVersion; }; - unsigned char GetGameVersion(void) { return m_ucGameVersion; }; + unsigned short GetNetVersion() { return m_usNetVersion; }; + unsigned char GetGameVersion() { return m_ucGameVersion; }; void SetNetVersion(unsigned short usNetVersion) { m_usNetVersion = usNetVersion; }; void SetGameVersion(unsigned char ucGameVersion) { m_ucGameVersion = ucGameVersion; }; - unsigned short GetMTAVersion(void) { return m_usMTAVersion; }; - unsigned short GetBitStreamVersion(void) { return m_usBitStreamVersion; }; - const SString& GetPlayerVersion(void) { return m_strPlayerVersion; }; + unsigned short GetMTAVersion() { return m_usMTAVersion; }; + unsigned short GetBitStreamVersion() { return m_usBitStreamVersion; }; + const SString& GetPlayerVersion() { return m_strPlayerVersion; }; - const char* GetNick(void) { return m_strNick; }; + const char* GetNick() { return m_strNick; }; void SetNick(const char* szNick) { m_strNick.AssignLeft(szNick, MAX_PLAYER_NICK_LENGTH); }; - const MD5& GetPassword(void) { return m_Password; }; + const MD5& GetPassword() { return m_Password; }; void SetPassword(const MD5& Password) { m_Password = Password; }; - const char* GetSerialUser(void) { return m_strSerialUser; } + const char* GetSerialUser() { return m_strSerialUser; } void SetSerialUser(const char* szSerialUser) { m_strSerialUser.AssignLeft(szSerialUser, MAX_SERIAL_LENGTH); } - bool IsOptionalUpdateInfoRequired(void) { return m_bOptionalUpdateInfoRequired; } + bool IsOptionalUpdateInfoRequired() { return m_bOptionalUpdateInfoRequired; } private: unsigned short m_usNetVersion; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerJoinPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerJoinPacket.h index 62b1a7e1474..39941dc7f34 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerJoinPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerJoinPacket.h @@ -16,9 +16,9 @@ class CPlayerJoinPacket : public CPacket { public: - virtual bool RequiresSourcePlayer(void) const { return false; } - ePacketID GetPacketID(void) const { return static_cast(PACKET_ID_PLAYER_JOIN); }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + virtual bool RequiresSourcePlayer() const { return false; } + ePacketID GetPacketID() const { return static_cast(PACKET_ID_PLAYER_JOIN); }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream) { return true; }; }; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerListPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerListPacket.h index fa5791ac54d..4f25d1a468a 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerListPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerListPacket.h @@ -17,16 +17,16 @@ class CPlayerListPacket : public CPacket { public: - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_LIST; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_LIST; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; void AddPlayer(CPlayer* pPlayer) { m_List.push_back(pPlayer); }; void RemovePlayer(CPlayer* pPlayer) { m_List.remove(pPlayer); }; - void RemoveAllPlayers(void) { m_List.clear(); }; + void RemoveAllPlayers() { m_List.clear(); }; - bool GetShowInChat(void) { return m_bShowInChat; }; + bool GetShowInChat() { return m_bShowInChat; }; void SetShowInChat(bool bShowInChat) { m_bShowInChat = bShowInChat; }; private: diff --git a/Server/mods/deathmatch/logic/packets/CPlayerModInfoPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerModInfoPacket.h index ccff0442427..468333ece94 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerModInfoPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerModInfoPacket.h @@ -29,8 +29,8 @@ struct SModInfoItem class CPlayerModInfoPacket : public CPacket { public: - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_MODINFO; }; - unsigned long GetFlags(void) const { return 0; }; // Not used + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_MODINFO; }; + unsigned long GetFlags() const { return 0; }; // Not used bool Read(NetBitStreamInterface& BitStream); diff --git a/Server/mods/deathmatch/logic/packets/CPlayerNetworkStatusPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerNetworkStatusPacket.h index 8e74e94c728..bebce682aac 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerNetworkStatusPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerNetworkStatusPacket.h @@ -12,9 +12,9 @@ class CPlayerNetworkStatusPacket : public CPacket { public: - virtual bool RequiresSourcePlayer(void) const { return true; } - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_NETWORK_STATUS; }; - unsigned long GetFlags(void) const + virtual bool RequiresSourcePlayer() const { return true; } + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_NETWORK_STATUS; }; + unsigned long GetFlags() const { assert(0); return 0; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerNoSocketPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerNoSocketPacket.h index 910324f1db5..b5de4d49743 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerNoSocketPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerNoSocketPacket.h @@ -12,9 +12,9 @@ class CPlayerNoSocketPacket : public CPacket { public: - virtual bool RequiresSourcePlayer(void) const { return true; } - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_NO_SOCKET; }; - unsigned long GetFlags(void) const + virtual bool RequiresSourcePlayer() const { return true; } + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_NO_SOCKET; }; + unsigned long GetFlags() const { assert(0); return 0; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.h index 21f2a0050fc..b6935d3f8fb 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.h @@ -17,12 +17,12 @@ class CPlayerPuresyncPacket : public CPacket { public: - CPlayerPuresyncPacket(void){}; + CPlayerPuresyncPacket(){}; explicit CPlayerPuresyncPacket(CPlayer* pPlayer) { m_pSourceElement = pPlayer; }; - bool HasSimHandler(void) const { return true; } - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_PURESYNC; }; - unsigned long GetFlags(void) const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; + bool HasSimHandler() const { return true; } + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_PURESYNC; }; + unsigned long GetFlags() const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerQuitPacket.cpp b/Server/mods/deathmatch/logic/packets/CPlayerQuitPacket.cpp index 834ab39a1f9..ca25b300551 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerQuitPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CPlayerQuitPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CPlayerQuitPacket::CPlayerQuitPacket(void) +CPlayerQuitPacket::CPlayerQuitPacket() { m_PlayerID = INVALID_ELEMENT_ID; m_ucQuitReason = 0; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerQuitPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerQuitPacket.h index 997372eb461..b91e80f125b 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerQuitPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerQuitPacket.h @@ -16,18 +16,18 @@ class CPlayerQuitPacket : public CPacket { public: - CPlayerQuitPacket(void); + CPlayerQuitPacket(); - ePacketID GetPacketID(void) const { return static_cast(PACKET_ID_PLAYER_QUIT); }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return static_cast(PACKET_ID_PLAYER_QUIT); }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream) { return true; }; bool Write(NetBitStreamInterface& BitStream) const; - ElementID GetPlayer(void) { return m_PlayerID; }; + ElementID GetPlayer() { return m_PlayerID; }; void SetPlayer(ElementID PlayerID) { m_PlayerID = PlayerID; }; - unsigned char GetQuitReason(void) { return m_ucQuitReason; } + unsigned char GetQuitReason() { return m_ucQuitReason; } void SetQuitReason(unsigned char ucQuitReason) { m_ucQuitReason = ucQuitReason; } private: diff --git a/Server/mods/deathmatch/logic/packets/CPlayerScreenShotPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerScreenShotPacket.h index 47ec8c66604..5a07da5bb5b 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerScreenShotPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerScreenShotPacket.h @@ -13,8 +13,8 @@ class CPlayerScreenShotPacket : public CPacket { public: - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_SCREENSHOT; }; - unsigned long GetFlags(void) const { return 0; }; // Not used + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_SCREENSHOT; }; + unsigned long GetFlags() const { return 0; }; // Not used bool Read(NetBitStreamInterface& BitStream); diff --git a/Server/mods/deathmatch/logic/packets/CPlayerSpawnPacket.cpp b/Server/mods/deathmatch/logic/packets/CPlayerSpawnPacket.cpp index fdcc4244e14..cf524ff7e5c 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerSpawnPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CPlayerSpawnPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CPlayerSpawnPacket::CPlayerSpawnPacket(void) +CPlayerSpawnPacket::CPlayerSpawnPacket() { m_PlayerID = INVALID_ELEMENT_ID; m_fSpawnRotation = 0; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerSpawnPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerSpawnPacket.h index 6bc7dc9093f..875528d764d 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerSpawnPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerSpawnPacket.h @@ -17,22 +17,22 @@ class CPlayerSpawnPacket : public CPacket { public: - CPlayerSpawnPacket(void); + CPlayerSpawnPacket(); CPlayerSpawnPacket(ElementID PlayerID, const CVector& vecSpawnPosition, float fSpawnRotation, unsigned short usPlayerSkin, unsigned char ucInterior, unsigned short usDimension, ElementID Team, unsigned char ucTimeContext); - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_SPAWN; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_SPAWN; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; - ElementID GetPlayer(void) { return m_PlayerID; }; - CVector& GetSpawnPosition(void) { return m_vecSpawnPosition; }; - float GetSpawnRotation(void) { return m_fSpawnRotation; }; - unsigned short GetPlayerSkin(void) { return m_usPlayerSkin; }; - ElementID GetTeam(void) { return m_Team; } - unsigned char GetInterior(void) { return m_ucInterior; } - unsigned short GetDimension(void) { return m_usDimension; } + ElementID GetPlayer() { return m_PlayerID; }; + CVector& GetSpawnPosition() { return m_vecSpawnPosition; }; + float GetSpawnRotation() { return m_fSpawnRotation; }; + unsigned short GetPlayerSkin() { return m_usPlayerSkin; }; + ElementID GetTeam() { return m_Team; } + unsigned char GetInterior() { return m_ucInterior; } + unsigned short GetDimension() { return m_usDimension; } void SetPlayer(ElementID PlayerID) { m_PlayerID = PlayerID; }; void SetSpawnPosition(CVector& vecPosition) { m_vecSpawnPosition = vecPosition; }; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerStatsPacket.cpp b/Server/mods/deathmatch/logic/packets/CPlayerStatsPacket.cpp index 262605e3922..3cac48332a2 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerStatsPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CPlayerStatsPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CPlayerStatsPacket::~CPlayerStatsPacket(void) +CPlayerStatsPacket::~CPlayerStatsPacket() { Clear(); } @@ -74,7 +74,7 @@ void CPlayerStatsPacket::Remove(unsigned short usID, float fValue) m_List.erase(iter); } } -void CPlayerStatsPacket::Clear(void) +void CPlayerStatsPacket::Clear() { m_List.clear(); } \ No newline at end of file diff --git a/Server/mods/deathmatch/logic/packets/CPlayerStatsPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerStatsPacket.h index 17b68ca87d9..fe02412ccf6 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerStatsPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerStatsPacket.h @@ -24,18 +24,18 @@ struct sPlayerStat class CPlayerStatsPacket : public CPacket { public: - ~CPlayerStatsPacket(void); + ~CPlayerStatsPacket(); - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_STATS; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_STATS; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; void Add(unsigned short usID, float fValue); void Remove(unsigned short usID, float fValue); - void Clear(void); + void Clear(); - int GetSize(void) { return m_List.size(); } + int GetSize() { return m_List.size(); } private: map m_List; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerTimeoutPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerTimeoutPacket.h index 773d2682759..443d992182c 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerTimeoutPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerTimeoutPacket.h @@ -16,8 +16,8 @@ class CPlayerTimeoutPacket : public CPacket { public: - ePacketID GetPacketID(void) const { return static_cast(PACKET_ID_PLAYER_TIMEOUT); }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return static_cast(PACKET_ID_PLAYER_TIMEOUT); }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream) { return true; }; bool Write(NetBitStreamInterface& BitStream) const { return true; }; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerTransgressionPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerTransgressionPacket.h index 1c6389809d2..0d92f0d0b66 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerTransgressionPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerTransgressionPacket.h @@ -14,8 +14,8 @@ class CPlayerTransgressionPacket : public CPacket { public: - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_TRANSGRESSION; }; - unsigned long GetFlags(void) const { return 0; }; // Not used + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_TRANSGRESSION; }; + unsigned long GetFlags() const { return 0; }; // Not used bool Read(NetBitStreamInterface& BitStream); diff --git a/Server/mods/deathmatch/logic/packets/CPlayerWastedPacket.cpp b/Server/mods/deathmatch/logic/packets/CPlayerWastedPacket.cpp index 118761454e0..47ea250fad8 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerWastedPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CPlayerWastedPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CPlayerWastedPacket::CPlayerWastedPacket(void) +CPlayerWastedPacket::CPlayerWastedPacket() { m_PlayerID = INVALID_ELEMENT_ID; m_Killer = INVALID_ELEMENT_ID; diff --git a/Server/mods/deathmatch/logic/packets/CPlayerWastedPacket.h b/Server/mods/deathmatch/logic/packets/CPlayerWastedPacket.h index f721b02fae1..d2f08150e0a 100644 --- a/Server/mods/deathmatch/logic/packets/CPlayerWastedPacket.h +++ b/Server/mods/deathmatch/logic/packets/CPlayerWastedPacket.h @@ -21,12 +21,12 @@ typedef unsigned long AnimationId; class CPlayerWastedPacket : public CPacket { public: - CPlayerWastedPacket(void); + CPlayerWastedPacket(); CPlayerWastedPacket(CPed* pPed, CElement* pKiller, unsigned char ucKillerWeapon, unsigned char ucBodyPart, bool bStealth, AssocGroupId animGroup = 0, AnimationId animID = 15); - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_WASTED; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_WASTED; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CProjectileSyncPacket.cpp b/Server/mods/deathmatch/logic/packets/CProjectileSyncPacket.cpp index 5e93ff1bb65..830ff8dd36c 100644 --- a/Server/mods/deathmatch/logic/packets/CProjectileSyncPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CProjectileSyncPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CProjectileSyncPacket::CProjectileSyncPacket(void) +CProjectileSyncPacket::CProjectileSyncPacket() { m_usModel = 0; } diff --git a/Server/mods/deathmatch/logic/packets/CProjectileSyncPacket.h b/Server/mods/deathmatch/logic/packets/CProjectileSyncPacket.h index d619bc17ef8..abcd9723e51 100644 --- a/Server/mods/deathmatch/logic/packets/CProjectileSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CProjectileSyncPacket.h @@ -17,10 +17,10 @@ class CProjectileSyncPacket : public CPacket { public: - CProjectileSyncPacket(void); + CProjectileSyncPacket(); - ePacketID GetPacketID(void) const { return PACKET_ID_PROJECTILE; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_PROJECTILE; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CResourceClientScriptsPacket.h b/Server/mods/deathmatch/logic/packets/CResourceClientScriptsPacket.h index a1d94c0429b..e38516b5ace 100644 --- a/Server/mods/deathmatch/logic/packets/CResourceClientScriptsPacket.h +++ b/Server/mods/deathmatch/logic/packets/CResourceClientScriptsPacket.h @@ -20,8 +20,8 @@ class CResourceClientScriptsPacket : public CPacket public: CResourceClientScriptsPacket(CResource* pResource); - ePacketID GetPacketID(void) const { return PACKET_ID_RESOURCE_CLIENT_SCRIPTS; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_RESOURCE_CLIENT_SCRIPTS; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; void AddItem(CResourceClientScriptItem* pItem); diff --git a/Server/mods/deathmatch/logic/packets/CResourceStartPacket.h b/Server/mods/deathmatch/logic/packets/CResourceStartPacket.h index 905897785e1..01a24b21819 100644 --- a/Server/mods/deathmatch/logic/packets/CResourceStartPacket.h +++ b/Server/mods/deathmatch/logic/packets/CResourceStartPacket.h @@ -20,8 +20,8 @@ class CResourceStartPacket : public CPacket public: CResourceStartPacket(const char* szResourceName, class CResource* pResource); - ePacketID GetPacketID(void) const { return PACKET_ID_RESOURCE_START; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_RESOURCE_START; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CResourceStopPacket.h b/Server/mods/deathmatch/logic/packets/CResourceStopPacket.h index ec86b6108b4..550648c3bd0 100644 --- a/Server/mods/deathmatch/logic/packets/CResourceStopPacket.h +++ b/Server/mods/deathmatch/logic/packets/CResourceStopPacket.h @@ -18,8 +18,8 @@ class CResourceStopPacket : public CPacket public: CResourceStopPacket(unsigned short usID); - ePacketID GetPacketID(void) const { return PACKET_ID_RESOURCE_STOP; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_RESOURCE_STOP; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CReturnSyncPacket.h b/Server/mods/deathmatch/logic/packets/CReturnSyncPacket.h index a39123ca2c9..bfa0949e3e9 100644 --- a/Server/mods/deathmatch/logic/packets/CReturnSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CReturnSyncPacket.h @@ -18,8 +18,8 @@ class CReturnSyncPacket : public CPacket public: CReturnSyncPacket(class CPlayer* pPlayer); - ePacketID GetPacketID(void) const { return PACKET_ID_RETURN_SYNC; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE; }; + ePacketID GetPacketID() const { return PACKET_ID_RETURN_SYNC; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE; }; bool Write(NetBitStreamInterface& BitStream) const; }; diff --git a/Server/mods/deathmatch/logic/packets/CServerTextItemPacket.h b/Server/mods/deathmatch/logic/packets/CServerTextItemPacket.h index 109483f7a4f..fb2af2cd2b2 100644 --- a/Server/mods/deathmatch/logic/packets/CServerTextItemPacket.h +++ b/Server/mods/deathmatch/logic/packets/CServerTextItemPacket.h @@ -19,8 +19,8 @@ class CServerTextItemPacket : public CPacket CServerTextItemPacket(unsigned long ulUniqueId, bool bDeleteable, float fX, float fY, float fScale, const SColor color, unsigned char format, unsigned char ucShadowAlpha, const char* szText); - ePacketID GetPacketID(void) const { return PACKET_ID_TEXT_ITEM; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_TEXT_ITEM; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.h b/Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.h index e683c814f64..59a2886efeb 100644 --- a/Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.h +++ b/Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.h @@ -12,13 +12,13 @@ class CSyncSettingsPacket : public CPacket { public: - CSyncSettingsPacket(void){}; + CSyncSettingsPacket(){}; CSyncSettingsPacket(const std::set& weaponTypesUsingBulletSync, uchar ucVehExtrapolateEnabled, short sVehExtrapolateBaseMs, short sVehExtrapolatePercent, short sVehExtrapolateMaxMs, uchar ucUseAltPulseOrder, uchar ucAllowFastSprintFix, uchar ucAllowDrivebyAnimationFix, uchar ucAllowShotgunDamageFix); - ePacketID GetPacketID(void) const { return PACKET_ID_SYNC_SETTINGS; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_SYNC_SETTINGS; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CUnoccupiedVehiclePushPacket.h b/Server/mods/deathmatch/logic/packets/CUnoccupiedVehiclePushPacket.h index f853d1bdde2..f6ff0f6f0c1 100644 --- a/Server/mods/deathmatch/logic/packets/CUnoccupiedVehiclePushPacket.h +++ b/Server/mods/deathmatch/logic/packets/CUnoccupiedVehiclePushPacket.h @@ -17,10 +17,10 @@ class CVehicle; class CUnoccupiedVehiclePushPacket : public CPacket { public: - CUnoccupiedVehiclePushPacket(void){}; + CUnoccupiedVehiclePushPacket(){}; - ePacketID GetPacketID(void) const { return PACKET_ID_VEHICLE_PUSH_SYNC; }; - unsigned long GetFlags(void) const { return 0; }; // Not used + ePacketID GetPacketID() const { return PACKET_ID_VEHICLE_PUSH_SYNC; }; + unsigned long GetFlags() const { return 0; }; // Not used bool Read(NetBitStreamInterface& BitStream); diff --git a/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleStartSyncPacket.h b/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleStartSyncPacket.h index d17691f9863..77c5ce7f2fb 100644 --- a/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleStartSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleStartSyncPacket.h @@ -19,8 +19,8 @@ class CUnoccupiedVehicleStartSyncPacket : public CPacket public: CUnoccupiedVehicleStartSyncPacket(CVehicle* pVehicle) { m_pVehicle = pVehicle; }; - ePacketID GetPacketID(void) const { return PACKET_ID_UNOCCUPIED_VEHICLE_STARTSYNC; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_UNOCCUPIED_VEHICLE_STARTSYNC; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleStopSyncPacket.h b/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleStopSyncPacket.h index be7c2d0f3ab..776b3416d02 100644 --- a/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleStopSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleStopSyncPacket.h @@ -18,8 +18,8 @@ class CUnoccupiedVehicleStopSyncPacket : public CPacket public: CUnoccupiedVehicleStopSyncPacket(ElementID ID) { m_ID = ID; }; - ePacketID GetPacketID(void) const { return PACKET_ID_UNOCCUPIED_VEHICLE_STOPSYNC; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_UNOCCUPIED_VEHICLE_STOPSYNC; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const { diff --git a/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleSyncPacket.cpp b/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleSyncPacket.cpp index fe861348705..fb07d547dd6 100644 --- a/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleSyncPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleSyncPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CUnoccupiedVehicleSyncPacket::~CUnoccupiedVehicleSyncPacket(void) +CUnoccupiedVehicleSyncPacket::~CUnoccupiedVehicleSyncPacket() { m_Syncs.clear(); } diff --git a/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleSyncPacket.h b/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleSyncPacket.h index 366882eb8d4..686a4215724 100644 --- a/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CUnoccupiedVehicleSyncPacket.h @@ -26,17 +26,17 @@ class CUnoccupiedVehicleSyncPacket : public CPacket }; public: - CUnoccupiedVehicleSyncPacket(void){}; - ~CUnoccupiedVehicleSyncPacket(void); + CUnoccupiedVehicleSyncPacket(){}; + ~CUnoccupiedVehicleSyncPacket(); - ePacketID GetPacketID(void) const { return PACKET_ID_UNOCCUPIED_VEHICLE_SYNC; }; - unsigned long GetFlags(void) const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_UNOCCUPIED_VEHICLE_SYNC; }; + unsigned long GetFlags() const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; - std::vector::iterator IterBegin(void) { return m_Syncs.begin(); }; - std::vector::iterator IterEnd(void) { return m_Syncs.end(); }; + std::vector::iterator IterBegin() { return m_Syncs.begin(); }; + std::vector::iterator IterEnd() { return m_Syncs.end(); }; std::vector m_Syncs; }; diff --git a/Server/mods/deathmatch/logic/packets/CUpdateInfoPacket.cpp b/Server/mods/deathmatch/logic/packets/CUpdateInfoPacket.cpp index 9ab3dfb1049..891c1bee241 100644 --- a/Server/mods/deathmatch/logic/packets/CUpdateInfoPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CUpdateInfoPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CUpdateInfoPacket::CUpdateInfoPacket(void) +CUpdateInfoPacket::CUpdateInfoPacket() { } diff --git a/Server/mods/deathmatch/logic/packets/CUpdateInfoPacket.h b/Server/mods/deathmatch/logic/packets/CUpdateInfoPacket.h index a13fd1e71b7..c7dc0b24980 100644 --- a/Server/mods/deathmatch/logic/packets/CUpdateInfoPacket.h +++ b/Server/mods/deathmatch/logic/packets/CUpdateInfoPacket.h @@ -14,11 +14,11 @@ class CUpdateInfoPacket : public CPacket { public: - CUpdateInfoPacket(void); + CUpdateInfoPacket(); CUpdateInfoPacket(const SString& m_strType, const SString& strData); - ePacketID GetPacketID(void) const { return PACKET_ID_UPDATE_INFO; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_UPDATE_INFO; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CVehicleDamageSyncPacket.h b/Server/mods/deathmatch/logic/packets/CVehicleDamageSyncPacket.h index 5ae5091e2f5..d79bf53c6f5 100644 --- a/Server/mods/deathmatch/logic/packets/CVehicleDamageSyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CVehicleDamageSyncPacket.h @@ -20,8 +20,8 @@ class CVehicleDamageSyncPacket : public CPacket public: CVehicleDamageSyncPacket(); - ePacketID GetPacketID(void) const { return PACKET_ID_VEHICLE_DAMAGE_SYNC; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_VEHICLE_DAMAGE_SYNC; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CVehicleInOutPacket.cpp b/Server/mods/deathmatch/logic/packets/CVehicleInOutPacket.cpp index 0bf6990cf9f..c7cfd23dbe5 100644 --- a/Server/mods/deathmatch/logic/packets/CVehicleInOutPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CVehicleInOutPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CVehicleInOutPacket::CVehicleInOutPacket(void) +CVehicleInOutPacket::CVehicleInOutPacket() { m_ID = INVALID_ELEMENT_ID; m_ucSeat = 0; @@ -58,7 +58,7 @@ CVehicleInOutPacket::CVehicleInOutPacket(ElementID ID, unsigned char ucSeat, uns m_ucDoor = 0; } -CVehicleInOutPacket::~CVehicleInOutPacket(void) +CVehicleInOutPacket::~CVehicleInOutPacket() { if (m_pCorrectVector) { diff --git a/Server/mods/deathmatch/logic/packets/CVehicleInOutPacket.h b/Server/mods/deathmatch/logic/packets/CVehicleInOutPacket.h index 2cf07fbbcd7..19b39f056cc 100644 --- a/Server/mods/deathmatch/logic/packets/CVehicleInOutPacket.h +++ b/Server/mods/deathmatch/logic/packets/CVehicleInOutPacket.h @@ -17,27 +17,27 @@ class CVehicleInOutPacket : public CPacket { public: - CVehicleInOutPacket(void); + CVehicleInOutPacket(); CVehicleInOutPacket(ElementID ID, unsigned char ucSeat, unsigned char ucAction); CVehicleInOutPacket(ElementID ID, unsigned char ucSeat, unsigned char ucAction, unsigned char ucDoor); CVehicleInOutPacket(ElementID ID, unsigned char ucSeat, unsigned char ucAction, ElementID PlayerIn, ElementID PlayerOut); - virtual ~CVehicleInOutPacket(void); + virtual ~CVehicleInOutPacket(); - ePacketID GetPacketID(void) const { return PACKET_ID_VEHICLE_INOUT; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_VEHICLE_INOUT; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; - unsigned char GetDoor(void) { return m_ucDoor; }; - bool GetOnWater(void) { return m_bOnWater; }; - ElementID GetID(void) { return m_ID; }; - unsigned char GetSeat(void) { return m_ucSeat; }; - float GetDoorAngle(void) { return m_fDoorAngle; } - unsigned char GetAction(void) { return m_ucAction; }; - ElementID GetPlayerIn(void) { return m_PlayerIn; }; - ElementID GetPlayerOut(void) { return m_PlayerOut; }; - unsigned char GetStartedJacking(void) { return m_ucStartedJacking; }; + unsigned char GetDoor() { return m_ucDoor; }; + bool GetOnWater() { return m_bOnWater; }; + ElementID GetID() { return m_ID; }; + unsigned char GetSeat() { return m_ucSeat; }; + float GetDoorAngle() { return m_fDoorAngle; } + unsigned char GetAction() { return m_ucAction; }; + ElementID GetPlayerIn() { return m_PlayerIn; }; + ElementID GetPlayerOut() { return m_PlayerOut; }; + unsigned char GetStartedJacking() { return m_ucStartedJacking; }; void SetID(ElementID ID) { m_ID = ID; }; void SetSeat(unsigned char ucSeat) { m_ucSeat = ucSeat; }; diff --git a/Server/mods/deathmatch/logic/packets/CVehiclePuresyncPacket.h b/Server/mods/deathmatch/logic/packets/CVehiclePuresyncPacket.h index 734c7833a11..8ca1737ef04 100644 --- a/Server/mods/deathmatch/logic/packets/CVehiclePuresyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CVehiclePuresyncPacket.h @@ -20,12 +20,12 @@ class CVehicle; class CVehiclePuresyncPacket : public CPacket { public: - CVehiclePuresyncPacket(void){}; + CVehiclePuresyncPacket(){}; explicit CVehiclePuresyncPacket(class CPlayer* pPlayer) { m_pSourceElement = pPlayer; }; - bool HasSimHandler(void) const { return true; } - ePacketID GetPacketID(void) const { return PACKET_ID_PLAYER_VEHICLE_PURESYNC; }; - unsigned long GetFlags(void) const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; + bool HasSimHandler() const { return true; } + ePacketID GetPacketID() const { return PACKET_ID_PLAYER_VEHICLE_PURESYNC; }; + unsigned long GetFlags() const { return PACKET_MEDIUM_PRIORITY | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CVehicleResyncPacket.h b/Server/mods/deathmatch/logic/packets/CVehicleResyncPacket.h index 75cf6fd2975..3d3d6c22e84 100644 --- a/Server/mods/deathmatch/logic/packets/CVehicleResyncPacket.h +++ b/Server/mods/deathmatch/logic/packets/CVehicleResyncPacket.h @@ -20,8 +20,8 @@ class CVehicleResyncPacket : public CPacket public: explicit CVehicleResyncPacket(CVehicle* pVehicle) { m_pVehicle = pVehicle; }; - ePacketID GetPacketID(void) const { return PACKET_ID_VEHICLE_RESYNC; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_VEHICLE_RESYNC; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CVehicleSpawnPacket.h b/Server/mods/deathmatch/logic/packets/CVehicleSpawnPacket.h index 5e9d1498ec6..227bed2b1e7 100644 --- a/Server/mods/deathmatch/logic/packets/CVehicleSpawnPacket.h +++ b/Server/mods/deathmatch/logic/packets/CVehicleSpawnPacket.h @@ -21,13 +21,13 @@ class CVehicle; class CVehicleSpawnPacket : public CPacket { public: - ePacketID GetPacketID(void) const { return PACKET_ID_VEHICLE_SPAWN; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_VEHICLE_SPAWN; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Write(NetBitStreamInterface& BitStream) const; void Add(CVehicle* pVehicle) { m_List.push_back(pVehicle); }; - void Clear(void) { m_List.clear(); }; + void Clear() { m_List.clear(); }; private: std::vector m_List; diff --git a/Server/mods/deathmatch/logic/packets/CVehicleTrailerPacket.h b/Server/mods/deathmatch/logic/packets/CVehicleTrailerPacket.h index 6187341bad3..8c967adef1c 100644 --- a/Server/mods/deathmatch/logic/packets/CVehicleTrailerPacket.h +++ b/Server/mods/deathmatch/logic/packets/CVehicleTrailerPacket.h @@ -18,21 +18,21 @@ class CVehicleTrailerPacket : public CPacket { public: - CVehicleTrailerPacket(void){}; + CVehicleTrailerPacket(){}; CVehicleTrailerPacket(CVehicle* pVehicle, CVehicle* pTrailer, bool bAttached); - ePacketID GetPacketID(void) const { return PACKET_ID_VEHICLE_TRAILER; }; - unsigned long GetFlags(void) const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; + ePacketID GetPacketID() const { return PACKET_ID_VEHICLE_TRAILER; }; + unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; }; bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; - ElementID GetVehicle(void) { return m_Vehicle; }; - ElementID GetAttachedVehicle(void) { return m_AttachedVehicle; }; - bool GetAttached(void) { return m_bAttached; } - CVector GetPosition(void) { return m_vecPosition; } - CVector GetRotationDegrees(void) { return m_vecRotationDegrees; } - CVector GetTurnSpeed(void) { return m_vecTurnSpeed; } + ElementID GetVehicle() { return m_Vehicle; }; + ElementID GetAttachedVehicle() { return m_AttachedVehicle; }; + bool GetAttached() { return m_bAttached; } + CVector GetPosition() { return m_vecPosition; } + CVector GetRotationDegrees() { return m_vecRotationDegrees; } + CVector GetTurnSpeed() { return m_vecTurnSpeed; } private: ElementID m_Vehicle; diff --git a/Server/mods/deathmatch/logic/packets/CVoiceDataPacket.cpp b/Server/mods/deathmatch/logic/packets/CVoiceDataPacket.cpp index 792a6ba82e8..0d26101feb3 100644 --- a/Server/mods/deathmatch/logic/packets/CVoiceDataPacket.cpp +++ b/Server/mods/deathmatch/logic/packets/CVoiceDataPacket.cpp @@ -11,7 +11,7 @@ #include "StdInc.h" -CVoiceDataPacket::CVoiceDataPacket(void) +CVoiceDataPacket::CVoiceDataPacket() { m_pBuffer = NULL; m_usDataBufferSize = 0; diff --git a/Server/mods/deathmatch/logic/packets/CVoiceDataPacket.h b/Server/mods/deathmatch/logic/packets/CVoiceDataPacket.h index 2f39274193d..64c2342ceaf 100644 --- a/Server/mods/deathmatch/logic/packets/CVoiceDataPacket.h +++ b/Server/mods/deathmatch/logic/packets/CVoiceDataPacket.h @@ -17,12 +17,12 @@ class CVoiceDataPacket : public CPacket { public: CVoiceDataPacket(CPlayer* pPlayer, const unsigned char* pbSrcBuffer, unsigned short usLength); - CVoiceDataPacket(void); + CVoiceDataPacket(); ~CVoiceDataPacket(); - ePacketID GetPacketID(void) const { return PACKET_ID_VOICE_DATA; } - unsigned long GetFlags(void) const { return PACKET_LOW_PRIORITY | PACKET_SEQUENCED; }; - virtual ePacketOrdering GetPacketOrdering(void) const { return PACKET_ORDERING_VOICE; } + ePacketID GetPacketID() const { return PACKET_ID_VOICE_DATA; } + unsigned long GetFlags() const { return PACKET_LOW_PRIORITY | PACKET_SEQUENCED; }; + virtual ePacketOrdering GetPacketOrdering() const { return PACKET_ORDERING_VOICE; } bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; diff --git a/Server/mods/deathmatch/logic/packets/CVoiceEndPacket.h b/Server/mods/deathmatch/logic/packets/CVoiceEndPacket.h index 64d4cd371f8..b86add8ef0c 100644 --- a/Server/mods/deathmatch/logic/packets/CVoiceEndPacket.h +++ b/Server/mods/deathmatch/logic/packets/CVoiceEndPacket.h @@ -19,14 +19,14 @@ class CVoiceEndPacket : public CPacket CVoiceEndPacket(class CPlayer* pPlayer = NULL); ~CVoiceEndPacket(); - ePacketID GetPacketID(void) const { return PACKET_ID_VOICE_END; } - unsigned long GetFlags(void) const { return PACKET_LOW_PRIORITY | PACKET_SEQUENCED; }; - virtual ePacketOrdering GetPacketOrdering(void) const { return PACKET_ORDERING_VOICE; } + ePacketID GetPacketID() const { return PACKET_ID_VOICE_END; } + unsigned long GetFlags() const { return PACKET_LOW_PRIORITY | PACKET_SEQUENCED; }; + virtual ePacketOrdering GetPacketOrdering() const { return PACKET_ORDERING_VOICE; } bool Read(NetBitStreamInterface& BitStream); bool Write(NetBitStreamInterface& BitStream) const; - ElementID GetPlayer(void); + ElementID GetPlayer(); void SetPlayer(ElementID PlayerID); private: diff --git a/Server/mods/deathmatch/utils/CFunctionUseLogger.cpp b/Server/mods/deathmatch/utils/CFunctionUseLogger.cpp index a332af8748a..6567ae059e1 100644 --- a/Server/mods/deathmatch/utils/CFunctionUseLogger.cpp +++ b/Server/mods/deathmatch/utils/CFunctionUseLogger.cpp @@ -22,7 +22,7 @@ CFunctionUseLogger::CFunctionUseLogger(const SString& strLogFilename) // // CFunctionUseLogger::~CFunctionUseLogger // -CFunctionUseLogger::~CFunctionUseLogger(void) +CFunctionUseLogger::~CFunctionUseLogger() { MaybeFlush(true); } @@ -30,7 +30,7 @@ CFunctionUseLogger::~CFunctionUseLogger(void) // // CFunctionUseLogger::Pulse // -void CFunctionUseLogger::Pulse(void) +void CFunctionUseLogger::Pulse() { if (!m_FuncCallRecordMap.empty()) MaybeFlush(); diff --git a/Server/mods/deathmatch/utils/CFunctionUseLogger.h b/Server/mods/deathmatch/utils/CFunctionUseLogger.h index 8f16200bf29..352f51b18f1 100644 --- a/Server/mods/deathmatch/utils/CFunctionUseLogger.h +++ b/Server/mods/deathmatch/utils/CFunctionUseLogger.h @@ -26,9 +26,9 @@ class CFunctionUseLogger ZERO_ON_NEW CFunctionUseLogger(const SString& strLogFilename); - ~CFunctionUseLogger(void); + ~CFunctionUseLogger(); - void Pulse(void); + void Pulse(); void OnFunctionUse(lua_State* luaVM, const char* szFunctionName, const char* szArgs, uint uiArgsSize); protected: diff --git a/Server/mods/deathmatch/utils/CHqComms.h b/Server/mods/deathmatch/utils/CHqComms.h index 065a78ec78f..2ac6245c01f 100644 --- a/Server/mods/deathmatch/utils/CHqComms.h +++ b/Server/mods/deathmatch/utils/CHqComms.h @@ -25,7 +25,7 @@ class CHqComms : public CRefCountable public: ZERO_ON_NEW - CHqComms(void) + CHqComms() { m_iPollInterval = TICKS_FROM_MINUTES(60); m_strURL = HQCOMMS_URL; @@ -36,7 +36,7 @@ class CHqComms : public CRefCountable // // Send query if it's time // - void Pulse(void) + void Pulse() { // Check for min client version info if (m_Stage == HQCOMMS_STAGE_NONE || (m_Stage == HQCOMMS_STAGE_TIMER && m_CheckTimer.Get() > (uint)m_iPollInterval)) @@ -240,10 +240,10 @@ class CHqComms : public CRefCountable // // Get http downloader used for hq comms etc. // - static CNetHTTPDownloadManagerInterface* GetDownloadManager(void) { return g_pNetServer->GetHTTPDownloadManager(EDownloadMode::ASE); } + static CNetHTTPDownloadManagerInterface* GetDownloadManager() { return g_pNetServer->GetHTTPDownloadManager(EDownloadMode::ASE); } protected: - ~CHqComms(void) {} // Must use Release() + ~CHqComms() {} // Must use Release() int m_iPollInterval; int m_iPrevBadFileHashesRev; diff --git a/Server/mods/deathmatch/utils/CMasterServerAnnouncer.h b/Server/mods/deathmatch/utils/CMasterServerAnnouncer.h index 596b891f295..7aa8c38236a 100644 --- a/Server/mods/deathmatch/utils/CMasterServerAnnouncer.h +++ b/Server/mods/deathmatch/utils/CMasterServerAnnouncer.h @@ -46,12 +46,12 @@ class CMasterServer : public CRefCountable } protected: - ~CMasterServer(void) {} // Must use Release() + ~CMasterServer() {} // Must use Release() public: // // Pulse this master server // - void Pulse(void) + void Pulse() { if (m_bStatusBusy) return; @@ -172,12 +172,12 @@ class CMasterServer : public CRefCountable } } - const SMasterServerDefinition& GetDefinition(void) const { return m_Definition; } + const SMasterServerDefinition& GetDefinition() const { return m_Definition; } // // Get http downloader used for master server comms etc. // - static CNetHTTPDownloadManagerInterface* GetDownloadManager(void) { return g_pNetServer->GetHTTPDownloadManager(EDownloadMode::ASE); } + static CNetHTTPDownloadManagerInterface* GetDownloadManager() { return g_pNetServer->GetHTTPDownloadManager(EDownloadMode::ASE); } protected: bool m_bStatusBusy; @@ -200,7 +200,7 @@ class CMasterServerAnnouncer public: ZERO_ON_NEW - ~CMasterServerAnnouncer(void) + ~CMasterServerAnnouncer() { while (!m_MasterServerList.empty()) { @@ -212,7 +212,7 @@ class CMasterServerAnnouncer // // Make list of master servers to contact // - void InitServerList(void) + void InitServerList() { assert(m_MasterServerList.empty()); AddServer(true, true, false, false, 60 * 24, "Querying MTA master server...", QUERY_URL_MTA_MASTER_SERVER); @@ -255,7 +255,7 @@ class CMasterServerAnnouncer // // Pulse each master server in our list // - void Pulse(void) + void Pulse() { if (m_MasterServerList.empty()) InitServerList(); diff --git a/Server/mods/deathmatch/utils/COpenPortsTester.h b/Server/mods/deathmatch/utils/COpenPortsTester.h index 5daae33024b..24722fde4e0 100644 --- a/Server/mods/deathmatch/utils/COpenPortsTester.h +++ b/Server/mods/deathmatch/utils/COpenPortsTester.h @@ -16,7 +16,7 @@ class COpenPortsTester // // Start a new test // - void Start(void) + void Start() { if (m_iPortTestStage != 0) return; @@ -130,7 +130,7 @@ class COpenPortsTester // // Get http downloader used for port testing // - static CNetHTTPDownloadManagerInterface* GetDownloadManager(void) { return g_pNetServer->GetHTTPDownloadManager(EDownloadMode::ASE); } + static CNetHTTPDownloadManagerInterface* GetDownloadManager() { return g_pNetServer->GetHTTPDownloadManager(EDownloadMode::ASE); } protected: int m_iPortTestStage; diff --git a/Server/mods/deathmatch/utils/CZipMaker.cpp b/Server/mods/deathmatch/utils/CZipMaker.cpp index 1b29a02960e..8fec1c6d340 100644 --- a/Server/mods/deathmatch/utils/CZipMaker.cpp +++ b/Server/mods/deathmatch/utils/CZipMaker.cpp @@ -48,7 +48,7 @@ CZipMaker::~CZipMaker() // Returns false if not valid // /////////////////////////////////////////////////////////////// -bool CZipMaker::IsValid(void) +bool CZipMaker::IsValid() { return m_uzFile != NULL; } @@ -60,7 +60,7 @@ bool CZipMaker::IsValid(void) // Returns false if failed // /////////////////////////////////////////////////////////////// -bool CZipMaker::Close(void) +bool CZipMaker::Close() { if (!m_uzFile) return false; diff --git a/Server/mods/deathmatch/utils/CZipMaker.h b/Server/mods/deathmatch/utils/CZipMaker.h index 199f165ac9c..7b7153d2f0d 100644 --- a/Server/mods/deathmatch/utils/CZipMaker.h +++ b/Server/mods/deathmatch/utils/CZipMaker.h @@ -13,10 +13,10 @@ class CZipMaker { public: CZipMaker(const SString& strZipPathFilename); - ~CZipMaker(void); + ~CZipMaker(); - bool IsValid(void); - bool Close(void); + bool IsValid(); + bool Close(); bool InsertFile(const SString& strSrc, const SString& strDest); bool InsertDirectoryTree(const SString& strSrc, const SString& strDest); diff --git a/Server/sdk/core/CExceptionInformation.h b/Server/sdk/core/CExceptionInformation.h index 99f8642c3c4..fd4ef8e9832 100644 --- a/Server/sdk/core/CExceptionInformation.h +++ b/Server/sdk/core/CExceptionInformation.h @@ -14,26 +14,26 @@ class CExceptionInformation { public: - virtual ~CExceptionInformation(void) {} - virtual unsigned int GetCode(void) = 0; - virtual const char* GetModulePathName(void) = 0; - virtual const char* GetModuleBaseName(void) = 0; - virtual uint GetAddressModuleOffset(void) = 0; + virtual ~CExceptionInformation() {} + virtual unsigned int GetCode() = 0; + virtual const char* GetModulePathName() = 0; + virtual const char* GetModuleBaseName() = 0; + virtual uint GetAddressModuleOffset() = 0; - virtual unsigned long GetEAX(void) = 0; - virtual unsigned long GetEBX(void) = 0; - virtual unsigned long GetECX(void) = 0; - virtual unsigned long GetEDX(void) = 0; - virtual unsigned long GetESI(void) = 0; - virtual unsigned long GetEDI(void) = 0; - virtual unsigned long GetEBP(void) = 0; - virtual unsigned long GetESP(void) = 0; - virtual unsigned long GetEIP(void) = 0; - virtual unsigned long GetCS(void) = 0; - virtual unsigned long GetDS(void) = 0; - virtual unsigned long GetES(void) = 0; - virtual unsigned long GetFS(void) = 0; - virtual unsigned long GetGS(void) = 0; - virtual unsigned long GetSS(void) = 0; - virtual unsigned long GetEFlags(void) = 0; + virtual unsigned long GetEAX() = 0; + virtual unsigned long GetEBX() = 0; + virtual unsigned long GetECX() = 0; + virtual unsigned long GetEDX() = 0; + virtual unsigned long GetESI() = 0; + virtual unsigned long GetEDI() = 0; + virtual unsigned long GetEBP() = 0; + virtual unsigned long GetESP() = 0; + virtual unsigned long GetEIP() = 0; + virtual unsigned long GetCS() = 0; + virtual unsigned long GetDS() = 0; + virtual unsigned long GetES() = 0; + virtual unsigned long GetFS() = 0; + virtual unsigned long GetGS() = 0; + virtual unsigned long GetSS() = 0; + virtual unsigned long GetEFlags() = 0; }; diff --git a/Server/sdk/core/CModManager.h b/Server/sdk/core/CModManager.h index d5ee816f7a7..f70eb90bbfe 100644 --- a/Server/sdk/core/CModManager.h +++ b/Server/sdk/core/CModManager.h @@ -16,7 +16,7 @@ class CModManager public: virtual bool RequestLoad(const char* szModName) = 0; - virtual const char* GetServerPath(void) = 0; - virtual const char* GetModPath(void) = 0; + virtual const char* GetServerPath() = 0; + virtual const char* GetModPath() = 0; virtual SString GetAbsolutePath(const char* szRelative) = 0; }; diff --git a/Server/sdk/core/CServerBase.h b/Server/sdk/core/CServerBase.h index ed72b1d710c..aee2517488a 100644 --- a/Server/sdk/core/CServerBase.h +++ b/Server/sdk/core/CServerBase.h @@ -18,13 +18,13 @@ class CServerBase public: virtual void ServerInitialize(CServerInterface* pServer) = 0; virtual bool ServerStartup(int iArgumentCount, char* szArguments[]) = 0; - virtual void ServerShutdown(void) = 0; + virtual void ServerShutdown() = 0; - virtual void DoPulse(void) = 0; + virtual void DoPulse() = 0; virtual void HandleInput(char* szCommand) = 0; virtual void GetTag(char* szInfoTag, int iInfoTag) = 0; - virtual bool IsFinished(void) = 0; - virtual bool PendingWorkToDo(void) = 0; + virtual bool IsFinished() = 0; + virtual bool PendingWorkToDo() = 0; virtual bool GetSleepIntervals(int& iSleepBusyMs, int& iSleepIdleMs, int& iLogicFpsLimit) = 0; }; diff --git a/Server/sdk/core/CServerInterface.h b/Server/sdk/core/CServerInterface.h index 6d900a67274..1b0f7dae43a 100644 --- a/Server/sdk/core/CServerInterface.h +++ b/Server/sdk/core/CServerInterface.h @@ -18,18 +18,18 @@ class CServerInterface { public: - virtual CNetServer* GetNetwork(void) = 0; - virtual CModManager* GetModManager(void) = 0; - virtual CXML* GetXML(void) = 0; + virtual CNetServer* GetNetwork() = 0; + virtual CModManager* GetModManager() = 0; + virtual CXML* GetXML() = 0; - virtual const char* GetServerModPath(void) = 0; + virtual const char* GetServerModPath() = 0; virtual SString GetAbsolutePath(const char* szRelative) = 0; virtual void Printf(const char* szFormat, ...) = 0; - virtual bool IsRequestingExit(void) = 0; + virtual bool IsRequestingExit() = 0; // Clears input buffer - virtual bool ClearInput(void) = 0; + virtual bool ClearInput() = 0; // Prints current input buffer on a new line, clears the input buffer and resets history selection - virtual bool ResetInput(void) = 0; + virtual bool ResetInput() = 0; }; diff --git a/Server/sdk/net/CNetServer.h b/Server/sdk/net/CNetServer.h index 30b328326de..0dc8eeb0d6a 100644 --- a/Server/sdk/net/CNetServer.h +++ b/Server/sdk/net/CNetServer.h @@ -40,12 +40,12 @@ struct SPacketStat class CBinaryFileInterface { public: - virtual ~CBinaryFileInterface(void) {} + virtual ~CBinaryFileInterface() {} virtual bool FOpen(const char* szFilename, const char* szMode, bool bValidate) = 0; - virtual void FClose(void) = 0; - virtual bool FEof(void) = 0; - virtual void FFlush(void) = 0; - virtual int FTell(void) = 0; + virtual void FClose() = 0; + virtual bool FEof() = 0; + virtual void FFlush() = 0; + virtual int FTell() = 0; virtual void FSeek(int iOffset, int iOrigin) = 0; virtual int FRead(void* pData, uint uiSize) = 0; virtual int FWrite(const void* pData, uint uiSize) = 0; @@ -53,7 +53,7 @@ class CBinaryFileInterface struct SNetOptions { - SNetOptions(void) { memset(this, 0, sizeof(*this)); } + SNetOptions() { memset(this, 0, sizeof(*this)); } struct { @@ -103,14 +103,14 @@ class CNetServer // szIP can be NULL if autochoosing is wanted. virtual bool StartNetwork(const char* szIP, unsigned short usServerPort, unsigned int uiAllowedPlayers, const char* szServerName) = 0; - virtual void StopNetwork(void) = 0; + virtual void StopNetwork() = 0; - virtual void DoPulse(void) = 0; + virtual void DoPulse() = 0; virtual void RegisterPacketHandler(PPACKETHANDLER pfnPacketHandler) = 0; virtual bool GetNetworkStatistics(NetStatistics* pDest, const NetServerPlayerID& PlayerID) = 0; - virtual const SPacketStat* GetPacketStats(void) = 0; + virtual const SPacketStat* GetPacketStats() = 0; virtual bool GetBandwidthStatistics(SBandwidthStatistics* pDest) = 0; virtual bool GetNetPerformanceStatistics(SNetPerformanceStatistics* pDest, bool bResetCounters) = 0; virtual void GetPingStatus(SFixedString<32>* pstrStatus) = 0; @@ -139,7 +139,7 @@ class CNetServer virtual void SetChecks(const char* szDisableComboACMap, const char* szDisableACMap, const char* szEnableSDMap, int iEnableClientChecks, bool bHideAC, const char* szImgMods) = 0; - virtual unsigned int GetPendingPacketCount(void) = 0; + virtual unsigned int GetPendingPacketCount() = 0; virtual void GetNetRoute(SFixedString<32>* pstrRoute) = 0; virtual bool InitServerId(const char* szPath) = 0; @@ -158,7 +158,7 @@ class CNetServer return false; } virtual bool GetPlayerPacketUsageStats(uchar* packetIdList, uint uiNumPacketIds, SPlayerPacketUsage* pOutStats, uint uiTopCount) { return false; } - virtual const char* GetLogOutput(void) { return NULL; } + virtual const char* GetLogOutput() { return NULL; } virtual bool IsValidSocket(const NetServerPlayerID& playerID) { assert(0); diff --git a/Server/sdk/net/ns_playerid.h b/Server/sdk/net/ns_playerid.h index bed1b06e550..7abda1d075e 100644 --- a/Server/sdk/net/ns_playerid.h +++ b/Server/sdk/net/ns_playerid.h @@ -18,11 +18,11 @@ class SNetExtraInfo : public CRefCountable protected: SNetExtraInfo(const SNetExtraInfo&); const SNetExtraInfo& operator=(const SNetExtraInfo&); - ~SNetExtraInfo(void) {} + ~SNetExtraInfo() {} public: ZERO_ON_NEW - SNetExtraInfo(void) {} + SNetExtraInfo() {} bool m_bHasPing; uint m_uiPing; @@ -35,7 +35,7 @@ class NetServerPlayerID unsigned short m_usPort; public: - NetServerPlayerID(void) + NetServerPlayerID() { m_uiBinaryAddress = 0xFFFFFFFF; m_usPort = 0xFFFF; @@ -47,7 +47,7 @@ class NetServerPlayerID m_usPort = usPort; }; - ~NetServerPlayerID(void){}; + ~NetServerPlayerID(){}; friend inline int operator==(const NetServerPlayerID& left, const NetServerPlayerID& right) { @@ -64,6 +64,6 @@ class NetServerPlayerID return left.m_uiBinaryAddress < right.m_uiBinaryAddress || (left.m_uiBinaryAddress == right.m_uiBinaryAddress && left.m_usPort < right.m_usPort); } - unsigned long GetBinaryAddress(void) const { return m_uiBinaryAddress; }; - unsigned short GetPort(void) const { return m_usPort; }; + unsigned long GetBinaryAddress() const { return m_uiBinaryAddress; }; + unsigned short GetPort() const { return m_usPort; }; }; diff --git a/Shared/XML/CXMLArray.cpp b/Shared/XML/CXMLArray.cpp index 24aad793e4d..47b8b33d3e6 100644 --- a/Shared/XML/CXMLArray.cpp +++ b/Shared/XML/CXMLArray.cpp @@ -19,7 +19,7 @@ CStack CXMLArray::m_IDStack; std::vector CXMLArray::m_Elements; unsigned long CXMLArray::m_ulCapacity = 0; -void CXMLArray::Initialize(void) +void CXMLArray::Initialize() { m_ulCapacity = 0; ExpandBy(20000); @@ -88,12 +88,12 @@ void CXMLArray::ExpandBy(unsigned long ulAmount) assert(m_IDStack.GetCapacity() == m_ulCapacity); } -unsigned long CXMLArray::GetCapacity(void) +unsigned long CXMLArray::GetCapacity() { return m_ulCapacity; } -unsigned long CXMLArray::GetUnusedAmount(void) +unsigned long CXMLArray::GetUnusedAmount() { return m_IDStack.GetUnusedAmount(); } diff --git a/Shared/XML/CXMLArray.h b/Shared/XML/CXMLArray.h index c9066a30a9e..bdfe87a78a6 100644 --- a/Shared/XML/CXMLArray.h +++ b/Shared/XML/CXMLArray.h @@ -16,14 +16,14 @@ class CXMLCommon; class CXMLArray { public: - static void Initialize(void); + static void Initialize(); static unsigned long PopUniqueID(CXMLCommon* pEntry); static void PushUniqueID(CXMLCommon* pEntry); static CXMLCommon* GetEntry(unsigned long ulID); - static unsigned long GetCapacity(void); - static unsigned long GetUnusedAmount(void); + static unsigned long GetCapacity(); + static unsigned long GetUnusedAmount(); private: static void ExpandBy(unsigned long ulAmount); diff --git a/Shared/XML/CXMLAttributeImpl.cpp b/Shared/XML/CXMLAttributeImpl.cpp index bf79268d4bd..b5eaec331df 100644 --- a/Shared/XML/CXMLAttributeImpl.cpp +++ b/Shared/XML/CXMLAttributeImpl.cpp @@ -46,7 +46,7 @@ CXMLAttributeImpl::CXMLAttributeImpl(CXMLAttributesImpl& Attributes, TiXmlElemen m_ulID = CXMLArray::PopUniqueID(this); } -CXMLAttributeImpl::~CXMLAttributeImpl(void) +CXMLAttributeImpl::~CXMLAttributeImpl() { // Remove from array over XML stuff if (m_bUsingIDs) @@ -62,12 +62,12 @@ CXMLAttributeImpl::~CXMLAttributeImpl(void) m_Attributes.RemoveFromList(this); } -const std::string CXMLAttributeImpl::GetName(void) const +const std::string CXMLAttributeImpl::GetName() const { return std::string(m_Attribute.Name()); } -const std::string& CXMLAttributeImpl::GetValue(void) const +const std::string& CXMLAttributeImpl::GetValue() const { return m_Attribute.ValueStr(); } @@ -119,7 +119,7 @@ void CXMLAttributeImpl::SetValue(float fValue) SetValue(szBuffer); } -void CXMLAttributeImpl::DeleteWrapper(void) +void CXMLAttributeImpl::DeleteWrapper() { // Delete us, but don't delete the attribute m_bDeleteAttribute = false; diff --git a/Shared/XML/CXMLAttributeImpl.h b/Shared/XML/CXMLAttributeImpl.h index b923b75640c..1e974e1f0af 100644 --- a/Shared/XML/CXMLAttributeImpl.h +++ b/Shared/XML/CXMLAttributeImpl.h @@ -23,10 +23,10 @@ class CXMLAttributeImpl : public CXMLAttribute public: CXMLAttributeImpl(class CXMLAttributesImpl& Attributes, TiXmlElement& Node, const std::string& strName); CXMLAttributeImpl(class CXMLAttributesImpl& Attributes, TiXmlElement& Node, TiXmlAttribute& Attribute); - virtual ~CXMLAttributeImpl(void); + virtual ~CXMLAttributeImpl(); - const std::string GetName(void) const; - const std::string& GetValue(void) const; + const std::string GetName() const; + const std::string& GetValue() const; void SetValue(const char* szValue); void SetValue(bool bValue); @@ -34,11 +34,11 @@ class CXMLAttributeImpl : public CXMLAttribute void SetValue(unsigned int uiValue); void SetValue(float fValue); - eXMLClass GetClassType(void) { return CXML_ATTR; }; - unsigned long GetID(void) { return m_ulID; }; - bool IsUsingIDs(void) { return m_bUsingIDs; }; + eXMLClass GetClassType() { return CXML_ATTR; }; + unsigned long GetID() { return m_ulID; }; + bool IsUsingIDs() { return m_bUsingIDs; }; - void DeleteWrapper(void); + void DeleteWrapper(); private: unsigned long m_ulID; diff --git a/Shared/XML/CXMLAttributesImpl.cpp b/Shared/XML/CXMLAttributesImpl.cpp index 18d39e7eea9..1aad2797857 100644 --- a/Shared/XML/CXMLAttributesImpl.cpp +++ b/Shared/XML/CXMLAttributesImpl.cpp @@ -20,13 +20,13 @@ CXMLAttributesImpl::CXMLAttributesImpl(TiXmlElement& Node, bool bUseIDs) : m_bUs CreateAttributes(); } -CXMLAttributesImpl::~CXMLAttributesImpl(void) +CXMLAttributesImpl::~CXMLAttributesImpl() { // Delete all attribute wrappers (not from the xml tree) DeleteAttributes(); } -unsigned int CXMLAttributesImpl::Count(void) +unsigned int CXMLAttributesImpl::Count() { return static_cast(m_Attributes.size()); } @@ -103,7 +103,7 @@ bool CXMLAttributesImpl::Delete(const char* szName) return false; } -void CXMLAttributesImpl::DeleteAll(void) +void CXMLAttributesImpl::DeleteAll() { // Delete each attribute m_bCanRemoveFromList = false; @@ -117,7 +117,7 @@ void CXMLAttributesImpl::DeleteAll(void) m_bCanRemoveFromList = true; } -TiXmlElement& CXMLAttributesImpl::GetNode(void) +TiXmlElement& CXMLAttributesImpl::GetNode() { return m_Node; } @@ -137,7 +137,7 @@ void CXMLAttributesImpl::RemoveFromList(CXMLAttribute* pAttribute) } } -void CXMLAttributesImpl::CreateAttributes(void) +void CXMLAttributesImpl::CreateAttributes() { // Grab the first attribute and iterate from there TiXmlAttribute* pAttrib = m_Node.FirstAttribute(); @@ -151,7 +151,7 @@ void CXMLAttributesImpl::CreateAttributes(void) } } -void CXMLAttributesImpl::DeleteAttributes(void) +void CXMLAttributesImpl::DeleteAttributes() { // Deleted every item in the list m_bCanRemoveFromList = false; diff --git a/Shared/XML/CXMLAttributesImpl.h b/Shared/XML/CXMLAttributesImpl.h index 9f36e5626fc..bac5ae927ec 100644 --- a/Shared/XML/CXMLAttributesImpl.h +++ b/Shared/XML/CXMLAttributesImpl.h @@ -20,30 +20,30 @@ class CXMLAttributesImpl : public CXMLAttributes { public: CXMLAttributesImpl(TiXmlElement& Node, bool bUseIDs); - ~CXMLAttributesImpl(void); + ~CXMLAttributesImpl(); - unsigned int Count(void); + unsigned int Count(); class CXMLAttribute* Find(const char* szName); class CXMLAttribute* Get(unsigned int uiIndex); class CXMLAttribute* Create(const char* szName); class CXMLAttribute* Create(const class CXMLAttribute& Copy); bool Delete(const char* szName); - void DeleteAll(void); + void DeleteAll(); - TiXmlElement& GetNode(void); + TiXmlElement& GetNode(); class CXMLAttribute* AddToList(class CXMLAttribute* pAttribute); void RemoveFromList(class CXMLAttribute* pAttribute); - std::list::iterator ListBegin(void) { return m_Attributes.begin(); } - std::list::iterator ListEnd(void) { return m_Attributes.end(); } + std::list::iterator ListBegin() { return m_Attributes.begin(); } + std::list::iterator ListEnd() { return m_Attributes.end(); } - bool IsUsingIDs(void) const { return m_bUsingIDs; } + bool IsUsingIDs() const { return m_bUsingIDs; } private: - void CreateAttributes(void); - void DeleteAttributes(void); + void CreateAttributes(); + void DeleteAttributes(); const bool m_bUsingIDs; bool m_bCanRemoveFromList; diff --git a/Shared/XML/CXMLFileImpl.cpp b/Shared/XML/CXMLFileImpl.cpp index ee3759f0db5..c26c314aa83 100644 --- a/Shared/XML/CXMLFileImpl.cpp +++ b/Shared/XML/CXMLFileImpl.cpp @@ -33,7 +33,7 @@ CXMLFileImpl::CXMLFileImpl(const char* szFilename, bool bUseIDs, bool bReadOnly) m_ulID = CXMLArray::PopUniqueID(this); } -CXMLFileImpl::~CXMLFileImpl(void) +CXMLFileImpl::~CXMLFileImpl() { // Remove from array over XML stuff if (m_bUsingIDs) @@ -46,7 +46,7 @@ CXMLFileImpl::~CXMLFileImpl(void) delete m_pDocument; } -const char* CXMLFileImpl::GetFilename(void) +const char* CXMLFileImpl::GetFilename() { return m_strFilename.c_str(); } @@ -113,7 +113,7 @@ bool CXMLFileImpl::Parse(std::vector* pOutFileContents) return false; } -bool CXMLFileImpl::Write(void) +bool CXMLFileImpl::Write() { if (m_bReadOnly) return false; @@ -135,7 +135,7 @@ bool CXMLFileImpl::Write(void) return false; } -bool CXMLFileImpl::WriteSafer(void) +bool CXMLFileImpl::WriteSafer() { // We have a filename? if (m_strFilename != "") @@ -179,7 +179,7 @@ bool CXMLFileImpl::WriteSafer(void) return false; } -void CXMLFileImpl::Clear(void) +void CXMLFileImpl::Clear() { if (m_pRootNode) { @@ -188,7 +188,7 @@ void CXMLFileImpl::Clear(void) } } -void CXMLFileImpl::Reset(void) +void CXMLFileImpl::Reset() { // Clear our wrapper tree ClearWrapperTree(); @@ -219,7 +219,7 @@ CXMLNode* CXMLFileImpl::CreateRootNode(const std::string& strTagName) return m_pRootNode; } -CXMLNode* CXMLFileImpl::GetRootNode(void) +CXMLNode* CXMLFileImpl::GetRootNode() { // Return it return m_pRootNode; @@ -232,7 +232,7 @@ CXMLErrorCodes::Code CXMLFileImpl::GetLastError(std::string& strOut) return m_errLastError; } -void CXMLFileImpl::ResetLastError(void) +void CXMLFileImpl::ResetLastError() { // Set the code and the string m_errLastError = CXMLErrorCodes::NoError; @@ -246,12 +246,12 @@ void CXMLFileImpl::SetLastError(CXMLErrorCodes::Code errCode, const std::string& m_strLastError = strDescription; } -TiXmlDocument* CXMLFileImpl::GetDocument(void) +TiXmlDocument* CXMLFileImpl::GetDocument() { return m_pDocument; } -bool CXMLFileImpl::BuildWrapperTree(void) +bool CXMLFileImpl::BuildWrapperTree() { // Clear the previous tree ClearWrapperTree(); @@ -310,7 +310,7 @@ bool CXMLFileImpl::BuildSubElements(CXMLNodeImpl* pNode) return true; } -void CXMLFileImpl::ClearWrapperTree(void) +void CXMLFileImpl::ClearWrapperTree() { // Delete the previous wrapper tree if (m_pRootNode) @@ -365,7 +365,7 @@ void CXMLFileImpl::FileRecoveryPreSave(const SString& strFilename) } // Unstore filename in case of problems during save -void CXMLFileImpl::FileRecoveryPostSave(void) +void CXMLFileImpl::FileRecoveryPostSave() { if (!ms_strSaveFlagFile.empty()) FileDelete(ms_strSaveFlagFile); diff --git a/Shared/XML/CXMLFileImpl.h b/Shared/XML/CXMLFileImpl.h index d41efb77939..86b9a2d98c7 100644 --- a/Shared/XML/CXMLFileImpl.h +++ b/Shared/XML/CXMLFileImpl.h @@ -22,45 +22,45 @@ class CXMLFileImpl : public CXMLFile public: CXMLFileImpl(const char* szFilename, bool bUseIDs, bool bReadOnly); - ~CXMLFileImpl(void); + ~CXMLFileImpl(); - const char* GetFilename(void); + const char* GetFilename(); void SetFilename(const char* szFilename); bool Parse(std::vector* pOutFileContents = NULL); - bool Write(void); - void Clear(void); - void Reset(void); + bool Write(); + void Clear(); + void Reset(); CXMLNode* CreateRootNode(const std::string& strTagName); - CXMLNode* GetRootNode(void); + CXMLNode* GetRootNode(); CXMLErrorCodes::Code GetLastError(std::string& strOut); - void ResetLastError(void); + void ResetLastError(); // Private functions void SetLastError(CXMLErrorCodes::Code errCode, const std::string& strDescription); - TiXmlDocument* GetDocument(void); + TiXmlDocument* GetDocument(); - eXMLClass GetClassType(void) { return CXML_FILE; }; - unsigned long GetID(void) + eXMLClass GetClassType() { return CXML_FILE; }; + unsigned long GetID() { dassert(m_bUsingIDs); return m_ulID; }; - bool IsValid(void) { return !m_bUsingIDs || m_ulID != INVALID_XML_ID; }; - bool IsUsingIDs(void) { return m_bUsingIDs; } + bool IsValid() { return !m_bUsingIDs || m_ulID != INVALID_XML_ID; }; + bool IsUsingIDs() { return m_bUsingIDs; } static void InitFileRecovery(const char* szSaveFlagDirectory); void FileRecoveryPreSave(const SString& strFilename); - void FileRecoveryPostSave(void); + void FileRecoveryPostSave(); private: - bool BuildWrapperTree(void); + bool BuildWrapperTree(); bool BuildSubElements(class CXMLNodeImpl* pNode); - void ClearWrapperTree(void); - bool WriteSafer(void); + void ClearWrapperTree(); + bool WriteSafer(); std::string m_strFilename; diff --git a/Shared/XML/CXMLImpl.cpp b/Shared/XML/CXMLImpl.cpp index da4145247b7..f912f297c6a 100644 --- a/Shared/XML/CXMLImpl.cpp +++ b/Shared/XML/CXMLImpl.cpp @@ -17,13 +17,13 @@ #endif #include "SharedUtil.hpp" -CXMLImpl::CXMLImpl(void) +CXMLImpl::CXMLImpl() { // Init array stuff CXMLArray::Initialize(); } -CXMLImpl::~CXMLImpl(void) +CXMLImpl::~CXMLImpl() { } @@ -44,7 +44,7 @@ void CXMLImpl::DeleteXML(CXMLFile* pFile) delete pFile; } -CXMLNode* CXMLImpl::CreateDummyNode(void) +CXMLNode* CXMLImpl::CreateDummyNode() { CXMLNode* xmlNode = new CXMLNodeImpl(NULL, NULL, *new TiXmlElement("dummy_storage")); if (xmlNode->IsValid()) diff --git a/Shared/XML/CXMLImpl.h b/Shared/XML/CXMLImpl.h index 2389ecb031c..8fed14c1e63 100644 --- a/Shared/XML/CXMLImpl.h +++ b/Shared/XML/CXMLImpl.h @@ -16,13 +16,13 @@ class CXMLImpl : public CXML { public: - CXMLImpl(void); - virtual ~CXMLImpl(void); + CXMLImpl(); + virtual ~CXMLImpl(); CXMLFile* CreateXML(const char* szFilename, bool bUseIDs, bool bReadOnly); void DeleteXML(CXMLFile* pFile); - CXMLNode* CreateDummyNode(void); + CXMLNode* CreateDummyNode(); CXMLAttribute* GetAttrFromID(unsigned long ulID); CXMLFile* GetFileFromID(unsigned long ulID); diff --git a/Shared/XML/CXMLNodeImpl.cpp b/Shared/XML/CXMLNodeImpl.cpp index faddb95df7b..7d914499746 100644 --- a/Shared/XML/CXMLNodeImpl.cpp +++ b/Shared/XML/CXMLNodeImpl.cpp @@ -37,7 +37,7 @@ CXMLNodeImpl::CXMLNodeImpl(CXMLFileImpl* pFile, CXMLNodeImpl* pParent, TiXmlElem m_ulID = CXMLArray::PopUniqueID(this); } -CXMLNodeImpl::~CXMLNodeImpl(void) +CXMLNodeImpl::~CXMLNodeImpl() { // Remove from array over XML stuff if (m_bUsingIDs) @@ -100,7 +100,7 @@ CXMLNode* CXMLNodeImpl::CreateSubNode(const char* szTagName, CXMLNode* pInsertAf } } -void CXMLNodeImpl::DeleteAllSubNodes(void) +void CXMLNodeImpl::DeleteAllSubNodes() { // Don't let the nodes remove themselves from this list m_bCanRemoveFromList = false; @@ -117,7 +117,7 @@ void CXMLNodeImpl::DeleteAllSubNodes(void) m_Children.clear(); } -unsigned int CXMLNodeImpl::GetSubNodeCount(void) +unsigned int CXMLNodeImpl::GetSubNodeCount() { return static_cast(m_Children.size()); } @@ -164,22 +164,22 @@ CXMLNode* CXMLNodeImpl::FindSubNode(const char* szTagName, unsigned int uiIndex) return NULL; } -CXMLAttributes& CXMLNodeImpl::GetAttributes(void) +CXMLAttributes& CXMLNodeImpl::GetAttributes() { return m_Attributes; } -CXMLNode* CXMLNodeImpl::GetParent(void) +CXMLNode* CXMLNodeImpl::GetParent() { return m_pParent; } -int CXMLNodeImpl::GetLine(void) +int CXMLNodeImpl::GetLine() { return m_pNode->Row(); } -const std::string& CXMLNodeImpl::GetTagName(void) +const std::string& CXMLNodeImpl::GetTagName() { return m_pNode->ValueStr(); } @@ -189,7 +189,7 @@ void CXMLNodeImpl::SetTagName(const std::string& strString) m_pNode->SetValue(strString); } -const std::string CXMLNodeImpl::GetTagContent(void) +const std::string CXMLNodeImpl::GetTagContent() { // FIXME: This can be sort of misleading as sub-tags are not included const char* szSubText = m_pNode->GetText(); @@ -326,7 +326,7 @@ void CXMLNodeImpl::SetTagContentf(const char* szFormat, ...) SetTagContent(szBuffer); } -TiXmlElement* CXMLNodeImpl::GetNode(void) +TiXmlElement* CXMLNodeImpl::GetNode() { return m_pNode; } @@ -411,7 +411,7 @@ bool CXMLNodeImpl::CopyChildrenInto(CXMLNode* pDestination, bool bRecursive) return true; } -void CXMLNodeImpl::DeleteWrapper(void) +void CXMLNodeImpl::DeleteWrapper() { // Don't let the nodes remove themselves from this list m_bCanRemoveFromList = false; @@ -455,7 +455,7 @@ void CXMLNodeImpl::RemoveFromList(CXMLNode* pNode) } } -void CXMLNodeImpl::RemoveAllFromList(void) +void CXMLNodeImpl::RemoveAllFromList() { m_Children.clear(); } @@ -487,7 +487,7 @@ SString CXMLNodeImpl::GetAttributeValue(const SString& strAttributeName) return pAttribute ? pAttribute->GetValue() : ""; } -SString CXMLNodeImpl::GetCommentText(void) +SString CXMLNodeImpl::GetCommentText() { SString strComment; TiXmlNode* pCommentNode = m_pNode->PreviousSibling(); diff --git a/Shared/XML/CXMLNodeImpl.h b/Shared/XML/CXMLNodeImpl.h index 541a0421721..8c0ff52eb0d 100644 --- a/Shared/XML/CXMLNodeImpl.h +++ b/Shared/XML/CXMLNodeImpl.h @@ -22,28 +22,28 @@ class CXMLNodeImpl : public CXMLNode { public: CXMLNodeImpl(class CXMLFileImpl* pFile, CXMLNodeImpl* pParent, TiXmlElement& Node); - ~CXMLNodeImpl(void); + ~CXMLNodeImpl(); CXMLNode* CreateSubNode(const char* szTagName, CXMLNode* pInsertBefore = nullptr); void DeleteSubNode(CXMLNode* pNode) { delete pNode; }; - void DeleteAllSubNodes(void); + void DeleteAllSubNodes(); - unsigned int GetSubNodeCount(void); + unsigned int GetSubNodeCount(); CXMLNode* GetSubNode(unsigned int uiIndex); CXMLNode* FindSubNode(const char* szTagName, unsigned int uiIndex = 0); - std::list::iterator ChildrenBegin(void) { return m_Children.begin(); }; - std::list::iterator ChildrenEnd(void) { return m_Children.end(); }; + std::list::iterator ChildrenBegin() { return m_Children.begin(); }; + std::list::iterator ChildrenEnd() { return m_Children.end(); }; - CXMLAttributes& GetAttributes(void); - CXMLNode* GetParent(void); + CXMLAttributes& GetAttributes(); + CXMLNode* GetParent(); - int GetLine(void); + int GetLine(); - const std::string& GetTagName(void); + const std::string& GetTagName(); void SetTagName(const std::string& strString); - const std::string GetTagContent(void); + const std::string GetTagContent(); bool GetTagContent(bool& bContent); bool GetTagContent(int& iContent); bool GetTagContent(unsigned int& uiContent); @@ -56,28 +56,28 @@ class CXMLNodeImpl : public CXMLNode void SetTagContent(float fContent); void SetTagContentf(const char* szFormat, ...); - eXMLClass GetClassType(void) { return CXML_NODE; }; - unsigned long GetID(void) + eXMLClass GetClassType() { return CXML_NODE; }; + unsigned long GetID() { dassert(m_pFile && m_pFile->IsUsingIDs()); return m_ulID; }; - bool IsUsingIDs(void) { return m_bUsingIDs; }; + bool IsUsingIDs() { return m_bUsingIDs; }; CXMLNode* CopyNode(CXMLNode* pParent = NULL); bool CopyChildrenInto(CXMLNode* pDestination, bool bRecursive); - TiXmlElement* GetNode(void); - void DeleteWrapper(void); + TiXmlElement* GetNode(); + void DeleteWrapper(); void AddToList(CXMLNode* pNode); void RemoveFromList(CXMLNode* pNode); - void RemoveAllFromList(void); + void RemoveAllFromList(); - bool IsValid(void) { return !m_bUsingIDs || m_ulID != INVALID_XML_ID; }; + bool IsValid() { return !m_bUsingIDs || m_ulID != INVALID_XML_ID; }; virtual SString GetAttributeValue(const SString& strAttributeName); - virtual SString GetCommentText(void); + virtual SString GetCommentText(); virtual void SetCommentText(const char* szCommentText, bool bLeadingBlankLine = false); private: diff --git a/Shared/animation/CEasingCurve.cpp b/Shared/animation/CEasingCurve.cpp index 2e7ba46c75c..115531f7e29 100644 --- a/Shared/animation/CEasingCurve.cpp +++ b/Shared/animation/CEasingCurve.cpp @@ -29,7 +29,7 @@ class CComplexEasingFunction : m_eType(a_eType), m_fAmplitude(amplitude), m_fPeriod(period), m_fOvershoot(overshoot) { } - virtual ~CComplexEasingFunction(void) {} + virtual ~CComplexEasingFunction() {} virtual double valueForProgress(double a_fProgress) const = 0; diff --git a/Shared/mods/deathmatch/logic/CDebugHookManager.cpp b/Shared/mods/deathmatch/logic/CDebugHookManager.cpp index 043f5e3ed1e..7f0825ac1a2 100644 --- a/Shared/mods/deathmatch/logic/CDebugHookManager.cpp +++ b/Shared/mods/deathmatch/logic/CDebugHookManager.cpp @@ -24,7 +24,7 @@ // // /////////////////////////////////////////////////////////////// -CDebugHookManager::CDebugHookManager(void) +CDebugHookManager::CDebugHookManager() { #ifndef MTA_CLIENT m_MaskArgumentsMap["dbConnect"] = {1, 2, 3}; // type, 1=HOST, 2=USERNAME, 3=PASSWORD, options @@ -42,7 +42,7 @@ CDebugHookManager::CDebugHookManager(void) // // /////////////////////////////////////////////////////////////// -CDebugHookManager::~CDebugHookManager(void) +CDebugHookManager::~CDebugHookManager() { } diff --git a/Shared/mods/deathmatch/logic/CDebugHookManager.h b/Shared/mods/deathmatch/logic/CDebugHookManager.h index 7d3f9a43f5a..4a5f54e68e2 100644 --- a/Shared/mods/deathmatch/logic/CDebugHookManager.h +++ b/Shared/mods/deathmatch/logic/CDebugHookManager.h @@ -32,8 +32,8 @@ class CDebugHookManager { public: ZERO_ON_NEW - CDebugHookManager(void); - ~CDebugHookManager(void); + CDebugHookManager(); + ~CDebugHookManager(); bool AddDebugHook(EDebugHookType hookType, const CLuaFunctionRef& functionRef, const std::vector& allowedNameList); bool RemoveDebugHook(EDebugHookType hookType, const CLuaFunctionRef& functionRef); void OnLuaMainDestroy(CLuaMain* pLuaMain); @@ -44,7 +44,7 @@ class CDebugHookManager void OnPostEvent(const char* szName, const CLuaArguments& Arguments, CElement* pSource, CPlayer* pCaller); bool OnPreEventFunction(const char* szName, const CLuaArguments& Arguments, CElement* pSource, CPlayer* pCaller, CMapEvent* pMapEvent); void OnPostEventFunction(const char* szName, const CLuaArguments& Arguments, CElement* pSource, CPlayer* pCaller, CMapEvent* pMapEvent); - bool HasPostFunctionHooks(void) const { return !m_PostFunctionHookList.empty() || m_uiPostFunctionOverride; } + bool HasPostFunctionHooks() const { return !m_PostFunctionHookList.empty() || m_uiPostFunctionOverride; } protected: std::vector& GetHookInfoListForType(EDebugHookType hookType); diff --git a/Shared/mods/deathmatch/logic/CIdArray.cpp b/Shared/mods/deathmatch/logic/CIdArray.cpp index 3ae4b03484b..9e748fd41f5 100644 --- a/Shared/mods/deathmatch/logic/CIdArray.cpp +++ b/Shared/mods/deathmatch/logic/CIdArray.cpp @@ -27,7 +27,7 @@ static const char* GetIdClassTypeName(EIdClassType eClass); // // Initialize // -void CIdArray::Initialize(void) +void CIdArray::Initialize() { if (!m_bInitialized) { @@ -171,12 +171,12 @@ void CIdArray::ExpandBy(uint uiAmount) assert(m_IDStack.GetCapacity() == m_uiCapacity); } -uint CIdArray::GetCapacity(void) +uint CIdArray::GetCapacity() { return m_uiCapacity; } -uint CIdArray::GetUnusedAmount(void) +uint CIdArray::GetUnusedAmount() { return m_IDStack.GetUnusedAmount(); } diff --git a/Shared/mods/deathmatch/logic/CIdArray.h b/Shared/mods/deathmatch/logic/CIdArray.h index 0b36388f7ce..501269a7f73 100644 --- a/Shared/mods/deathmatch/logic/CIdArray.h +++ b/Shared/mods/deathmatch/logic/CIdArray.h @@ -67,14 +67,14 @@ struct SIdEntry class CIdArray { public: - static void Initialize(void); + static void Initialize(); static SArrayId PopUniqueId(void* pObject, EIdClassType idClass); static void PushUniqueId(void* pObject, EIdClassType idClass, SArrayId id); static void* FindEntry(SArrayId id, EIdClassType idClass); - static uint GetCapacity(void); - static uint GetUnusedAmount(void); + static uint GetCapacity(); + static uint GetUnusedAmount(); private: static void ExpandBy(uint uiAmount); diff --git a/Shared/mods/deathmatch/logic/CLatentReceiver.cpp b/Shared/mods/deathmatch/logic/CLatentReceiver.cpp index 1efbe0d782a..d0dea391fa9 100644 --- a/Shared/mods/deathmatch/logic/CLatentReceiver.cpp +++ b/Shared/mods/deathmatch/logic/CLatentReceiver.cpp @@ -29,7 +29,7 @@ CLatentReceiver::CLatentReceiver(NetPlayerID remoteId, ushort usBitStreamVersion // // /////////////////////////////////////////////////////////////// -CLatentReceiver::~CLatentReceiver(void) +CLatentReceiver::~CLatentReceiver() { } diff --git a/Shared/mods/deathmatch/logic/CLatentSendQueue.cpp b/Shared/mods/deathmatch/logic/CLatentSendQueue.cpp index e7badc69ff1..8f0f29af420 100644 --- a/Shared/mods/deathmatch/logic/CLatentSendQueue.cpp +++ b/Shared/mods/deathmatch/logic/CLatentSendQueue.cpp @@ -29,7 +29,7 @@ CLatentSendQueue::CLatentSendQueue(NetPlayerID remoteId, ushort usBitStreamVersi // // /////////////////////////////////////////////////////////////// -CLatentSendQueue::~CLatentSendQueue(void) +CLatentSendQueue::~CLatentSendQueue() { } @@ -194,7 +194,7 @@ bool CLatentSendQueue::CancelSend(SSendHandle handle) // // /////////////////////////////////////////////////////////////// -void CLatentSendQueue::CancelAllSends(void) +void CLatentSendQueue::CancelAllSends() { // Use a copy because CancelSend will not remove a finishing transfer std::list listCopy = m_TxQueue; @@ -254,7 +254,7 @@ void CLatentSendQueue::GetSendHandles(std::vector& outResultList) // // /////////////////////////////////////////////////////////////// -void CLatentSendQueue::UpdateEstimatedDurations(void) +void CLatentSendQueue::UpdateEstimatedDurations() { uint uiUsingRate = MIN_SEND_RATE; // Recalculate estimated times for all transfers @@ -284,7 +284,7 @@ void CLatentSendQueue::UpdateEstimatedDurations(void) // Called when a transfer is removed from the queue. // /////////////////////////////////////////////////////////////// -void CLatentSendQueue::PostQueueRemove(void) +void CLatentSendQueue::PostQueueRemove() { // Recalculate the current transfer rate m_uiCurrentRate = MIN_SEND_RATE; diff --git a/Shared/mods/deathmatch/logic/CLatentTransferManager.cpp b/Shared/mods/deathmatch/logic/CLatentTransferManager.cpp index c753cbe5195..d41a72b818d 100644 --- a/Shared/mods/deathmatch/logic/CLatentTransferManager.cpp +++ b/Shared/mods/deathmatch/logic/CLatentTransferManager.cpp @@ -18,7 +18,7 @@ using namespace LatentTransfer; // // /////////////////////////////////////////////////////////////// -CLatentTransferManager::CLatentTransferManager(void) +CLatentTransferManager::CLatentTransferManager() { } @@ -29,7 +29,7 @@ CLatentTransferManager::CLatentTransferManager(void) // // /////////////////////////////////////////////////////////////// -CLatentTransferManager::~CLatentTransferManager(void) +CLatentTransferManager::~CLatentTransferManager() { } @@ -40,7 +40,7 @@ CLatentTransferManager::~CLatentTransferManager(void) // // /////////////////////////////////////////////////////////////// -void CLatentTransferManager::DoPulse(void) +void CLatentTransferManager::DoPulse() { // Update timing info CTickCount tickCountNow = CTickCount::Now(); @@ -156,7 +156,7 @@ SSendHandle CLatentTransferManager::AddSend(NetPlayerID remoteId, ushort usBitSt // Finished multiple sends // /////////////////////////////////////////////////////////////// -void CLatentTransferManager::AddSendBatchEnd(void) +void CLatentTransferManager::AddSendBatchEnd() { #ifndef MTA_CLIENT markerLatentEvent.SetAndStoreString(SString("BatchEnd (%d sends)", m_uiNumSends)); diff --git a/Shared/mods/deathmatch/logic/CLatentTransferManager.h b/Shared/mods/deathmatch/logic/CLatentTransferManager.h index 0ece25ce31d..45107ef3fd0 100644 --- a/Shared/mods/deathmatch/logic/CLatentTransferManager.h +++ b/Shared/mods/deathmatch/logic/CLatentTransferManager.h @@ -37,7 +37,7 @@ namespace LatentTransfer // struct SSendItem { - SSendItem(void) + SSendItem() : uiId(0), uiRate(0), usCategory(0), @@ -70,7 +70,7 @@ struct SSendItem // struct SReceiveItem { - SReceiveItem(void) : usId(0), uiRate(0), usCategory(0), usResourceNetId(0xFFFF), uiWritePosition(0), bReceiveStarted(false) {} + SReceiveItem() : usId(0), uiRate(0), usCategory(0), usResourceNetId(0xFFFF), uiWritePosition(0), bReceiveStarted(false) {} ushort usId; // Part of handle - Used for verification CBuffer buffer; // The receive buffer @@ -105,19 +105,19 @@ class CLatentSendQueue public: ZERO_ON_NEW CLatentSendQueue(NetPlayerID remoteId, ushort usBitStreamVersion); - ~CLatentSendQueue(void); + ~CLatentSendQueue(); void DoPulse(int iTimeMsBetweenCalls); bool OnLuaMainDestroy(void* pLuaMain); SSendHandle AddSend(CBufferRef bufferRef, uint uiRate, ushort usCategory, void* pLuaMain, ushort usResourceNetId); bool CancelSend(SSendHandle handle); - void CancelAllSends(void); + void CancelAllSends(); bool GetSendStatus(SSendHandle handle, SSendStatus* pOutSendStatus); void GetSendHandles(std::vector& outResultList); protected: void SendCancelNotification(SSendItem& activeTx); - void PostQueueRemove(void); - void UpdateEstimatedDurations(void); + void PostQueueRemove(); + void UpdateEstimatedDurations(); const NetPlayerID m_RemoteId; const ushort m_usBitStreamVersion; @@ -139,7 +139,7 @@ class CLatentReceiver public: ZERO_ON_NEW CLatentReceiver(NetPlayerID remoteId, ushort usBitStreamVersion); - ~CLatentReceiver(void); + ~CLatentReceiver(); void OnReceive(NetBitStreamInterface* pBitStream); protected: @@ -161,16 +161,16 @@ class CLatentTransferManager { public: ZERO_ON_NEW - CLatentTransferManager(void); - ~CLatentTransferManager(void); - void DoPulse(void); + CLatentTransferManager(); + ~CLatentTransferManager(); + void DoPulse(); void RemoveRemote(NetPlayerID remoteId); void OnLuaMainDestroy(void* pLuaMain); // Send functions void AddSendBatchBegin(unsigned char ucPacketId, NetBitStreamInterface* pBitStream); SSendHandle AddSend(NetPlayerID remoteId, ushort usBitStreamVersion, uint uiRate, void* pLuaMain, ushort usResourceNetId); - void AddSendBatchEnd(void); + void AddSendBatchEnd(); bool CancelSend(NetPlayerID remoteId, SSendHandle handle); void CancelAllSends(NetPlayerID remoteId); diff --git a/Shared/mods/deathmatch/logic/CScriptDebugging.cpp b/Shared/mods/deathmatch/logic/CScriptDebugging.cpp index 45877515d83..6a1664d2dbb 100644 --- a/Shared/mods/deathmatch/logic/CScriptDebugging.cpp +++ b/Shared/mods/deathmatch/logic/CScriptDebugging.cpp @@ -344,7 +344,7 @@ void CScriptDebugging::OnLuaMainDestroy(CLuaMain* pLuaMain) ListRemove(m_LuaMainStack, pLuaMain); } -CLuaMain* CScriptDebugging::GetTopLuaMain(void) +CLuaMain* CScriptDebugging::GetTopLuaMain() { if (!m_LuaMainStack.empty()) return m_LuaMainStack.back(); diff --git a/Shared/mods/deathmatch/logic/CTickRateSettings.h b/Shared/mods/deathmatch/logic/CTickRateSettings.h index b3d52c23034..2bb9b50c681 100644 --- a/Shared/mods/deathmatch/logic/CTickRateSettings.h +++ b/Shared/mods/deathmatch/logic/CTickRateSettings.h @@ -11,7 +11,7 @@ struct CTickRateSettings { public: - CTickRateSettings(void) + CTickRateSettings() { iPureSync = 100; iLightSync = 1500; diff --git a/Shared/mods/deathmatch/logic/CZoneNames.cpp b/Shared/mods/deathmatch/logic/CZoneNames.cpp index bdd62d94dc9..20de2c84db6 100644 --- a/Shared/mods/deathmatch/logic/CZoneNames.cpp +++ b/Shared/mods/deathmatch/logic/CZoneNames.cpp @@ -403,7 +403,7 @@ static const SZone _zoneInfoList[] = { }; static const IMPLEMENT_FIXED_ARRAY(SZone, zoneInfoList); -CZoneNames::CZoneNames(void) +CZoneNames::CZoneNames() { // Initialize zone tree for (uint i = 0; i < NUMELMS(zoneInfoList); i++) diff --git a/Shared/mods/deathmatch/logic/CZoneNames.h b/Shared/mods/deathmatch/logic/CZoneNames.h index ede3bde6aab..d4ba8a52597 100644 --- a/Shared/mods/deathmatch/logic/CZoneNames.h +++ b/Shared/mods/deathmatch/logic/CZoneNames.h @@ -22,7 +22,7 @@ typedef RTree CZoneTree; class CZoneNames { public: - CZoneNames(void); + CZoneNames(); const char* GetZoneName(const CVector& vecPosition); const char* GetCityName(const CVector& vecPosition); diff --git a/Shared/mods/deathmatch/logic/lua/CLuaMatrix.cpp b/Shared/mods/deathmatch/logic/lua/CLuaMatrix.cpp index 4f72a7aa06b..7161616b431 100644 --- a/Shared/mods/deathmatch/logic/lua/CLuaMatrix.cpp +++ b/Shared/mods/deathmatch/logic/lua/CLuaMatrix.cpp @@ -11,7 +11,7 @@ #include -CLuaMatrix::CLuaMatrix(void) : CMatrix() +CLuaMatrix::CLuaMatrix() : CMatrix() { m_uiScriptID = CIdArray::PopUniqueId(this, EIdClass::MATRIX); } @@ -21,7 +21,7 @@ CLuaMatrix::CLuaMatrix(const CMatrix& matrix) : CMatrix(matrix) m_uiScriptID = CIdArray::PopUniqueId(this, EIdClass::MATRIX); } -CLuaMatrix::~CLuaMatrix(void) +CLuaMatrix::~CLuaMatrix() { CIdArray::PushUniqueId(this, EIdClass::MATRIX, m_uiScriptID); m_uiScriptID = INVALID_ARRAY_ID; diff --git a/Shared/mods/deathmatch/logic/lua/CLuaMatrix.h b/Shared/mods/deathmatch/logic/lua/CLuaMatrix.h index 5cf5b78c796..0e5047a4d2d 100644 --- a/Shared/mods/deathmatch/logic/lua/CLuaMatrix.h +++ b/Shared/mods/deathmatch/logic/lua/CLuaMatrix.h @@ -14,12 +14,12 @@ class CLuaMatrix : public CMatrix { public: - CLuaMatrix(void); + CLuaMatrix(); CLuaMatrix(const CMatrix& matrix); - ~CLuaMatrix(void); + ~CLuaMatrix(); - unsigned int GetScriptID(void) const { return m_uiScriptID; } + unsigned int GetScriptID() const { return m_uiScriptID; } static CLuaMatrix* GetFromScriptID(unsigned int uiScriptID); diff --git a/Shared/mods/deathmatch/logic/lua/CLuaShared.cpp b/Shared/mods/deathmatch/logic/lua/CLuaShared.cpp index 18f0c119a55..fd8302a4914 100644 --- a/Shared/mods/deathmatch/logic/lua/CLuaShared.cpp +++ b/Shared/mods/deathmatch/logic/lua/CLuaShared.cpp @@ -66,7 +66,7 @@ bool CLuaShared::CheckUTF8BOMAndUpdate(const char** pcpOutBuffer, uint* puiOutSi return GetUTF8Confidence((const unsigned char*)cpBuffer, uiSize) >= 80; } -void CLuaShared::LoadFunctions(void) +void CLuaShared::LoadFunctions() { CLuaBitDefs::LoadFunctions(); CLuaCryptDefs::LoadFunctions(); diff --git a/Shared/mods/deathmatch/logic/lua/CLuaShared.h b/Shared/mods/deathmatch/logic/lua/CLuaShared.h index 17df2c4e638..3ee1fc30113 100644 --- a/Shared/mods/deathmatch/logic/lua/CLuaShared.h +++ b/Shared/mods/deathmatch/logic/lua/CLuaShared.h @@ -26,7 +26,7 @@ class CLuaShared public: static void EmbedChunkName(SString strChunkName, const char** pcpOutBuffer, uint* puiOutSize); static bool CheckUTF8BOMAndUpdate(const char** pcpOutBuffer, uint* puiOutSize); - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClasses(lua_State* luaVM); // Shared scripting is the only place where we need the async task scheduler diff --git a/Shared/mods/deathmatch/logic/lua/CLuaVector2.cpp b/Shared/mods/deathmatch/logic/lua/CLuaVector2.cpp index 897db791831..4fa94f14f3a 100644 --- a/Shared/mods/deathmatch/logic/lua/CLuaVector2.cpp +++ b/Shared/mods/deathmatch/logic/lua/CLuaVector2.cpp @@ -11,7 +11,7 @@ #include -CLuaVector2D::CLuaVector2D(void) : CVector2D() +CLuaVector2D::CLuaVector2D() : CVector2D() { m_uiScriptID = CIdArray::PopUniqueId(this, EIdClass::VECTOR2); } @@ -26,7 +26,7 @@ CLuaVector2D::CLuaVector2D(const CVector2D& vector) : CVector2D(vector) m_uiScriptID = CIdArray::PopUniqueId(this, EIdClass::VECTOR2); } -CLuaVector2D::~CLuaVector2D(void) +CLuaVector2D::~CLuaVector2D() { CIdArray::PushUniqueId(this, EIdClass::VECTOR2, m_uiScriptID); m_uiScriptID = INVALID_ARRAY_ID; diff --git a/Shared/mods/deathmatch/logic/lua/CLuaVector2.h b/Shared/mods/deathmatch/logic/lua/CLuaVector2.h index 8d1b817237c..220c5cd544a 100644 --- a/Shared/mods/deathmatch/logic/lua/CLuaVector2.h +++ b/Shared/mods/deathmatch/logic/lua/CLuaVector2.h @@ -14,13 +14,13 @@ class CLuaVector2D : public CVector2D { public: - CLuaVector2D(void); + CLuaVector2D(); CLuaVector2D(const CVector2D& vector); CLuaVector2D(float fX, float fY); - ~CLuaVector2D(void); + ~CLuaVector2D(); - unsigned int GetScriptID(void) const { return m_uiScriptID; } + unsigned int GetScriptID() const { return m_uiScriptID; } static CLuaVector2D* GetFromScriptID(unsigned int uiScriptID); diff --git a/Shared/mods/deathmatch/logic/lua/CLuaVector3.cpp b/Shared/mods/deathmatch/logic/lua/CLuaVector3.cpp index 3ab5bcfd1a2..79cc527f01d 100644 --- a/Shared/mods/deathmatch/logic/lua/CLuaVector3.cpp +++ b/Shared/mods/deathmatch/logic/lua/CLuaVector3.cpp @@ -11,7 +11,7 @@ #include -CLuaVector3D::CLuaVector3D(void) : CVector() +CLuaVector3D::CLuaVector3D() : CVector() { m_uiScriptID = CIdArray::PopUniqueId(this, EIdClass::VECTOR3); } @@ -26,7 +26,7 @@ CLuaVector3D::CLuaVector3D(const CVector& vector) : CVector(vector) m_uiScriptID = CIdArray::PopUniqueId(this, EIdClass::VECTOR3); } -CLuaVector3D::~CLuaVector3D(void) +CLuaVector3D::~CLuaVector3D() { CIdArray::PushUniqueId(this, EIdClass::VECTOR3, m_uiScriptID); m_uiScriptID = INVALID_ARRAY_ID; diff --git a/Shared/mods/deathmatch/logic/lua/CLuaVector3.h b/Shared/mods/deathmatch/logic/lua/CLuaVector3.h index a982aee753e..c28b04abee8 100644 --- a/Shared/mods/deathmatch/logic/lua/CLuaVector3.h +++ b/Shared/mods/deathmatch/logic/lua/CLuaVector3.h @@ -14,13 +14,13 @@ class CLuaVector3D : public CVector { public: - CLuaVector3D(void); + CLuaVector3D(); CLuaVector3D(const CVector& vector); CLuaVector3D(float fX, float fY, float fZ); - ~CLuaVector3D(void); + ~CLuaVector3D(); - unsigned int GetScriptID(void) const { return m_uiScriptID; } + unsigned int GetScriptID() const { return m_uiScriptID; } static CLuaVector3D* GetFromScriptID(unsigned int uiScriptID); diff --git a/Shared/mods/deathmatch/logic/lua/CLuaVector4.cpp b/Shared/mods/deathmatch/logic/lua/CLuaVector4.cpp index e29f50ce050..e897662320c 100644 --- a/Shared/mods/deathmatch/logic/lua/CLuaVector4.cpp +++ b/Shared/mods/deathmatch/logic/lua/CLuaVector4.cpp @@ -11,7 +11,7 @@ #include -CLuaVector4D::CLuaVector4D(void) : CVector4D() +CLuaVector4D::CLuaVector4D() : CVector4D() { m_uiScriptID = CIdArray::PopUniqueId(this, EIdClass::VECTOR4); } @@ -26,7 +26,7 @@ CLuaVector4D::CLuaVector4D(const CVector4D& vector) : CVector4D(vector) m_uiScriptID = CIdArray::PopUniqueId(this, EIdClass::VECTOR4); } -CLuaVector4D::~CLuaVector4D(void) +CLuaVector4D::~CLuaVector4D() { CIdArray::PushUniqueId(this, EIdClass::VECTOR4, m_uiScriptID); m_uiScriptID = INVALID_ARRAY_ID; diff --git a/Shared/mods/deathmatch/logic/lua/CLuaVector4.h b/Shared/mods/deathmatch/logic/lua/CLuaVector4.h index c578a0c671e..044b9d702cd 100644 --- a/Shared/mods/deathmatch/logic/lua/CLuaVector4.h +++ b/Shared/mods/deathmatch/logic/lua/CLuaVector4.h @@ -14,13 +14,13 @@ class CLuaVector4D : public CVector4D { public: - CLuaVector4D(void); + CLuaVector4D(); CLuaVector4D(const CVector4D& vector); CLuaVector4D(float fX, float fY, float fZ, float fW); - ~CLuaVector4D(void); + ~CLuaVector4D(); - unsigned int GetScriptID(void) const { return m_uiScriptID; } + unsigned int GetScriptID() const { return m_uiScriptID; } static CLuaVector4D* GetFromScriptID(unsigned int uiScriptID); diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp index 31d8ed8b5fb..eda4b01d57a 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp @@ -12,7 +12,7 @@ #define mask(n) (~((0xFFFFFFFF << 1) << ((n) - 1))) -void CLuaBitDefs::LoadFunctions(void) +void CLuaBitDefs::LoadFunctions() { std::map functions{ {"bitAnd", bitAnd}, diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.h b/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.h index bf10e0572b4..077c53bdfd4 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.h +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.h @@ -14,7 +14,7 @@ class CLuaBitDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); // bitwise operators LUA_DECLARE(bitAnd); diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp index 19597efcbaa..399ba49cc74 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp @@ -10,7 +10,7 @@ #include "StdInc.h" #include -void CLuaCryptDefs::LoadFunctions(void) +void CLuaCryptDefs::LoadFunctions() { std::map functions{ {"md5", Md5}, diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.h b/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.h index c0f6ac09f5a..5c6e652b48a 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.h +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.h @@ -14,7 +14,7 @@ class CLuaCryptDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); LUA_DECLARE(Md5); LUA_DECLARE(Sha256); diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp index 64f3ce842f5..e4bb398a063 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp @@ -12,7 +12,7 @@ #define DEFAULT_MAX_FILESIZE 52428800 -void CLuaFileDefs::LoadFunctions(void) +void CLuaFileDefs::LoadFunctions() { std::map functions{ {"fileOpen", fileOpen}, diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.h b/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.h index e69eba585d9..1888e710eaa 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.h +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.h @@ -14,7 +14,7 @@ class CLuaFileDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); private: diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp index 0715ce37306..4a59faccaac 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp @@ -10,7 +10,7 @@ #include "StdInc.h" -void CLuaUTFDefs::LoadFunctions(void) +void CLuaUTFDefs::LoadFunctions() { std::map functions{ {"utfLen", UtfLen}, diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.h b/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.h index 5be6ae326ca..bd1017272df 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.h +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.h @@ -14,7 +14,7 @@ class CLuaUTFDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); LUA_DECLARE(UtfLen); LUA_DECLARE(UtfSeek); diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp index 24b843eb551..520cbdeeda5 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp @@ -10,7 +10,7 @@ #include "StdInc.h" -void CLuaUtilDefs::LoadFunctions(void) +void CLuaUtilDefs::LoadFunctions() { std::map functions{ // Util functions to make scripting easier for the end user diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.h b/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.h index 8003b33fc53..849011a94d4 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.h +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.h @@ -14,7 +14,7 @@ class CLuaUtilDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); // Reserved functions LUA_DECLARE(DisabledFunction); diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp index 4aa9dc78cc1..193b3773d06 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp @@ -10,7 +10,7 @@ #include "StdInc.h" -void CLuaXMLDefs::LoadFunctions(void) +void CLuaXMLDefs::LoadFunctions() { std::map functions{ {"xmlCreateFile", xmlCreateFile}, diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.h b/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.h index 8dd55174698..c215dc93334 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.h +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.h @@ -14,7 +14,7 @@ class CLuaXMLDefs : public CLuaDefs { public: - static void LoadFunctions(void); + static void LoadFunctions(); static void AddClass(lua_State* luaVM); LUA_DECLARE(xmlCreateFile); diff --git a/Shared/publicsdk/CThread.cpp b/Shared/publicsdk/CThread.cpp index 27c5cd92791..a7d3805724d 100644 --- a/Shared/publicsdk/CThread.cpp +++ b/Shared/publicsdk/CThread.cpp @@ -18,7 +18,7 @@ #include "CThread.h" -CThread::CThread(void) +CThread::CThread() { m_pThreadData = NULL; m_pArg = NULL; @@ -27,7 +27,7 @@ CThread::CThread(void) #endif } -CThread::~CThread(void) +CThread::~CThread() { Stop(); } @@ -53,7 +53,7 @@ bool CThread::Start(CThreadData* pData) return true; } -void CThread::Stop(void) +void CThread::Stop() { if (m_hThread) { @@ -113,7 +113,7 @@ void* CThread::EntryPoint(void* pThis) } #endif -CThreadData* CThread::Arg(void) const +CThreadData* CThread::Arg() const { return m_pThreadData; } diff --git a/Shared/publicsdk/CThread.h b/Shared/publicsdk/CThread.h index 088d9233460..07526d8b910 100644 --- a/Shared/publicsdk/CThread.h +++ b/Shared/publicsdk/CThread.h @@ -41,11 +41,11 @@ typedef pthread_mutex_t ThreadMutex; class CThread { public: - CThread(void); - virtual ~CThread(void); + CThread(); + virtual ~CThread(); bool Start(CThreadData* pData); - void Stop(void); + void Stop(); static bool TryLock(ThreadMutex* Mutex); static void Lock(ThreadMutex* Mutex); @@ -56,7 +56,7 @@ class CThread virtual int Execute(CThreadData* pData) = 0; - CThreadData* Arg(void) const; + CThreadData* Arg() const; void Arg(CThreadData* pData); #ifdef WIN32 // Win32 threads diff --git a/Shared/publicsdk/CThreadData.cpp b/Shared/publicsdk/CThreadData.cpp index a06e26cb4b4..eb6c8052e6d 100644 --- a/Shared/publicsdk/CThreadData.cpp +++ b/Shared/publicsdk/CThreadData.cpp @@ -18,7 +18,7 @@ #include "CThreadData.h" -CThreadData::CThreadData(void) +CThreadData::CThreadData() { bAbortThread = false; @@ -32,7 +32,7 @@ CThreadData::CThreadData(void) #endif } -CThreadData::~CThreadData(void) +CThreadData::~CThreadData() { #ifdef WIN32 DeleteCriticalSection(&MutexPrimary); diff --git a/Shared/publicsdk/CThreadData.h b/Shared/publicsdk/CThreadData.h index 61d30c5ee48..6cb17e3db36 100644 --- a/Shared/publicsdk/CThreadData.h +++ b/Shared/publicsdk/CThreadData.h @@ -25,8 +25,8 @@ class CThreadData; class CThreadData { public: - CThreadData(void); - ~CThreadData(void); + CThreadData(); + ~CThreadData(); bool bAbortThread; ThreadMutex MutexPrimary; // primary mutex for suspend/resume operations diff --git a/Shared/publicsdk/extra/CLuaArgument.cpp b/Shared/publicsdk/extra/CLuaArgument.cpp index 46c5b94677a..5627d37be9c 100644 --- a/Shared/publicsdk/extra/CLuaArgument.cpp +++ b/Shared/publicsdk/extra/CLuaArgument.cpp @@ -22,7 +22,7 @@ using namespace std; -CLuaArgument::CLuaArgument(void) +CLuaArgument::CLuaArgument() { m_szString = NULL; m_iType = LUA_TNIL; @@ -72,7 +72,7 @@ CLuaArgument::CLuaArgument(lua_State* luaVM, unsigned int uiArgument) Read(luaVM, uiArgument); } -CLuaArgument::~CLuaArgument(void) +CLuaArgument::~CLuaArgument() { // Eventually destroy our string if (m_szString) diff --git a/Shared/publicsdk/extra/CLuaArgument.h b/Shared/publicsdk/extra/CLuaArgument.h index 1ff893d310e..df289811684 100644 --- a/Shared/publicsdk/extra/CLuaArgument.h +++ b/Shared/publicsdk/extra/CLuaArgument.h @@ -26,14 +26,14 @@ extern "C" class CLuaArgument { public: - CLuaArgument(void); + CLuaArgument(); CLuaArgument(bool bBool); CLuaArgument(double dNumber); CLuaArgument(const char* szString); CLuaArgument(void* pUserData); CLuaArgument(const CLuaArgument& Argument); CLuaArgument(lua_State* luaVM, unsigned int uiArgument); - ~CLuaArgument(void); + ~CLuaArgument(); const CLuaArgument& operator=(const CLuaArgument& Argument); bool operator==(const CLuaArgument& Argument); @@ -42,12 +42,12 @@ class CLuaArgument void Read(lua_State* luaVM, unsigned int uiArgument); void Push(lua_State* luaVM) const; - int GetType(void) const { return m_iType; }; + int GetType() const { return m_iType; }; - bool GetBoolean(void) const { return m_bBoolean; }; - lua_Number GetNumber(void) const { return m_Number; }; - const char* GetString(void) const { return m_szString; }; - void* GetLightUserData(void) const { return m_pLightUserData; }; + bool GetBoolean() const { return m_bBoolean; }; + lua_Number GetNumber() const { return m_Number; }; + const char* GetString() const { return m_szString; }; + void* GetLightUserData() const { return m_pLightUserData; }; private: int m_iType; diff --git a/Shared/publicsdk/extra/CLuaArguments.cpp b/Shared/publicsdk/extra/CLuaArguments.cpp index bee16c7f069..e9148e1afa8 100644 --- a/Shared/publicsdk/extra/CLuaArguments.cpp +++ b/Shared/publicsdk/extra/CLuaArguments.cpp @@ -104,7 +104,7 @@ bool CLuaArguments::Call(lua_State* luaVM, const char* szFunction) const return true; } -CLuaArgument* CLuaArguments::PushNil(void) +CLuaArgument* CLuaArguments::PushNil() { CLuaArgument* pArgument = new CLuaArgument; m_Arguments.push_back(pArgument); @@ -139,7 +139,7 @@ CLuaArgument* CLuaArguments::PushUserData(void* pUserData) return pArgument; } -void CLuaArguments::DeleteArguments(void) +void CLuaArguments::DeleteArguments() { // Delete each item vector::iterator iter = m_Arguments.begin(); diff --git a/Shared/publicsdk/extra/CLuaArguments.h b/Shared/publicsdk/extra/CLuaArguments.h index ea272f60b53..d734daa76be 100644 --- a/Shared/publicsdk/extra/CLuaArguments.h +++ b/Shared/publicsdk/extra/CLuaArguments.h @@ -31,9 +31,9 @@ using namespace std; class CLuaArguments { public: - CLuaArguments(void){}; + CLuaArguments(){}; CLuaArguments(const CLuaArguments& Arguments); - ~CLuaArguments(void) { DeleteArguments(); }; + ~CLuaArguments() { DeleteArguments(); }; const CLuaArguments& operator=(const CLuaArguments& Arguments); @@ -42,17 +42,17 @@ class CLuaArguments void PushArguments(CLuaArguments& Arguments); bool Call(lua_State* luaVM, const char* szFunction) const; - CLuaArgument* PushNil(void); + CLuaArgument* PushNil(); CLuaArgument* PushBoolean(bool bBool); CLuaArgument* PushNumber(double dNumber); CLuaArgument* PushString(const char* szString); CLuaArgument* PushUserData(void* pUserData); - void DeleteArguments(void); + void DeleteArguments(); - unsigned int Count(void) const { return static_cast(m_Arguments.size()); }; - vector::const_iterator IterBegin(void) { return m_Arguments.begin(); }; - vector::const_iterator IterEnd(void) { return m_Arguments.end(); }; + unsigned int Count() const { return static_cast(m_Arguments.size()); }; + vector::const_iterator IterBegin() { return m_Arguments.begin(); }; + vector::const_iterator IterEnd() { return m_Arguments.end(); }; private: vector m_Arguments; diff --git a/Shared/sdk/CDuplicateLineFilter.h b/Shared/sdk/CDuplicateLineFilter.h index a46f82ae38d..43887ae462e 100644 --- a/Shared/sdk/CDuplicateLineFilter.h +++ b/Shared/sdk/CDuplicateLineFilter.h @@ -87,7 +87,7 @@ class CDuplicateLineFilter // Finish current match and push relevant lines to the output buffer // ////////////////////////////////////////////////////////// - void Flush(void) + void Flush() { if (m_bIsMatching == false) return; diff --git a/Shared/sdk/CFastList.h b/Shared/sdk/CFastList.h index b8703f0871f..b09f11967d1 100644 --- a/Shared/sdk/CFastList.h +++ b/Shared/sdk/CFastList.h @@ -56,7 +56,7 @@ class CFastList bool m_bSuspendingModifyOperations; std::vector m_SuspendedOperationList; - CFastList(void) : uiRevision(1), uiNextFrontIndex(UINT_MAX / 2 - 1), uiNextBackIndex(UINT_MAX / 2), m_bSuspendingModifyOperations(false) + CFastList() : uiRevision(1), uiNextFrontIndex(UINT_MAX / 2 - 1), uiNextBackIndex(UINT_MAX / 2), m_bSuspendingModifyOperations(false) { #ifdef MTA_DEBUG // T must be a pointer @@ -65,9 +65,9 @@ class CFastList #endif } - const T& front(void) const { return orderedMap.begin()->second; } + const T& front() const { return orderedMap.begin()->second; } - void pop_front(void) + void pop_front() { dassert(!m_bSuspendingModifyOperations); T item = front(); @@ -112,11 +112,11 @@ class CFastList bool contains(const T& item) const { return (infoMap.find(item) != infoMap.end()); } - size_t size(void) const { return orderedMap.size(); } + size_t size() const { return orderedMap.size(); } - bool empty(void) const { return orderedMap.empty(); } + bool empty() const { return orderedMap.empty(); } - void clear(void) + void clear() { dassert(!m_bSuspendingModifyOperations); orderedMap.clear(); @@ -144,17 +144,17 @@ class CFastList } } - uint GetRevision(void) const { return uiRevision; } + uint GetRevision() const { return uiRevision; } // Queue remove/push_back/push_front operations until ResumeModifyOperations is called - void SuspendModifyOperations(void) + void SuspendModifyOperations() { dassert(!m_bSuspendingModifyOperations); m_bSuspendingModifyOperations = true; } // Replay queued operations - void ResumeModifyOperations(void) + void ResumeModifyOperations() { dassert(m_bSuspendingModifyOperations); m_bSuspendingModifyOperations = false; @@ -172,7 +172,7 @@ class CFastList protected: // Reset indexing - void Reindex(void) + void Reindex() { uiNextFrontIndex = UINT_MAX / 2 - 1; uiNextBackIndex = UINT_MAX / 2; @@ -225,9 +225,9 @@ class CFastList ConstIterator(typename MapType::const_iterator initer) : iter(initer) {} bool operator==(const ConstIterator& other) const { return iter == other.iter; } bool operator!=(const ConstIterator& other) const { return iter != other.iter; } - void operator++(void) { ++iter; } + void operator++() { ++iter; } void operator++(int) { iter++; } - const T& operator*(void)const { return iter->second; } + const T& operator*()const { return iter->second; } }; class Iterator @@ -238,10 +238,10 @@ class CFastList Iterator(typename MapType::iterator initer) : iter(initer) {} bool operator==(const Iterator& other) const { return iter == other.iter; } bool operator!=(const Iterator& other) const { return iter != other.iter; } - void operator++(void) { ++iter; } + void operator++() { ++iter; } void operator++(int) { iter++; } - const T& operator*(void)const { return iter->second; } - operator ConstIterator(void) const { return ConstIterator(iter); } + const T& operator*()const { return iter->second; } + operator ConstIterator() const { return ConstIterator(iter); } }; // @@ -255,9 +255,9 @@ class CFastList ConstReverseIterator(typename MapType::const_reverse_iterator initer) : iter(initer) {} bool operator==(const ConstReverseIterator& other) const { return iter == other.iter; } bool operator!=(const ConstReverseIterator& other) const { return iter != other.iter; } - void operator++(void) { ++iter; } + void operator++() { ++iter; } void operator++(int) { iter++; } - const T& operator*(void)const { return iter->second; } + const T& operator*()const { return iter->second; } }; class ReverseIterator @@ -268,21 +268,21 @@ class CFastList ReverseIterator(typename MapType::reverse_iterator initer) : iter(initer) {} bool operator==(const ReverseIterator& other) const { return iter == other.iter; } bool operator!=(const ReverseIterator& other) const { return iter != other.iter; } - void operator++(void) { ++iter; } + void operator++() { ++iter; } void operator++(int) { iter++; } - const T& operator*(void)const { return iter->second; } - operator ConstReverseIterator(void) const { return ConstReverseIterator(iter); } + const T& operator*()const { return iter->second; } + operator ConstReverseIterator() const { return ConstReverseIterator(iter); } }; - ConstIterator begin(void) const { return ConstIterator(orderedMap.begin()); } - ConstIterator end(void) const { return ConstIterator(orderedMap.end()); } - Iterator begin(void) { return Iterator(orderedMap.begin()); } - Iterator end(void) { return Iterator(orderedMap.end()); } + ConstIterator begin() const { return ConstIterator(orderedMap.begin()); } + ConstIterator end() const { return ConstIterator(orderedMap.end()); } + Iterator begin() { return Iterator(orderedMap.begin()); } + Iterator end() { return Iterator(orderedMap.end()); } - ConstReverseIterator rbegin(void) const { return ConstReverseIterator(orderedMap.rbegin()); } - ConstReverseIterator rend(void) const { return ConstReverseIterator(orderedMap.rend()); } - ReverseIterator rbegin(void) { return ReverseIterator(orderedMap.rbegin()); } - ReverseIterator rend(void) { return ReverseIterator(orderedMap.rend()); } + ConstReverseIterator rbegin() const { return ConstReverseIterator(orderedMap.rbegin()); } + ConstReverseIterator rend() const { return ConstReverseIterator(orderedMap.rend()); } + ReverseIterator rbegin() { return ReverseIterator(orderedMap.rbegin()); } + ReverseIterator rend() { return ReverseIterator(orderedMap.rend()); } // Allow use of std iterator names typedef Iterator iterator; diff --git a/Shared/sdk/CMatrix.h b/Shared/sdk/CMatrix.h index 4cf16a6bfd9..7d149b37e36 100644 --- a/Shared/sdk/CMatrix.h +++ b/Shared/sdk/CMatrix.h @@ -110,7 +110,7 @@ class CMatrix vRight.fZ * vec.fX + vFront.fZ * vec.fY + vUp.fZ * vec.fZ); } - CMatrix Inverse(void) const + CMatrix Inverse() const { float fDeterminant = vRight.fX * (vFront.fY * vUp.fZ - vUp.fY * vFront.fZ) - vFront.fX * (vRight.fY * vUp.fZ - vUp.fY * vRight.fZ) + vUp.fX * (vRight.fY * vFront.fZ - vFront.fY * vRight.fZ); @@ -144,7 +144,7 @@ class CMatrix return matResult; } - CMatrix Clone(void) const + CMatrix Clone() const { CMatrix matResult; matResult.vRight = vRight.Clone(); @@ -224,7 +224,7 @@ class CMatrix // Get matrix rotation as angles // Inverted to match MTAized rotations for vehicles and players (and objects on the server) // Should produce the same results as ( CVector(0,0,0) - ConvertToEulerAngles() ) - CVector GetRotation(void) const + CVector GetRotation() const { // Operate only on rotation, ignore scale. CMatrix matRot = GetRotationMatrix(); @@ -270,7 +270,7 @@ class CMatrix } // Get matrix translational part - const CVector& GetPosition(void) const { return vPos; } + const CVector& GetPosition() const { return vPos; } // Set matrix translational part void SetPosition(const CVector& vecPosition) { vPos = vecPosition; } diff --git a/Shared/sdk/CMatrix4.h b/Shared/sdk/CMatrix4.h index fbcda5c44ff..be7c86bfc64 100644 --- a/Shared/sdk/CMatrix4.h +++ b/Shared/sdk/CMatrix4.h @@ -20,7 +20,7 @@ class CMatrix4 { public: - CMatrix4(void) { Identity(); } + CMatrix4() { Identity(); } void rotX(float angle) { @@ -70,7 +70,7 @@ class CMatrix4 m_cell[10] = 1.0; } - void Identity(void) + void Identity() { m_cell[1] = m_cell[2] = m_cell[3] = m_cell[4] = m_cell[6] = m_cell[7] = m_cell[8] = m_cell[9] = m_cell[11] = m_cell[12] = m_cell[13] = m_cell[14] = 0; diff --git a/Shared/sdk/CScriptArgReader.h b/Shared/sdk/CScriptArgReader.h index ea4e8824c85..07bb20df2a2 100644 --- a/Shared/sdk/CScriptArgReader.h +++ b/Shared/sdk/CScriptArgReader.h @@ -41,7 +41,7 @@ class CScriptArgReader m_bHasCustomMessage = false; } - ~CScriptArgReader(void) { assert(!IsReadFunctionPending()); } + ~CScriptArgReader() { assert(!IsReadFunctionPending()); } // // Read next number @@ -1089,7 +1089,7 @@ class CScriptArgReader // // Call after other arguments have been read // - void ReadFunctionComplete(void) + void ReadFunctionComplete() { if (!m_pPendingFunctionOutValue) return; @@ -1110,7 +1110,7 @@ class CScriptArgReader } // Debug check - bool IsReadFunctionPending(void) const { return m_pPendingFunctionOutValue && m_pPendingFunctionIndex != -1; } + bool IsReadFunctionPending() const { return m_pPendingFunctionOutValue && m_pPendingFunctionIndex != -1; } // // Peek at next type @@ -1158,18 +1158,18 @@ class CScriptArgReader return false; } - bool NextIsVector4D(void) const + bool NextIsVector4D() const { return (NextCouldBeNumber() && NextCouldBeNumber(1) && NextCouldBeNumber(2) && NextCouldBeNumber(3)) || NextIsUserDataOfType(); } - bool NextIsVector3D(void) const + bool NextIsVector3D() const { return (NextCouldBeNumber() && NextCouldBeNumber(1) && NextCouldBeNumber(2)) || NextIsUserDataOfType() || NextIsUserDataOfType(); } - bool NextIsVector2D(void) const + bool NextIsVector2D() const { return (NextCouldBeNumber() && NextCouldBeNumber(1)) || NextIsUserDataOfType() || NextIsUserDataOfType() || NextIsUserDataOfType(); @@ -1282,7 +1282,7 @@ class CScriptArgReader // // GetErrorMessage // - SString GetErrorMessage(void) + SString GetErrorMessage() { if (!m_bError) return "No error"; @@ -1310,7 +1310,7 @@ class CScriptArgReader // // Put off getting error type and value until just before we need it // - void ResolveErrorGotArgumentTypeAndValue(void) + void ResolveErrorGotArgumentTypeAndValue() { if (!m_bError || m_bResolvedErrorGotArgumentTypeAndValue) return; @@ -1362,7 +1362,7 @@ class CScriptArgReader // // Make full error message // - SString GetFullErrorMessage(void) { return SString("%s @ '%s' [%s]", *m_strErrorCategory, lua_tostring(m_luaVM, lua_upvalueindex(1)), *GetErrorMessage()); } + SString GetFullErrorMessage() { return SString("%s @ '%s' [%s]", *m_strErrorCategory, lua_tostring(m_luaVM, lua_upvalueindex(1)), *GetErrorMessage()); } // // Set custom warning message diff --git a/Shared/sdk/CVector.h b/Shared/sdk/CVector.h index 9d4737a095b..91cd971cddb 100644 --- a/Shared/sdk/CVector.h +++ b/Shared/sdk/CVector.h @@ -42,7 +42,7 @@ class CVector this->fZ = fZ; } - float Normalize(void) + float Normalize() { float t = sqrt(fX * fX + fY * fY + fZ * fZ); if (t > FLOAT_EPSILON) @@ -57,9 +57,9 @@ class CVector return t; } - float Length(void) const { return sqrt((fX * fX) + (fY * fY) + (fZ * fZ)); } + float Length() const { return sqrt((fX * fX) + (fY * fY) + (fZ * fZ)); } - float LengthSquared(void) const { return (fX * fX) + (fY * fY) + (fZ * fZ); } + float LengthSquared() const { return (fX * fX) + (fY * fY) + (fZ * fZ); } float DotProduct(const CVector* param) const { return fX * param->fX + fY * param->fY + fZ * param->fZ; } @@ -72,7 +72,7 @@ class CVector } // Convert (direction) to rotation - CVector ToRotation(void) const + CVector ToRotation() const { CVector vecRotation; vecRotation.fZ = atan2(fY, fX); @@ -83,7 +83,7 @@ class CVector } // Return a perpendicular direction - CVector GetOtherAxis(void) const + CVector GetOtherAxis() const { CVector vecResult; if (std::abs(fX) > std::abs(fY)) @@ -94,7 +94,7 @@ class CVector return vecResult; } - CVector Clone(void) const + CVector Clone() const { CVector vecResult; vecResult.fX = fX; diff --git a/Shared/sdk/CVector2D.h b/Shared/sdk/CVector2D.h index 331702d6df5..513fa8a918a 100644 --- a/Shared/sdk/CVector2D.h +++ b/Shared/sdk/CVector2D.h @@ -20,7 +20,7 @@ class CVector2D { public: - CVector2D(void) + CVector2D() { fX = 0; fY = 0; @@ -56,9 +56,9 @@ class CVector2D float Length() const { return sqrt(fX * fX + fY * fY); } - float LengthSquared(void) const { return (fX * fX) + (fY * fY); } + float LengthSquared() const { return (fX * fX) + (fY * fY); } - void Normalize(void) + void Normalize() { float fLength = Length(); if (fLength > 0.0f) diff --git a/Shared/sdk/CVector4D.h b/Shared/sdk/CVector4D.h index e9d6755321f..74c6dd48230 100644 --- a/Shared/sdk/CVector4D.h +++ b/Shared/sdk/CVector4D.h @@ -20,7 +20,7 @@ class CVector4D { public: - CVector4D(void) + CVector4D() { fX = 0; fY = 0; @@ -57,9 +57,9 @@ class CVector4D float Length() const { return sqrt(fX * fX + fY * fY + fZ * fZ + fW * fW); } - float LengthSquared(void) const { return (fX * fX) + (fY * fY) + (fZ * fZ) + (fW * fW); } + float LengthSquared() const { return (fX * fX) + (fY * fY) + (fZ * fZ) + (fW * fW); } - void Normalize(void) + void Normalize() { float fLength = Length(); if (fLength > 0.0f) diff --git a/Shared/sdk/SString.h b/Shared/sdk/SString.h index e1664c333a8..beee396f0e9 100644 --- a/Shared/sdk/SString.h +++ b/Shared/sdk/SString.h @@ -71,7 +71,7 @@ class SString : public std::string // Assignment operator const char*() const { return c_str(); } // Auto assign to const char* without using c_str() - const char* operator*(void)const { return c_str(); } + const char* operator*()const { return c_str(); } // Functions void Split(const SString& strDelim, std::vector& outResult, unsigned int uiMaxAmount = 0, unsigned int uiMinAmount = 0) const; @@ -82,9 +82,9 @@ class SString : public std::string SString ReplaceI(const char* szOld, const char* szNew, bool bSearchJustReplaced = false) const; SString TrimStart(const char* szOld) const; SString TrimEnd(const char* szOld) const; - SString ToLower(void) const; - SString ToUpper(void) const; - SString ConformLineEndings(void) const; + SString ToLower() const; + SString ToUpper() const; + SString ConformLineEndings() const; bool Contains(const SString& strOther) const; bool ContainsI(const SString& strOther) const; bool CompareI(const SString& strOther) const; @@ -114,7 +114,7 @@ class SStringX : public SString // struct SCharStringRef { - SCharStringRef(void) : pData(NULL), uiSize(0) {} + SCharStringRef() : pData(NULL), uiSize(0) {} char* pData; size_t uiSize; }; @@ -127,7 +127,7 @@ template class TSplitString : public std::vector { public: - TSplitString(void) {} + TSplitString() {} TSplitString(const STRING_TYPE& strInput, const STRING_TYPE& strDelim, unsigned int uiMaxAmount = 0, unsigned int uiMinAmount = 0) { Split(strInput, strDelim, uiMaxAmount, uiMinAmount); diff --git a/Shared/sdk/SString.hpp b/Shared/sdk/SString.hpp index 6288bc1475b..984b73fd56e 100644 --- a/Shared/sdk/SString.hpp +++ b/Shared/sdk/SString.hpp @@ -346,7 +346,7 @@ SString SString::TrimEnd(const char* szOld) const // // Change to all lower case characters. // -SString SString::ToLower(void) const +SString SString::ToLower() const { SString strResult = *this; std::transform(strResult.begin(), strResult.end(), strResult.begin(), SharedUtil::tolower); @@ -356,7 +356,7 @@ SString SString::ToLower(void) const // // Change to all upper case characters. // -SString SString::ToUpper(void) const +SString SString::ToUpper() const { SString strResult = *this; std::transform(strResult.begin(), strResult.end(), strResult.begin(), SharedUtil::toupper); @@ -366,7 +366,7 @@ SString SString::ToUpper(void) const // // Change '0x0a' or '0x0d' or '0x0d 0x0a' to '\n'. // -SString SString::ConformLineEndings(void) const +SString SString::ConformLineEndings() const { assert('\n' == '\x0A'); if (std::count(begin(), end(), '\n')) diff --git a/Shared/sdk/SharedUtil.AllocTracking.h b/Shared/sdk/SharedUtil.AllocTracking.h index 209826df7bb..3b9a4744baa 100644 --- a/Shared/sdk/SharedUtil.AllocTracking.h +++ b/Shared/sdk/SharedUtil.AllocTracking.h @@ -187,7 +187,7 @@ namespace std class CArray : public std::vector<_Ty, Allocator<_Ty> > { public: - CArray(void) : std::vector<_Ty, Allocator<_Ty> >() {} + CArray() : std::vector<_Ty, Allocator<_Ty> >() {} CArray(int size) : std::vector<_Ty, Allocator<_Ty> >(size) {} CArray(int size, int fill) : std::vector<_Ty, Allocator<_Ty> >(size, fill) {} template @@ -206,7 +206,7 @@ namespace std class CMap : public std::map<_Kty, _Ty, _Pr, Allocator > > { public: - CMap(void) : std::map<_Kty, _Ty, _Pr, Allocator > >() {} + CMap() : std::map<_Kty, _Ty, _Pr, Allocator > >() {} CMap(uint uiInitialSize) : std::map<_Kty, _Ty, _Pr, Allocator > >() {} }; @@ -214,7 +214,7 @@ namespace std class CSet : public std::set<_Kty, _Pr, Allocator<_Kty> > { public: - CSet(void) : std::set<_Kty, _Pr, Allocator<_Kty> >() {} + CSet() : std::set<_Kty, _Pr, Allocator<_Kty> >() {} template CSet(_Iter _First, _Iter _Last) : std::set<_Kty, _Pr, Allocator<_Kty> >(_First, _Last) { diff --git a/Shared/sdk/SharedUtil.AllocTracking.hpp b/Shared/sdk/SharedUtil.AllocTracking.hpp index 4bfe0d14f88..3ccdf7a4ac6 100644 --- a/Shared/sdk/SharedUtil.AllocTracking.hpp +++ b/Shared/sdk/SharedUtil.AllocTracking.hpp @@ -306,7 +306,7 @@ class CAllocStats } // Return false if should not use alloc tracking - bool Lock(void) + bool Lock() { thread_id dwThreadWanting = GetCurrentThreadId(); if (dwThreadWanting == dwThreadUsing) @@ -316,7 +316,7 @@ class CAllocStats return true; } - void Unlock(void) + void Unlock() { dwThreadUsing = INVALID_THREAD_ID; cs.Unlock(); diff --git a/Shared/sdk/SharedUtil.Buffer.h b/Shared/sdk/SharedUtil.Buffer.h index cd05162a8c5..06fea2dd495 100644 --- a/Shared/sdk/SharedUtil.Buffer.h +++ b/Shared/sdk/SharedUtil.Buffer.h @@ -25,7 +25,7 @@ namespace SharedUtil void resize(size_t newSizeInBytes) { buffer.resize(newSizeInBytes); } - operator T*(void) { return buffer.empty() ? nullptr : reinterpret_cast(&buffer.at(0)); } + operator T*() { return buffer.empty() ? nullptr : reinterpret_cast(&buffer.at(0)); } }; // Assuming compiled on little endian machine @@ -42,12 +42,12 @@ namespace SharedUtil class CBuffer : protected std::vector { public: - CBuffer(void) {} + CBuffer() {} CBuffer(const void* pData, uint uiSize) { AddBytes(pData, uiSize, 0); } - void Clear(void) { clear(); } + void Clear() { clear(); } - bool IsEmpty(void) const { return empty(); } + bool IsEmpty() const { return empty(); } void Reserve(uint uiSize) { return reserve(uiSize); } @@ -65,7 +65,7 @@ namespace SharedUtil memset(GetData() + uiOldSize, 0, uiSize - uiOldSize); } - uint GetSize(void) const { return (uint)size(); } + uint GetSize() const { return (uint)size(); } // Access char* GetData(uint uiOffset = 0) { return size() ? &at(uiOffset) : NULL; } @@ -160,11 +160,11 @@ namespace SharedUtil public: CBufferStream(bool bToFromNetwork) : m_iPos(0), m_uiVersion(0), m_bToFromNetwork(bToFromNetwork) {} void Seek(int iPos) { m_iPos = Clamp(0, iPos, GetSize()); } - int Tell(void) const { return m_iPos; } - virtual int GetSize(void) const = 0; + int Tell() const { return m_iPos; } + virtual int GetSize() const = 0; bool AtEnd(int iOffset = 0) const { return m_iPos + iOffset >= GetSize(); } void SetVersion(uint uiVersion) { m_uiVersion = uiVersion; } - uint Version(void) const { return m_uiVersion; } + uint Version() const { return m_uiVersion; } protected: int m_iPos; @@ -186,8 +186,8 @@ namespace SharedUtil public: CBufferReadStream(const CBuffer& source, bool bToFromNetwork = false) : CBufferStream(bToFromNetwork), pBuffer(&source) {} - virtual int GetSize(void) const { return pBuffer->GetSize(); } - virtual const char* GetData(void) const { return pBuffer->GetData(); } + virtual int GetSize() const { return pBuffer->GetSize(); } + virtual const char* GetData() const { return pBuffer->GetData(); } // Return true if enough bytes left in the buffer bool CanReadNumberOfBytes(int iLength) @@ -323,7 +323,7 @@ namespace SharedUtil public: CBufferWriteStream(CBuffer& source, bool bToFromNetwork = false) : CBufferStream(bToFromNetwork), pBuffer(&source) {} - virtual int GetSize(void) const { return pBuffer->GetSize(); } + virtual int GetSize() const { return pBuffer->GetSize(); } void WriteBytes(const void* pData, int iLength, bool bToFromNetwork = false) { diff --git a/Shared/sdk/SharedUtil.FastHashMap.h b/Shared/sdk/SharedUtil.FastHashMap.h index aeeefcab908..4313d8ed5b5 100644 --- a/Shared/sdk/SharedUtil.FastHashMap.h +++ b/Shared/sdk/SharedUtil.FastHashMap.h @@ -59,7 +59,7 @@ namespace SharedUtil this->set_empty_key(GetEmptyMapKey((K*)NULL)); this->set_deleted_key(GetDeletedMapKey((K*)NULL)); } - CFastHashMap(void) + CFastHashMap() { this->set_empty_key(GetEmptyMapKey((K*)NULL)); this->set_deleted_key(GetDeletedMapKey((K*)NULL)); diff --git a/Shared/sdk/SharedUtil.FastHashSet.h b/Shared/sdk/SharedUtil.FastHashSet.h index 259a86a0c36..43578284fad 100644 --- a/Shared/sdk/SharedUtil.FastHashSet.h +++ b/Shared/sdk/SharedUtil.FastHashSet.h @@ -34,7 +34,7 @@ namespace SharedUtil class CFastHashSet : public google::dense_hash_set { public: - CFastHashSet(void) + CFastHashSet() { this->set_empty_key(GetEmptyMapKey((K*)NULL)); this->set_deleted_key(GetDeletedMapKey((K*)NULL)); diff --git a/Shared/sdk/SharedUtil.File.h b/Shared/sdk/SharedUtil.File.h index a47ffa7dd42..191468762ed 100644 --- a/Shared/sdk/SharedUtil.File.h +++ b/Shared/sdk/SharedUtil.File.h @@ -66,26 +66,26 @@ namespace SharedUtil SString ConformPathForSorting(const SString& strPathFilename); bool IsAbsolutePath(const SString& strPath); - SString GetSystemCurrentDirectory(void); - SString GetSystemDllDirectory(void); - SString GetSystemLocalAppDataPath(void); - SString GetSystemCommonAppDataPath(void); - SString GetSystemPersonalPath(void); - SString GetSystemWindowsPath(void); - SString GetSystemSystemPath(void); - SString GetSystemTempPath(void); - SString GetMTADataPath(void); - SString GetMTADataPathCommon(void); - SString GetMTATempPath(void); + SString GetSystemCurrentDirectory(); + SString GetSystemDllDirectory(); + SString GetSystemLocalAppDataPath(); + SString GetSystemCommonAppDataPath(); + SString GetSystemPersonalPath(); + SString GetSystemWindowsPath(); + SString GetSystemSystemPath(); + SString GetSystemTempPath(); + SString GetMTADataPath(); + SString GetMTADataPathCommon(); + SString GetMTATempPath(); bool IsShortPathName(const char* szPath); bool IsShortPathName(const wchar_t* szPath); SString GetSystemShortPathName(const SString& strPath); SString GetSystemLongPathName(const SString& strPath); - SString GetLaunchPathFilename(void); - SString GetLaunchPath(void); - SString GetLaunchFilename(void); + SString GetLaunchPathFilename(); + SString GetLaunchPath(); + SString GetLaunchFilename(); SString GetPathDriveName(const SString& strPath); uint GetPathFreeSpaceMB(const SString& strPath); diff --git a/Shared/sdk/SharedUtil.File.hpp b/Shared/sdk/SharedUtil.File.hpp index 9bfb0af9113..7a0cc7cbb75 100644 --- a/Shared/sdk/SharedUtil.File.hpp +++ b/Shared/sdk/SharedUtil.File.hpp @@ -284,7 +284,7 @@ SString SharedUtil::PathMakeRelative(const SString& strInBasePath, const SString return strAbsPath; } -SString SharedUtil::GetSystemCurrentDirectory(void) +SString SharedUtil::GetSystemCurrentDirectory() { #ifdef WIN32 wchar_t szResult[1024] = L""; @@ -302,7 +302,7 @@ SString SharedUtil::GetSystemCurrentDirectory(void) #ifdef WIN32 #ifdef MTA_CLIENT -SString SharedUtil::GetSystemDllDirectory(void) +SString SharedUtil::GetSystemDllDirectory() { wchar_t szResult[1024] = L""; GetDllDirectoryW(NUMELMS(szResult), szResult); @@ -311,7 +311,7 @@ SString SharedUtil::GetSystemDllDirectory(void) return ToUTF8(szResult); } -SString SharedUtil::GetSystemLocalAppDataPath(void) +SString SharedUtil::GetSystemLocalAppDataPath() { wchar_t szResult[MAX_PATH] = L""; SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, szResult); @@ -320,7 +320,7 @@ SString SharedUtil::GetSystemLocalAppDataPath(void) return ToUTF8(szResult); } -SString SharedUtil::GetSystemCommonAppDataPath(void) +SString SharedUtil::GetSystemCommonAppDataPath() { wchar_t szResult[MAX_PATH] = L""; SHGetFolderPathW(NULL, CSIDL_COMMON_APPDATA, NULL, 0, szResult); @@ -329,7 +329,7 @@ SString SharedUtil::GetSystemCommonAppDataPath(void) return ToUTF8(szResult); } -SString SharedUtil::GetSystemPersonalPath(void) +SString SharedUtil::GetSystemPersonalPath() { wchar_t szResult[MAX_PATH] = L""; SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, 0, szResult); @@ -338,7 +338,7 @@ SString SharedUtil::GetSystemPersonalPath(void) return ToUTF8(szResult); } -SString SharedUtil::GetSystemWindowsPath(void) +SString SharedUtil::GetSystemWindowsPath() { wchar_t szResult[MAX_PATH] = L""; SHGetFolderPathW(NULL, CSIDL_WINDOWS, NULL, 0, szResult); @@ -347,7 +347,7 @@ SString SharedUtil::GetSystemWindowsPath(void) return ToUTF8(szResult); } -SString SharedUtil::GetSystemSystemPath(void) +SString SharedUtil::GetSystemSystemPath() { wchar_t szResult[MAX_PATH] = L""; SHGetFolderPathW(NULL, CSIDL_SYSTEM, NULL, 0, szResult); @@ -356,7 +356,7 @@ SString SharedUtil::GetSystemSystemPath(void) return ToUTF8(szResult); } -SString SharedUtil::GetSystemTempPath(void) +SString SharedUtil::GetSystemTempPath() { wchar_t szResult[4030] = L""; GetTempPathW(4000, szResult); @@ -365,23 +365,23 @@ SString SharedUtil::GetSystemTempPath(void) return ToUTF8(szResult); } -SString SharedUtil::GetMTADataPath(void) +SString SharedUtil::GetMTADataPath() { return PathJoin(GetSystemCommonAppDataPath(), GetProductCommonDataDir(), GetMajorVersionString()); } -SString SharedUtil::GetMTADataPathCommon(void) +SString SharedUtil::GetMTADataPathCommon() { return PathJoin(GetSystemCommonAppDataPath(), GetProductCommonDataDir(), "Common"); } -SString SharedUtil::GetMTATempPath(void) +SString SharedUtil::GetMTATempPath() { return PathJoin(GetSystemTempPath(), "MTA" + GetMajorVersionString()); } // C:\Program Files\gta_sa.exe -SString SharedUtil::GetLaunchPathFilename(void) +SString SharedUtil::GetLaunchPathFilename() { static SString strLaunchPathFilename; if (strLaunchPathFilename.empty()) @@ -398,13 +398,13 @@ SString SharedUtil::GetLaunchPathFilename(void) } // C:\Program Files -SString SharedUtil::GetLaunchPath(void) +SString SharedUtil::GetLaunchPath() { return ExtractPath(GetLaunchPathFilename()); } // gta_sa.exe -SString SharedUtil::GetLaunchFilename(void) +SString SharedUtil::GetLaunchFilename() { return ExtractFilename(GetLaunchPathFilename()); } diff --git a/Shared/sdk/SharedUtil.Game.h b/Shared/sdk/SharedUtil.Game.h index bee72ce2ed4..ddb3ec93a47 100644 --- a/Shared/sdk/SharedUtil.Game.h +++ b/Shared/sdk/SharedUtil.Game.h @@ -32,7 +32,7 @@ namespace SharedUtil class CVehicleColor { public: - CVehicleColor(void); + CVehicleColor(); void SetRGBColors(SColor color1, SColor color2, SColor color3, SColor color4); void SetPaletteColors(uchar ucColor1, uchar ucColor2, uchar ucColor3, uchar ucColor4); @@ -43,16 +43,16 @@ namespace SharedUtil SColor GetRGBColor(uint uiSlot); uchar GetPaletteColor(uint uiSlot); - int GetNumColorsUsed(void); + int GetNumColorsUsed(); static uchar GetPaletteIndexFromRGB(SColor color); static SColor GetRGBFromPaletteIndex(uchar ucColor); protected: - void InvalidatePaletteColors(void); - void ValidatePaletteColors(void); - void InvalidateRGBColors(void); - void ValidateRGBColors(void); + void InvalidatePaletteColors(); + void ValidatePaletteColors(); + void InvalidateRGBColors(); + void ValidateRGBColors(); SColor m_RGBColors[4]; uchar m_ucPaletteColors[4]; @@ -62,7 +62,7 @@ namespace SharedUtil struct SHeatHazeSettings { - SHeatHazeSettings(void) + SHeatHazeSettings() : ucIntensity(0), ucRandomShift(0), usSpeedMin(1), diff --git a/Shared/sdk/SharedUtil.Game.hpp b/Shared/sdk/SharedUtil.Game.hpp index 90644200d67..bc0ae398380 100644 --- a/Shared/sdk/SharedUtil.Game.hpp +++ b/Shared/sdk/SharedUtil.Game.hpp @@ -72,7 +72,7 @@ namespace SharedUtil return ucState; } - CVehicleColor::CVehicleColor(void) + CVehicleColor::CVehicleColor() { // Init m_ucPaletteColors[0] = 0; // Palette color 0 is black @@ -151,7 +151,7 @@ namespace SharedUtil } // Can return: 1,2,3, or 4 - int CVehicleColor::GetNumColorsUsed(void) + int CVehicleColor::GetNumColorsUsed() { // Find last unblack int i; @@ -165,21 +165,21 @@ namespace SharedUtil } // Switching to RGB mode - void CVehicleColor::InvalidatePaletteColors(void) + void CVehicleColor::InvalidatePaletteColors() { m_bRGBColorsWrong = false; m_bPaletteColorsWrong = true; } // Switching to palette mode - void CVehicleColor::InvalidateRGBColors(void) + void CVehicleColor::InvalidateRGBColors() { m_bPaletteColorsWrong = false; m_bRGBColorsWrong = true; } // Ensure switched - void CVehicleColor::ValidateRGBColors(void) + void CVehicleColor::ValidateRGBColors() { if (m_bRGBColorsWrong) { @@ -190,7 +190,7 @@ namespace SharedUtil } // Ensure switched - void CVehicleColor::ValidatePaletteColors(void) + void CVehicleColor::ValidatePaletteColors() { if (m_bPaletteColorsWrong) { diff --git a/Shared/sdk/SharedUtil.Hash.h b/Shared/sdk/SharedUtil.Hash.h index ee5234698f3..466f2438c6f 100644 --- a/Shared/sdk/SharedUtil.Hash.h +++ b/Shared/sdk/SharedUtil.Hash.h @@ -43,8 +43,8 @@ namespace SharedUtil class CMD5Hasher { public: - CMD5Hasher(void); - ~CMD5Hasher(void); + CMD5Hasher(); + ~CMD5Hasher(); bool Calculate(const char* szFilename, MD5& md5Result); bool Calculate(const void* pBuffer, size_t sizeLength, MD5& md5Result); @@ -53,10 +53,10 @@ namespace SharedUtil static SString CalculateHexString(const char* szFilename); static SString CalculateHexString(const void* pBuffer, size_t sizeLength); - void Init(void); + void Init(); void Update(unsigned char* input, unsigned int input_length); - void Finalize(void); - const unsigned char* GetResult(void) const; + void Finalize(); + const unsigned char* GetResult() const; private: void Transform(unsigned char* pBuffer); diff --git a/Shared/sdk/SharedUtil.Hash.hpp b/Shared/sdk/SharedUtil.Hash.hpp index 9aa44461f66..6d9997cbc35 100644 --- a/Shared/sdk/SharedUtil.Hash.hpp +++ b/Shared/sdk/SharedUtil.Hash.hpp @@ -41,9 +41,9 @@ namespace SharedUtil #define S43 15 #define S44 21 - CMD5Hasher::CMD5Hasher(void) {} + CMD5Hasher::CMD5Hasher() {} - CMD5Hasher::~CMD5Hasher(void) {} + CMD5Hasher::~CMD5Hasher() {} bool CMD5Hasher::Calculate(const char* szFilename, MD5& md5Result) { @@ -128,7 +128,7 @@ namespace SharedUtil return ""; } - void CMD5Hasher::Init(void) + void CMD5Hasher::Init() { // Nothing counted, so count=0 m_count[0] = 0; @@ -185,7 +185,7 @@ namespace SharedUtil // CRYPT_END } - void CMD5Hasher::Finalize(void) + void CMD5Hasher::Finalize() { unsigned char bits[8]; unsigned int index, padLen; @@ -210,7 +210,7 @@ namespace SharedUtil memset(m_buffer, 0, sizeof(m_buffer)); } - const unsigned char* CMD5Hasher::GetResult(void) const { return m_digest; } + const unsigned char* CMD5Hasher::GetResult() const { return m_digest; } void CMD5Hasher::Transform(unsigned char block[64]) { diff --git a/Shared/sdk/SharedUtil.IntervalCounter.h b/Shared/sdk/SharedUtil.IntervalCounter.h index 2ebd36804eb..8c076ae3c36 100644 --- a/Shared/sdk/SharedUtil.IntervalCounter.h +++ b/Shared/sdk/SharedUtil.IntervalCounter.h @@ -21,12 +21,12 @@ namespace SharedUtil CIntervalCounter(uint uiMinIntervalMs, T* pCounter); private: - virtual ~CIntervalCounter(void); + virtual ~CIntervalCounter(); public: - void StopThread(void); + void StopThread(); static void* StaticThreadProc(void* pContext); - void* ThreadProc(void); + void* ThreadProc(); protected: // Main thread variables diff --git a/Shared/sdk/SharedUtil.IntervalCounter.hpp b/Shared/sdk/SharedUtil.IntervalCounter.hpp index a7ff85abbc2..104e0e05560 100644 --- a/Shared/sdk/SharedUtil.IntervalCounter.hpp +++ b/Shared/sdk/SharedUtil.IntervalCounter.hpp @@ -25,7 +25,7 @@ namespace SharedUtil m_pServiceThreadHandle = new CThreadHandle(CIntervalCounter::StaticThreadProc, this); } - CIntervalCounter::~CIntervalCounter(void) + CIntervalCounter::~CIntervalCounter() { // Stop and delete processing thread StopThread(); @@ -39,7 +39,7 @@ namespace SharedUtil // Stop the processing thread // /////////////////////////////////////////////////////////////// - void CIntervalCounter::StopThread(void) + void CIntervalCounter::StopThread() { // Stop the processing thread shared.m_Mutex.Lock(); @@ -80,7 +80,7 @@ namespace SharedUtil // Thread loop // /////////////////////////////////////////////////////////////// - void* CIntervalCounter::ThreadProc(void) + void* CIntervalCounter::ThreadProc() { shared.m_Mutex.Lock(); while (!shared.m_bTerminateThread) diff --git a/Shared/sdk/SharedUtil.Logging.h b/Shared/sdk/SharedUtil.Logging.h index 0595950d756..409c1801089 100644 --- a/Shared/sdk/SharedUtil.Logging.h +++ b/Shared/sdk/SharedUtil.Logging.h @@ -18,9 +18,9 @@ namespace SharedUtil void SetDebugTagHidden(const SString& strTag, bool bHidden = true); bool IsDebugTagHidden(const SString& strTag); #else - inline void OutputDebugLineDummy(void) {} - inline void SetDebugTagHiddenDummy(void) {} - inline bool IsDebugTagHiddenDummy(void) { return false; } + inline void OutputDebugLineDummy() {} + inline void SetDebugTagHiddenDummy() {} + inline bool IsDebugTagHiddenDummy() { return false; } #define OutputDebugLine(x) OutputDebugLineDummy () #define SetDebugTagHidden(x) SetDebugTagHiddenDummy () #define IsDebugTagHidden(x) IsDebugTagHiddenDummy () diff --git a/Shared/sdk/SharedUtil.Logging.hpp b/Shared/sdk/SharedUtil.Logging.hpp index 873f57621cf..0397ddc71eb 100644 --- a/Shared/sdk/SharedUtil.Logging.hpp +++ b/Shared/sdk/SharedUtil.Logging.hpp @@ -16,7 +16,7 @@ namespace SharedUtil // // Add tags here to hide permanently // - void InitDebugTags(void) + void InitDebugTags() { SetDebugTagHidden("Updater"); SetDebugTagHidden("Shader"); @@ -97,7 +97,7 @@ namespace SharedUtil { struct SDebugCountInfo { - SDebugCountInfo(void) : iCount(0), iHigh(0) {} + SDebugCountInfo() : iCount(0), iHigh(0) {} int iCount; int iHigh; }; diff --git a/Shared/sdk/SharedUtil.MemAccess.h b/Shared/sdk/SharedUtil.MemAccess.h index 6e4d4677c51..374f59c97da 100644 --- a/Shared/sdk/SharedUtil.MemAccess.h +++ b/Shared/sdk/SharedUtil.MemAccess.h @@ -17,7 +17,7 @@ namespace SharedUtil DWORD oldProt; }; - void SetInitialVirtualProtect(void); + void SetInitialVirtualProtect(); bool IsSlowMem(const void* pAddr, uint uiAmount); SMemWrite OpenMemWrite(const void* pAddr, uint uiAmount); void CloseMemWrite(SMemWrite& hMem); diff --git a/Shared/sdk/SharedUtil.MemAccess.hpp b/Shared/sdk/SharedUtil.MemAccess.hpp index 3e7f14c7939..b7bcb5e39cd 100644 --- a/Shared/sdk/SharedUtil.MemAccess.hpp +++ b/Shared/sdk/SharedUtil.MemAccess.hpp @@ -22,7 +22,7 @@ namespace SharedUtil } // Unprotect fast mem areas - void SetInitialVirtualProtect(void) + void SetInitialVirtualProtect() { DWORD oldProt; VirtualProtect((LPVOID)0x4C0000, 0x1000, PAGE_EXECUTE_READWRITE, &oldProt); diff --git a/Shared/sdk/SharedUtil.Misc.h b/Shared/sdk/SharedUtil.Misc.h index 669158d2e7b..b6edd31699f 100644 --- a/Shared/sdk/SharedUtil.Misc.h +++ b/Shared/sdk/SharedUtil.Misc.h @@ -16,7 +16,7 @@ namespace SharedUtil class CArgMap; #ifdef WIN32 - SString GetMajorVersionString(void); + SString GetMajorVersionString(); // Get a system registry value SString GetSystemRegistryValue(uint hKey, const SString& strPath, const SString& strName); @@ -51,7 +51,7 @@ namespace SharedUtil // Get startup directory as saved in the registry by the launcher // Used in the Win32 Client only // - SString GetMTASABaseDir(void); + SString GetMTASABaseDir(); // // Turns a relative MTASA path i.e. "MTA\file.dat" @@ -60,7 +60,7 @@ namespace SharedUtil SString CalcMTASAPath(const SString& strPath); // Returns true if current process is GTA (i.e not MTA process) - bool IsGTAProcess(void); + bool IsGTAProcess(); // // Run ShellExecute with these parameters after exit @@ -79,7 +79,7 @@ namespace SharedUtil // What server to connect to after update // void SetPostUpdateConnect(const SString& strHost); - SString GetPostUpdateConnect(void); + SString GetPostUpdateConnect(); // // For tracking results of new features @@ -87,12 +87,12 @@ namespace SharedUtil void AddReportLog(uint uiId, const SString& strText, uint uiAmountLimit = 0); void AddExceptionReportLog(uint uiId, const char* szExceptionName, const char* szExceptionText); void SetReportLogContents(const SString& strText); - SString GetReportLogContents(void); - SString GetReportLogProcessTag(void); + SString GetReportLogContents(); + SString GetReportLogProcessTag(); void WriteDebugEvent(const SString& strText); void WriteErrorEvent(const SString& strText); - void BeginEventLog(void); - void CycleEventLog(void); + void BeginEventLog(); + void CycleEventLog(); void SetApplicationSetting(const SString& strPath, const SString& strName, const SString& strValue); SString GetApplicationSetting(const SString& strPath, const SString& strName); @@ -107,25 +107,25 @@ namespace SharedUtil int GetApplicationSettingInt(const SString& strName); int IncApplicationSettingInt(const SString& strName); - void WatchDogReset(void); + void WatchDogReset(); bool WatchDogIsSectionOpen(const SString& str); void WatchDogIncCounter(const SString& str); int WatchDogGetCounter(const SString& str); void WatchDogClearCounter(const SString& str); void WatchDogBeginSection(const SString& str); void WatchDogCompletedSection(const SString& str); - bool WatchDogWasUncleanStop(void); + bool WatchDogWasUncleanStop(); void WatchDogSetUncleanStop(bool bOn); - bool WatchDogWasLastRunCrash(void); + bool WatchDogWasLastRunCrash(); void WatchDogSetLastRunCrash(bool bOn); - void WatchDogUserDidInteractWithMenu(void); + void WatchDogUserDidInteractWithMenu(); void SetProductRegistryPath(const SString& strRegistryPath); - const SString& GetProductRegistryPath(void); + const SString& GetProductRegistryPath(); void SetProductCommonDataDir(const SString& strCommonDataDir); - const SString& GetProductCommonDataDir(void); + const SString& GetProductCommonDataDir(); void SetProductVersion(const SString& strVersion); - const SString& GetProductVersion(void); + const SString& GetProductVersion(); // BrowseToSolution flags enum @@ -144,28 +144,28 @@ namespace SharedUtil SHOW_MESSAGE_ONLY = 0x80, // Just show message without going online }; void BrowseToSolution(const SString& strType, int uiFlags = 0, const SString& strMessageBoxMessage = "", const SString& strErrorCode = ""); - bool ProcessPendingBrowseToSolution(void); - void ClearPendingBrowseToSolution(void); + bool ProcessPendingBrowseToSolution(); + void ClearPendingBrowseToSolution(); SString GetSystemErrorMessage(uint uiErrorCode, bool bRemoveNewlines = true, bool bPrependCode = true); void SetClipboardText(const SString& strText); // Version checks bool IsWindowsVersionOrGreater(WORD wMajorVersion, WORD wMinorVersion, WORD wServicePackMajor); - bool IsWindowsXPSP3OrGreater(void); - bool IsWindowsVistaOrGreater(void); - bool IsWindows7OrGreater(void); - bool IsWindows8OrGreater(void); + bool IsWindowsXPSP3OrGreater(); + bool IsWindowsVistaOrGreater(); + bool IsWindows7OrGreater(); + bool IsWindows8OrGreater(); #endif // Ensure rand() seed gets set to a new unique value - void RandomizeRandomSeed(void); + void RandomizeRandomSeed(); // // Return true if currently executing the main thread // See implementation for details - bool IsMainThread(void); + bool IsMainThread(); // CPU stats struct SThreadCPUTimes @@ -180,7 +180,7 @@ namespace SharedUtil }; struct SThreadCPUTimesStore : SThreadCPUTimes { - SThreadCPUTimesStore(void) + SThreadCPUTimesStore() { ZERO_POD_STRUCT(this); fAvgTimeSeconds = 5; @@ -190,7 +190,7 @@ namespace SharedUtil uint64 ullPrevKernelTimeUs; float fAvgTimeSeconds; }; - DWORD _GetCurrentProcessorNumber(void); + DWORD _GetCurrentProcessorNumber(); void GetThreadCPUTimes(uint64& outUserTime, uint64& outKernelTime); void UpdateThreadCPUTimes(SThreadCPUTimesStore& store, long long* pllTickCount = NULL); @@ -528,10 +528,10 @@ namespace SharedUtil class CCriticalSection { public: - CCriticalSection(void); - ~CCriticalSection(void); - void Lock(void); - void Unlock(void); + CCriticalSection(); + ~CCriticalSection(); + void Lock(); + void Unlock(); private: void* m_pCriticalSection; @@ -561,8 +561,8 @@ namespace SharedUtil // // Expiry stuff // - int GetBuildAge(void); - int GetDaysUntilExpire(void); + int GetBuildAge(); + int GetDaysUntilExpire(); // // string stuff @@ -581,15 +581,15 @@ namespace SharedUtil class CStack { public: - CStack(void) + CStack() { m_ulCapacity = 0; ExpandBy(INITIAL_MAX_STACK_SIZE - 1); } - unsigned long GetCapacity(void) const { return m_ulCapacity; } + unsigned long GetCapacity() const { return m_ulCapacity; } - unsigned long GetUnusedAmount(void) const { return m_Queue.size(); } + unsigned long GetUnusedAmount() const { return m_Queue.size(); } void ExpandBy(unsigned long ulAmount) { @@ -640,7 +640,7 @@ namespace SharedUtil char szData[MAX_LENGTH + 1]; public: - SFixedString(void) { szData[0] = 0; } + SFixedString() { szData[0] = 0; } // In SFixedString& operator=(const char* szOther) @@ -678,9 +678,9 @@ namespace SharedUtil void Merge(const CArgMap& other, bool bAllowMultiValues = false); void SetFromString(const SString& strLine, bool bAllowMultiValues = false); void MergeFromString(const SString& strLine, bool bAllowMultiValues = false); - SString ToString(void) const; - bool HasMultiValues(void) const; - void RemoveMultiValues(void); + SString ToString() const; + bool HasMultiValues() const; + void RemoveMultiValues(); SString Escape(const SString& strIn) const; SString Unescape(const SString& strIn) const; void Set(const SString& strInCmd, const SString& strInValue); // Set a unique key string value @@ -771,14 +771,14 @@ namespace SharedUtil bool Contains(const T& item) const { return MapContains(m_Map, item); } // list only - typename LIST_TYPE ::iterator begin(void) { return m_List.begin(); } - typename LIST_TYPE ::iterator end(void) { return m_List.end(); } - typename LIST_TYPE ::reverse_iterator rbegin(void) { return m_List.rbegin(); } - typename LIST_TYPE ::reverse_iterator rend(void) { return m_List.rend(); } - uint size(void) const { return m_List.size(); } - bool empty(void) const { return m_List.empty(); } - const T& back(void) const { return m_List.back(); } - const T& front(void) const { return m_List.front(); } + typename LIST_TYPE ::iterator begin() { return m_List.begin(); } + typename LIST_TYPE ::iterator end() { return m_List.end(); } + typename LIST_TYPE ::reverse_iterator rbegin() { return m_List.rbegin(); } + typename LIST_TYPE ::reverse_iterator rend() { return m_List.rend(); } + uint size() const { return m_List.size(); } + bool empty() const { return m_List.empty(); } + const T& back() const { return m_List.back(); } + const T& front() const { return m_List.front(); } // list and map void push_back(const T& item) @@ -793,13 +793,13 @@ namespace SharedUtil m_List.push_front(item); } - void pop_back(void) + void pop_back() { RemoveMapRef(m_List.back()); m_List.pop_back(); } - void pop_front(void) + void pop_front() { RemoveMapRef(m_List.front()); m_List.pop_front(); @@ -816,7 +816,7 @@ namespace SharedUtil } } - void clear(void) + void clear() { m_Map.clear(); m_List.clear(); @@ -848,7 +848,7 @@ namespace SharedUtil } // Debug - void Validate(void) const + void Validate() const { int iTotalRefs = 0; for (typename std::map::const_iterator it = m_Map.begin(); it != m_Map.end(); ++it) @@ -958,8 +958,8 @@ namespace SharedUtil public: Node* m_pNode; IteratorBase(CIntrusiveList* pList, Node* pNode) : m_pList(pList), m_pNode(pNode) { m_pList->m_ActiveIterators.push_back(this); } - ~IteratorBase(void) { ListRemove(m_pList->m_ActiveIterators, this); } - T* operator*(void) { return m_pNode->m_pOuterItem; } + ~IteratorBase() { ListRemove(m_pList->m_ActiveIterators, this); } + T* operator*() { return m_pNode->m_pOuterItem; } virtual void NotifyRemovingNode(Node* pNode) = 0; }; @@ -972,7 +972,7 @@ namespace SharedUtil Iterator(CIntrusiveList* pList, Node* pNode) : IteratorBase(pList, pNode) {} bool operator==(const Iterator& other) const { return IteratorBase::m_pNode == other.m_pNode; } bool operator!=(const Iterator& other) const { return IteratorBase::m_pNode != other.m_pNode; } - void operator++(void) { IteratorBase::m_pNode = IteratorBase::m_pNode->m_pNext; } + void operator++() { IteratorBase::m_pNode = IteratorBase::m_pNode->m_pNext; } void operator++(int) { IteratorBase::m_pNode = IteratorBase::m_pNode->m_pNext; } virtual void NotifyRemovingNode(Node* pNode) { @@ -990,7 +990,7 @@ namespace SharedUtil ReverseIterator(CIntrusiveList* pList, Node* pNode) : IteratorBase(pList, pNode) {} bool operator==(const ReverseIterator& other) const { return IteratorBase::m_pNode == other.m_pNode; } bool operator!=(const ReverseIterator& other) const { return IteratorBase::m_pNode != other.m_pNode; } - void operator++(void) { IteratorBase::m_pNode = IteratorBase::m_pNode->m_pPrev; } + void operator++() { IteratorBase::m_pNode = IteratorBase::m_pNode->m_pPrev; } void operator++(int) { IteratorBase::m_pNode = IteratorBase::m_pNode->m_pPrev; } virtual void NotifyRemovingNode(Node* pNode) { @@ -1010,11 +1010,11 @@ namespace SharedUtil m_pLast = NULL; } - ~CIntrusiveList(void) { assert(m_ActiveIterators.empty()); } + ~CIntrusiveList() { assert(m_ActiveIterators.empty()); } - bool empty(void) const { return m_Size == 0; } + bool empty() const { return m_Size == 0; } - size_t size(void) const { return m_Size; } + size_t size() const { return m_Size; } // // Check if list contains item @@ -1120,13 +1120,13 @@ namespace SharedUtil m_Size++; } - Iterator begin(void) { return Iterator(this, m_pFirst); } + Iterator begin() { return Iterator(this, m_pFirst); } - Iterator end(void) { return Iterator(this, NULL); } + Iterator end() { return Iterator(this, NULL); } - ReverseIterator rbegin(void) { return ReverseIterator(this, m_pLast); } + ReverseIterator rbegin() { return ReverseIterator(this, m_pLast); } - ReverseIterator rend(void) { return ReverseIterator(this, NULL); } + ReverseIterator rend() { return ReverseIterator(this, NULL); } // Allow use of std iterator names typedef Iterator iterator; @@ -1146,7 +1146,7 @@ namespace SharedUtil class CIntrusiveListExt : public CIntrusiveList { public: - CIntrusiveListExt(void) : CIntrusiveList(member_ptr) {} + CIntrusiveListExt() : CIntrusiveList(member_ptr) {} }; // @@ -1244,7 +1244,7 @@ namespace SharedUtil return false; } - const SString& GetTypeName(void) const { return m_strTypeName; } + const SString& GetTypeName() const { return m_strTypeName; } SString m_strTypeName; SString m_strDefaultName; @@ -1502,14 +1502,14 @@ namespace SharedUtil int m_iRefCount; protected: - virtual ~CRefCountableST(void) {} + virtual ~CRefCountableST() {} public: - CRefCountableST(void) : m_iRefCount(1) {} + CRefCountableST() : m_iRefCount(1) {} - void AddRef(void) { ++m_iRefCount; } + void AddRef() { ++m_iRefCount; } - void Release(void) + void Release() { assert(m_iRefCount > 0); bool bLastRef = --m_iRefCount == 0; @@ -1536,19 +1536,19 @@ namespace SharedUtil static CCriticalSection ms_CS; protected: - virtual ~CRefCountable(void) {} + virtual ~CRefCountable() {} public: - CRefCountable(void) : m_iRefCount(1), m_pCS(&ms_CS) {} + CRefCountable() : m_iRefCount(1), m_pCS(&ms_CS) {} - void AddRef(void) + void AddRef() { m_pCS->Lock(); ++m_iRefCount; m_pCS->Unlock(); } - int Release(void) + int Release() { m_pCS->Lock(); assert(m_iRefCount > 0); @@ -1631,14 +1631,14 @@ namespace SharedUtil private: T* pData; // Target - virtual ~CRefedPointer(void) { SAFE_DELETE(pData); } + virtual ~CRefedPointer() { SAFE_DELETE(pData); } CRefedPointer(const CRefedPointer& other); CRefedPointer& operator=(const CRefedPointer& other); public: - CRefedPointer(void) { pData = new T(); } + CRefedPointer() { pData = new T(); } - T* GetData(void) { return pData; } + T* GetData() { return pData; } }; // @@ -1679,9 +1679,9 @@ namespace SharedUtil return *this; } - T* operator->(void) { return pPointer->GetData(); } + T* operator->() { return pPointer->GetData(); } - const T* operator->(void)const { return pPointer->GetData(); } + const T* operator->()const { return pPointer->GetData(); } }; }; // namespace SharedUtil diff --git a/Shared/sdk/SharedUtil.Misc.hpp b/Shared/sdk/SharedUtil.Misc.hpp index 845eff47f60..801bafd3c84 100644 --- a/Shared/sdk/SharedUtil.Misc.hpp +++ b/Shared/sdk/SharedUtil.Misc.hpp @@ -39,7 +39,7 @@ struct SReportLine { SString strText; uint uiId; - operator SString&(void) { return strText; } + operator SString&() { return strText; } bool operator==(const SReportLine& other) const { return strText == other.strText && uiId == other.uiId; } }; CDuplicateLineFilter ms_ReportLineFilter; @@ -74,7 +74,7 @@ int SharedUtil::MessageBoxUTF8(HWND hWnd, SString lpText, SString lpCaption, UIN // Get startup directory as saved in the registry by the launcher // Used in the Win32 Client only // -SString SharedUtil::GetMTASABaseDir(void) +SString SharedUtil::GetMTASABaseDir() { static SString strInstallRoot; if (strInstallRoot.empty()) @@ -102,7 +102,7 @@ SString SharedUtil::CalcMTASAPath(const SString& strPath) // // Returns true if current process is GTA (i.e not MTA process) // -bool SharedUtil::IsGTAProcess(void) +bool SharedUtil::IsGTAProcess() { SString strLaunchPathFilename = GetLaunchPathFilename(); if (strLaunchPathFilename.EndsWithI("gta_sa.exe") || strLaunchPathFilename.EndsWithI("proxy_sa.exe")) @@ -175,7 +175,7 @@ static bool DeleteRegistryKey(HKEY hkRoot, const char* szSubKey) // // GetMajorVersionString // -SString SharedUtil::GetMajorVersionString(void) +SString SharedUtil::GetMajorVersionString() { return SStringX(MTA_DM_ASE_VERSION).Left(3); } @@ -307,7 +307,7 @@ void SharedUtil::SetPostUpdateConnect(const SString& strHost) // // What server to connect to after update // -SString SharedUtil::GetPostUpdateConnect(void) +SString SharedUtil::GetPostUpdateConnect() { SString strPostUpdateConnect = GetRegistryValue("", "PostUpdateConnect"); SetPostUpdateConnect(""); @@ -404,7 +404,7 @@ int SharedUtil::IncApplicationSettingInt(const SString& strName) // WatchDog // -void SharedUtil::WatchDogReset(void) +void SharedUtil::WatchDogReset() { RemoveApplicationSettingKey("watchdog"); } @@ -447,7 +447,7 @@ void SharedUtil::WatchDogClearCounter(const SString& str) static bool bWatchDogWasUncleanStopCached = false; static bool bWatchDogWasUncleanStopValue = false; -bool SharedUtil::WatchDogWasUncleanStop(void) +bool SharedUtil::WatchDogWasUncleanStop() { if (!bWatchDogWasUncleanStopCached) { @@ -470,7 +470,7 @@ void SharedUtil::WatchDogSetUncleanStop(bool bOn) static bool bWatchDogWasLastRunCrashCached = false; static bool bWatchDogWasLastRunCrashValue = false; -bool SharedUtil::WatchDogWasLastRunCrash(void) +bool SharedUtil::WatchDogWasLastRunCrash() { if (!bWatchDogWasLastRunCrashCached) { @@ -490,7 +490,7 @@ void SharedUtil::WatchDogSetLastRunCrash(bool bOn) // // Special things // -void SharedUtil::WatchDogUserDidInteractWithMenu(void) +void SharedUtil::WatchDogUserDidInteractWithMenu() { WatchDogCompletedSection(WD_SECTION_NOT_USED_MAIN_MENU); WatchDogCompletedSection(WD_SECTION_POST_INSTALL); @@ -502,7 +502,7 @@ void SharedUtil::SetProductRegistryPath(const SString& strRegistryPath) ms_strProductRegistryPath = strRegistryPath; } -const SString& SharedUtil::GetProductRegistryPath(void) +const SString& SharedUtil::GetProductRegistryPath() { if (ms_strProductRegistryPath.empty()) ms_strProductRegistryPath = PRODUCT_REGISTRY_PATH; @@ -515,7 +515,7 @@ void SharedUtil::SetProductCommonDataDir(const SString& strCommonDataDir) ms_strProductCommonDataDir = strCommonDataDir; } -const SString& SharedUtil::GetProductCommonDataDir(void) +const SString& SharedUtil::GetProductCommonDataDir() { if (ms_strProductCommonDataDir.empty()) ms_strProductCommonDataDir = PRODUCT_COMMON_DATA_DIR; @@ -528,7 +528,7 @@ void SharedUtil::SetProductVersion(const SString& strVersion) ms_strProductVersion = strVersion; } -const SString& SharedUtil::GetProductVersion(void) +const SString& SharedUtil::GetProductVersion() { if (ms_strProductVersion.empty()) ms_strProductVersion = @@ -596,7 +596,7 @@ void SharedUtil::BrowseToSolution(const SString& strType, int iFlags, const SStr // Process next BrowseToSolution // Return true if did browse // -bool SharedUtil::ProcessPendingBrowseToSolution(void) +bool SharedUtil::ProcessPendingBrowseToSolution() { SString strType, strMessageBoxMessage, strErrorCode; int iFlags; @@ -651,7 +651,7 @@ bool SharedUtil::ProcessPendingBrowseToSolution(void) // // Clear BrowseToSolution // -void SharedUtil::ClearPendingBrowseToSolution(void) +void SharedUtil::ClearPendingBrowseToSolution() { SetApplicationSetting("pending-browse-to-solution", ""); } @@ -659,7 +659,7 @@ void SharedUtil::ClearPendingBrowseToSolution(void) // // For tracking results of new features // -static SString GetReportLogHeaderText(void) +static SString GetReportLogHeaderText() { SString strMTABuild = GetApplicationSetting("mta-version-ext").SplitRight("-"); SString strOSVersion = GetApplicationSetting("os-version"); @@ -750,7 +750,7 @@ void SharedUtil::SetReportLogContents(const SString& strText) FileSave(strPathFilename, strText.length() ? &strText.at(0) : NULL, strText.length()); } -SString SharedUtil::GetReportLogContents(void) +SString SharedUtil::GetReportLogContents() { SString strReportFilename = PathJoin(GetMTADataPath(), "report.log"); // Load file into a string @@ -760,7 +760,7 @@ SString SharedUtil::GetReportLogContents(void) return &buffer[0]; } -SString SharedUtil::GetReportLogProcessTag(void) +SString SharedUtil::GetReportLogProcessTag() { static SString strResult; if (strResult.empty()) @@ -826,7 +826,7 @@ void SharedUtil::WriteErrorEvent(const SString& strText) WriteEvent("[Error]", strText); } -void SharedUtil::BeginEventLog(void) +void SharedUtil::BeginEventLog() { // Cycle now if flag requires it if (GetApplicationSettingInt("no-cycle-event-log") == 0) @@ -837,7 +837,7 @@ void SharedUtil::BeginEventLog(void) WriteDebugEvent("BeginEventLog"); } -void SharedUtil::CycleEventLog(void) +void SharedUtil::CycleEventLog() { // Set flag to cycle on next start SetApplicationSettingInt("no-cycle-event-log", 0); @@ -1073,25 +1073,25 @@ SString SharedUtil::EscapeURLArgument(const SString& strArg) // #ifdef WIN32 -SharedUtil::CCriticalSection::CCriticalSection(void) +SharedUtil::CCriticalSection::CCriticalSection() { m_pCriticalSection = new CRITICAL_SECTION; InitializeCriticalSection((CRITICAL_SECTION*)m_pCriticalSection); } -SharedUtil::CCriticalSection::~CCriticalSection(void) +SharedUtil::CCriticalSection::~CCriticalSection() { DeleteCriticalSection((CRITICAL_SECTION*)m_pCriticalSection); delete (CRITICAL_SECTION*)m_pCriticalSection; } -void SharedUtil::CCriticalSection::Lock(void) +void SharedUtil::CCriticalSection::Lock() { if (m_pCriticalSection) EnterCriticalSection((CRITICAL_SECTION*)m_pCriticalSection); } -void SharedUtil::CCriticalSection::Unlock(void) +void SharedUtil::CCriticalSection::Unlock() { if (m_pCriticalSection) LeaveCriticalSection((CRITICAL_SECTION*)m_pCriticalSection); @@ -1100,24 +1100,24 @@ void SharedUtil::CCriticalSection::Unlock(void) #else #include -SharedUtil::CCriticalSection::CCriticalSection(void) +SharedUtil::CCriticalSection::CCriticalSection() { m_pCriticalSection = new pthread_mutex_t; pthread_mutex_init((pthread_mutex_t*)m_pCriticalSection, NULL); } -SharedUtil::CCriticalSection::~CCriticalSection(void) +SharedUtil::CCriticalSection::~CCriticalSection() { pthread_mutex_destroy((pthread_mutex_t*)m_pCriticalSection); delete (pthread_mutex_t*)m_pCriticalSection; } -void SharedUtil::CCriticalSection::Lock(void) +void SharedUtil::CCriticalSection::Lock() { pthread_mutex_lock((pthread_mutex_t*)m_pCriticalSection); } -void SharedUtil::CCriticalSection::Unlock(void) +void SharedUtil::CCriticalSection::Unlock() { pthread_mutex_unlock((pthread_mutex_t*)m_pCriticalSection); } @@ -1127,7 +1127,7 @@ void SharedUtil::CCriticalSection::Unlock(void) // // Ensure rand() seed gets set to a new unique value // -void SharedUtil::RandomizeRandomSeed(void) +void SharedUtil::RandomizeRandomSeed() { srand(rand() + GetTickCount32()); } @@ -1136,7 +1136,7 @@ void SharedUtil::RandomizeRandomSeed(void) // Return true if currently executing the main thread. // (Linux: Main thread being defined as the thread the function is first called from.) // -bool SharedUtil::IsMainThread(void) +bool SharedUtil::IsMainThread() { #ifdef WIN32 static DWORD dwMainThreadID = 0; @@ -1191,7 +1191,7 @@ bool SharedUtil::IsMainThread(void) #ifdef WIN32 #include -int SharedUtil::GetBuildAge(void) +int SharedUtil::GetBuildAge() { tm when; memset(&when, 0, sizeof(when)); @@ -1202,7 +1202,7 @@ int SharedUtil::GetBuildAge(void) } #if defined(MTA_DM_EXPIRE_DAYS) -int SharedUtil::GetDaysUntilExpire(void) +int SharedUtil::GetDaysUntilExpire() { tm when; memset(&when, 0, sizeof(when)); @@ -1482,7 +1482,7 @@ namespace SharedUtil } } - SString CArgMap::ToString(void) const + SString CArgMap::ToString() const { SString strResult; for (std::multimap::const_iterator iter = m_Map.begin(); iter != m_Map.end(); ++iter) @@ -1494,7 +1494,7 @@ namespace SharedUtil return strResult; } - bool CArgMap::HasMultiValues(void) const + bool CArgMap::HasMultiValues() const { for (std::multimap::const_iterator iter = m_Map.begin(); iter != m_Map.end(); ++iter) { @@ -1506,7 +1506,7 @@ namespace SharedUtil return false; } - void CArgMap::RemoveMultiValues(void) + void CArgMap::RemoveMultiValues() { if (HasMultiValues()) SetFromString(ToString(), false); @@ -1602,11 +1602,11 @@ namespace SharedUtil // Only a guide as it could change after the call has returned // /////////////////////////////////////////////////////////////////////////// - DWORD _GetCurrentProcessorNumber(void) + DWORD _GetCurrentProcessorNumber() { DWORD dwProcessorNumber = -1; #ifdef WIN32 - typedef DWORD(WINAPI * FUNC_GetCurrentProcessorNumber)(VOID); + typedef DWORD(WINAPI * FUNC_GetCurrentProcessorNumber)(); // Dynamically load GetCurrentProcessorNumber, as it does not exist on XP static FUNC_GetCurrentProcessorNumber pfn = NULL; diff --git a/Shared/sdk/SharedUtil.Profiling.h b/Shared/sdk/SharedUtil.Profiling.h index e7809c979d3..c5daace5654 100644 --- a/Shared/sdk/SharedUtil.Profiling.h +++ b/Shared/sdk/SharedUtil.Profiling.h @@ -39,7 +39,7 @@ namespace SharedUtil TIMEUS timeStamp; }; - CStatEvents(void); + CStatEvents(); void SetEnabled(bool bEnabled); bool ClearBuffer(bool bCanResize); void Sample(class SStatCollection& m_StatCollection); @@ -132,8 +132,8 @@ namespace SharedUtil class CStatResults { public: - CStatResults(void); - void FrameEnd(void); + CStatResults(); + void FrameEnd(); SStatResultCollection m_CollectionCombo; float m_fNextMaxClearTime; diff --git a/Shared/sdk/SharedUtil.Profiling.hpp b/Shared/sdk/SharedUtil.Profiling.hpp index b460a9bd6b8..204ede6d6e7 100644 --- a/Shared/sdk/SharedUtil.Profiling.hpp +++ b/Shared/sdk/SharedUtil.Profiling.hpp @@ -175,7 +175,7 @@ namespace SharedUtil // // //////////////////////////////////////////////// - CStatEvents::CStatEvents(void) : m_bEnabled(false), m_ItemBuffer(0), m_BufferPos(0), m_BufferPosMax(0), m_BufferPosMaxUsing(0) { ClearBuffer(true); } + CStatEvents::CStatEvents() : m_bEnabled(false), m_ItemBuffer(0), m_BufferPos(0), m_BufferPosMax(0), m_BufferPosMaxUsing(0) { ClearBuffer(true); } /////////////////////////////////////////////////////////////// // @@ -346,7 +346,7 @@ namespace SharedUtil // // /////////////////////////////////////////////////////////////// - CStatResults::CStatResults(void) { m_fNextMaxClearTime = 0; } + CStatResults::CStatResults() { m_fNextMaxClearTime = 0; } /////////////////////////////////////////////////////////////// // @@ -355,7 +355,7 @@ namespace SharedUtil // Save all stats in a ResultCollection // /////////////////////////////////////////////////////////////// - void CStatResults::FrameEnd(void) + void CStatResults::FrameEnd() { CLOCK("Profiling", "Compile stats"); diff --git a/Shared/sdk/SharedUtil.SysInfo.h b/Shared/sdk/SharedUtil.SysInfo.h index 9630db264c9..d0db481bde3 100644 --- a/Shared/sdk/SharedUtil.SysInfo.h +++ b/Shared/sdk/SharedUtil.SysInfo.h @@ -21,11 +21,11 @@ namespace SharedUtil struct SLibVersionInfo : VS_FIXEDFILEINFO { - int GetFileVersionMajor(void) { return HIWORD(dwFileVersionMS); } - int GetFileVersionMinor(void) { return LOWORD(dwFileVersionMS); } - int GetFileVersionBuild(void) { return HIWORD(dwFileVersionLS); } - int GetFileVersionRelease(void) { return LOWORD(dwFileVersionLS); } - SString GetFileVersionString(void) + int GetFileVersionMajor() { return HIWORD(dwFileVersionMS); } + int GetFileVersionMinor() { return LOWORD(dwFileVersionMS); } + int GetFileVersionBuild() { return HIWORD(dwFileVersionLS); } + int GetFileVersionRelease() { return LOWORD(dwFileVersionLS); } + SString GetFileVersionString() { return SString("%d.%d.%d.%d", GetFileVersionMajor(), GetFileVersionMinor(), GetFileVersionBuild(), GetFileVersionRelease()); } @@ -34,14 +34,14 @@ namespace SharedUtil }; bool QueryWMI(SQueryWMIResult& outResult, const SString& strQuery, const SString& strKeys, const SString& strNamespace = "CIMV2"); - SString GetWMIOSVersion(void); + SString GetWMIOSVersion(); long long GetWMIVideoAdapterMemorySize(const SString& strDisplay); - long long GetWMITotalPhysicalMemory(void); + long long GetWMITotalPhysicalMemory(); void GetWMIAntiVirusStatus(std::vector& outEnabledList, std::vector& outDisabledList); void GetInstalledHotFixList(std::vector& outInstalledList); bool IsHotFixInstalled(const SString& strHotFixId); bool GetLibVersionInfo(const SString& strLibName, SLibVersionInfo* pOutLibVersionInfo); - bool Is64BitOS(void); + bool Is64BitOS(); } // namespace SharedUtil #endif diff --git a/Shared/sdk/SharedUtil.SysInfo.hpp b/Shared/sdk/SharedUtil.SysInfo.hpp index 68d6d0203a9..beb65ddd588 100644 --- a/Shared/sdk/SharedUtil.SysInfo.hpp +++ b/Shared/sdk/SharedUtil.SysInfo.hpp @@ -275,7 +275,7 @@ bool SharedUtil::QueryWMI(SQueryWMIResult& outResult, const SString& strQuery, c // // ///////////////////////////////////////////////////////////////////// -SString SharedUtil::GetWMIOSVersion(void) +SString SharedUtil::GetWMIOSVersion() { SQueryWMIResult result; @@ -295,7 +295,7 @@ SString SharedUtil::GetWMIOSVersion(void) // // ///////////////////////////////////////////////////////////////////// -long long SharedUtil::GetWMITotalPhysicalMemory(void) +long long SharedUtil::GetWMITotalPhysicalMemory() { // This won't change after the first call static long long llResult = 0; @@ -549,7 +549,7 @@ bool SharedUtil::GetLibVersionInfo(const SString& strLibName, SLibVersionInfo* p // Return true if is Windows 64 bit OS // /////////////////////////////////////////////////////////////// -bool SharedUtil::Is64BitOS(void) +bool SharedUtil::Is64BitOS() { typedef BOOL(WINAPI * LPFN_ISWOW64PROCESS)(HANDLE, PBOOL); static LPFN_ISWOW64PROCESS fnIsWow64Process = NULL; diff --git a/Shared/sdk/SharedUtil.Tests.hpp b/Shared/sdk/SharedUtil.Tests.hpp index 4922504a7cc..e521ab42f88 100644 --- a/Shared/sdk/SharedUtil.Tests.hpp +++ b/Shared/sdk/SharedUtil.Tests.hpp @@ -13,13 +13,13 @@ *****************************************************************************/ // Fwd decl -void SString_Tests(void); -void SharedUtil_File_Tests(void); -void SharedUtil_ClassIdent_Tests(void); -void SharedUtil_WildcardMatch_Tests(void); -void SharedUtil_Collection_Tests(void); -void SharedUtil_String_Tests(void); -void SharedUtil_Hash_Tests(void); +void SString_Tests(); +void SharedUtil_File_Tests(); +void SharedUtil_ClassIdent_Tests(); +void SharedUtil_WildcardMatch_Tests(); +void SharedUtil_Collection_Tests(); +void SharedUtil_String_Tests(); +void SharedUtil_Hash_Tests(); /////////////////////////////////////////////////////////////// // @@ -28,7 +28,7 @@ void SharedUtil_Hash_Tests(void); // // /////////////////////////////////////////////////////////////// -void SharedUtil_Tests(void) +void SharedUtil_Tests() { SString_Tests(); SharedUtil_File_Tests(); @@ -70,7 +70,7 @@ void SharedUtil_Tests(void) // Tests for functions from SString.hpp // /////////////////////////////////////////////////////////////// -void SString_Tests(void) +void SString_Tests() { // vFormat { @@ -206,7 +206,7 @@ void SString_Tests(void) // Tests for functions from SharedUtil.File.hpp // /////////////////////////////////////////////////////////////// -void SharedUtil_File_Tests(void) +void SharedUtil_File_Tests() { #ifdef WIN32 @@ -260,7 +260,7 @@ void SharedUtil_File_Tests(void) // Tests for macros in SharedUtil.ClassIdent.h // /////////////////////////////////////////////////////////////// -void SharedUtil_ClassIdent_Tests(void) +void SharedUtil_ClassIdent_Tests() { #if WIN32 // Setup @@ -276,31 +276,31 @@ void SharedUtil_ClassIdent_Tests(void) struct SPlant { DECLARE_BASE_CLASS(SPlant) - SPlant(void) : ClassInit(this) {} + SPlant() : ClassInit(this) {} }; struct STree : SPlant { DECLARE_CLASS(STree, SPlant) - STree(void) : ClassInit(this) {} + STree() : ClassInit(this) {} }; struct SFlower : SPlant { DECLARE_CLASS(SFlower, SPlant) - SFlower(void) : ClassInit(this) {} + SFlower() : ClassInit(this) {} }; struct SBlueBell : SFlower { DECLARE_CLASS(SBlueBell, SFlower) - SBlueBell(void) : ClassInit(this) {} + SBlueBell() : ClassInit(this) {} }; struct SDaffodil : SFlower { DECLARE_CLASS(SDaffodil, SFlower) - SDaffodil(void) : ClassInit(this) {} + SDaffodil() : ClassInit(this) {} }; // Create test data @@ -394,7 +394,7 @@ void SharedUtil_ClassIdent_Tests(void) // Tests for WildcardMatch // /////////////////////////////////////////////////////////////// -void SharedUtil_WildcardMatch_Tests(void) +void SharedUtil_WildcardMatch_Tests() { // WildcardMatch { @@ -422,7 +422,7 @@ void SharedUtil_WildcardMatch_Tests(void) // Test behaviour of iterators and such // /////////////////////////////////////////////////////////////// -void SharedUtil_Collection_Tests(void) +void SharedUtil_Collection_Tests() { // std::map { @@ -508,7 +508,7 @@ void SharedUtil_Collection_Tests(void) // Test behaviour of strings // /////////////////////////////////////////////////////////////// -void SharedUtil_String_Tests(void) +void SharedUtil_String_Tests() { // Formatting { @@ -603,7 +603,7 @@ void SharedUtil_String_Tests(void) // Test behaviour of hashing/crypt related functions // /////////////////////////////////////////////////////////////// -void SharedUtil_Hash_Tests(void) +void SharedUtil_Hash_Tests() { // ConvertHexStringToData/ConvertDataToHexString { diff --git a/Shared/sdk/SharedUtil.Thread.h b/Shared/sdk/SharedUtil.Thread.h index 94b80940690..1e006ea11eb 100644 --- a/Shared/sdk/SharedUtil.Thread.h +++ b/Shared/sdk/SharedUtil.Thread.h @@ -34,11 +34,11 @@ namespace SharedUtil public: CThreadHandle(PFN_ThreadStart threadStart, void* arg) { res = pthread_create(&handle, NULL, threadStart, arg); } - static void AllowASyncCancel(void) { pthread_setcancelstate(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); } + static void AllowASyncCancel() { pthread_setcancelstate(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); } - bool IsValid(void) const { return res == 0; } + bool IsValid() const { return res == 0; } - void Cancel(void) { pthread_cancel(handle); } + void Cancel() { pthread_cancel(handle); } }; // @@ -50,23 +50,23 @@ namespace SharedUtil pthread_cond_t cond; bool m_bInCondWait; // Hacky flag to avoid deadlock on dll exit public: - CComboMutex(void) + CComboMutex() { m_bInCondWait = false; pthread_mutex_init(&mutex, NULL); pthread_cond_init(&cond, NULL); } - ~CComboMutex(void) + ~CComboMutex() { if (!m_bInCondWait) pthread_cond_destroy(&cond); pthread_mutex_destroy(&mutex); } - void Lock(void) { pthread_mutex_lock(&mutex); } + void Lock() { pthread_mutex_lock(&mutex); } - void Unlock(void) { pthread_mutex_unlock(&mutex); } + void Unlock() { pthread_mutex_unlock(&mutex); } // unlock - wait for signal - lock // Returns ETIMEDOUT if timeout period expired @@ -111,7 +111,7 @@ namespace SharedUtil return 0; } - void Signal(void) { pthread_cond_signal(&cond); } + void Signal() { pthread_cond_signal(&cond); } }; } // namespace SharedUtil diff --git a/Shared/sdk/SharedUtil.Time.h b/Shared/sdk/SharedUtil.Time.h index ee905f38c5b..68d0e4e9a8e 100644 --- a/Shared/sdk/SharedUtil.Time.h +++ b/Shared/sdk/SharedUtil.Time.h @@ -16,7 +16,7 @@ namespace SharedUtil // This keeps the counter as low as possible to delay any precision or wrap around issues. // Note: Return value is module dependent // - uint GetTickCount32(void); + uint GetTickCount32(); // Forbid use of GetTickCount #define GetTickCount GetTickCount_has_been_replaced_with_GetTickCount32 @@ -29,12 +29,12 @@ namespace SharedUtil // an __int64 and will effectively never wrap. This is an emulated version for XP and down. // Note: Wrap around issue is only defeated if the gap between calls is less than 24 days. // - long long GetTickCount64_(void); + long long GetTickCount64_(); // // Retrieves the number of seconds that have elapsed since some arbitrary point in time. // - double GetSecondCount(void); + double GetSecondCount(); // // Get the time as a sortable string. @@ -47,11 +47,11 @@ namespace SharedUtil // Get time in microseconds typedef ulong TIMEUS; - TIMEUS GetTimeUs(void); + TIMEUS GetTimeUs(); // Get tick count cached per module - long long GetModuleTickCount64(void); - void UpdateModuleTickCount64(void); + long long GetModuleTickCount64(); + void UpdateModuleTickCount64(); // Debugging void AddTickCount(long long llTickCountAdd); @@ -65,7 +65,7 @@ namespace SharedUtil public: // Constructors - CTickCount(void) : m_llTicks(0) {} + CTickCount() : m_llTicks(0) {} explicit CTickCount(long long llTicks) : m_llTicks(llTicks) {} explicit CTickCount(double dTicks) : m_llTicks(static_cast(dTicks)) {} @@ -92,9 +92,9 @@ namespace SharedUtil bool operator!=(const CTickCount& other) const { return m_llTicks != other.m_llTicks; } // Conversion - double ToDouble(void) const { return static_cast(m_llTicks); } - long long ToLongLong(void) const { return m_llTicks; } - int ToInt(void) const { return static_cast(m_llTicks); } + double ToDouble() const { return static_cast(m_llTicks); } + long long ToLongLong() const { return m_llTicks; } + int ToInt() const { return static_cast(m_llTicks); } // Static functions static CTickCount Now(bool bUseModuleTickCount = false) { return CTickCount(bUseModuleTickCount ? GetModuleTickCount64() : GetTickCount64_()); } @@ -108,7 +108,7 @@ namespace SharedUtil { public: // MaxIncrement should be set higher than the expected tick interval between Get() calls - CElapsedTime(void) + CElapsedTime() { m_llMaxIncrement = INT_MAX; m_bUseModuleTickCount = false; @@ -123,13 +123,13 @@ namespace SharedUtil void SetUseModuleTickCount(bool bUseModuleTickCount) { m_bUseModuleTickCount = bUseModuleTickCount; } - void Reset(void) + void Reset() { m_llUpdateTime = DoGetTickCount(); m_ullElapsedTime = 0; } - unsigned long long Get(void) + unsigned long long Get() { long long llTime = DoGetTickCount(); m_ullElapsedTime += Clamp(0LL, llTime - m_llUpdateTime, m_llMaxIncrement); @@ -138,7 +138,7 @@ namespace SharedUtil } protected: - long long DoGetTickCount(void) { return m_bUseModuleTickCount ? GetModuleTickCount64() : GetTickCount64_(); } + long long DoGetTickCount() { return m_bUseModuleTickCount ? GetModuleTickCount64() : GetTickCount64_(); } long long m_llUpdateTime; unsigned long long m_ullElapsedTime; @@ -153,7 +153,7 @@ namespace SharedUtil class CElapsedTimeApprox { public: - CElapsedTimeApprox(void) + CElapsedTimeApprox() { m_bInitialized = false; m_uiMaxIncrement = INT_MAX; @@ -166,7 +166,7 @@ namespace SharedUtil #endif } - ~CElapsedTimeApprox(void) + ~CElapsedTimeApprox() { if (m_ppIntervalCounter && *m_ppIntervalCounter) if ((*m_ppIntervalCounter)->Release() == 0) @@ -175,7 +175,7 @@ namespace SharedUtil void SetMaxIncrement(uint uiMaxIncrement) { m_uiMaxIncrement = uiMaxIncrement; } - void Reset(void) + void Reset() { dassert(m_bInitialized); m_ucUpdateCount = DoGetCount(); @@ -183,7 +183,7 @@ namespace SharedUtil } // This will wrap if gap between calls is over 25.5 seconds - uint Get(void) + uint Get() { dassert(m_bInitialized); uchar ucCount = DoGetCount(); @@ -196,7 +196,7 @@ namespace SharedUtil static void StaticInitialize(CElapsedTimeApprox* pTimer); protected: - uchar DoGetCount(void) { return *m_pucCounterValue; } + uchar DoGetCount() { return *m_pucCounterValue; } bool m_bInitialized; uchar m_ucUpdateCount; @@ -212,25 +212,25 @@ namespace SharedUtil class CElapsedTimeHD { public: - CElapsedTimeHD(void) + CElapsedTimeHD() { Reset(); } - void Reset(void) + void Reset() { m_resetTime = DoGetTickCount(); } // Returns time in milliseconds since last reset - double Get(void) + double Get() { std::chrono::duration elapsedTime = DoGetTickCount() - m_resetTime; return elapsedTime.count() / 1000.0; } protected: - std::chrono::high_resolution_clock::time_point DoGetTickCount(void) + std::chrono::high_resolution_clock::time_point DoGetTickCount() { return std::chrono::high_resolution_clock::now(); } @@ -251,7 +251,7 @@ namespace SharedUtil TIMEUS timeUs; }; - CTimeUsMarker(void) { itemList.reserve(RESERVE_NUM_ITEMS); } + CTimeUsMarker() { itemList.reserve(RESERVE_NUM_ITEMS); } void Set(const char* szDesc) { @@ -267,7 +267,7 @@ namespace SharedUtil Set(stringStoreList.back()); } - SString GetString(void) const + SString GetString() const { SString strStatus; for (uint i = 1; i < itemList.size(); i++) diff --git a/Shared/sdk/SharedUtil.Time.hpp b/Shared/sdk/SharedUtil.Time.hpp index 12c2d35a800..a323e26c5aa 100644 --- a/Shared/sdk/SharedUtil.Time.hpp +++ b/Shared/sdk/SharedUtil.Time.hpp @@ -15,7 +15,7 @@ static CCriticalSection ms_criticalSection; static long long ms_llTickCountAdd = 0; -unsigned long GetTickCountInternal(void); +unsigned long GetTickCountInternal(); // Debugging void SharedUtil::AddTickCount(long long llTickCountAdd) @@ -30,7 +30,7 @@ void SharedUtil::AddTickCount(long long llTickCountAdd) // This keeps the counter as low as possible to delay any precision or wrap around issues. // Note: Return value is module dependent // -uint SharedUtil::GetTickCount32(void) +uint SharedUtil::GetTickCount32() { return (uint)GetTickCount64_(); } @@ -42,7 +42,7 @@ uint SharedUtil::GetTickCount32(void) // an __int64 and will effectively never wrap. This is an emulated version for XP and down. // Note: Wrap around issue is only defeated if the gap between calls is less than 24 days. // -long long SharedUtil::GetTickCount64_(void) +long long SharedUtil::GetTickCount64_() { ms_criticalSection.Lock(); @@ -75,7 +75,7 @@ long long SharedUtil::GetTickCount64_(void) // // Retrieves the number of seconds that have elapsed since some arbitrary point in time. // -double SharedUtil::GetSecondCount(void) +double SharedUtil::GetSecondCount() { return GetTickCount64_() * (1 / 1000.0); } @@ -134,7 +134,7 @@ template class CThreadResultValue { public: - CThreadResultValue(void) : m_ucLastWrittenIndex(0) {} + CThreadResultValue() : m_ucLastWrittenIndex(0) {} void Initialize(const T& initialValue) { @@ -158,7 +158,7 @@ class CThreadResultValue } } - T GetValue(void) + T GetValue() { while (true) { @@ -184,7 +184,7 @@ namespace SharedUtil class CPerModuleTickCount { public: - CPerModuleTickCount(void) + CPerModuleTickCount() { #ifdef MTA_DEBUG m_TimeSinceUpdated.SetMaxIncrement(500); @@ -192,7 +192,7 @@ namespace SharedUtil m_ResultValue.Initialize(GetTickCount64_()); } - long long Get(void) + long long Get() { #ifdef MTA_DEBUG if (m_TimeSinceUpdated.Get() > 10000) @@ -204,7 +204,7 @@ namespace SharedUtil return m_ResultValue.GetValue(); } - void Update(void) + void Update() { #ifdef MTA_DEBUG m_TimeSinceUpdated.Reset(); @@ -222,12 +222,12 @@ namespace SharedUtil CPerModuleTickCount ms_PerModuleTickCount; } // namespace SharedUtil -long long SharedUtil::GetModuleTickCount64(void) +long long SharedUtil::GetModuleTickCount64() { return ms_PerModuleTickCount.Get(); } -void SharedUtil::UpdateModuleTickCount64(void) +void SharedUtil::UpdateModuleTickCount64() { return ms_PerModuleTickCount.Update(); } @@ -244,7 +244,7 @@ void SharedUtil::UpdateModuleTickCount64(void) // Apple / Darwin platforms with Mach monotonic clock support #include -unsigned long GetTickCountInternal(void) +unsigned long GetTickCountInternal() { mach_timebase_info_data_t info; @@ -262,7 +262,7 @@ unsigned long GetTickCountInternal(void) #elif !defined(WIN32) // BSD / Linux platforms with POSIX monotonic clock support -unsigned long GetTickCountInternal(void) +unsigned long GetTickCountInternal() { #if !defined(CLOCK_MONOTONIC) #error "This platform does not have monotonic clock support." @@ -288,7 +288,7 @@ unsigned long GetTickCountInternal(void) ** run-time. When this occurs simply fallback to other time source. */ else - (void)gettimeofday(&now, NULL); + gettimeofday(&now, NULL); // ACHTUNG: Note that the above gettimeofday fallback is dangerous because it is a wall clock // and thus not guaranteed to be monotonic. Ideally, this function should throw a fatal error @@ -303,7 +303,7 @@ unsigned long GetTickCountInternal(void) // Win32 platforms #include #pragma comment(lib, "Winmm.lib") -unsigned long GetTickCountInternal(void) +unsigned long GetTickCountInternal() { // Uses timeGetTime() as Win32 GetTickCount() has a resolution of 16ms. // (timeGetTime() has a resolution is 1ms assuming timeBeginPeriod(1) has been called at startup). diff --git a/Shared/sdk/SharedUtil.Win32Utf8FileHooks.hpp b/Shared/sdk/SharedUtil.Win32Utf8FileHooks.hpp index 5afe4695af7..f2e71fe91f0 100644 --- a/Shared/sdk/SharedUtil.Win32Utf8FileHooks.hpp +++ b/Shared/sdk/SharedUtil.Win32Utf8FileHooks.hpp @@ -250,7 +250,7 @@ namespace SharedUtil // Hook adding // ///////////////////////////////////////////////////////////// - void AddUtf8FileHooks(void) + void AddUtf8FileHooks() { #define ADDHOOK(module,name) \ pfn##name = reinterpret_cast < FUNC_##name > ( DetourFunction ( DetourFindFunction ( module, #name ), reinterpret_cast < PBYTE > ( My##name ) ) ); \ @@ -280,7 +280,7 @@ namespace SharedUtil // Hook taking away // ///////////////////////////////////////////////////////////// - void RemoveUtf8FileHooks(void) + void RemoveUtf8FileHooks() { #define DELHOOK(name) \ if ( pfn##name ) \ diff --git a/Shared/sdk/WString.h b/Shared/sdk/WString.h index ffff3e79991..1d0742b2a84 100644 --- a/Shared/sdk/WString.h +++ b/Shared/sdk/WString.h @@ -30,7 +30,7 @@ class WString : public std::wstring { public: // Constructors - WString(void) : std::wstring() {} + WString() : std::wstring() {} WString(const wchar_t* szText) : std::wstring(szText ? szText : L"") {} @@ -73,7 +73,7 @@ class WString : public std::wstring // Assignment operator const wchar_t*() const { return c_str(); } // Auto assign to const wchar_t* without using c_str() - const wchar_t* operator*(void)const { return c_str(); } + const wchar_t* operator*()const { return c_str(); } // Functions void Split(const WString& strDelim, std::vector& outResult, unsigned int uiMaxAmount = 0, unsigned int uiMinAmount = 0) const; @@ -84,9 +84,9 @@ class WString : public std::wstring WString ReplaceI(const wchar_t* szOld, const wchar_t* szNew, bool bSearchJustReplaced = false) const; WString TrimStart(const wchar_t* szOld) const; WString TrimEnd(const wchar_t* szOld) const; - WString ToLower(void) const; - WString ToUpper(void) const; - WString ConformLineEndings(void) const; + WString ToLower() const; + WString ToUpper() const; + WString ConformLineEndings() const; bool Contains(const WString& strOther) const; bool ContainsI(const WString& strOther) const; bool CompareI(const WString& strOther) const; @@ -100,7 +100,7 @@ class WString : public std::wstring static WString Join(const WString& strDelim, const std::vector& parts, int iFirst = 0, int iCount = 0x3fffffff); void AssignLeft(const wchar_t* szOther, uint uiMaxLength); - SString ToAnsi(void) const; + SString ToAnsi() const; }; class WStringX : public WString diff --git a/Shared/sdk/WString.hpp b/Shared/sdk/WString.hpp index 21fa71df069..0deeaeb4df8 100644 --- a/Shared/sdk/WString.hpp +++ b/Shared/sdk/WString.hpp @@ -300,7 +300,7 @@ WString WString::TrimEnd(const wchar_t* szOld) const // // Change to all lower case characters. // -WString WString::ToLower(void) const +WString WString::ToLower() const { WString strResult = *this; std::transform(strResult.begin(), strResult.end(), strResult.begin(), ::tolower); @@ -310,7 +310,7 @@ WString WString::ToLower(void) const // // Change to all upper case characters. // -WString WString::ToUpper(void) const +WString WString::ToUpper() const { WString strResult = *this; std::transform(strResult.begin(), strResult.end(), strResult.begin(), ::toupper); @@ -320,7 +320,7 @@ WString WString::ToUpper(void) const // // Change '0x0a' or '0x0d' or '0x0d 0x0a' to '\n'. // -WString WString::ConformLineEndings(void) const +WString WString::ConformLineEndings() const { assert('\n' == '\x0A'); if (std::count(begin(), end(), '\n')) @@ -428,7 +428,7 @@ WString::WString(const char* szText) *this = FromUTF8(szText); } -SString WString::ToAnsi(void) const +SString WString::ToAnsi() const { return ToUTF8(*this); } diff --git a/Shared/sdk/net/CNetHTTPDownloadManagerInterface.h b/Shared/sdk/net/CNetHTTPDownloadManagerInterface.h index 8d25dca1dff..9d8f56a4ce0 100644 --- a/Shared/sdk/net/CNetHTTPDownloadManagerInterface.h +++ b/Shared/sdk/net/CNetHTTPDownloadManagerInterface.h @@ -50,7 +50,7 @@ struct SStringContent length = other.length(); pData = *other; } - operator SString(void) const { return SStringX(pData, length); } + operator SString() const { return SStringX(pData, length); } size_t length = 0; const char* pData = nullptr; }; @@ -71,7 +71,7 @@ struct SStringMapContent } assert(pos == numItems); } - operator std::map(void) const + operator std::map() const { std::map result; for (size_t i = 0; i < numItems; i += 2) @@ -162,15 +162,15 @@ class CNetHTTPDownloadManagerInterface { public: // Get some stats regarding the current download size now & total - virtual uint GetDownloadSizeNow(void) = 0; - virtual void ResetDownloadSize(void) = 0; + virtual uint GetDownloadSizeNow() = 0; + virtual void ResetDownloadSize() = 0; // Get an error if one has been set - virtual const char* GetError(void) = 0; + virtual const char* GetError() = 0; // Process the queued files // Returns true if all of the downloads have completed, false if there are additional downloads - virtual bool ProcessQueuedFiles(void) = 0; + virtual bool ProcessQueuedFiles() = 0; // Queue a file to download virtual bool QueueFile(const char* szURL, const char* szOutputFile, void* objectPtr = NULL, @@ -180,7 +180,7 @@ class CNetHTTPDownloadManagerInterface // Limit number of concurrent http client connections virtual void SetMaxConnections(int iMaxConnections) = 0; - virtual void Reset(void) = 0; + virtual void Reset() = 0; // objectPtr and pfnDownloadFinishedCallback are used to identify the download and should be the same as when QueueFile was originally called virtual bool CancelDownload(void* objectPtr, PFN_DOWNLOAD_FINISHED_CALLBACK pfnDownloadFinishedCallback) = 0; diff --git a/Shared/sdk/net/SyncStructures.h b/Shared/sdk/net/SyncStructures.h index 4429802f214..b4bc6d4fba7 100644 --- a/Shared/sdk/net/SyncStructures.h +++ b/Shared/sdk/net/SyncStructures.h @@ -82,10 +82,10 @@ struct SIntegerSync : public ISyncStructure } void Write(NetBitStreamInterface& bitStream) const { bitStream.WriteBits(reinterpret_cast(&data), bits); } - SIntegerSync(void) { assert(bits <= sizeof(type) * 8); } + SIntegerSync() { assert(bits <= sizeof(type) * 8); } SIntegerSync(type value) { data.value = value; } - operator type(void) const { return data.value; } + operator type() const { return data.value; } struct { @@ -2047,7 +2047,7 @@ struct SColorSync : public ISyncStructure void Write(NetBitStreamInterface& bitStream) const { bitStream.WriteBits(reinterpret_cast(&data), 32); } // From SColor - SColorSync(void) {} + SColorSync() {} SColorSync(SColor color) { data.ucR = color.R; @@ -2057,7 +2057,7 @@ struct SColorSync : public ISyncStructure } // To SColor - operator SColor(void) const { return SColorRGBA(data.ucR, data.ucG, data.ucB, data.ucA); } + operator SColor() const { return SColorRGBA(data.ucR, data.ucG, data.ucB, data.ucA); } struct { @@ -2180,11 +2180,11 @@ struct SMouseButtonSync : public ISyncStructure ////////////////////////////////////////// struct SHeatHazeSync : public ISyncStructure { - SHeatHazeSync(void) {} + SHeatHazeSync() {} SHeatHazeSync(const SHeatHazeSettings& settings) { data.settings = settings; } // To SHeatHazeSettings - operator SHeatHazeSettings(void) const { return data.settings; } + operator SHeatHazeSettings() const { return data.settings; } template bool ReadRange(NetBitStreamInterface& bitStream, T& outvalue, const T low, const T hi) diff --git a/Shared/sdk/net/bitstream.h b/Shared/sdk/net/bitstream.h index a6b76208d11..83e1fd77e84 100644 --- a/Shared/sdk/net/bitstream.h +++ b/Shared/sdk/net/bitstream.h @@ -24,13 +24,13 @@ class NetBitStreamInterface; class NetBitStreamInterfaceNoVersion : public CRefCountable { public: - virtual operator NetBitStreamInterface&(void) = 0; + virtual operator NetBitStreamInterface&() = 0; - virtual int GetReadOffsetAsBits(void) = 0; + virtual int GetReadOffsetAsBits() = 0; virtual void SetReadOffsetAsBits(int iOffset) = 0; - virtual void Reset(void) = 0; - virtual void ResetReadPointer(void) = 0; + virtual void Reset() = 0; + virtual void ResetReadPointer() = 0; // Don't use this, it screws up randomly in certain conditions causing packet misalign virtual void Write(const unsigned char& input) = 0; @@ -109,15 +109,15 @@ class NetBitStreamInterfaceNoVersion : public CRefCountable virtual bool ReadNormQuat(float& w, float& x, float& y, float& z) = 0; virtual bool ReadOrthMatrix(float& m00, float& m01, float& m02, float& m10, float& m11, float& m12, float& m20, float& m21, float& m22) = 0; // GetNumberOfBitsUsed appears to round up to the next byte boundary, when reading - virtual int GetNumberOfBitsUsed(void) const = 0; - virtual int GetNumberOfBytesUsed(void) const = 0; + virtual int GetNumberOfBitsUsed() const = 0; + virtual int GetNumberOfBytesUsed() const = 0; // GetNumberOfUnreadBits appears to round up to the next byte boundary, when reading - virtual int GetNumberOfUnreadBits(void) const = 0; + virtual int GetNumberOfUnreadBits() const = 0; - virtual void AlignWriteToByteBoundary(void) const = 0; - virtual void AlignReadToByteBoundary(void) const = 0; + virtual void AlignWriteToByteBoundary() const = 0; + virtual void AlignReadToByteBoundary() const = 0; - virtual unsigned char* GetData(void) const = 0; + virtual unsigned char* GetData() const = 0; // Force long types to use 4 bytes bool Read(unsigned long& e) @@ -352,12 +352,12 @@ class NetBitStreamInterface : public NetBitStreamInterfaceNoVersion const NetBitStreamInterface& operator=(const NetBitStreamInterface&); protected: - NetBitStreamInterface(void) { DEBUG_CREATE_COUNT("NetBitStreamInterface"); } - virtual ~NetBitStreamInterface(void) { DEBUG_DESTROY_COUNT("NetBitStreamInterface"); } + NetBitStreamInterface() { DEBUG_CREATE_COUNT("NetBitStreamInterface"); } + virtual ~NetBitStreamInterface() { DEBUG_DESTROY_COUNT("NetBitStreamInterface"); } public: - virtual operator NetBitStreamInterface&(void) { return *this; } - virtual unsigned short Version(void) const = 0; + virtual operator NetBitStreamInterface&() { return *this; } + virtual unsigned short Version() const = 0; }; // Interface for all sync structures diff --git a/Shared/sdk/sha2.hpp b/Shared/sdk/sha2.hpp index 43f8d6c5929..bf633d1dbd4 100644 --- a/Shared/sdk/sha2.hpp +++ b/Shared/sdk/sha2.hpp @@ -978,7 +978,7 @@ void test(const char* vector, unsigned char* digest, unsigned int digest_size) } } -int main(void) +int main() { static const char* vectors[4][3] = {/* SHA-224 */ { diff --git a/Shared/sdk/xml/CXML.h b/Shared/sdk/xml/CXML.h index 238485fc7c4..bcb6aadd2d4 100644 --- a/Shared/sdk/xml/CXML.h +++ b/Shared/sdk/xml/CXML.h @@ -20,7 +20,7 @@ class CXML public: virtual CXMLFile* CreateXML(const char* szFilename, bool bUseIDs = false, bool bReadOnly = false) = 0; virtual void DeleteXML(CXMLFile* pFile) = 0; - virtual CXMLNode* CreateDummyNode(void) = 0; + virtual CXMLNode* CreateDummyNode() = 0; virtual CXMLAttribute* GetAttrFromID(unsigned long ulID) = 0; virtual CXMLFile* GetFileFromID(unsigned long ulID) = 0; diff --git a/Shared/sdk/xml/CXMLAttribute.h b/Shared/sdk/xml/CXMLAttribute.h index 415c8754202..1802e2adca1 100644 --- a/Shared/sdk/xml/CXMLAttribute.h +++ b/Shared/sdk/xml/CXMLAttribute.h @@ -17,10 +17,10 @@ class CXMLAttribute : public CXMLCommon { public: - virtual ~CXMLAttribute(void){}; + virtual ~CXMLAttribute(){}; - virtual const std::string GetName(void) const = 0; - virtual const std::string& GetValue(void) const = 0; + virtual const std::string GetName() const = 0; + virtual const std::string& GetValue() const = 0; virtual void SetValue(const char* szValue) = 0; virtual void SetValue(bool bValue) = 0; @@ -28,5 +28,5 @@ class CXMLAttribute : public CXMLCommon virtual void SetValue(unsigned int uiValue) = 0; virtual void SetValue(float fValue) = 0; - virtual void DeleteWrapper(void) = 0; + virtual void DeleteWrapper() = 0; }; diff --git a/Shared/sdk/xml/CXMLAttributes.h b/Shared/sdk/xml/CXMLAttributes.h index 36e43726741..503602bf125 100644 --- a/Shared/sdk/xml/CXMLAttributes.h +++ b/Shared/sdk/xml/CXMLAttributes.h @@ -18,15 +18,15 @@ class CXMLAttribute; class CXMLAttributes { public: - virtual unsigned int Count(void) = 0; + virtual unsigned int Count() = 0; virtual CXMLAttribute* Find(const char* szName) = 0; virtual CXMLAttribute* Get(unsigned int uiIndex) = 0; virtual CXMLAttribute* Create(const char* szName) = 0; virtual CXMLAttribute* Create(const CXMLAttribute& Copy) = 0; virtual bool Delete(const char* szName) = 0; - virtual void DeleteAll(void) = 0; + virtual void DeleteAll() = 0; - virtual std::list::iterator ListBegin(void) = 0; - virtual std::list::iterator ListEnd(void) = 0; + virtual std::list::iterator ListBegin() = 0; + virtual std::list::iterator ListEnd() = 0; }; diff --git a/Shared/sdk/xml/CXMLCommon.h b/Shared/sdk/xml/CXMLCommon.h index 17285152d33..0270d981ae3 100644 --- a/Shared/sdk/xml/CXMLCommon.h +++ b/Shared/sdk/xml/CXMLCommon.h @@ -23,8 +23,8 @@ enum eXMLClass class CXMLCommon { public: - virtual ~CXMLCommon(void){}; + virtual ~CXMLCommon(){}; - virtual eXMLClass GetClassType(void) = 0; - virtual unsigned long GetID(void) = 0; + virtual eXMLClass GetClassType() = 0; + virtual unsigned long GetID() = 0; }; diff --git a/Shared/sdk/xml/CXMLFile.h b/Shared/sdk/xml/CXMLFile.h index 892afe07054..b0db598429d 100644 --- a/Shared/sdk/xml/CXMLFile.h +++ b/Shared/sdk/xml/CXMLFile.h @@ -21,21 +21,21 @@ class CXMLNode; class CXMLFile : public CXMLCommon { public: - virtual ~CXMLFile(void){}; + virtual ~CXMLFile(){}; - virtual const char* GetFilename(void) = 0; + virtual const char* GetFilename() = 0; virtual void SetFilename(const char* szFilename) = 0; virtual bool Parse(std::vector* pOutFileContents = NULL) = 0; - virtual bool Write(void) = 0; - virtual void Clear(void) = 0; - virtual void Reset(void) = 0; + virtual bool Write() = 0; + virtual void Clear() = 0; + virtual void Reset() = 0; virtual CXMLNode* CreateRootNode(const std::string& strTagName) = 0; - virtual CXMLNode* GetRootNode(void) = 0; + virtual CXMLNode* GetRootNode() = 0; virtual CXMLErrorCodes::Code GetLastError(std::string& strOut) = 0; - virtual void ResetLastError(void) = 0; + virtual void ResetLastError() = 0; - virtual bool IsValid(void) = 0; + virtual bool IsValid() = 0; }; diff --git a/Shared/sdk/xml/CXMLNode.h b/Shared/sdk/xml/CXMLNode.h index 97bcba5e3f4..720ab931f3f 100644 --- a/Shared/sdk/xml/CXMLNode.h +++ b/Shared/sdk/xml/CXMLNode.h @@ -18,27 +18,27 @@ class CXMLNode : public CXMLCommon { public: - virtual ~CXMLNode(void){}; + virtual ~CXMLNode(){}; virtual CXMLNode* CreateSubNode(const char* szTagName, CXMLNode* pInsertAfter = nullptr) = 0; virtual void DeleteSubNode(CXMLNode* pNode) = 0; - virtual void DeleteAllSubNodes(void) = 0; + virtual void DeleteAllSubNodes() = 0; - virtual unsigned int GetSubNodeCount(void) = 0; + virtual unsigned int GetSubNodeCount() = 0; virtual CXMLNode* GetSubNode(unsigned int uiIndex) = 0; virtual CXMLNode* FindSubNode(const char* szTagName, unsigned int uiIndex = 0) = 0; - virtual std::list::iterator ChildrenBegin(void) = 0; - virtual std::list::iterator ChildrenEnd(void) = 0; + virtual std::list::iterator ChildrenBegin() = 0; + virtual std::list::iterator ChildrenEnd() = 0; - virtual CXMLAttributes& GetAttributes(void) = 0; - virtual CXMLNode* GetParent(void) = 0; + virtual CXMLAttributes& GetAttributes() = 0; + virtual CXMLNode* GetParent() = 0; - virtual int GetLine(void) = 0; - virtual const std::string& GetTagName(void) = 0; + virtual int GetLine() = 0; + virtual const std::string& GetTagName() = 0; virtual void SetTagName(const std::string& strString) = 0; - virtual const std::string GetTagContent(void) = 0; + virtual const std::string GetTagContent() = 0; virtual bool GetTagContent(bool& bContent) = 0; virtual bool GetTagContent(int& iContent) = 0; virtual bool GetTagContent(unsigned int& uiContent) = 0; @@ -54,9 +54,9 @@ class CXMLNode : public CXMLCommon virtual CXMLNode* CopyNode(CXMLNode* pParent) = 0; virtual bool CopyChildrenInto(CXMLNode* pDestination, bool bRecursive) = 0; - virtual bool IsValid(void) = 0; + virtual bool IsValid() = 0; virtual SString GetAttributeValue(const SString& strAttributeName) = 0; - virtual SString GetCommentText(void) = 0; + virtual SString GetCommentText() = 0; virtual void SetCommentText(const char* szCommentText, bool bLeadingBlankLine = false) = 0; };