Merge remote-tracking branch 'Fire-Head/master'

# Conflicts:
#	src/core/Radar.cpp
This commit is contained in:
Sergeanur 2020-04-09 21:40:46 +03:00
commit a5239b554f
20 changed files with 1726 additions and 915 deletions

View file

@ -153,6 +153,7 @@ enum Config {
//#define MASTER
#if defined GTA_PS2
# define GTA_PS2_STUFF
# define RANDOMSPLASH
#elif defined GTA_PC
# define GTA3_1_1_PATCH