Sorted out library dependencies / includes. Include every header file needed by each...

[plomrogue] / src / roguelike.h

diff --git a/src/roguelike.h b/src/roguelike.h
index cf9d5cc634a6df00011ea7b5eb7ae1d0a0953192..45e63b9ae0d97573a43592fa38d6e9499eb338fe 100644 (file)
--- a/src/roguelike.h
+++ b/src/roguelike.h
@@ -1,6 +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;
@@ -17,30 +25,15 @@ struct Map {
   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);
 void update_log (struct World *, char *);
 
 struct Map init_map ();
 void map_scroll (struct Map *, char);
 
-void record_action (char);
-void next_turn (struct World *);
+void turn_over (struct World *, char);
 void save_game(struct World *);
 
-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);