From d958a36388644a9e58b63da0458f836d198833c8 Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Sat, 2 May 2020 09:26:33 -0400
Subject: add a config flag to allow local functions to be public by default

---
 conf/map/script.conf |  5 +++++
 src/map/script.c     | 10 ++++++++--
 src/map/script.h     |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/conf/map/script.conf b/conf/map/script.conf
index fc4f26965..cda25d546 100644
--- a/conf/map/script.conf
+++ b/conf/map/script.conf
@@ -59,6 +59,11 @@ script_configuration: {
 	// Defaults to INT_MAX.
 	//input_max_value: 2147483647
 	input_max_value: 10000000
+
+	// Specifies whether functions not explicitly marked with a "private" or
+	// "public" keyword should be treated as "private" by default.
+	// Default: true
+	functions_private_by_default: true
 }
 
 import: "conf/import/script.conf"
diff --git a/src/map/script.c b/src/map/script.c
index 9d6b9d8a2..6f21f2a82 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2091,8 +2091,12 @@ static const char *parse_syntax(const char *p)
 			script->set_label(l, VECTOR_LENGTH(script->buf), p);
 			return p;
 		} else if( p2 - p == 8 && strncmp(p, "function", 8) == 0 ) {
-			// local function implicitly marked as private
-			return script->parse_syntax_function(p2, false);
+			// local function not marked as public or private
+			if (script->config.functions_private_by_default) {
+				return script->parse_syntax_function(p2, false);
+			} else {
+				return script->parse_syntax_function(p2, true);
+			}
 		}
 		break;
 	case 'i':
@@ -4968,6 +4972,7 @@ static bool script_config_read(const char *filename, bool imported)
 
 	libconfig->setting_lookup_bool_real(setting, "warn_func_mismatch_paramnum", &script->config.warn_func_mismatch_paramnum);
 	libconfig->setting_lookup_bool_real(setting, "warn_func_mismatch_argtypes", &script->config.warn_func_mismatch_argtypes);
+	libconfig->setting_lookup_bool_real(setting, "functions_private_by_default", &script->config.functions_private_by_default);
 	libconfig->setting_lookup_int(setting, "check_cmdcount", &script->config.check_cmdcount);
 	libconfig->setting_lookup_int(setting, "check_gotocount", &script->config.check_gotocount);
 	libconfig->setting_lookup_int(setting, "input_min_value", &script->config.input_min_value);
@@ -28570,6 +28575,7 @@ void script_defaults(void)
 	script->config.ontouch_name = "OnTouch_";  //ontouch_name (runs on first visible char to enter area, picks another char if the first char leaves)
 	script->config.ontouch2_name = "OnTouch";  //ontouch2_name (run whenever a char walks into the OnTouch area)
 	script->config.onuntouch_name = "OnUnTouch";  //onuntouch_name (run whenever a char walks from the OnTouch area)
+	script->config.functions_private_by_default = true;
 
 	// for ENABLE_CASE_CHECK
 	script->calc_hash_ci = calc_hash_ci;
diff --git a/src/map/script.h b/src/map/script.h
index 044bcdc42..0a6a21f1b 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -584,6 +584,7 @@ enum itemskill_flag {
 struct Script_Config {
 	bool warn_func_mismatch_argtypes;
 	bool warn_func_mismatch_paramnum;
+	bool functions_private_by_default;
 	int check_cmdcount;
 	int check_gotocount;
 	int input_min_value;
-- 
cgit v1.2.3-70-g09d2