X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fcommand_db.c;h=00a907b3c9d73470ebf781a38d156e48f3930678;hb=3a5db435e5dc6422e559033fbdf9b64c8d8567c9;hp=e9478c60d284f805843a2a307033d25eae87a3cd;hpb=8226d2e4e1aaaeb3b843b4eb9a178d71cc7896e1;p=plomrogue

diff --git a/src/client/command_db.c b/src/client/command_db.c
index e9478c6..00a907b 100644
--- a/src/client/command_db.c
+++ b/src/client/command_db.c
@@ -1,17 +1,20 @@
 /* src/client/command_db.c */
 
 #include "command_db.h"
+#include <stddef.h> /* NULL */
 #include <stdint.h> /* uint8_t, uint32_t */
 #include <stdio.h> /* FILE */
 #include <stdlib.h> /* free() */
-#include <string.h> /* memcpy(), strlen(), strtok() */
+#include <string.h> /* memcpy(), strlen(), strtok(), strcmp() */
 #include "../common/readwrite.h" /* try_fopen(), try_fclose(), try_fgets()
                                   * textfile_sizes()
                                   */
+#include "../common/rexit.h" /* for exit_err() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #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".*/
@@ -29,17 +32,24 @@ static void copy_tokenized_string(char * line, char ** ch_ptr, char * delim)
 
 
 
-extern char * get_command_longdsc(char * dsc_short)
+extern struct Command * get_command(char * dsc_short)
 {
-    struct Command * cmd_ptr = world.cmd_db.cmds;
-    while (1)
+    struct Command * cmd_ptr = world.commandDB.cmds;
+    uint8_t i = 0;
+    while (i < world.commandDB.n)
     {
         if (0 == strcmp(dsc_short, cmd_ptr->dsc_short))
         {
-            return cmd_ptr->dsc_long;
+            break;
         }
         cmd_ptr = &cmd_ptr[1];
+        i++;
     }
+    char * err_start = "get_command_data() failed on request for: ";
+    char err[strlen(err_start) + strlen(dsc_short) + 1];
+    sprintf(err, "%s%s", err_start, dsc_short);
+    exit_err(i == world.commandDB.n, err);
+    return cmd_ptr;
 }
 
 
@@ -47,25 +57,35 @@ extern char * get_command_longdsc(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.cmd_db.cmds = try_malloc(lines * sizeof(struct Command), f_name);
     uint8_t i = 0;
+    char * delim = " ";
     while (try_fgets(line, linemax + 1, file, f_name))
     {
         if ('\n' == line[0] || 0 == line[0])
         {
             break;
         }
-        copy_tokenized_string(line, &world.cmd_db.cmds[i].dsc_short, " ");
-        copy_tokenized_string(NULL, &world.cmd_db.cmds[i].dsc_long, "\n");
+        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);
+        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.cmd_db.n = lines;
+    world.commandDB.n = i;
     set_cleanup_flag(CLEANUP_COMMANDS);
 }
 
@@ -74,11 +94,12 @@ extern void init_command_db()
 extern void free_command_db()
 {
     uint8_t i = 0;
-    while (i < world.cmd_db.n)
+    while (i < world.commandDB.n)
     {
-        free(world.cmd_db.cmds[i].dsc_short);
-        free(world.cmd_db.cmds[i].dsc_long);
+        free(world.commandDB.cmds[i].dsc_short);
+        free(world.commandDB.cmds[i].dsc_long);
+        free(world.commandDB.cmds[i].server_msg);
         i++;
     }
-    free(world.cmd_db.cmds);
+    free(world.commandDB.cmds);
 }