diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-10-18 18:57:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-18 18:57:47 +0200 |
| commit | 4bfc75c2f9878aad791610f95b3e48edd05dc621 (patch) | |
| tree | c2a222cfdbb5d7ebcd9acf27920b7fa6da6918d1 /src/control | |
| parent | Merge pull request #772 from Nick007J/miami (diff) | |
| parent | Merge branch 'miami' into miami (diff) | |
| download | re3-4bfc75c2f9878aad791610f95b3e48edd05dc621.tar re3-4bfc75c2f9878aad791610f95b3e48edd05dc621.tar.gz re3-4bfc75c2f9878aad791610f95b3e48edd05dc621.tar.bz2 re3-4bfc75c2f9878aad791610f95b3e48edd05dc621.tar.lz re3-4bfc75c2f9878aad791610f95b3e48edd05dc621.tar.xz re3-4bfc75c2f9878aad791610f95b3e48edd05dc621.tar.zst re3-4bfc75c2f9878aad791610f95b3e48edd05dc621.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Replay.cpp | 12 | ||||
| -rw-r--r-- | src/control/Script.cpp | 9 |
2 files changed, 8 insertions, 13 deletions
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp index 310d9686..4fdd3439 100644 --- a/src/control/Replay.cpp +++ b/src/control/Replay.cpp @@ -387,10 +387,8 @@ void CReplay::RecordThisFrame(void) tBulletTracePacket* bt = (tBulletTracePacket*)&Record.m_pBase[Record.m_nOffset]; bt->type = REPLAYPACKET_BULLET_TRACES; bt->index = i; - bt->frames = CBulletTraces::aTraces[i].m_framesInUse; - bt->lifetime = CBulletTraces::aTraces[i].m_lifeTime; - bt->inf = CBulletTraces::aTraces[i].m_vecCurrentPos; - bt->sup = CBulletTraces::aTraces[i].m_vecTargetPos; + bt->inf = CBulletTraces::aTraces[i].m_vecStartPos; + bt->sup = CBulletTraces::aTraces[i].m_vecEndPos; Record.m_nOffset += sizeof(*bt); } tMiscPacket* misc = (tMiscPacket*)&Record.m_pBase[Record.m_nOffset]; @@ -1117,10 +1115,8 @@ bool CReplay::PlayBackThisFrameInterpolation(CAddressInReplayBuffer *buffer, flo { tBulletTracePacket* pb = (tBulletTracePacket*)&ptr[offset]; CBulletTraces::aTraces[pb->index].m_bInUse = true; - CBulletTraces::aTraces[pb->index].m_framesInUse = pb->frames; - CBulletTraces::aTraces[pb->index].m_lifeTime = pb->lifetime; - CBulletTraces::aTraces[pb->index].m_vecCurrentPos = pb->inf; - CBulletTraces::aTraces[pb->index].m_vecTargetPos = pb->sup; + CBulletTraces::aTraces[pb->index].m_vecStartPos = pb->inf; + CBulletTraces::aTraces[pb->index].m_vecEndPos = pb->sup; buffer->m_nOffset += sizeof(tBulletTracePacket); break; } diff --git a/src/control/Script.cpp b/src/control/Script.cpp index a2ab5f0b..ba53c9cf 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -1804,9 +1804,8 @@ void CMissionCleanup::Process() if (!CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle) TheCamera.Restore(); TheCamera.SetWideScreenOff(); - // TODO(MIAMI) - //CSpecialFX::bLiftCam = false; - //CSpecialFX::bVideoCam = false; + CSpecialFX::bLiftCam = false; + CSpecialFX::bVideoCam = false; CTimeCycle::StopExtraColour(0); for (int i = 0; i < MISSION_AUDIO_SLOTS; i++) DMAudio.ClearMissionAudio(i); @@ -12404,7 +12403,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command) case COMMAND_SWITCH_SECURITY_CAMERA: { CollectParameters(&m_nIp, 1); - debug("SWITCH_SECURITY_CAMERA is not implemented\n"); // TODO(MIAMI) + CSpecialFX::bVideoCam = ScriptParams[0] != 0; return 0; } //case COMMAND_IS_CHAR_IN_FLYING_VEHICLE: @@ -12844,7 +12843,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command) case COMMAND_SWITCH_LIFT_CAMERA: { CollectParameters(&m_nIp, 1); - debug("SWITCH_LIFT_CAMERA is not implemented\n"); // TODO(MIAMI) + CSpecialFX::bLiftCam = ScriptParams[0] != 0; return 0; } case COMMAND_CLOSE_ALL_CAR_DOORS: |