-#include <string.h> /* for strchr(), strlen(), memcpy(), strtok() */
-#include "readwrite.h" /* for get_linemax(), try_fopen(), try_fclose()
- * [read/write]_uint[8/16/23][_bigendian]()
+#include <string.h> /* for strlen(), memcpy(), strtok() */
+#include "readwrite.h" /* for textfile_sizes(), try_fopen(), try_fclose(),
+ * try_fgets()
*/
#include "misc.h" /* for try_malloc(), find_passable_pos() */
#include "main.h" /* for world global */
*/
#include "misc.h" /* for try_malloc(), find_passable_pos() */
#include "main.h" /* for world global */
for (; NULL != mo_ptr; mo_ptr = mo_ptr->next, i++);
uint8_t size = 3+1 + 3+1 + 3+1 + 5+1 + 5 + ((1+3)*i) + 1 + 1;
char line[size];
for (; NULL != mo_ptr; mo_ptr = mo_ptr->next, i++);
uint8_t size = 3+1 + 3+1 + 3+1 + 5+1 + 5 + ((1+3)*i) + 1 + 1;
char line[size];
- sprintf(line, "%d %d %d %d %d",
- mo->id, mo->type, mo->lifepoints, mo->pos.y, mo->pos.x);
+ sprintf(line, "%d %d %d %d %d %d %d %d",
+ mo->id, mo->type, mo->lifepoints, mo->pos.y, mo->pos.x,
+ mo->command, mo->arg, mo->progress);
for (mo_ptr = mo->owns; NULL != mo_ptr; mo_ptr = mo_ptr->next)
{
sprintf(line + strlen(line), " %d", mo_ptr->id);
for (mo_ptr = mo->owns; NULL != mo_ptr; mo_ptr = mo_ptr->next)
{
sprintf(line + strlen(line), " %d", mo_ptr->id);
{
char * f_name = "init_map_object_defs()";
FILE * file = try_fopen(filename, "r", f_name);
{
char * f_name = "init_map_object_defs()";
FILE * file = try_fopen(filename, "r", f_name);
struct MapObjDef ** last_mod_ptr_ptr = &world.map_obj_defs;
char * delim = " ";
char line[linemax + 1];
while (try_fgets(line, linemax + 1, file, f_name))
{
struct MapObjDef ** last_mod_ptr_ptr = &world.map_obj_defs;
char * delim = " ";
char line[linemax + 1];
while (try_fgets(line, linemax + 1, file, f_name))
{
mod->next = NULL;
mod->id = atoi(strtok(line, delim));
mod->corpse_id = atoi(strtok(NULL, delim));
mod->next = NULL;
mod->id = atoi(strtok(line, delim));
mod->corpse_id = atoi(strtok(NULL, delim));
fpos_t pos;
exit_err(-1 == fgetpos(file, &pos), f_name);
while (try_fgets(line, linemax + 1, file, f_name))
{
fpos_t pos;
exit_err(-1 == fgetpos(file, &pos), f_name);
while (try_fgets(line, linemax + 1, file, f_name))
{
mo->next = NULL;
mo->id = atoi(strtok(line, delim));
mo->type = atoi(strtok(NULL, delim));
mo->lifepoints = atoi(strtok(NULL, delim));
mo->pos.y = atoi(strtok(NULL, delim));
mo->pos.x = atoi(strtok(NULL, delim));
mo->next = NULL;
mo->id = atoi(strtok(line, delim));
mo->type = atoi(strtok(NULL, delim));
mo->lifepoints = atoi(strtok(NULL, delim));
mo->pos.y = atoi(strtok(NULL, delim));
mo->pos.x = atoi(strtok(NULL, delim));
+ mo->command = atoi(strtok(NULL, delim));;
+ mo->arg = atoi(strtok(NULL, delim));;
+ mo->progress = atoi(strtok(NULL, delim));;
while (try_fgets(line, linemax + 1, file, f_name))
{
uint8_t id = atoi(strtok(line, delim));
while (try_fgets(line, linemax + 1, file, f_name))
{
uint8_t id = atoi(strtok(line, delim));
- own_map_object(&mo->owns, &world.map_objs,
- (uint8_t) atoi(owned_id));
+ own_map_object(&mo->owns, &world.map_objs, atoi(owned_id));
- struct MapObj * mo = try_malloc(sizeof(struct MapObj), f_name);
- mo->id = world.map_obj_count;
- world.map_obj_count++;
- mo->type = mod->id;
+ struct MapObj * mo = try_malloc(sizeof(struct MapObj), f_name);
+ mo->id = world.map_obj_count++;
+ mo->type = mod->id;
- mo->owns = NULL;
- mo->next = NULL;
- struct MapObj ** last_ptr_ptr = &world.map_objs;
- struct MapObj * mo_ptr;
- while (NULL != * last_ptr_ptr)
- {
- mo_ptr = * last_ptr_ptr;
- last_ptr_ptr = & mo_ptr->next;
- }
- * last_ptr_ptr = mo;
+ mo->progress = 0;
+ mo->command = 0;
+ mo->arg = 0;
+ mo->owns = NULL;
+ mo->next = NULL;
+ struct MapObj ** mo_ptr_ptr = &world.map_objs;
+ for (; NULL != * mo_ptr_ptr; mo_ptr_ptr = &(*mo_ptr_ptr)->next);
+ * mo_ptr_ptr = mo;
- struct MapObj ** last_ptr_ptr = target;
- struct MapObj * mo_ptr;
- while (NULL != * last_ptr_ptr)
- {
- mo_ptr = * last_ptr_ptr;
- last_ptr_ptr = & mo_ptr->next;
- }
- * last_ptr_ptr = mo;
+ struct MapObj ** mo_ptr_ptr = target;
+ for (; NULL != * mo_ptr_ptr; mo_ptr_ptr = &(*mo_ptr_ptr)->next);
+ * mo_ptr_ptr = mo;
extern struct MapObjDef * get_map_object_def(uint8_t id)
{
struct MapObjDef * mod = world.map_obj_defs;
extern struct MapObjDef * get_map_object_def(uint8_t id)
{
struct MapObjDef * mod = world.map_obj_defs;
- for (; owned != NULL; owned = owned->next)
- {
- set_object_position(owned, pos);
- }
+ for (; owned != NULL; set_object_position(owned, pos), owned = owned->next);