diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-01-22 15:04:09 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-22 15:04:09 +0200 |
| commit | cea6b20c09532c3321c45f18ce36ec34fe836d1f (patch) | |
| tree | bd6376dac146895eb1f0c1de37f1cf2e2bfdb19f /src/peds/PedChat.cpp | |
| parent | 8dab92d158be70e49b9fff04f7187023aa1cf3c3 (diff) | |
| parent | feb993e751ad8baccedc0547383913069846f8f5 (diff) | |
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# src/animation/CutsceneMgr.cpp
# src/control/CarCtrl.cpp
# src/control/Script.cpp
# src/control/Script2.cpp
# src/core/Frontend.cpp
# src/core/main.cpp
# src/entities/Physical.cpp
# src/peds/Ped.cpp
# src/peds/PedAI.cpp
# src/text/Messages.cpp
# src/vehicles/Cranes.cpp
# src/vehicles/Transmission.cpp
Diffstat (limited to 'src/peds/PedChat.cpp')
| -rw-r--r-- | src/peds/PedChat.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/peds/PedChat.cpp b/src/peds/PedChat.cpp index 470b7eeb..ec6719c6 100644 --- a/src/peds/PedChat.cpp +++ b/src/peds/PedChat.cpp @@ -4,8 +4,6 @@ #include "General.h" #include "Ped.h" -// --MIAMI: file done - // Corresponds to ped sounds (from SOUND_PED_DEATH to SOUND_PED_TAXI_CALL) PedAudioData CommentWaitTime[56] = { { 500, 800, 500, 2 }, |