-/* src/server/run.c */
+/* src/server/run.c
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
+ */
#define _POSIX_C_SOURCE 200809L
#include "run.h"
#include <stddef.h> /* NULL */
-#include <stdint.h> /* uint8_t, uint16_t, uint32_t */
+#include <stdint.h> /* uint8_t, uint16_t, uint32_t, int16_t */
#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() */
+#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() */
+#include "things.h" /* Thing, get_thing_action_id_by_name(), get_player(),
+ * try_thing_proliferation()
+ */
#include "world.h" /* world */
/* Return 1 on world.exists, else 0 and err_line() appropriate error message. */
static uint8_t player_commands_allowed();
-/* Parse player command "tok0" with no argument to player action, comment on
- * invalidity of non-zero "tok1" (but do not abort in that case).
- */
-static uint8_t parse_player_command_0arg(char * tok0, char * tok1);
+/* Parse player command "tok0" with no argument to player action. */
+static uint8_t parse_player_command_0arg(char * tok0);
/* Parse player command "tok0" with one argument "tok1" to player action. */
static uint8_t parse_player_command_1arg(char * tok0, char * tok1);
-/* Parse/apply command "tok0" with argument "tok1" and test the line for further
- * tokens, commenting on their invalidity (but don't abort on finding them).
- */
-static uint8_t parse_command_1arg(char * tok0, char * tok1);
-
+/* Parse/apply command "tok0" (read further tokens as necessary). */
+static uint8_t parse_command(char * tok0);
/* Compares first line of server out file to world.server_test, aborts if they
* don't match, but not before unsetting the flags deleting files in the server
*/
static void server_test();
+/* Return array of IDs of non-owned things in game world, ended by non-ID -1. */
+static int16_t * build_whitelist();
+
+/* Return 1 if value of "id" appears in "whitelist", else 0. */
+static uint8_t thing_in_whitelist(uint8_t id, int16_t * whitelist);
+
/* Run the game world and its inhabitants (and their actions) until the player
- * avatar is free to receive new commands (or is dead).
+ * avatar is free to receive new commands (or is dead). Only actions and
+ * proliferations for non-owned things are performed that exist at the start of
+ * the turn jumped into, or started anew by the cycle.
*/
static void turn_over();
-
static uint8_t set_char_by_string_comparison(char * string, char * comparand,
char * c_to_set, char value)
{
{
if (!world.exists)
{
- err_line(1, "No world exists in which to run player commands.");
- return 0;
+ return !err_line(1, "No world exists in which to run player commands.");
}
return 1;
}
-static uint8_t parse_player_command_0arg(char * tok0, char * tok1)
+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();
- err_line (NULL != tok1, "No arguments expected, ignoring them.");
}
return 1;
}
-static uint8_t parse_command_1arg(char * tok0, char * tok1)
+static uint8_t parse_command(char * tok0)
{
- char * tok2 = token_from_line(NULL);
- if ( parse_player_command_1arg(tok0, tok1)
- || parse_god_command_1arg(tok0, tok1));
+ if (parse_player_command_0arg(tok0))
+ {
+ return 1;
+ }
else
{
- return 0;
+ char * tok1 = token_from_line(NULL);
+ if (tok1 && ( parse_player_command_1arg(tok0, tok1)
+ || parse_god_command_1arg(tok0, tok1)))
+ {
+ return 1;
+ }
+ else
+ {
+ char * tok2 = token_from_line(NULL);
+ if (tok2 && parse_god_command_2arg(tok0, tok1, tok2))
+ {
+ return 1;
+ }
+ else
+ {
+ char * tok3 = token_from_line(NULL);
+ if (tok2 && parse_god_command_3arg(tok0, tok1, tok2, tok3))
+ {
+ return 1;
+ }
+ }
+ }
}
- char * err = "But one argument expected, ignoring further arguments.";
- err_line (NULL != tok2, err);
- return 1;
+ return 0;
}
static void server_test()
{
- char * f_name = "server_test()";
char test[10 + 1 + 10 + 1 + 1];
- FILE * file = try_fopen(s[S_PATH_OUT], "r", f_name);
- try_fgets(test, 10 + 10 + 1 + 1, file, f_name);
- try_fclose(file, f_name);
+ FILE * file = try_fopen(s[S_PATH_OUT], "r", __func__);
+ try_fgets(test, 10 + 10 + 1 + 1, file, __func__);
+ try_fclose(file, __func__);
if (strcmp(test, world.server_test))
{
unset_cleanup_flag(CLEANUP_WORLDSTATE);
+static int16_t * build_whitelist()
+{
+ uint16_t i_things = NULL != world.things;
+ struct Thing * t = world.things;
+ for (; t; t = t->next, i_things++);
+ int16_t * whitelist = try_malloc(i_things * sizeof(int16_t), __func__);
+ for (i_things = 0, t = world.things; t;
+ whitelist[i_things] = t->id, t = t->next, i_things++)
+ whitelist[i_things] = -1;
+ return whitelist;
+}
+
+
+
+static uint8_t thing_in_whitelist(uint8_t id, int16_t * whitelist)
+{
+ int16_t i;
+ for (i = 0; -1 < whitelist[i]; i++)
+ {
+ if ((int16_t) id == whitelist[i])
+ {
+ return 1;
+ }
+ }
+ return 0;
+}
+
+
+
static void turn_over()
{
struct Thing * player = get_player();
struct Thing * thing = player;
uint16_t start_turn = world.turn;
+ int16_t * whitelist = build_whitelist();
while ( 0 < player->lifepoints
|| (0 == player->lifepoints && start_turn == world.turn))
- {
- if (NULL == thing)
+ { /* TODO: check meaning and refactorability of 2nd condition */
+ if (!thing)
{
world.turn++;
thing = world.things;
+ free(whitelist);
+ whitelist = build_whitelist();
}
- if (0 < thing->lifepoints)
+ if (thing_in_whitelist(thing->id, whitelist))
{
- if (0 == thing->command)
+ if (0 < thing->lifepoints)
{
- if (thing == player)
+ if (0 == thing->command)
{
- break;
+ if (thing == player)
+ {
+ break;
+ }
+ ai(thing);
+ }
+ thing->progress++;
+ struct ThingAction * ta = get_thing_action(thing->command);
+ if (thing->progress == ta->effort)
+ {
+ ta->func(thing);
+ thing->command = 0;
+ thing->progress = 0;
}
- ai(thing);
- }
- thing->progress++;
-
- struct ThingAction * ta = get_thing_action(thing->command);
- if (thing->progress == ta->effort)
- {
- ta->func(thing);
- thing->command = 0;
- thing->progress = 0;
}
+ try_thing_proliferation(thing);
}
thing = thing->next;
}
+ free(whitelist);
}
-static void record_msg(char * msg)
+extern void record(char * msg, uint8_t force)
{
- char * f_name = "record_msg()";
- 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", f_name);
- uint32_t linemax = textfile_width(file_read);
- char * line = try_malloc(linemax + 1, f_name);
- while (try_fgets(line, linemax + 1, file_read, f_name))
+ 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, f_name);
+ 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, f_name);
}
- try_fwrite(msg, strlen(msg), 1, file_tmp, f_name);
- try_fputc('\n', file_tmp, f_name);
- 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;
+ }
}
extern void obey_msg(char * msg, uint8_t do_record, uint8_t do_verbose)
{
- char * f_name = "obey_msg()";
if (world.is_verbose && do_verbose)
{
- exit_trouble(-1 == printf("Input: %s\n", msg), f_name, "printf()");
+ exit_trouble(-1 == printf("Input: %s\n", msg), __func__, "printf");
}
set_err_line_options("Trouble with message: ", msg, 0);
char * msg_copy = strdup(msg);
- if (msg[0] == 'm')
- {
- int a = 5;
- a = a;
- }
char * tok0 = token_from_line(msg_copy);
- if (NULL != tok0)
+ if (tok0)
{
- char * tok1 = token_from_line(NULL);
- if ( parse_player_command_0arg(tok0, tok1)
- || (tok1 && parse_command_1arg(tok0, tok1)))
+
+ if (parse_command(tok0))
{
if (world.exists)
{
}
if (do_record)
{
- save_world();
- record_msg(msg);
+ record(msg, 0);
}
+ char * tokplus = token_from_line(NULL);
+ err_line(!(!tokplus), "Too many arguments, ignoring overflow.");
free(msg_copy);
return;
}
extern uint8_t io_loop()
{
- char * f_name = "io_loop()";
while (1)
{
- server_test();
char * msg = io_round();
- if (NULL == msg)
+ server_test();
+ if (!msg)
{
continue;
}
if (world.is_verbose)
{
- exit_trouble(-1 == printf("Input: %s\n", msg), f_name, "printf()");
+ exit_trouble(-1 == printf("Input: %s\n", msg), __func__, "printf");
}
if (!strcmp("QUIT", msg))
{
{
free(msg);
char * pong = "PONG\n";
- try_fwrite(pong, strlen(pong), 1, world.file_out, f_name);
+ try_fwrite(pong, strlen(pong), 1, world.file_out, __func__);
fflush(world.file_out);
continue;
}
projects / plomrogue / blobdiff