X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=906bed266ae54f76edf06d5659a1f87d0fc24ce4;hb=3dedf6344c941891491773d1cc5d647aa664b218;hp=3ae71757fe6ec0568a3bc6f937608846a129db4e;hpb=c31d3a8d3f993a2cfcc8c5e438283e3a693d5b27;p=plomrogue diff --git a/src/server/run.c b/src/server/run.c index 3ae7175..906bed2 100644 --- a/src/server/run.c +++ b/src/server/run.c @@ -20,7 +20,7 @@ #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() */ @@ -86,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; @@ -157,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;