Made Map struct use yx_uint16 for 2D coordinates/sizes.

[plomrogue] / src / roguelike.h

diff --git a/src/roguelike.h b/src/roguelike.h
index bb6088c2767907a7b8a10fcc8270f797ef918dca..5dd17f797572af839d76dd3c7bfafab991b856af 100644 (file)
--- 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,10 +13,8 @@ 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 {
@@ -29,7 +30,6 @@ struct Map init_map ();
 void save_game(struct World *);
 void record_action (char);
 struct yx_uint16 mv_yx_in_dir (char, struct yx_uint16);
-char yx_uint16_cmp (struct yx_uint16, struct yx_uint16);
 void next_turn (struct World *);
 void update_log (struct World *, char *);
 void move_player (struct World *, char);
@@ -40,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