diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-10-12 20:52:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 20:52:59 +0200 |
| commit | 1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4 (patch) | |
| tree | bb6768eda3c5916ecddd9806e830f992996af69d /src/control/SceneEdit.cpp | |
| parent | Streaming and cross-platform fixes (diff) | |
| parent | sync with upstream (diff) | |
| download | re3-1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4.tar re3-1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4.tar.gz re3-1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4.tar.bz2 re3-1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4.tar.lz re3-1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4.tar.xz re3-1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4.tar.zst re3-1e11c1eac67b969bf9e5fca3d9e2e7087454dcb4.zip | |
Diffstat (limited to 'src/control/SceneEdit.cpp')
| -rw-r--r-- | src/control/SceneEdit.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/control/SceneEdit.cpp b/src/control/SceneEdit.cpp index a7727fde..21512290 100644 --- a/src/control/SceneEdit.cpp +++ b/src/control/SceneEdit.cpp @@ -20,6 +20,8 @@ #include "WeaponInfo.h" #include "World.h" +//--MIAMI: file done + bool CSceneEdit::m_bEditOn; int32 CSceneEdit::m_bCameraFollowActor; bool CSceneEdit::m_bRecording; @@ -1070,7 +1072,7 @@ bool CSceneEdit::SelectWeapon(void) } if (CPad::GetPad(1)->GetLeftShoulder1JustDown()) { if (++m_nWeaponType >= WEAPONTYPE_DETONATOR) - m_nWeaponType = WEAPONTYPE_BASEBALLBAT; + m_nWeaponType = WEAPONTYPE_BRASSKNUCKLE; pActors[m_nActor]->ClearWeapons(); pActors[m_nActor]->GiveWeapon((eWeaponType)m_nWeaponType, 1000); pActors[m_nActor]->AddWeaponModel(CWeaponInfo::GetWeaponInfo(pActors[m_nActor]->GetWeapon()->m_eWeaponType)->m_nModelId); @@ -1078,7 +1080,7 @@ bool CSceneEdit::SelectWeapon(void) } else if (CPad::GetPad(1)->GetRightShoulder1JustDown()){ if (--m_nWeaponType <= WEAPONTYPE_UNARMED) - m_nWeaponType = WEAPONTYPE_GRENADE; + m_nWeaponType = WEAPONTYPE_MINIGUN; pActors[m_nActor]->ClearWeapons(); pActors[m_nActor]->GiveWeapon((eWeaponType)m_nWeaponType, 1000); pActors[m_nActor]->AddWeaponModel(CWeaponInfo::GetWeaponInfo(pActors[m_nActor]->GetWeapon()->m_eWeaponType)->m_nModelId); |