diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-11 00:00:50 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-11 00:00:50 +0200 |
| commit | 2f085ea5f585ac2a54bfa1eb51082b5f41a67184 (patch) | |
| tree | 90b3006d9ff5aa65b753d27336d134d1cc783ce5 /src/core | |
| parent | some changes (diff) | |
| parent | RpAnimBlend and frame updates (diff) | |
| download | re3-2f085ea5f585ac2a54bfa1eb51082b5f41a67184.tar re3-2f085ea5f585ac2a54bfa1eb51082b5f41a67184.tar.gz re3-2f085ea5f585ac2a54bfa1eb51082b5f41a67184.tar.bz2 re3-2f085ea5f585ac2a54bfa1eb51082b5f41a67184.tar.lz re3-2f085ea5f585ac2a54bfa1eb51082b5f41a67184.tar.xz re3-2f085ea5f585ac2a54bfa1eb51082b5f41a67184.tar.zst re3-2f085ea5f585ac2a54bfa1eb51082b5f41a67184.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Cam.cpp | 4 | ||||
| -rw-r--r-- | src/core/World.cpp | 2 | ||||
| -rw-r--r-- | src/core/re3.cpp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp index ae7df51f..a8787675 100644 --- a/src/core/Cam.cpp +++ b/src/core/Cam.cpp @@ -280,12 +280,12 @@ CCam::Process(void) if(DirectionWasLooking != LOOKING_BEHIND) TheCamera.m_bJust_Switched = true; DirectionWasLooking = LOOKING_BEHIND; - }else if(CPad::GetPad(0)->GetLookLeft()){ + }else if(!((CVehicle*)CamTargetEntity)->IsRealHeli() && CPad::GetPad(0)->GetLookLeft()){ LookLeft(); if(DirectionWasLooking != LOOKING_LEFT) TheCamera.m_bJust_Switched = true; DirectionWasLooking = LOOKING_LEFT; - }else if(CPad::GetPad(0)->GetLookRight()){ + }else if(!((CVehicle*)CamTargetEntity)->IsRealHeli() && CPad::GetPad(0)->GetLookRight()){ LookRight(); if(DirectionWasLooking != LOOKING_RIGHT) TheCamera.m_bJust_Switched = true; diff --git a/src/core/World.cpp b/src/core/World.cpp index e48d0f75..6ea3489b 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -1926,6 +1926,7 @@ CWorld::Process(void) if(csObj && csObj->m_entryInfoList.first) { if(csObj->m_rwObject && RwObjectGetType(csObj->m_rwObject) == rpCLUMP && RpAnimBlendClumpGetFirstAssociation(csObj->GetClump())) { +// TODO(MIAMI): doRender argument RpAnimBlendClumpUpdateAnimations(csObj->GetClump(), 0.02f * (csObj->IsObject() ? CTimer::GetTimeStepNonClipped() @@ -1944,6 +1945,7 @@ CWorld::Process(void) CEntity *movingEnt = (CEntity *)node->item; if(movingEnt->m_rwObject && RwObjectGetType(movingEnt->m_rwObject) == rpCLUMP && RpAnimBlendClumpGetFirstAssociation(movingEnt->GetClump())) { +// TODO(MIAMI): doRender argument RpAnimBlendClumpUpdateAnimations(movingEnt->GetClump(), 0.02f * (movingEnt->IsObject() ? CTimer::GetTimeStepNonClipped() diff --git a/src/core/re3.cpp b/src/core/re3.cpp index a2c0a9a3..8ed27eef 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -323,7 +323,7 @@ DebugMenuPopulate(void) DebugMenuAddCmd("Spawn", "Spawn Banshee", [](){ SpawnCar(MI_BANSHEE); }); DebugMenuAddCmd("Spawn", "Spawn Cuban", [](){ SpawnCar(MI_CUBAN); }); DebugMenuAddCmd("Spawn", "Spawn Voodoo", [](){ SpawnCar(MI_VOODOO); }); - DebugMenuAddCmd("Spawn", "Spawn Dodo", [](){ SpawnCar(MI_DODO); }); + DebugMenuAddCmd("Spawn", "Spawn Sparrow", [](){ SpawnCar(MI_SPARROW); }); DebugMenuAddCmd("Spawn", "Spawn Rhino", [](){ SpawnCar(MI_RHINO); }); DebugMenuAddCmd("Spawn", "Spawn Firetruck", [](){ SpawnCar(MI_FIRETRUCK); }); DebugMenuAddCmd("Spawn", "Spawn Predator", [](){ SpawnCar(MI_PREDATOR); }); |