The player is now a map object like any other. All actor contacts now lead to violenc...

[plomrogue] / src / map_objects.h

diff --git a/src/map_objects.h b/src/map_objects.h
index ced2ab3f161b4cc237d642bc0fabd28effe1ce14..a56595f79aaad4c7358b092c22817fca3f66b7db 100644 (file)
--- a/src/map_objects.h
+++ b/src/map_objects.h
@@ -16,15 +16,6 @@ struct World;
 
 
 
-/* Player is non-standard: single and of a hard-coded type. */
-struct Player
-{
-    struct yx_uint16 pos;
-    uint8_t hitpoints;
-};
-
-
-
 struct MapObj
 {
     struct MapObj * next;        /* pointer to next one in map object chain */
@@ -80,6 +71,11 @@ extern void free_map_objects(struct MapObj * mo_start);
 
 
 
+/* Get pointer to the MapObj struct that represents the player. */
+extern struct MapObj * get_player(struct World * world);
+
+
+
 /* Get pointer to the map object definition of identifier "def_id". */
 extern struct MapObjDef * get_map_object_def(struct World * w, uint8_t id);