X-Git-Url: https://plomlompom.com/repos/do_todos?a=blobdiff_plain;f=src%2Froguelike.h;h=5dd17f797572af839d76dd3c7bfafab991b856af;hb=c7ff0e4b00f98a0cf65465c552af5ebfcfeaab57;hp=99e115de8668b043fe640b4a76044788ce830f2a;hpb=b1f018b25a1cd4a48b197208ae48675f0065eb64;p=plomrogue

diff --git a/src/roguelike.h b/src/roguelike.h
index 99e115d..5dd17f7 100644
--- a/src/roguelike.h
+++ b/src/roguelike.h
@@ -1,3 +1,6 @@
+#ifndef ROGUELIKE_H
+#define ROGUELIKE_H
+
 struct World {
   char interactive;
   struct KeyBinding * keybindings;
@@ -10,24 +13,23 @@ struct World {
   struct Player * player; };
 
 struct Map {
-  uint16_t width;
-  uint16_t height;
-  uint16_t offset_x;
-  uint16_t offset_y;
+  struct yx_uint16 size;
+  struct yx_uint16 offset;
   char * cells; };
 
 struct Player {
-  uint16_t y;
-  uint16_t x; };
+  struct yx_uint16 pos; };
 
 struct Monster {
-  uint16_t y;
-  uint16_t x; };
+  struct Monster * next;
+  char name;
+  struct yx_uint16 pos; };
 
 uint16_t rrand(char, uint32_t);
 struct Map init_map ();
 void save_game(struct World *);
 void record_action (char);
+struct yx_uint16 mv_yx_in_dir (char, struct yx_uint16);
 void next_turn (struct World *);
 void update_log (struct World *, char *);
 void move_player (struct World *, char);
@@ -38,3 +40,5 @@ void scroll_pad (struct WinMeta *, char);
 void growshrink_active_window (struct WinMeta *, char);
 void map_scroll (struct Map *, char);
 unsigned char meta_keys(int, struct World *, struct WinMeta *, struct Win *, struct Win *, struct Win *, struct Win *);
+
+#endif