X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Froguelike.h;h=8bf538017bb39f27155c955a99baff8f438785a8;hb=714bf970109b33005e0ab3e588d818460ccdc304;hp=bb6088c2767907a7b8a10fcc8270f797ef918dca;hpb=a1384bd171b558158855ec7c6683eba8fd8e609f;p=plomrogue

diff --git a/src/roguelike.h b/src/roguelike.h
index bb6088c..8bf5380 100644
--- a/src/roguelike.h
+++ b/src/roguelike.h
@@ -1,3 +1,14 @@
+#ifndef ROGUELIKE_H
+#define ROGUELIKE_H
+
+#include <stdint.h>
+#include "yx_uint16.h"
+
+struct WinMeta;
+struct Win;
+struct KeyBinding;
+struct KeysWinData;
+
 struct World {
   char interactive;
   struct KeyBinding * keybindings;
@@ -6,37 +17,29 @@ struct World {
   uint32_t turn;
   char * log;
   struct Map * map;
+  struct Item * item;
   struct Monster * monster;
   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 {
-  struct yx_uint16 pos; };
-
-struct Monster {
-  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);
-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);
-char is_passable (struct Map *, uint16_t, uint16_t);
-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 *);
+extern uint16_t rrand(char, uint32_t);
+extern void update_log (struct World *, char *);
+
+extern struct Map init_map ();
+extern void map_scroll (struct Map *, char, struct yx_uint16);
+extern void map_center_player (struct Map *, struct Player *, struct yx_uint16);
+
+extern void turn_over (struct World *, char);
+extern void save_game(struct World *);
+
+extern void toggle_window (struct WinMeta *, struct Win *);
+extern void scroll_pad (struct WinMeta *, char);
+extern void growshrink_active_window (struct WinMeta *, char);
+
+extern unsigned char meta_keys(int, struct World *, struct WinMeta *, struct Win *, struct Win *, struct Win *, struct Win *);
+
+#endif