diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-19 22:27:41 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-19 22:27:41 +0200 |
| commit | fec0028e12fb7e362344cfc07d7dcb6b07c29e04 (patch) | |
| tree | 675e1d491bd8f9cb80c707fbba45ae41005a4d31 /src/control | |
| parent | slightly restructured ped flags for convenience (diff) | |
| parent | Merge pull request #567 from erorcun/miami (diff) | |
| download | re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.gz re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.bz2 re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.lz re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.xz re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.zst re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Pickups.cpp | 22 | ||||
| -rw-r--r-- | src/control/Script.cpp | 12 |
2 files changed, 30 insertions, 4 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index 01a28193..cccf9cc4 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -49,6 +49,16 @@ uint16 AmmoForWeapon[20] = { 0, 1, 45, 125, 25, 150, 300, 25, 5, 250, 5, 5, 0, 5 uint16 AmmoForWeapon_OnStreet[WEAPONTYPE_TOTALWEAPONS] = { 0, 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, 4, 4, 4, @@ -70,16 +80,20 @@ uint16 AmmoForWeapon_OnStreet[WEAPONTYPE_TOTALWEAPONS] = { uint16 CostOfWeapon[20] = { 0, 10, 250, 800, 1500, 3000, 5000, 10000, 25000, 25000, 2000, 2000, 0, 50000, 0, 3000, 0, 0, 0, 0 }; // TODO(Miami): Those are all placeholders!! -uint8 aWeaponReds[] = { 0, 255, 0, 128, 255, 255, 0, 255, 0, 128, 128, 255, +uint8 aWeaponReds[] = { 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, +255, 0, 128, 255, 255, 0, 255, 0, 128, 128, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 128, 0, 255, 0 }; -uint8 aWeaponGreens[] = { 0, 0, 255, 128, 255, 0, 255, 128, 255, 0, 255, 255, +uint8 aWeaponGreens[] = { 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, +0, 255, 128, 255, 0, 255, 128, 255, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 255, 0, 255, 0 }; -uint8 aWeaponBlues[] = { 0, 0, 0, 255, 0, 255, 255, 0, 128, 255, 0, 255, +uint8 aWeaponBlues[] = { 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, +0, 0, 255, 0, 255, 255, 0, 128, 255, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 128, 255, 0, 0 }; -float aWeaponScale[] = { 1.0f, 1.0f, 2.0f, 1.5f, 1.0f, 1.0f, 1.5f, 1.0f, 2.0f, 1.0f, 2.0f, 2.5f, +float aWeaponScale[] = { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, +2.0f, 1.5f, 1.0f, 1.0f, 1.5f, 1.0f, 2.0f, 1.0f, 2.0f, 2.5f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f }; diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 4112acf4..0129b155 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -10334,8 +10334,20 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command) { switch (command) { case COMMAND_SET_CHAR_CAN_BE_DAMAGED_BY_MEMBERS_OF_GANG: + { + CollectParameters(&m_nIp, 3); + CPed *pTarget = CPools::GetPedPool()->GetAt(ScriptParams[0]); + uint8 flag = 1 << (uint8)ScriptParams[1]; + if (ScriptParams[2]) + pTarget->m_gangFlags |= flag; + else + pTarget->m_gangFlags &= ~flag; + + return 0; + } case COMMAND_LOAD_AND_LAUNCH_MISSION_EXCLUSIVE: case COMMAND_IS_MISSION_AUDIO_PLAYING: + assert(0); case COMMAND_CREATE_LOCKED_PROPERTY_PICKUP: { CollectParameters(&m_nIp, 3); |