commit a3e027a20bc15350ccee1051755a5e0d918b9ef8
Author:     Turo Lamminen <turol@iki.fi>
AuthorDate: Tue Apr 28 17:57:05 2020 +0300
Commit:     Turo Lamminen <turol@iki.fi>
CommitDate: Tue Apr 28 17:58:46 2020 +0300

    strife: Refactor chat macro defaults for const correctness

    strife version of f523e59e1db0015b5e6e25da863c387f19841eea
---
 src/strife/d_main.c   | 17 +++++++++++++++++
 src/strife/hu_stuff.c | 14 +-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/strife/d_main.c b/src/strife/d_main.c
index 39c1b775..b73a2c87 100644
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -396,6 +396,22 @@ void D_Display (void)
 // Add configuration file variable bindings.
 //

+
+static const char * const chat_macro_defaults[10] =
+{
+    HUSTR_CHATMACRO0,
+    HUSTR_CHATMACRO1,
+    HUSTR_CHATMACRO2,
+    HUSTR_CHATMACRO3,
+    HUSTR_CHATMACRO4,
+    HUSTR_CHATMACRO5,
+    HUSTR_CHATMACRO6,
+    HUSTR_CHATMACRO7,
+    HUSTR_CHATMACRO8,
+    HUSTR_CHATMACRO9
+};
+
+
 void D_BindVariables(void)
 {
     int i;
@@ -460,6 +476,7 @@ void D_BindVariables(void)
     {
         char buf[12];

+        chat_macros[i] = M_StringDuplicate(chat_macro_defaults[i]);
         M_snprintf(buf, sizeof(buf), "chatmacro%i", i);
         M_BindStringVariable(buf, &chat_macros[i]);
     }
diff --git a/src/strife/hu_stuff.c b/src/strife/hu_stuff.c
index a69cf11b..fad70e6e 100644
--- a/src/strife/hu_stuff.c
+++ b/src/strife/hu_stuff.c
@@ -58,19 +58,7 @@
 #define HU_INPUTWIDTH   64
 #define HU_INPUTHEIGHT  1

-char *chat_macros[10] =
-{
-    HUSTR_CHATMACRO0,
-    HUSTR_CHATMACRO1,
-    HUSTR_CHATMACRO2,
-    HUSTR_CHATMACRO3,
-    HUSTR_CHATMACRO4,
-    HUSTR_CHATMACRO5,
-    HUSTR_CHATMACRO6,
-    HUSTR_CHATMACRO7,
-    HUSTR_CHATMACRO8,
-    HUSTR_CHATMACRO9
-};
+char *chat_macros[10];

 // villsa [STRIFE]
 char player_names[8][16] =