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

# Conflicts: # src/core/Radar.cpp
2020-04-09 21:40:46 +03:00
parent 5b5de5d2f3 590ff32469
commit a5239b554f
20 changed files with 1726 additions and 915 deletions
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -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