X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=8251d06118e7ddb071bfd21841c7fab9c1c68379;hb=891ba8fbca53d920f6b3704827fa6b8aee737de4;hp=3f1b1e39aa9893f716e06557eb4d8d301dc2a9c5;hpb=27f8cdc988b4bbd92d9d0daee7019461c690008e;p=plomrogue diff --git a/src/server/run.c b/src/server/run.c index 3f1b1e3..8251d06 100644 --- a/src/server/run.c +++ b/src/server/run.c @@ -5,11 +5,11 @@ #include /* NULL */ #include /* uint8_t, uint16_t, uint32_t */ #include /* FILE, printf(), fflush() */ -#include /* free(), atoi() */ -#include /* strlen(), strcmp() strncmp(), strdup() */ +#include /* free() */ +#include /* strlen(), strcmp(), strncmp(), strdup() */ #include /* access() */ #include "../common/parse_file.h" /* set_err_line_options(), token_from_line(), - * err_line() + * err_line(), err_line_inc(), parse_val() */ #include "../common/readwrite.h" /* try_fopen(), try_fcose(), try_fwrite(), * try_fgets(), textfile_width(), try_fputc() @@ -17,43 +17,35 @@ #include "../common/rexit.h" /* exit_trouble(), exit_err() */ #include "../common/try_malloc.h" /* try_malloc() */ #include "ai.h" /* ai() */ -#include "cleanup.h" /* set_cleanup_flag(), unset_cleanup_flag() */ -#include "field_of_view.h" /* build_fov_map() */ +#include "cleanup.h" /* unset_cleanup_flag() */ +#include "god_commands.h" /* parse_god_command_1arg() */ #include "hardcoded_strings.h" /* s */ -#include "init.h" /* remake_world() */ #include "io.h" /* io_round(), save_world() */ -#include "map.h" /* remake_map() */ -#include "thing_actions.h" /* ThingAction */ -#include "things.h" /* Thing, get_thing(), own_thing(), add_thing(), - * get_thing_action_id_by_name(), get_player() - */ -#include "world.h" /* global world */ +#include "things.h" /* Thing, get_thing_action_id_by_name(), get_player() */ +#include "world.h" /* world */ -/* Parse/apply god command in "tok0"/"tok1" on "t" owning another thing. */ -static uint8_t parse_carry(char * tok0, char * tok1, struct Thing * t); +/* If "string" and "comparand" match in string, set "c_to_set" to value." */ +static uint8_t set_char_by_string_comparison(char * string, char * comparand, + char * c_to_set, char value); -/* Parse/apply god commansd in "tok0"/"tok1" on positioning a thing "t". */ -static uint8_t parse_position(char* tok0, char * tok1, struct Thing * t); +/* Return 1 on world.exists, else 0 and err_line() appropriate error message. */ +static uint8_t player_commands_allowed(); -/* Parse/apply god command in "tok0"/"tok1" oo setting "t"'s thing type. */ -static uint8_t parse_thing_type(char * tok0, char * tok1, struct Thing * t); +/* 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/apply god command in "tok0"/"tok1" on setting up thing "t". */ -static uint8_t parse_thing_command(char * tok0, char * tok1, struct Thing * t); +/* Parse player command "tok0" with one argument "tok1" to player action. */ +static uint8_t parse_player_command_1arg(char * tok0, char * tok1); -/* Parse/apply god command on enabling/disabling generation of fields of view on - * god commands that may affect them, via static global "do_fov". On enabling, - * (re-)generate all animate things' fields of view. +/* 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_do_fov(char * tok0, char * tok1); - -/* Parse/apply god command in "tok0"/"tok1" manipulating a thing's state. */ -static uint8_t parse_thing_manipulation(char * tok0, char * tok1); +static uint8_t parse_command_1arg(char * tok0, char * tok1); -/* Parse player command in "tok0"/"tok1" to action in player thing. */ -static uint8_t parse_player_command(char * tok0, char * tok1); /* 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 @@ -69,60 +61,13 @@ static void turn_over(); -/* Do god commands to create / position things generate their fields of view? */ -static uint8_t do_fov = 0; - - - -static uint8_t parse_carry(char * tok0, char * tok1, struct Thing * t) -{ - uint8_t id; - if (parse_val(tok0, tok1, s[S_CMD_CARRIES], '8', (char *) &id)) - { - if (!err_line(id == t->id, "Thing cannot carry itself.")) - { - struct Thing * o = get_thing(world.things, id, 0); - if (!err_line(!o, "Thing cannot carry thing that does not exist.")) - { - own_thing(&(t->owns), &world.things, id); - o->pos = t->pos; - } - } - return 1; - } - return 0; -} - - -static uint8_t parse_position(char* tok0, char * tok1, struct Thing * t) +static uint8_t set_char_by_string_comparison(char * string, char * comparand, + char * c_to_set, char value) { - char axis = 0; - if (!strcmp(tok0, s[S_CMD_POS_Y])) - { - axis = 'y'; - } - else if (!strcmp(tok0, s[S_CMD_POS_X])) - { - axis = 'x'; - } - if (axis && !parsetest_int(tok1, '8')) + if (!strcmp(string, comparand)) { - uint8_t length = atoi(tok1); - char * err = "Position is outside of map."; - if (!err_line(length >= world.map.length, err)) - { - if ('y' == axis) - { - t->pos.y = length; - } - else if ('x' == axis) - { - t->pos.x = length; - } - free(t->fov_map); - t->fov_map= do_fov && t->lifepoints ? build_fov_map(t) : t->fov_map; - } + * c_to_set = value; return 1; } return 0; @@ -130,39 +75,29 @@ static uint8_t parse_position(char* tok0, char * tok1, struct Thing * t) -static uint8_t parse_thing_type(char * tok0, char * tok1, struct Thing * t) +static uint8_t player_commands_allowed() { - uint8_t type; - if (parse_val(tok0, tok1, s[S_CMD_TYPE], '8', (char *) &type)) + if (!world.exists) { - struct ThingType * tt = world.thing_types; - for (; NULL != tt && type != tt->id; tt = tt->next); - if (!err_line(!tt, "Thing type does not exist.")) - { - t->type = type; - } - return 1; + err_line(1, "No world exists in which to run player commands."); + return 0; } - return 0; + return 1; } -static uint8_t parse_thing_command(char * tok0, char * tok1, struct Thing * t) +static uint8_t parse_player_command_0arg(char * tok0, char * tok1) { - uint8_t command; - if (parse_val(tok0, tok1, s[S_CMD_COMMAND], '8', (char *) &command)) + struct Thing * player = get_player(); + if (!strcmp(tok0, s[S_CMD_WAIT]) || !strcmp(tok0, s[S_CMD_PICKUP])) { - if (!command) - { - t->command = command; - return 1; - } - struct ThingAction * ta = world.thing_actions; - for (; NULL != ta && command != ta->id; ta = ta->next); - if (!err_line(!ta, "Thing action does not exist.")) + if (player_commands_allowed()) { - t->command = command; + 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; } @@ -171,46 +106,31 @@ static uint8_t parse_thing_command(char * tok0, char * tok1, struct Thing * t) -static uint8_t parse_do_fov(char * tok0, char * tok1) +static uint8_t parse_player_command_1arg(char * tok0, char * tok1) { - if (parse_val(tok0, tok1, s[S_CMD_DO_FOV], '8', (char *) &do_fov)) + struct Thing * player = get_player(); + if ( ( parse_val(tok0, tok1, s[S_CMD_DROP], '8', (char *) &player->arg) + || parse_val(tok0, tok1, s[S_CMD_USE], '8', (char *) &player->arg)) + && player_commands_allowed()) { - if (do_fov) - { - struct Thing * ti; - for (ti = world.things; ti; ti = ti->next) - { - ti->fov_map = ti->lifepoints ? build_fov_map(ti) : ti->fov_map; - } - } - return 1; + player->command = get_thing_action_id_by_name(tok0); + turn_over(); } - return 0; -} - - - -static uint8_t parse_thing_manipulation(char * tok0, char * tok1) -{ - uint8_t id; - static struct Thing * t = NULL; - if (t && ( parse_thing_type(tok0, tok1, t) - || parse_thing_command(tok0, tok1, t) - || parse_val(tok0, tok1, s[S_CMD_ARGUMENT], '8', (char *)&t->arg) - || parse_val(tok0,tok1,s[S_CMD_PROGRESS],'8',(char *)&t->progress) - || parse_val(tok0, tok1, s[S_CMD_LIFEPOINTS], '8', - (char *) &t->lifepoints) - || parse_position(tok0, tok1, t) - || parse_carry(tok0, tok1, t))); - else if (parse_val(tok0, tok1, s[S_CMD_THING], '8', (char *) &id)) + else if (!strcmp(tok0, s[S_CMD_MOVE]) && player_commands_allowed()) { - t = get_thing(world.things, id, 1); - if (!t) + char dir = '\0'; + if (!( set_char_by_string_comparison(tok1, "east", &dir, 'd') + || set_char_by_string_comparison(tok1, "south-east", &dir, 'c') + || set_char_by_string_comparison(tok1, "south-west", &dir, 'x') + || set_char_by_string_comparison(tok1, "west", &dir, 's') + || set_char_by_string_comparison(tok1, "north-west", &dir, 'w') + || set_char_by_string_comparison(tok1, "north-east", &dir, 'e'))) { - t = add_thing(id, 0, 0); - set_cleanup_flag(CLEANUP_THINGS); - t->fov_map= do_fov && t->lifepoints ? build_fov_map(t) : t->fov_map; + return 0; } + player->arg = dir; + player->command = get_thing_action_id_by_name(tok0); + turn_over(); } else { @@ -221,22 +141,17 @@ static uint8_t parse_thing_manipulation(char * tok0, char * tok1) -static uint8_t parse_player_command(char * tok0, char * tok1) +static uint8_t parse_command_1arg(char * tok0, char * tok1) { - struct Thing * player = get_player(); - if ( parse_val(tok0, tok1, s[S_CMD_WAIT], '8', (char *) &player->arg) - || parse_val(tok0, tok1, s[S_CMD_MOVE], '8', (char *) &player->arg) - || parse_val(tok0, tok1, s[S_CMD_PICKUP], '8', (char *) &player->arg) - || parse_val(tok0, tok1, s[S_CMD_DROP], '8', (char *) &player->arg) - || parse_val(tok0, tok1, s[S_CMD_USE], '8', (char *) &player->arg)) - { - player->command = get_thing_action_id_by_name(tok0); - turn_over(); - } + char * tok2 = token_from_line(NULL); + if ( parse_player_command_1arg(tok0, tok1) + || parse_god_command_1arg(tok0, tok1)); else { return 0; } + char * err = "But one argument expected, ignoring further arguments."; + err_line (NULL != tok2, err); return 1; } @@ -287,11 +202,8 @@ static void turn_over() ai(thing); } thing->progress++; - struct ThingAction * ta = world.thing_actions; - while (ta->id != thing->command) - { - ta = ta->next; - } + + struct ThingAction * ta = get_thing_action(thing->command); if (thing->progress == ta->effort) { ta->func(thing); @@ -329,44 +241,42 @@ static void record_msg(char * msg) -extern void obey_msg(char * msg, uint8_t do_record) +extern void obey_msg(char * msg, uint8_t do_record, uint8_t do_verbose) { - set_err_line_options("Trouble with message: ", msg, 0, 0); - char * msg_copy = strdup(msg); - char * tok0 = token_from_line(msg_copy); - char * tok1 = token_from_line(NULL); - char * tok2 = token_from_line(NULL); - if (err_line(!(tok0 && tok1) || tok2, "Bad number of tokens.")) + char * f_name = "obey_msg()"; + if (world.is_verbose && do_verbose) { - return; + exit_trouble(-1 == printf("Input: %s\n", msg), f_name, "printf()"); } - if ( parse_thing_manipulation(tok0, tok1) - || parse_player_command(tok0, tok1) - || parse_val(tok0, tok1, s[S_CMD_SEED_RAND], 'U', (char *) &world.seed) - || parse_val(tok0, tok1, s[S_CMD_TURN], 'u', (char *) &world.turn) - || parse_do_fov(tok0, tok1)); - else if (parse_val(tok0,tok1,s[S_CMD_SEED_MAP],'U',(char *)&world.seed_map)) - - { - remake_map(); - } - else if (parse_val(tok0, tok1, s[S_CMD_MAKE_WORLD],'U',(char *)&world.seed)) + set_err_line_options("Trouble with message: ", msg, 0); + char * msg_copy = strdup(msg); + if (msg[0] == 'm') { - remake_world(); + int a = 5; + a = a; } - else + char * tok0 = token_from_line(msg_copy); + if (NULL != tok0) { - err_line(1, "Unknown command."); - free(msg_copy); - return; + char * tok1 = token_from_line(NULL); + if ( parse_player_command_0arg(tok0, tok1) + || (tok1 && parse_command_1arg(tok0, tok1))) + { + if (world.exists) + { + world.do_update = 1; + } + if (do_record) + { + save_world(); + record_msg(msg); + } + free(msg_copy); + return; + } } - world.last_update_turn = 0; + err_line(1, "Unknown command/argument or bad number of tokens."); free(msg_copy); - if (do_record) - { - save_world(); - record_msg(msg); - } } @@ -404,7 +314,7 @@ extern uint8_t io_loop() free(msg); return 0; } - obey_msg(msg, 1); + obey_msg(msg, 1, 0); free(msg); } }