X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fgod_commands.c;h=09aeecec624d60e48d0703478c0f46787d550968;hb=3dedf6344c941891491773d1cc5d647aa664b218;hp=b0aa86aabf2d6e927065d486d7cd92ecb543107a;hpb=1c7d2240c874aa6697d99b0fb058ac490db8c414;p=plomrogue diff --git a/src/server/god_commands.c b/src/server/god_commands.c index b0aa86a..09aeece 100644 --- a/src/server/god_commands.c +++ b/src/server/god_commands.c @@ -4,10 +4,11 @@ #include /* NULL */ #include /* uint8_t */ #include /* atoi(), free() */ -#include /* strcmp() */ +#include /* strcmp(), memset(), memcpy() */ #include /* F_OK, access(), unlink() */ #include "../common/parse_file.h" /* err_line(), parse_val(), parsetest_int() */ #include "../common/rexit.h" /* exit_trouble() */ +#include "../common/try_malloc.h" /* try_malloc() */ #include "cleanup.h" /* unset_cleanup_flag() */ #include "field_of_view.h" /* build_fov_map() */ #include "hardcoded_strings.h" /* s */ @@ -17,7 +18,7 @@ * actor_use(), actor_pickup(), actor_drop() */ #include "things.h" /* Thing, ThingType, add_thing(), get_thing(), own_thing(), - * free_things() + * free_things(), add_thing_to_memory_map(),get_thing_type() */ #include "world.h" /* world */ @@ -48,7 +49,7 @@ static uint8_t parse_position(char* tok0, char * tok1, struct Thing * t); static uint8_t parse_carry(char * tok0, char * tok1, struct Thing * t); /* Parse/apply god command in "tok0"/"tok1" to manipulate a Thing. */ -static uint8_t parse_thing_manipulation(char * tok0, char * tok1); +static uint8_t parse_thing_manipulation_1arg(char * tok0, char * tok1); /* Performs parse_world_active()'s world activation legality tests. */ static uint8_t world_may_be_set_active(); @@ -70,9 +71,15 @@ static uint8_t set_map_length(char * tok0, char * tok1); +/* Thing, ThingType or ThingAction selected to be manipulated. */ +static struct Thing * t = NULL; +static struct ThingType * tt = NULL; +static struct ThingAction * ta = NULL; + + + static uint8_t parse_thingtype_manipulation(char * tok0, char * tok1) { - static struct ThingType * tt = NULL; if (!tt && ( !strcmp(tok0, s[S_CMD_TT_CONSUM]) || !strcmp(tok0, s[S_CMD_TT_SYMB]) || !strcmp(tok0, s[S_CMD_TT_STARTN]) || !strcmp(tok0, s[S_CMD_TT_NAME]) @@ -128,7 +135,6 @@ static uint8_t try_func_name(struct ThingAction * ta, char * name, static uint8_t parse_thingaction_manipulation(char * tok0, char * tok1) { - static struct ThingAction * ta = NULL; if (!ta && (!strcmp(tok0, s[S_CMD_TA_EFFORT]) || !strcmp(tok0, s[S_CMD_TA_NAME]))) { @@ -239,10 +245,9 @@ static uint8_t parse_position(char* tok0, char * tok1, struct Thing * t) { t->pos.x = length; } - free(t->fov_map); if (world.exists && t->lifepoints) { - t->fov_map = build_fov_map(t); + build_fov_map(t); } } return 1; @@ -273,9 +278,8 @@ static uint8_t parse_carry(char * tok0, char * tok1, struct Thing * t) -static uint8_t parse_thing_manipulation(char * tok0, char * tok1) +static uint8_t parse_thing_manipulation_1arg(char * tok0, char * tok1) { - static struct Thing * t = NULL; if (!t && ( !strcmp(tok0, s[S_CMD_T_PROGRESS]) || !strcmp(tok0, s[S_CMD_T_TYPE]) || !strcmp(tok0, s[S_CMD_T_CARRIES]) || !strcmp(tok0, s[S_CMD_T_POSY]) @@ -302,7 +306,7 @@ static uint8_t parse_thing_manipulation(char * tok0, char * tok1) t = add_thing(id, world.thing_types->id, 0, 0); if (world.exists && t->lifepoints) { - t->fov_map = build_fov_map(t); + build_fov_map(t); } } } @@ -371,11 +375,7 @@ static uint8_t parse_world_active(char * tok0, char * tok1) { if (ti->lifepoints) { - if (ti->fov_map) - { - free(ti->fov_map); - } - ti->fov_map = build_fov_map(ti); + build_fov_map(ti); } } world.exists = 1; @@ -415,7 +415,7 @@ extern uint8_t parse_god_command_1arg(char * tok0, char * tok1) { if ( parse_thingtype_manipulation(tok0, tok1) || parse_thingaction_manipulation(tok0, tok1) - || parse_thing_manipulation(tok0, tok1) + || parse_thing_manipulation_1arg(tok0, tok1) || set_map_length(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) @@ -438,3 +438,71 @@ extern uint8_t parse_god_command_1arg(char * tok0, char * tok1) } return 1; } + + + +extern uint8_t parse_god_command_2arg(char * tok0, char * tok1, char * tok2) +{ + if (!t && !strcmp(tok0, s[S_CMD_T_MEMMAP])) + { + err_line(1, "No thing defined to manipulate yet."); + return 1; + } + if (!strcmp(tok0, s[S_CMD_T_MEMMAP])) + { + uint8_t y = atoi(tok1); + if (parsetest_int(tok1, '8') || y >= world.map.length) + { + err_line(1, "Illegal value for map line number."); + return 1; + } + if (strlen(tok2) != world.map.length) + { + err_line(1, "Map line length is unequal map width."); + return 1; + } + if (!t->mem_map) + { + uint32_t map_size = world.map.length * world.map.length; + t->mem_map = try_malloc(map_size, __func__); + memset(t->mem_map, ' ', map_size); + } + memcpy(t->mem_map + y * world.map.length, tok2, world.map.length); + } + else + { + return 0; + } + return 1; +} + + + +extern uint8_t parse_god_command_3arg(char * tok0, char * tok1, char * tok2, + char * tok3) +{ + if (!t && !strcmp(tok0, s[S_CMD_T_MEMTHING])) + { + err_line(1, "No thing defined to manipulate yet."); + return 1; + } + if (!strcmp(tok0, s[S_CMD_T_MEMTHING])) + { + uint8_t id = atoi(tok1); + uint8_t y = atoi(tok2); + uint8_t x = atoi(tok3); + if ( parsetest_int(tok1, '8') || !get_thing_type(id) + || parsetest_int(tok2, '8') || y >= world.map.length + || parsetest_int(tok3, '8') || x >= world.map.length) + { + err_line(1, "Illegal value for thing type or position."); + return 1; + } + add_thing_to_memory_map(t, id, y, x); + } + else + { + return 0; + } + return 1; +}