X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/form?a=blobdiff_plain;f=src%2Froguelike.h;h=9ecd71a890f9f90a3153a0a45862dee88002eddd;hb=f222ace2f2441b21a3c29741483d8018294820a4;hp=2ae0c88cec69cd65776a91e2d8a6defdc3eeab05;hpb=6d5705b43adbc2a4b522f971206007c9073c7144;p=plomrogue

diff --git a/src/roguelike.h b/src/roguelike.h
index 2ae0c88..9ecd71a 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;
@@ -17,19 +20,18 @@ struct Map {
   char * cells; };
 
 struct Player {
-  uint16_t y;
-  uint16_t x; };
+  struct yx_uint16 pos; };
 
 struct Monster {
   struct Monster * next;
   char name;
-  uint16_t y;
-  uint16_t x; };
+  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);
@@ -40,3 +42,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