X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Froguelike.h;h=357a4c8e85da54a281c4109cc572c7a425610014;hb=1f4244b457c7df5b5981e4c0efcf93a8b6386360;hp=99e115de8668b043fe640b4a76044788ce830f2a;hpb=b1f018b25a1cd4a48b197208ae48675f0065eb64;p=plomrogue

diff --git a/src/roguelike.h b/src/roguelike.h
index 99e115d..357a4c8 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,31 +13,37 @@ 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);
+void update_log (struct World *, char *);
+
 struct Map init_map ();
+void map_scroll (struct Map *, char);
+
+void turn_over (struct World *, char);
 void save_game(struct World *);
-void record_action (char);
-void next_turn (struct World *);
-void update_log (struct World *, char *);
-void move_player (struct World *, char);
+
 char is_passable (struct Map *, uint16_t, uint16_t);
+struct yx_uint16 mv_yx_in_dir (char, struct yx_uint16);
+void move_monster (struct World *, struct Monster *);
+void move_player (struct World *, char);
 void player_wait(struct World *);
+
 void toggle_window (struct WinMeta *, struct Win *);
 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