foxygit / doom Log in
commit 43edb6bf2e1d1cdc0bb4389a0c94b8751a18df38
Author:     Turo Lamminen <turol@iki.fi>
AuthorDate: Mon Apr 27 19:46:03 2020 +0300
Commit:     Turo Lamminen <turol@iki.fi>
CommitDate: Tue Apr 28 17:58:28 2020 +0300

    hexen: Refactor chat macro defaults for const correctness

    hexen version of f523e59e1db0015b5e6e25da863c387f19841eea
---
 src/hexen/ct_chat.c | 13 +------------
 src/hexen/h2_main.c | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/hexen/ct_chat.c b/src/hexen/ct_chat.c
index 5d68e69d..90205fb6 100644
--- a/src/hexen/ct_chat.c
+++ b/src/hexen/ct_chat.c
@@ -84,18 +84,7 @@ const char *CT_FromPlrText[MAXPLAYERS] = {
     "PURPLE:  "
 };

-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];

 boolean altdown;
 boolean shiftdown;
diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c
index a63b14c9..cdc48407 100644
--- a/src/hexen/h2_main.c
+++ b/src/hexen/h2_main.c
@@ -124,6 +124,22 @@ static char *SavePathConfig;

 // CODE --------------------------------------------------------------------

+
+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;
@@ -172,6 +188,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]);
     }