Fixed map centering bug, refactored center offseting.

[plomrogue] / src / roguelike.h

diff --git a/src/roguelike.h b/src/roguelike.h
index 7c54dc43dc7f38f2189a85688cd0a02d303e7c79..4298551d2a409668ea2cd28a35832a5bf859f81e 100644 (file)
--- a/src/roguelike.h
+++ b/src/roguelike.h
@@ -1,8 +1,13 @@
 #ifndef ROGUELIKE_H
 #define ROGUELIKE_H
 
+#include <stdint.h>
 #include "yx_uint16.h"
-#include "windows.h"
+
+struct WinMeta;
+struct Win;
+struct KeyBinding;
+struct KeysWinData;
 
 struct World {
   char interactive;
@@ -12,6 +17,7 @@ struct World {
   uint32_t turn;
   char * log;
   struct Map * map;
+  struct Item * item;
   struct Monster * monster;
   struct Player * player; };
 
@@ -20,19 +26,21 @@ struct Map {
   struct yx_uint16 offset;
   char * cells; };
 
-uint16_t rrand(char, uint32_t);
-void update_log (struct World *, char *);
+extern uint16_t rrand(char, uint32_t);
+extern void update_log (struct World *, char *);
 
-struct Map init_map ();
-void map_scroll (struct Map *, char);
+extern struct Map init_map ();
+extern void map_scroll (struct Map *, char, struct yx_uint16);
+uint16_t center_offset (uint16_t, uint16_t, uint16_t);
+extern void map_center_player (struct Map *, struct Player *, struct yx_uint16);
 
-void turn_over (struct World *, char);
-void save_game(struct World *);
+extern void turn_over (struct World *, char);
+extern void save_game(struct World *);
 
-void toggle_window (struct WinMeta *, struct Win *);
-void scroll_pad (struct WinMeta *, char);
-void growshrink_active_window (struct WinMeta *, char);
+extern void toggle_window (struct WinMeta *, struct Win *);
+extern void scroll_pad (struct WinMeta *, char);
+extern void growshrink_active_window (struct WinMeta *, char);
 
-unsigned char meta_keys(int, struct World *, struct WinMeta *, struct Win *, struct Win *, struct Win *, struct Win *);
+extern unsigned char meta_keys(int, struct World *, struct WinMeta *, struct Win *, struct Win *, struct Win *, struct Win *);
 
 #endif