From 40d62e06c7ba470985b76d253a724e2431196636 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 12 Jan 2021 17:34:57 +0900
Subject: [PATCH] [gamecode] Put strings and debug back in load funcs

It turns out they're required to be initialized before most of the rest
of the system.
---
 libs/gamecode/pr_debug.c   | 1 -
 libs/gamecode/pr_load.c    | 2 ++
 libs/gamecode/pr_strings.c | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/gamecode/pr_debug.c b/libs/gamecode/pr_debug.c
index d8105c5f6..a272babf8 100644
--- a/libs/gamecode/pr_debug.c
+++ b/libs/gamecode/pr_debug.c
@@ -1702,7 +1702,6 @@ PR_Debug_Init (progs_t *pr)
 									pr->hashlink_freelist);
 
 	PR_Resources_Register (pr, "PR_Debug", res, pr_debug_clear);
-	PR_AddLoadFunc (pr, PR_LoadDebug);
 }
 
 void
diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index 6ef18cc15..32033ae90 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -378,7 +378,9 @@ pr_run_ctors (progs_t *pr)
 }
 
 static int (*load_funcs_1[])(progs_t *) = {
+	PR_LoadStrings,
 	PR_RelocateBuiltins,
+	PR_LoadDebug,
 	0,
 };
 
diff --git a/libs/gamecode/pr_strings.c b/libs/gamecode/pr_strings.c
index 7cb295284..82e9540da 100644
--- a/libs/gamecode/pr_strings.c
+++ b/libs/gamecode/pr_strings.c
@@ -1222,5 +1222,4 @@ PR_Strings_Init (progs_t *pr)
 	res->print_str = dstring_new ();
 
 	PR_Resources_Register (pr, "Strings", res, pr_strings_clear);
-	PR_AddLoadFunc (pr, PR_LoadStrings);
 }