diff --git a/README.md b/README.md index 2bb2808d3e..93c2f7e240 100644 --- a/README.md +++ b/README.md @@ -17,18 +17,9 @@ Before you start writing code, please make sure to read the [coding guidelines]( * [Visual Studio 2022](https://visualstudio.microsoft.com/en/downloads/) (Community Edition is enough) * [CMake](https://cmake.org) (for those who want to use CMake instead of premake5) -#### Game -* GTA SA **Compact** exe -* [ASI Loader](https://gtaforums.com/topic/523982-relopensrc-silents-asi-loader/) -* [III.VC.SA.WindowedMode.asi](https://github.com/ThirteenAG/III.VC.SA.WindowedMode) -* [Mouse Fix (**dinput8.dll**)]() - -You can download them in a single [archive](https://github.com/codenulls/gta-reversed/files/6949371/gta_sa.zip). -Using other plugins is strongly discouraged and we provide __**no support**__. - ### Build Instructions -You can either build with **Premake5** or **CMake**; that's up to you, but a C++20 capable compiler with support is required. +You can either build with **Premake5** or **CMake**; that's up to you, but a C++20 capable compiler [with ``, `` support] is required. First clone the project, including the submodules: ```shell @@ -38,10 +29,11 @@ git clone --recurse-submodules https://github.com/gta-reversed/gta-reversed-mode
Premake5 -1) Execute `premake5.bat` for 2022, or `premake5.bat vs20xx` for other VS versions. (Note: Premake works fine with vs2019, CMake requires vs2022) (e.g: `premake5.bat vs2019`) +1) Execute `premake5.bat` 2) You'll find gta_reversed.sln shortcut in the same folder as premake5. +3) Open it, and once the project has loaded, just hit `CTRL + SHIFT + B`
@@ -79,13 +71,30 @@ git clone --recurse-submodules https://github.com/gta-reversed/gta-reversed-mode
+### Game +To install all the necessary files, run `install.py` with **__administrator privileges__** [Necessary to create symlinks on Windows] in the root directory. +Alternatively, you can install them by yourself: + +* GTA SA **Compact** exe +* [ASI Loader](https://gtaforums.com/topic/523982-relopensrc-silents-asi-loader/) +* [III.VC.SA.WindowedMode.asi](https://github.com/ThirteenAG/III.VC.SA.WindowedMode) +* Mouse Fix (**dinput8.dll**) [Can be found in the zip in `./contrib`] + +You can download them in a single [archive](https://github.com/gta-reversed/gta-reversed-modern/blob/master/contrib/plugins.zip). +Using other plugins is strongly discouraged and we provide __**no support**__. ### Preparing Environment (Optional) +[If you have ran `install.py` in the previous step then this step is already done] + +
+Instructions You can create symbolic links [symlinks] for artifacts [the `.asi`] to need not copy them every time you compile the project. -Open a console with administrator privileges in the git repo's directory and run `contrib\link_asi.bat` or right click `link_asi.bat` file and click `Run as administrator`, then +Open a console with **__administrator privileges__** in the git repo's directory and run `contrib\link_asi.bat` or right click `link_asi.bat` file and click `Run as administrator`, then follow instructions at the command window. + +
### What to work on? Check [this](https://github.com/gta-reversed/gta-reversed-modern/discussions/402) out for some inspiration ;) diff --git a/install.py b/contrib/install.py similarity index 100% rename from install.py rename to contrib/install.py diff --git a/source/game_sa/Entity/Vehicle/Automobile.cpp b/source/game_sa/Entity/Vehicle/Automobile.cpp index c08df4e414..096406a34a 100644 --- a/source/game_sa/Entity/Vehicle/Automobile.cpp +++ b/source/game_sa/Entity/Vehicle/Automobile.cpp @@ -5111,7 +5111,7 @@ CObject* CAutomobile::SpawnFlyingComponent(eCarNodes nodeIndex, uint32 collision *RwFrameGetMatrix(flyingObjFrame) = *frameLTM; // Set this frame's matrix to be the same as the component's - TODO: This most likely isn't the correct way to do this.. CVisibilityPlugins::SetAtomicRenderCallback(clonedFlyingObjAtomic, nullptr); obj->AttachToRwObject((RwObject*)clonedFlyingObjAtomic, true); - + obj->m_bDontStream = true; obj->m_fMass = 10.f; obj->m_fTurnMass = 25.f; diff --git a/source/game_sa/Models/ClumpModelInfo.cpp b/source/game_sa/Models/ClumpModelInfo.cpp index 704791737d..0c2960da08 100644 --- a/source/game_sa/Models/ClumpModelInfo.cpp +++ b/source/game_sa/Models/ClumpModelInfo.cpp @@ -330,7 +330,7 @@ RwFrame* CClumpModelInfo::FindFrameFromNameWithoutIdCB(RwFrame* frame, void* sea searchInfo->m_pFrame = frame; return nullptr; } - + RwFrameForAllChildren(frame, FindFrameFromNameWithoutIdCB, searchData); if (searchInfo->m_pFrame) return nullptr;