X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmap_objects.c;h=e35a88c49c01b692e10ea14998dc40d27d1cc591;hb=951248dddace9f7cadcf30700a3c3e6ad7ae2888;hp=6ed8c331e4374a4a286fdbb70a314627055c4669;hpb=6ba18516a602b3d4ad95981887ad9c5eb40a335a;p=plomrogue

diff --git a/src/map_objects.c b/src/map_objects.c
index 6ed8c33..e35a88c 100644
--- a/src/map_objects.c
+++ b/src/map_objects.c
@@ -4,7 +4,7 @@
 #include <stdlib.h> /* for malloc(), calloc(), free(), atoi() */
 #include <stdint.h> /* for uint8_t */
 #include <stdio.h> /* for FILE typedef */
-#include <string.h> /* for strchr(), strlen(), memcpy()  */
+#include <string.h> /* for strchr(), strlen(), memcpy(), strtok() */
 #include "readwrite.h" /* for [read/write]_uint[8/16/23][_bigendian]() */
 #include "misc.h" /* for textfile_sizes(), find_passable_pos() */
 #include "main.h" /* for World struct */
@@ -99,24 +99,25 @@ extern void init_map_object_defs(struct World * world, char * filename)
     struct MonsterDef * * p_p_md  = &world->monster_def;
     char * defline = malloc(linemax);
     char * line_p;
+    char * delim = " ";
     while (fgets(defline, linemax, file))
     {
         mod.next    = 0;
-        mod.id      = atoi(defline);
-        line_p      = strchr(defline, ' ') + 1;
-        mod.m_or_i  = * line_p;
-        mod.mapchar = * (line_p + 2);
+        mod.id      = atoi(strtok(defline, delim));
+        mod.m_or_i  = * strtok(NULL, delim);
+        mod.mapchar = * strtok(NULL, delim);
         if ('i' == mod.m_or_i)
         {
-            line_p = line_p + 5;
+            line_p = strtok(NULL, delim);
         }
         else
         {
-            md.hitpoints_start = atoi   (line_p + 4);
-            line_p             = strchr (line_p + 4, ' ') + 1;
+            md.corpse_id       = atoi(strtok(NULL, delim));
+            md.hitpoints_start = atoi(strtok(NULL, delim));
+            line_p             = strtok(NULL, delim);
         }
-        mod.desc = calloc (strlen (line_p), sizeof(char));
-        memcpy (mod.desc, line_p, strlen(line_p) - 1);
+        mod.desc = calloc(strlen(line_p), sizeof(char));
+        memcpy(mod.desc, line_p, strlen(line_p) - 1);
         if ('i' == mod.m_or_i)
         {
             id.map_obj_def = mod;
@@ -134,7 +135,7 @@ extern void init_map_object_defs(struct World * world, char * filename)
     }
     free(defline);
     fclose(file);
-};
+}
 
 
 
@@ -143,19 +144,24 @@ extern uint8_t write_map_objects(struct World * world, void * start,
 {
     struct MapObj * map_obj;
     struct MapObjDef * mod;
-    uint8_t err = 0;
     for (map_obj = start; map_obj != 0; map_obj = map_obj->next)
     {
-        err = err | write_uint8(map_obj->type, file);
-        err = err | write_uint16_bigendian(map_obj->pos.y + 1, file);
-        err = err | write_uint16_bigendian(map_obj->pos.x + 1, file);
+        if (   write_uint8(map_obj->type, file)
+            || write_uint16_bigendian(map_obj->pos.y + 1, file)
+            || write_uint16_bigendian(map_obj->pos.x + 1, file))
+        {
+            return 1;
+        }
         mod = get_map_obj_def(world, map_obj->type);
         if ('m' == mod->m_or_i)
         {
-            err = err | write_map_objects_monsterdata(map_obj, file);
+            if (write_map_objects_monsterdata(map_obj, file))
+            {
+                return 1;
+            }
         }
     }
-    return (err | write_uint16_bigendian(0, file));
+    return write_uint16_bigendian(0, file);
 }
 
 
@@ -169,17 +175,22 @@ extern uint8_t read_map_objects(struct World * world, void * start, FILE * file)
     char first = 1;
     long pos;
     uint16_t read_uint16 = 0;
-    uint8_t err = 0;
     while (1)
     {
         pos = ftell(file);
-        err = err | read_uint16_bigendian(file, &read_uint16);
+        if (read_uint16_bigendian(file, &read_uint16))
+        {
+            return 1;
+        }
         if (0 == read_uint16)
         {
             break;
         }
         fseek(file, pos, SEEK_SET);
-        err = err | read_uint8(file, &type);
+        if (read_uint8(file, &type))
+        {
+            return 1;
+        }
         mod = get_map_obj_def(world, type);
         if ('m' == mod->m_or_i)
         {
@@ -191,20 +202,26 @@ extern uint8_t read_map_objects(struct World * world, void * start, FILE * file)
         }
         map_obj = get_next_map_obj(start, &first, size, map_obj);
         map_obj->type = type;
-        err = err | read_uint16_bigendian(file, &map_obj->pos.y);
-        err = err | read_uint16_bigendian(file, &map_obj->pos.x);
+        if (   read_uint16_bigendian(file, &map_obj->pos.y)
+            || read_uint16_bigendian(file, &map_obj->pos.x))
+        {
+            return 1;
+        }
         map_obj->pos.y--;
         map_obj->pos.x--;
         if ('m' == mod->m_or_i)
         {
-            err = err | read_map_objects_monsterdata(map_obj, file);
+            if (read_map_objects_monsterdata(map_obj, file))
+            {
+                return 1;
+            }
         }
     }
     if (!first)
     {
         map_obj->next = 0;
     }
-    return err;
+    return 0;
 }