From f4e20a3765772ff3b081a9c4b70d631f126da897 Mon Sep 17 00:00:00 2001 From: "Mikhail G." Date: Fri, 27 Sep 2024 04:15:36 +0700 Subject: [PATCH] Fix: byond tracy init (#26872) * remove https:// from version error * move proc_refs file --- code/__DEFINES/{proc_refs.dm => __proc_refs.dm} | 0 code/_compile_options.dm | 2 +- paradise.dme | 2 +- tools/ci/check_grep2.py | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename code/__DEFINES/{proc_refs.dm => __proc_refs.dm} (100%) diff --git a/code/__DEFINES/proc_refs.dm b/code/__DEFINES/__proc_refs.dm similarity index 100% rename from code/__DEFINES/proc_refs.dm rename to code/__DEFINES/__proc_refs.dm diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 8c6d4580c43..815aaa41d99 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -43,6 +43,6 @@ #define MIN_COMPILER_BUILD 1619 #if DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD //Don't forget to update this part -#error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update. +#error Your version of BYOND is too out-of-date to compile this project. Go to secure.byond.com/download and update. #error You need version 515.1619 or higher #endif diff --git a/paradise.dme b/paradise.dme index 96f265eb3df..d8a427de2c0 100644 --- a/paradise.dme +++ b/paradise.dme @@ -17,6 +17,7 @@ #include "code\__byond_version_compat.dm" #include "code\_compile_options.dm" #include "code\world_definition.dm" +#include "code\__DEFINES\__proc_refs.dm" #include "code\__DEFINES\_click.dm" #include "code\__DEFINES\_globals.dm" #include "code\__DEFINES\_init.dm" @@ -101,7 +102,6 @@ #include "code\__DEFINES\pipes.dm" #include "code\__DEFINES\power_defines.dm" #include "code\__DEFINES\preferences_defines.dm" -#include "code\__DEFINES\proc_refs.dm" #include "code\__DEFINES\procpath.dm" #include "code\__DEFINES\qdel_defines.dm" #include "code\__DEFINES\radiation_defines.dm" diff --git a/tools/ci/check_grep2.py b/tools/ci/check_grep2.py index e89cefdc168..a891db8241f 100644 --- a/tools/ci/check_grep2.py +++ b/tools/ci/check_grep2.py @@ -18,7 +18,7 @@ def print_error(message: str, filename: str, line_number: int): else: print(f"{filename}:{line_number}: {RED}{message}{NC}") -IGNORE_515_PROC_MARKER_FILENAME = "proc_refs.dm" +IGNORE_515_PROC_MARKER_FILENAME = "__proc_refs.dm" CHECK_515_PROC_MARKER_RE = re.compile(r"\.proc/") def check_515_proc_syntax(idx, line): if CHECK_515_PROC_MARKER_RE.search(line):