diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2021-01-14 22:06:43 +0100 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2021-01-14 22:06:43 +0100 |
| commit | a0a88b466328cf838570e816a0b212876d882f8e (patch) | |
| tree | c5de3d106e36ac1c2a3a5786c0ab443c101d5e1b | |
| parent | More checks before autolinking (diff) | |
| parent | incoming "fuck" commit (diff) | |
| download | re3-a0a88b466328cf838570e816a0b212876d882f8e.tar re3-a0a88b466328cf838570e816a0b212876d882f8e.tar.gz re3-a0a88b466328cf838570e816a0b212876d882f8e.tar.bz2 re3-a0a88b466328cf838570e816a0b212876d882f8e.tar.lz re3-a0a88b466328cf838570e816a0b212876d882f8e.tar.xz re3-a0a88b466328cf838570e816a0b212876d882f8e.tar.zst re3-a0a88b466328cf838570e816a0b212876d882f8e.zip | |
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/build-cmake-conan.yml | 2 | ||||
| -rw-r--r-- | src/control/Script2.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/build-cmake-conan.yml b/.github/workflows/build-cmake-conan.yml index 1f520677..acbad81c 100644 --- a/.github/workflows/build-cmake-conan.yml +++ b/.github/workflows/build-cmake-conan.yml @@ -95,7 +95,7 @@ jobs: conan export re3mss miles-sdk/master@ - name: "Download/build dependencies (conan install)" run: | - conan install ${{ github.workspace }} reVC/master -if build -o reVC:audio=${{ matrix.audio }} -o librw:platform=${{ matrix.platform }} -o librw:gl3_gfxlib=${{ matrix.gl3_gfxlib || 'glfw' }} --build missing -pr:h ./host_profile -pr:b default -s reVC:build_type=RelWithDebInfo -s librw:build_type=RelWithDebInfo + conan install ${{ github.workspace }} reVC/master@ -if build -o reVC:audio=${{ matrix.audio }} -o librw:platform=${{ matrix.platform }} -o librw:gl3_gfxlib=${{ matrix.gl3_gfxlib || 'glfw' }} --build missing -pr:h ./host_profile -pr:b default -s reVC:build_type=RelWithDebInfo -s librw:build_type=RelWithDebInfo env: CONAN_SYSREQUIRES_MODE: enabled - name: "Build reVC (conan build)" diff --git a/src/control/Script2.cpp b/src/control/Script2.cpp index a94bf907..f2d9ed9e 100644 --- a/src/control/Script2.cpp +++ b/src/control/Script2.cpp @@ -1299,9 +1299,9 @@ int8 CRunningScript::ProcessCommands400To499(int32 command) CollectParameters(&m_nIp, 2); CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]); script_assert(pPed); - CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[1]); + CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[1]); pPed->bScriptObjectiveCompleted = false; - pPed->SetObjective(OBJECTIVE_DESTROY_OBJECT, pVehicle); + pPed->SetObjective(OBJECTIVE_DESTROY_OBJECT, pObject); return 0; } case COMMAND_SET_CHAR_OBJ_DESTROY_CAR: |