X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmisc.c;h=0518aef5ca90f37d4563985033864383091d9b6b;hb=d504e5724574f9502ec203d495284738601bb6a0;hp=48ced07e635ead0f98b102380b416a735040cbd5;hpb=42f6cd9789e06f0257a078a33fa13aaea0714fce;p=plomrogue diff --git a/src/misc.c b/src/misc.c index 48ced07..0518aef 100644 --- a/src/misc.c +++ b/src/misc.c @@ -6,18 +6,18 @@ #include /* for size_t, calloc(), free() */ #include /* for strlen(), strcmp(), memcpy() */ #include /* for uint8_t, uint16_t */ -#include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian](), - * try_fopen(), try_fclose(), get_linemax() +#include "readwrite.h" /* for try_fopen(), try_fclose(), get_linemax(), + * try_fputc() */ #include "map_objects.h" /* for struct MapObj, get_player(), read_map_objects(), * write_map_objects() */ -#include "map_object_actions.h" /* for is_passable(), move_actor() */ -#include "map.h" /* for Map struct */ +#include "map_object_actions.h" /* for struct MapObjAct */ +#include "ai.h" /* for pretty_dumb_ai() */ +#include "map.h" /* for Map struct, is_passable() */ #include "main.h" /* for world global */ #include "yx_uint16.h" /* for yx_uint16 struct */ -#include "rrand.h" /* for rrand(), rrand_seed() */ -#include "rexit.h" /* for exit_err() */ +#include "rexit.h" /* for exit_err(), exit_trouble() */ #include "wincontrol.h" /* for init_winconfs(), init_wins(), free_winconfs(), * sorted_wintoggle_and_activate() */ @@ -26,27 +26,19 @@ -extern char * trouble_msg(char * parent, char * child) +extern uint16_t rrand() { - char * p1 = "Trouble in "; - char * p2 = " with "; - char * p3 = "."; - uint16_t size = strlen(p1) + strlen(parent) + strlen(p2) + strlen(child) - + strlen(p3) + 1; - char * msg = malloc(size); - exit_err(NULL == msg, "malloc() in trouble_msg() failed."); - sprintf(msg, "%s%s%s%s%s", p1, parent, p2, child, p3); - return msg; + /* Constants as recommended by POSIX.1-2001 (see man page rand(3)). */ + world.seed = ((world.seed * 1103515245) + 12345) % 4294967296; + return (world.seed >> 16); /* Ignore less random least significant bits. */ } extern void * try_malloc(size_t size, char * f) { - char * msg = trouble_msg(f, "malloc()"); void * p = malloc(size); - exit_err(NULL == p, msg); - free(msg); + exit_trouble(NULL == p, f, "malloc()"); return p; } @@ -54,10 +46,8 @@ extern void * try_malloc(size_t size, char * f) extern void * try_calloc(size_t size1, size_t size2, char * f) { - char * msg = trouble_msg(f, "calloc()"); void * p = calloc(size1, size2); - exit_err(NULL == p, msg); - free(msg); + exit_trouble(NULL == p, f, "calloc()"); return p; } @@ -205,8 +195,6 @@ extern uint16_t center_offset(uint16_t pos, uint16_t mapsize, extern void turn_over(char action) { char * f_name = "turn_over()"; - char * err_write = "Trouble in turn_over() with write_uint8() " - "writing to opened file 'record_tmp'."; char * recordfile_tmp = "record_tmp"; char * recordfile = "record"; @@ -217,29 +205,53 @@ extern void turn_over(char action) char c = fgetc(file_old); while (EOF != c) { - exit_err(write_uint8(c, file_new), err_write); + try_fputc(c, file_new, f_name); c = fgetc(file_old); } try_fclose(file_old, f_name); - exit_err(write_uint8(action, file_new), err_write); + try_fputc(action, file_new, f_name); if ( is_command_id_shortdsc(action, "drop") || is_command_id_shortdsc(action, "use")) { - uint8_t inventory_select = world.old_inventory_select; - exit_err(write_uint8(inventory_select, file_new), err_write); + try_fputc(world.inventory_select, file_new, f_name); } try_fclose_unlink_rename(file_new, recordfile_tmp, recordfile, f_name); } - world.turn++; - rrand_seed(world.seed * world.turn); - struct MapObj * monster; - for (monster = world.map_objs; monster != 0; monster = monster->next) + + struct MapObj * player = get_player(); + struct MapObj * map_object = player; + uint8_t first_round = 1; + while (0 < player->lifepoints) { - if (0 < monster->lifepoints && 0 != monster->id) + if (NULL == map_object) + { + world.turn++; + map_object = world.map_objs; + } + if (0 < map_object->lifepoints) /* map_object is animate. */ { - char * sel = "\0NSEW"; - move_actor(monster, sel[rrand() % 5]); + if (0 == first_round && 0 == map_object->progress) + { + if (map_object == player) + { + break; + } + pretty_dumb_ai(map_object); + } + first_round = 0; + map_object->progress++; + struct MapObjAct * moa = world.map_obj_acts; + while (moa->id != map_object->command) + { + moa = moa->next; + } + if (map_object->progress == moa->effort) + { + moa->func(map_object); + map_object->progress = 0; + } } + map_object = map_object->next; } } @@ -252,11 +264,13 @@ extern void save_game() char * savefile = "savefile"; FILE * file = try_fopen(savefile_tmp, "w", f_name); char line[12]; - sprintf(line, "%d\n", world.seed); + sprintf(line, "%u\n", world.mapseed); + try_fwrite(line, strlen(line), 1, file, f_name); + sprintf(line, "%u\n", world.seed); try_fwrite(line, strlen(line), 1, file, f_name); - sprintf(line, "%d\n", world.turn); + sprintf(line, "%u\n", world.turn); try_fwrite(line, strlen(line), 1, file, f_name); - sprintf(line, "%d\n", world.score); + sprintf(line, "%u\n", world.score); try_fwrite(line, strlen(line), 1, file, f_name); write_map_objects(file); try_fclose_unlink_rename(file, savefile_tmp, savefile, f_name); @@ -272,6 +286,8 @@ extern void load_game() uint16_t linemax = get_linemax(file, f_name); char line[linemax + 1]; try_fgets(line, linemax + 1, file, f_name); + world.mapseed = atoi(line); + try_fgets(line, linemax + 1, file, f_name); world.seed = atoi(line); try_fgets(line, linemax + 1, file, f_name); world.turn = atoi(line);