#include <stdlib.h> /* for size_t, calloc(), free() */
#include <string.h> /* for strlen(), strcmp(), memcpy() */
#include <stdint.h> /* 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(), textfile_sizes(),
+ * try_fputc(), try_fgetc()
*/
#include "map_objects.h" /* for struct MapObj, get_player(), read_map_objects(),
* write_map_objects()
*/
#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()
*/
-extern char * trouble_msg(char * parent, char * child)
-{
- 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;
+extern uint16_t rrand()
+{ /* 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;
}
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;
}
-extern uint16_t center_offset(uint16_t pos, uint16_t mapsize,
+extern uint16_t center_offset(uint16_t position, uint16_t mapsize,
uint16_t framesize)
{
uint16_t offset = 0;
if (mapsize > framesize)
{
- if (pos > framesize / 2)
+ if (position > framesize / 2)
{
- if (pos < mapsize - (framesize / 2))
+ if (position < mapsize - (framesize / 2))
{
- offset = pos - (framesize / 2);
+ offset = position - (framesize / 2);
}
else
{
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";
{
FILE * file_old = try_fopen(recordfile, "r", f_name);
FILE * file_new = try_fopen(recordfile_tmp, "w", f_name);
- char c = fgetc(file_old);
+ int c = try_fgetc(file_old, f_name);
while (EOF != c)
{
- exit_err(write_uint8(c, file_new), err_write);
- c = fgetc(file_old);
+ try_fputc((uint8_t) c, file_new, f_name);
+ c = try_fgetc(file_old, f_name);
}
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"))
{
- exit_err(write_uint8(world.inventory_select, file_new), err_write);
+ try_fputc(world.inventory_sel, file_new, f_name);
}
try_fclose_unlink_rename(file_new, recordfile_tmp, recordfile, f_name);
}
- rrand_seed(world.seed * world.turn);
struct MapObj * player = get_player();
struct MapObj * map_object = player;
{
break;
}
- char * sel = "NSEW";
- map_object->command = 1;
- map_object->arg = sel[rrand() % 4];
+ pretty_dumb_ai(map_object);
}
first_round = 0;
map_object->progress++;
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, "%u\n", world.map_obj_count);
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);
char * f_name = "load_game2()";
char * filename = "savefile";
FILE * file = try_fopen(filename, "r", f_name);
- uint16_t linemax = get_linemax(file, f_name);
+ uint16_t linemax = textfile_sizes(file, NULL);
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.map_obj_count = atoi(line);
+ try_fgets(line, linemax + 1, file, f_name);
world.turn = atoi(line);
try_fgets(line, linemax + 1, file, f_name);
world.score = atoi(line);
{
if ('u' == dir)
{
- if (world.inventory_select > 0)
- {
- world.inventory_select--;
- }
+ world.inventory_sel = world.inventory_sel - (world.inventory_sel > 0);
return;
}
struct MapObj * player = get_player();
}
uint8_t n_owned = 0;
for (; NULL != owned->next; owned = owned->next, n_owned++);
- if (world.inventory_select < n_owned)
- {
- world.inventory_select++;
- }
+ world.inventory_sel = world.inventory_sel + (world.inventory_sel < n_owned);
}
projects / plomrogue / blobdiff