Define server messages and server message arguments in confclient/commands, instead...

[plomrogue] / src / client / command_db.c

diff --git a/src/client/command_db.c b/src/client/command_db.c
index e9478c60d284f805843a2a307033d25eae87a3cd..fa125c45171b70877ed552df1974e5073eb16e55 100644 (file)
--- a/src/client/command_db.c
+++ b/src/client/command_db.c
@@ -4,10 +4,11 @@
 #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 */
@@ -29,17 +30,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_data(char * dsc_short)
 {
     struct Command * cmd_ptr = world.cmd_db.cmds;
-    while (1)
+    uint8_t i = 0;
+    while (i < world.cmd_db.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.cmd_db.n, err);
+    return cmd_ptr;
 }
 
 
@@ -54,13 +62,22 @@ extern void init_command_db()
     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(line, &world.cmd_db.cmds[i].dsc_short, delim);
+        copy_tokenized_string(NULL, &world.cmd_db.cmds[i].server_msg, delim);
+        if (!strcmp("0", world.cmd_db.cmds[i].server_msg))
+        {
+            free(world.cmd_db.cmds[i].server_msg);
+            world.cmd_db.cmds[i].server_msg = NULL;
+        }
+        char * arg_string = strtok(NULL, delim);
+        world.cmd_db.cmds[i].arg = arg_string[0];
         copy_tokenized_string(NULL, &world.cmd_db.cmds[i].dsc_long, "\n");
         i++;
     }
@@ -78,6 +95,7 @@ extern void free_command_db()
     {
         free(world.cmd_db.cmds[i].dsc_short);
         free(world.cmd_db.cmds[i].dsc_long);
+        free(world.cmd_db.cmds[i].server_msg);
         i++;
     }
     free(world.cmd_db.cmds);