#include <unistd.h> /* for unlink(), acess() */
#include <stdlib.h> /* for size_t, calloc(), free() */
#include <string.h> /* for strlen(), strcmp(), memcpy() */
-#include <stdint.h> /* for uint8_t, uint16_t */
+#include <stdint.h> /* for uint8_t, uint16_t, uint32_t */
#include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian](),
* try_fopen(), try_fclose(), get_linemax()
*/
#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 "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)
+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;
}
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;
}
free_keybindings(world.kb_winkeys.kbs);
while (0 != world.wmeta->active)
{
- suspend_win(world.wmeta, world.wmeta->active);
+ suspend_win(world.wmeta->active);
}
free_winconfs();
}
}
try_fclose(file_old, f_name);
exit_err(write_uint8(action, file_new), err_write);
- if (is_command_id_shortdsc(action, "drop"))
+ 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);
+ exit_err(write_uint8(world.inventory_select, file_new), err_write);
}
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;
+ }
+ char * sel = "NSEW";
+ map_object->command = get_moa_id_by_name("move");
+ map_object->arg = sel[rrand() % 4];
+ }
+ 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;
}
}
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);
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);