merge upstream

This commit is contained in:
Roman Masanin
2020-11-08 16:23:05 +03:00
20 changed files with 3298 additions and 406 deletions

View File

@@ -1,4 +1,4 @@
#pragma once
#pragma once
enum eSound : uint16
{
@@ -116,8 +116,8 @@ enum eSound : uint16
SOUND_PED_MIAMIVICE_EXITING_CAR,
SOUND_PED_COP_HELIPILOTPHRASE,
SOUND_PED_PULLOUTWEAPON,
SOUND_PED_HELI_PLAYER_FOUND,
SOUND_115,
SOUND_PED_HELI_PLAYER_FOUND = 114,
SOUND_PED_VCPA_PLAYER_FOUND = 115,
SOUND_PED_ON_FIRE,
SOUND_PED_AIMING,
SOUND_PED_HANDS_UP,