Merge branch 'master' into feature_freeroam_security_patch

multitheftauto · Jul 15, 2024 · ce1b2f0 · ce1b2f0
2 parents 21abca9 + 357fdf8
commit ce1b2f0
Show file tree

Hide file tree

Showing 12 changed files with 1,042 additions and 502 deletions.
diff --git a/[gameplay]/internetradio/client.lua b/[gameplay]/internetradio/client.lua
diff --git a/[gameplay]/internetradio/config/CRadioConfig.lua b/[gameplay]/internetradio/config/CRadioConfig.lua
@@ -0,0 +1,24 @@
+-- #######################################
+-- ## Project: Internet radio			##
+-- ## Authors: MTA contributors			##
+-- ## Version: 1.0						##
+-- #######################################
+
+RADIO_TRACK_SCALE = 1
+RADIO_TRACK_FONT = "default-bold"
+RADIO_TRACK_COLOR = tocolor(150, 50, 150, 255)
+RADIO_TRACK_BACKGROUND_COLOR = tocolor(0, 0, 0, 255)
+
+RADIO_TOGGLE_KEY = "F3"
+RADIO_SHOW_ON_START = false
+RADIO_COMMANDS = {"sound", "music", "musica", "song", "radio", "speaker"}
+RADIO_SETTINGS_PATH = "settings.json"
+
+RADIO_SETTINGS_TEMPLATE = {
+	["allowRemoteSpeakers"] = {
+		defaultsTo = true,
+		dataType = {
+			["boolean"] = true,
+		},
+	},
+}
diff --git a/[gameplay]/internetradio/config/SRadioConfig.lua b/[gameplay]/internetradio/config/SRadioConfig.lua
@@ -0,0 +1,7 @@
+-- #######################################
+-- ## Project: Internet radio			##
+-- ## Authors: MTA contributors			##
+-- ## Version: 1.0						##
+-- #######################################
+
+RADIO_BOX_MODEL = 2229