diff --git a/plugin_sa/game_sa/CPathFind.cpp b/plugin_sa/game_sa/CPathFind.cpp index 490ede96..0888b59c 100644 --- a/plugin_sa/game_sa/CPathFind.cpp +++ b/plugin_sa/game_sa/CPathFind.cpp @@ -20,6 +20,10 @@ void CPathFind::DoPathSearch(unsigned char pathType, CVector origin, CNodeAddres waterPath); } +bool CPathFind::IsWaterNodeNearby(CVector position, float radius) { + return plugin::CallMethodAndReturn(this, position, radius); +} + void CPathFind::SetPathsNeededAtPosition(const CVector& pos) { plugin::CallMethod<0x44DCD0, CPathFind*, const CVector&>(this, pos); } diff --git a/plugin_sa/game_sa/CPathFind.h b/plugin_sa/game_sa/CPathFind.h index c0edd172..25e3a6e0 100644 --- a/plugin_sa/game_sa/CPathFind.h +++ b/plugin_sa/game_sa/CPathFind.h @@ -48,15 +48,15 @@ class PLUGIN_API CPathFind float m_fForbiddenForScrCarsY1; float m_fForbiddenForScrCarsY2; - // - void DoPathSearch(unsigned char pathType, CVector origin, CNodeAddress originAddr, CVector target, CNodeAddress *pResultNodes, short *pNodesCount, int maxNodesToFind, float *pDistance, float maxSearchDistance, CNodeAddress *targetAddr, float maxUnkLimit, bool oneSideOnly, CNodeAddress forbiddenNodeAddr, bool includeNodesWithoutLinks, bool waterPath); - void SetPathsNeededAtPosition(const CVector& pos); - void UpdateStreaming(bool bForceStreaming); + bool IsWaterNodeNearby(CVector position, float radius); + + void SetPathsNeededAtPosition(const CVector& pos); + void UpdateStreaming(bool bForceStreaming); CPathNode *GetPathNode(CNodeAddress address); }; diff --git a/plugin_sa/game_sa/CStreamingInfo.h b/plugin_sa/game_sa/CStreamingInfo.h index 56a4acc0..ac147956 100644 --- a/plugin_sa/game_sa/CStreamingInfo.h +++ b/plugin_sa/game_sa/CStreamingInfo.h @@ -9,10 +9,12 @@ #include "PluginBase.h" enum eStreamingFlags { + DEFAULT = 0x0, GAME_REQUIRED = 0x2, MISSION_REQUIRED = 0x4, KEEP_IN_MEMORY = 0x8, PRIORITY_REQUEST = 0x10, + LOADING_SCENE = 0x20, SCM_COMMAND_FLAG = 0x0C }; diff --git a/tools/premake/premake5.lua b/tools/premake/premake5.lua index 8711e161..96b0dba1 100644 --- a/tools/premake/premake5.lua +++ b/tools/premake/premake5.lua @@ -815,7 +815,7 @@ function pluginSdkExampleProject(projectDir, projectName, projectType, game2, ga libdirs (getExamplePluginLibraryFolders(projectType, "$(CLEO_SDK_VC_DIR)", d3dSupport, d3dSupport, additionalLibraryDirs)) defines (getExamplePluginDefines(projectName, "GTAVC", projectType, d3dSupport, additionalDefinitions, "Vice City", "VC", "vc", "Tommy", "Vice City")) setupDebugger(projectType, "GTA_VC_DIR", "", "gta-vc.exe") - filter { "Release", "platforms:GTAVC" } + filter { "Release", "platforms:GTA-VC" } links (getExamplePluginLibraries("plugin_vc", projectType, "VC.CLEO", d3dSupport, d3dSupport, additionalLibraries, false)) targetname (projectName .. ".VC") filter { "Debug", "platforms:GTA-VC" } @@ -831,7 +831,7 @@ function pluginSdkExampleProject(projectDir, projectName, projectType, game2, ga libdirs (getExamplePluginLibraryFolders(projectType, "$(CLEO_SDK_SA_DIR)", d3dSupport, false, additionalLibraryDirs)) defines (getExamplePluginDefines(projectName, "GTASA", projectType, d3dSupport, additionalDefinitions, "San Andreas", "SA", "sa", "CJ", "San Andreas")) setupDebugger(projectType, "GTA_SA_DIR", "", "gta_sa.exe") - filter { "Release", "platforms:GTASA" } + filter { "Release", "platforms:GTA-SA" } links (getExamplePluginLibraries("plugin", projectType, "cleo", d3dSupport, false, additionalLibraries, false)) targetname (projectName .. ".SA") filter { "Debug", "platforms:GTA-SA" } @@ -863,7 +863,7 @@ function pluginSdkExampleProject(projectDir, projectName, projectType, game2, ga libdirs (getExamplePluginLibraryFolders(projectType, "", d3dSupport, false, additionalLibraryDirs)) defines (getExamplePluginDefines(projectName, "GTA3_UNREAL", projectType, d3dSupport, additionalDefinitions, "3", "3", "3", "Claude", "Liberty City")) setupDebugger(projectType, "GTA_III_UNREAL_DIR", "Gameface\\Binaries\\Win64\\", "LibertyCity.exe") - filter { "Release", "platforms:GTA3_UNREAL" } + filter { "Release", "platforms:GTA3_Unreal" } links (getExamplePluginLibraries("plugin_iii_unreal", projectType, "", d3dSupport, false, additionalLibraries, false)) targetname (projectName .. ".III-DE") filter { "Debug", "platforms:GTA3_Unreal" } @@ -879,7 +879,7 @@ function pluginSdkExampleProject(projectDir, projectName, projectType, game2, ga libdirs (getExamplePluginLibraryFolders(projectType, "", d3dSupport, false, additionalLibraryDirs)) defines (getExamplePluginDefines(projectName, "GTAVC_UNREAL", projectType, d3dSupport, additionalDefinitions, "Vice City", "VC", "vc", "Tommy", "Vice City")) setupDebugger(projectType, "GTA_VC_UNREAL_DIR", "Gameface\\Binaries\\Win64\\", "ViceCity.exe") - filter { "Release", "platforms:GTAVC_UNREAL" } + filter { "Release", "platforms:GTA-VC_Unreal" } links (getExamplePluginLibraries("plugin_vc_unreal", projectType, "", d3dSupport, d3dSupport, additionalLibraries, false)) targetname (projectName .. ".VC-DE") filter { "Debug", "platforms:GTA-VC_Unreal" } @@ -895,7 +895,7 @@ function pluginSdkExampleProject(projectDir, projectName, projectType, game2, ga libdirs (getExamplePluginLibraryFolders(projectType, "", d3dSupport, false, additionalLibraryDirs)) defines (getExamplePluginDefines(projectName, "GTASA_UNREAL", projectType, d3dSupport, additionalDefinitions, "San Andreas", "SA", "sa", "CJ", "San Andreas")) setupDebugger(projectType, "GTA_SA_UNREAL_DIR", "Gameface\\Binaries\\Win64\\", "SanAndreas.exe") - filter { "Release", "platforms:GTASA_UNREAL" } + filter { "Release", "platforms:GTA-SA_Unreal" } links (getExamplePluginLibraries("plugin_unreal", projectType, "", d3dSupport, false, additionalLibraries, false)) targetname (projectName .. ".SA-DE") filter { "Debug", "platforms:GTA-SA_Unreal" }