Eliminated some potential problems for alternative game map sizes.

[plomrogue] / src / server / map_objects.h

diff --git a/src/server/map_objects.h b/src/server/map_objects.h
index 0796c3c02d4db02f476922ee5bb88d7622607b69..a73aa801bdd2e0777d007d2383164c2bfd23ef84 100644 (file)
--- a/src/server/map_objects.h
+++ b/src/server/map_objects.h
@@ -8,7 +8,7 @@
 #define MAP_OBJECTS_H
 
 #include <stdint.h> /* uint8_t */
-#include "../common/yx_uint16.h" /* yx_uint16 structs */
+#include "../common/yx_uint8.h" /* yx_uint8 structs */
 
 
 
@@ -16,11 +16,11 @@ struct MapObj
 {
     struct MapObj * next;        /* pointer to next one in map object chain */
     struct MapObj * owns;        /* chain of map objects owned / in inventory */
-    struct yx_uint16 pos;        /* coordinate on map */
+    struct yx_uint8 pos;         /* coordinate on map */
     uint8_t id;                  /* individual map object's unique identifier */
     uint8_t type;                /* ID of appropriate map object definition */
     uint8_t lifepoints;          /* 0: object is inanimate; >0: hitpoints */
-    uint8_t command;             /* map object's current action */
+    uint8_t command;             /* map object's current action; 0 if none */
     uint8_t arg;                 /* optional field for .command argument */
     uint8_t progress;            /* turns already passed to realize .command */
 };
@@ -62,7 +62,7 @@ extern struct MapObj * get_player();
 extern struct MapObjDef * get_map_object_def(uint8_t id);
 
 /* Move not only "mo" to "pos", but also all map objects owned by it. */
-extern void set_object_position(struct MapObj * mo, struct yx_uint16 pos);
+extern void set_object_position(struct MapObj * mo, struct yx_uint8 pos);