X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fclient%2Fcommand_db.c;h=00a907b3c9d73470ebf781a38d156e48f3930678;hb=3a5db435e5dc6422e559033fbdf9b64c8d8567c9;hp=f5670a8f207b9638ce420e0775afb5aa492ccfd5;hpb=a053b626309d3d9c51caecf35a018b6e1df5ecb5;p=plomrogue

diff --git a/src/client/command_db.c b/src/client/command_db.c
index f5670a8..00a907b 100644
--- a/src/client/command_db.c
+++ b/src/client/command_db.c
@@ -14,6 +14,7 @@
 #include "cleanup.h" /* set_cleanup_flag() */
 #include "world.h" /* global world */
 
+#include "misc.h"
 
 
 /* Point "ch_ptr" to next strtok() string in "line" delimited by "delim".*/
@@ -56,12 +57,10 @@ extern struct Command * get_command(char * dsc_short)
 extern void init_command_db()
 {
     char * f_name = "init_command_db()";
-    char * path = "confclient/commands";
-    FILE * file = try_fopen(path, "r", f_name);
+    FILE * file = try_fopen(world.path_commands, "r", f_name);
     uint32_t lines;
     uint32_t linemax = textfile_sizes(file, &lines);
     char line[linemax + 1];
-    world.commandDB.cmds = try_malloc(lines * sizeof(struct Command), f_name);
     uint8_t i = 0;
     char * delim = " ";
     while (try_fgets(line, linemax + 1, file, f_name))
@@ -70,20 +69,23 @@ extern void init_command_db()
         {
             break;
         }
-        copy_tokenized_string(line, &world.commandDB.cmds[i].dsc_short, delim);
-        copy_tokenized_string(NULL, &world.commandDB.cmds[i].server_msg, delim);
-        if (!strcmp("0", world.commandDB.cmds[i].server_msg))
-        {                                             /*.server_msg==0 detects*/
-            free(world.commandDB.cmds[i].server_msg); /* non-server commands  */
-            world.commandDB.cmds[i].server_msg = NULL;/* in try_key() /       */
-        }                                             /* try_server_command().*/
+        struct Command cmd;
+        copy_tokenized_string(line, &cmd.dsc_short, delim);
+        copy_tokenized_string(NULL, &cmd.server_msg, delim);
+        if (!strcmp("0", cmd.server_msg))
+        {                          /* A .server_msg == NULL helps control.c's */
+            free(cmd.server_msg);  /* try_key() and try_server_command() to   */
+            cmd.server_msg = NULL; /* differentiate server commands from      */
+        }                          /* non-server commands.                    */
         char * arg_string = strtok(NULL, delim);
-        world.commandDB.cmds[i].arg = arg_string[0];
-        copy_tokenized_string(NULL, &world.commandDB.cmds[i].dsc_long, "\n");
+        cmd.arg = arg_string[0];
+        copy_tokenized_string(NULL, &cmd.dsc_long, "\n");
+        array_append(i, sizeof(struct Command), (void *) &cmd,
+                     (void **) &world.commandDB.cmds);
         i++;
     }
     try_fclose(file, f_name);
-    world.commandDB.n = lines;
+    world.commandDB.n = i;
     set_cleanup_flag(CLEANUP_COMMANDS);
 }