X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=906bed266ae54f76edf06d5659a1f87d0fc24ce4;hb=3dedf6344c941891491773d1cc5d647aa664b218;hp=ecfae2bc4d7ed4dea0f3067b970f36b920f0ffad;hpb=edebb2bf9aa780ee2f7006c1d2be9168564d34df;p=plomrogue

diff --git a/src/server/run.c b/src/server/run.c
index ecfae2b..906bed2 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -7,18 +7,20 @@
 #include <stdio.h> /* FILE, printf(), fflush() */
 #include <stdlib.h> /* free() */
 #include <string.h> /* strlen(), strcmp(), strncmp(), strdup() */
+#include <time.h> /* time_t, time() */
 #include <unistd.h> /* access() */
 #include "../common/parse_file.h" /* set_err_line_options(), token_from_line(),
                                    * err_line(), err_line_inc(), parse_val()
                                    */
 #include "../common/readwrite.h" /* try_fopen(), try_fcose(), try_fwrite(),
-                                  * try_fgets(), textfile_width(), try_fputc()
+                                  * try_fgets(), textfile_width(), try_fputc(),
+                                  * atomic_write_finish(), build_temp_path()
                                   */
 #include "../common/rexit.h" /* exit_trouble(), exit_err() */
 #include "../common/try_malloc.h" /* try_malloc() */
 #include "ai.h" /* ai() */
 #include "cleanup.h" /* unset_cleanup_flag() */
-#include "god_commands.h" /* parse_god_command_1arg(),parse_god_command_2arg()*/
+#include "god_commands.h" /* parse_god_command_(1|2|3)arg() */
 #include "hardcoded_strings.h" /* s */
 #include "io.h" /* io_round(), save_world() */
 #include "things.h" /* Thing, get_thing_action_id_by_name(), get_player() */
@@ -56,7 +58,6 @@ static void turn_over();
 
 
 
-
 static uint8_t set_char_by_string_comparison(char * string, char * comparand,
                                              char * c_to_set, char value)
 {
@@ -85,12 +86,20 @@ static uint8_t player_commands_allowed()
 static uint8_t parse_player_command_0arg(char * tok0)
 {
     struct Thing * player = get_player();
-    if (!strcmp(tok0, s[S_CMD_WAIT]) || !strcmp(tok0, s[S_CMD_PICKUP]))
+    if (   !strcmp(tok0, s[S_CMD_WAIT]) || !strcmp(tok0, s[S_CMD_PICKUP])
+        || !strcmp(tok0, s[S_CMD_AI]))
     {
         if (player_commands_allowed())
         {
-            player->command = get_thing_action_id_by_name(tok0);
-            player->arg = 0;
+            if (!strcmp(tok0, s[S_CMD_AI]))
+            {
+                ai(player);
+            }
+            else
+            {
+                player->command = get_thing_action_id_by_name(tok0);
+                player->arg = 0;
+            }
             turn_over();
         }
         return 1;
@@ -156,6 +165,14 @@ static uint8_t parse_command(char * tok0)
             {
                 return 1;
             }
+            else
+            {
+                char * tok3 = token_from_line(NULL);
+                if (tok2 && parse_god_command_3arg(tok0, tok1, tok2, tok3))
+                {
+                    return 1;
+                }
+            }
         }
     }
     return 0;
@@ -221,25 +238,40 @@ static void turn_over()
 
 
 
-static void record_msg(char * msg)
+extern void record(char * msg, uint8_t force)
 {
-    char * path_tmp;
-    FILE * file_tmp = atomic_write_start(s[S_PATH_RECORD], &path_tmp);
-    if (!access(s[S_PATH_RECORD], F_OK))
+    static FILE * file_tmp = NULL;
+    static time_t save_wait = 0;
+    static char * path_tmp;
+    if (!file_tmp)
     {
-        FILE * file_read = try_fopen(s[S_PATH_RECORD], "r", __func__);
-        uint32_t linemax = textfile_width(file_read);
-        char * line = try_malloc(linemax + 1, __func__);
-        while (try_fgets(line, linemax + 1, file_read, __func__))
+        path_tmp = build_temp_path(s[S_PATH_RECORD]);
+        file_tmp = try_fopen(path_tmp, "w", __func__);
+        if (!access(s[S_PATH_RECORD], F_OK))
         {
-            try_fwrite(line, strlen(line), 1, file_tmp, __func__);
+            FILE * file_read = try_fopen(s[S_PATH_RECORD], "r", __func__);
+            uint32_t linemax = textfile_width(file_read);
+            char * line = try_malloc(linemax + 1, __func__);
+            while (try_fgets(line, linemax + 1, file_read, __func__))
+            {
+                try_fwrite(line, strlen(line), 1, file_tmp, __func__);
+            }
+            free(line);
+            try_fclose(file_read, __func__);
         }
-        free(line);
-        try_fclose(file_read, __func__);
     }
-    try_fwrite(msg, strlen(msg), 1, file_tmp, __func__);
-    try_fputc('\n', file_tmp, __func__);
-    atomic_write_finish(file_tmp, s[S_PATH_RECORD], path_tmp);
+    if (msg)
+    {
+        try_fwrite(msg, strlen(msg), 1, file_tmp, __func__);
+        try_fputc('\n', file_tmp, __func__);
+    }
+    if (force || time(NULL) > save_wait + 15)
+    {
+        save_wait = time(NULL);
+        save_world();
+        atomic_write_finish(file_tmp, s[S_PATH_RECORD], path_tmp);
+        file_tmp = NULL;
+    }
 }
 
 
@@ -264,8 +296,7 @@ extern void obey_msg(char * msg, uint8_t do_record, uint8_t do_verbose)
             }
             if (do_record)
             {
-                save_world();
-                record_msg(msg);
+                record(msg, 0);
             }
             char * tokplus = token_from_line(NULL);
             err_line(NULL != tokplus, "Too many arguments, ignoring overflow.");
@@ -283,8 +314,8 @@ extern uint8_t io_loop()
 {
     while (1)
     {
-        server_test();
         char * msg = io_round();
+        server_test();
         if (NULL == msg)
         {
             continue;