#include "run.h"
#include <stddef.h> /* NULL */
#include <stdint.h> /* uint8_t, uint16_t, uint32_t */
-#include <stdio.h> /* FILE, sprintf() */
+#include <stdio.h> /* FILE, sprintf(), fflush() */
#include <stdlib.h> /* free() */
-#include <string.h> /* strlen(), strncmp(), atoi() */
+#include <string.h> /* strlen(), strcmp() strncmp(), atoi() */
#include <unistd.h> /* access() */
#include "../common/readwrite.h" /* try_fopen(), try_fcose(), try_fwrite(),
* try_fgets(), try_fclose_unlink_rename(),
- * textfile_sizes(), try_fputc()
+ * textfile_width(), try_fputc()
*/
-#include "../common/rexit.h" /* exit_trouble() */
+#include "../common/rexit.h" /* exit_trouble(), exit_err() */
#include "ai.h" /* ai() */
+#include "cleanup.h" /* unset_cleanup_flag() */
#include "init.h" /* remake_world() */
#include "io.h" /* io_round() */
-#include "map_object_actions.h" /* get_moa_id_by_name() */
-#include "map_objects.h" /* struct MapObj, get_player() */
+#include "thing_actions.h" /* get_thing_action_id_by_name() */
+#include "things.h" /* Thing, get_player() */
#include "world.h" /* global world */
*/
static void turn_over();
-/* Helper to turn_over() to determine whether a map object's action effort has
- * reached its end. The simplicity of just comparing map_object->progress to
- * moa->effort is suspended for actor movement, for in this case the effort
- * depends on the diagonal movement penalty expressed in the ratio of
- * world.map.dist_diagonal / world.map.dist_orthogonal. (Movement being diagonal
- * or orthogonal is determined by the ->arg char encoding an even or un-even
- * number digit).
- */
-static uint8_t is_effort_finished(struct MapObjAct * moa,
- struct MapObj * map_object);
-
-/* If "msg"'s first part matches "command_name", set player's MapObj's .command
+/* If "msg"'s first part matches "command_name", set player's Thing's .command
* to the command's id and its .arg to a numerical value following in the latter
* part of "msg" (if no digits are found, use 0); then finish player's turn and
* turn game over to the NPCs via turn_over(); then return 1. Else, return 0.
*/
static uint8_t apply_player_command(char * msg, char * command_name);
+/* Compares first line of file at world.path_out to world.server_test, aborts if
+ * they don't match, but not before unsetting the flags deleting files in the
+ * server directory, for in that case those must be assumed to belong to another
+ * server process.
+ */
+static void server_test();
+
static void turn_over()
{
- struct MapObj * player = get_player();
- struct MapObj * map_object = player;
+ struct Thing * player = get_player();
+ struct Thing * thing = player;
uint16_t start_turn = world.turn;
while ( 0 < player->lifepoints
|| (0 == player->lifepoints && start_turn == world.turn))
{
- if (NULL == map_object)
+ if (NULL == thing)
{
world.turn++;
- map_object = world.map_objs;
+ thing = world.things;
}
- if (0 < map_object->lifepoints)
+ if (0 < thing->lifepoints)
{
- if (0 == map_object->command)
+ if (0 == thing->command)
{
- if (map_object == player)
+ if (thing == player)
{
break;
}
- ai(map_object);
+ ai(thing);
}
- map_object->progress++;
- struct MapObjAct * moa = world.map_obj_acts;
- while (moa->id != map_object->command)
+ thing->progress++;
+ struct ThingAction * ta = world.thing_actions;
+ while (ta->id != thing->command)
{
- moa = moa->next;
+ ta = ta->next;
}
- if (is_effort_finished(moa, map_object))
+ if (thing->progress == ta->effort)
{
- moa->func(map_object);
- map_object->command = 0;
- map_object->progress = 0;
+ ta->func(thing);
+ thing->command = 0;
+ thing->progress = 0;
}
}
- map_object = map_object->next;
+ thing = thing->next;
}
}
-static uint8_t is_effort_finished(struct MapObjAct * moa,
- struct MapObj * map_object)
+static uint8_t apply_player_command(char * msg, char * command_name)
{
- if (moa->func != actor_move)
- {
- if (map_object->progress == moa->effort)
- {
- return 1;
- }
- }
- else if (strchr("8624", map_object->arg))
- {
- if (map_object->progress == moa->effort)
- {
- return 1;
- }
- }
- else if (strchr("1379", map_object->arg))
+ if (!strncmp(msg, command_name, strlen(command_name)))
{
- uint16_t diagonal_effort = (moa->effort * world.map.dist_diagonal)
- / world.map.dist_orthogonal;
- if (map_object->progress == diagonal_effort)
- {
- return 1;
- }
+ struct Thing * player = get_player();
+ player->arg = atoi(&(msg[strlen(command_name)]));
+ player->command = get_thing_action_id_by_name(command_name);
+ turn_over();
+ return 1;
}
return 0;
}
-static uint8_t apply_player_command(char * msg, char * command_name)
+static void server_test()
{
- if (!strncmp(msg, command_name, strlen(command_name)))
+ char * f_name = "server_test()";
+ char test[10 + 1 + 10 + 1 + 1];
+ FILE * file = try_fopen(world.path_out, "r", f_name);
+ try_fgets(test, 10 + 10 + 1 + 1, file, f_name);
+ try_fclose(file, f_name);
+ if (strcmp(test, world.server_test))
{
- struct MapObj * player = get_player();
- player->arg = atoi(&(msg[strlen(command_name)]));
- player->command = get_moa_id_by_name(command_name);
- turn_over();
- return 1;
+ unset_cleanup_flag(CLEANUP_WORLDSTATE);
+ unset_cleanup_flag(CLEANUP_OUT);
+ unset_cleanup_flag(CLEANUP_IN);
+ char * msg = "Server test string in server output file does not match. "
+ "This indicates that the current server process has been "
+ "superseded by another one.";
+ exit_err(1, msg);
}
- return 0;
}
char * f_name = "obey_msg()";
if ( apply_player_command(msg, "wait") /* TODO: Check for non-error */
|| apply_player_command(msg, "move") /* return value of a modified */
- || apply_player_command(msg, "pick_up")/* get_moa_id_by_name(); if id */
- || apply_player_command(msg, "drop") /* found, execute on it what's */
- || apply_player_command(msg, "use")); /* in apply_player_command(). */
- else
+ || apply_player_command(msg, "pick_up")/*get_thing_action_id_by_name()*/
+ || apply_player_command(msg, "drop") /* and if id found, execute on */
+ || apply_player_command(msg, "use")); /* it what's in */
+ else /* apply_player_command(). */
{
char * seed_command = "seed";
if (!strncmp(msg, seed_command, strlen(seed_command)))
if (!access(world.path_record, F_OK))
{
FILE * file_read = try_fopen(world.path_record, "r", f_name);
- uint32_t linemax = textfile_sizes(file_read, NULL);
+ uint32_t linemax = textfile_width(file_read);
char line[linemax + 1];
while (try_fgets(line, linemax + 1, file_read, f_name))
{
char * f_name = "io_loop()";
while (1)
{
+ server_test();
char * msg = io_round();
if (NULL == msg)
{
free(msg);
return 1;
}
+ if (!strcmp("PING", msg))
+ {
+ free(msg);
+ char * pong = "PONG\n";
+ try_fwrite(pong, strlen(pong), 1, world.file_out, f_name);
+ fflush(world.file_out);
+ continue;
+ }
if (world.replay)
{
free(msg);
projects / plomrogue / blobdiff