summaryrefslogtreecommitdiff
path: root/src/map/script.h
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-02-10 13:59:24 -0200
committershennetsind <ind@henn.et>2014-02-10 13:59:24 -0200
commitcd8d09337ba3108f46acbb5cfcd6a99ddb4b321e (patch)
tree70e501ba613ef8d4586c5f6c4be7424f3e953198 /src/map/script.h
parent9ca281d0a03ea083c4dba20de9d109d581a5ee4f (diff)
parentac45ebca3e9537eca665ba042412ddc1e65e9f73 (diff)
downloadhercules-cd8d09337ba3108f46acbb5cfcd6a99ddb4b321e.tar.gz
hercules-cd8d09337ba3108f46acbb5cfcd6a99ddb4b321e.tar.bz2
hercules-cd8d09337ba3108f46acbb5cfcd6a99ddb4b321e.tar.xz
hercules-cd8d09337ba3108f46acbb5cfcd6a99ddb4b321e.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/script.h')
-rw-r--r--src/map/script.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/script.h b/src/map/script.h
index 4906d4fa8..872c5bc31 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -23,8 +23,9 @@ struct eri;
**/
// TODO: Remove temporary code
#define ENABLE_CASE_CHECK
-#define DeprecationWarning(func, bad, good, file, line) ShowError("%s: use of deprecated keyword '%s' (use '%s' instead) in file '%s', line '%d'.\n", (func), (bad), (good), (file), (line));
-#define DeprecationWarning2(func, bad, good, where) ShowError("%s: detected possible use of wrong case in a script. Found '%s', probably meant to be '%s' (in '%s').\n", (func), (bad), (good), (where));
+#define get_script_source(source) ((source) ? (source) : "Unknown (Possibly source or variables stored in database")
+#define DeprecationWarning(func, bad, good, file, line) ShowError("%s: use of deprecated keyword '%s' (use '%s' instead) in file '%s', line '%d'.\n", (func), (bad), (good), get_script_source(file), (line));
+#define DeprecationWarning2(func, bad, good, where) ShowError("%s: detected possible use of wrong case in a script. Found '%s', probably meant to be '%s' (in '%s').\n", (func), (bad), (good), get_script_source(where));
#define disp_deprecation_message(func, good, p) disp_warning_message(func": use of deprecated keyword (use '"good"' instead).", (p));
#define NUM_WHISPER_VAR 10