Просмотр исходного кода

Merge branch 'hotfix/170803.1' into develop

Daniel Gibbs 9 лет назад
Родитель
Сommit
cfe5e2042d
2 измененных файлов с 7 добавлено и 2 удалено
  1. 2 2
      lgsm/functions/alert.sh
  2. 5 0
      lgsm/functions/core_functions.sh

+ 2 - 2
lgsm/functions/alert.sh

@@ -91,8 +91,8 @@ if [ "${postalert}" == "on" ]&&[ -n "${postalert}" ]; then
 	alertflag=1
 	alertflag=1
 	command_postdetails.sh
 	command_postdetails.sh
 elif [ "${postalert}" != "on" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
 elif [ "${postalert}" != "on" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
-	fn_print_warn_nl "Discord alerts not enabled"
-	fn_script_log_warn "Discord alerts not enabled"
+	fn_print_warn_nl "More Info not enabled"
+	fn_script_log_warn "More Info alerts not enabled"
 elif [ -z "${posttarget}" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
 elif [ -z "${posttarget}" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
 	fn_print_error_nl "posttarget not set"
 	fn_print_error_nl "posttarget not set"
 	fn_script_error_warn "posttarget not set"
 	fn_script_error_warn "posttarget not set"

+ 5 - 0
lgsm/functions/core_functions.sh

@@ -276,6 +276,11 @@ functionfile="${FUNCNAME}"
 fn_fetch_function
 fn_fetch_function
 }
 }
 
 
+fix_ark.sh(){
+functionfile="${FUNCNAME}"
+fn_fetch_function
+}
+
 fix_arma3.sh(){
 fix_arma3.sh(){
 functionfile="${FUNCNAME}"
 functionfile="${FUNCNAME}"
 fn_fetch_function
 fn_fetch_function