Actually save player's hitpoints to savefile (instead of, bug, resetting them on...

[plomrogue] / src / roguelike.h

diff --git a/src/roguelike.h b/src/roguelike.h
index 6ddc8260bce8bc7a97304f1727d5ae3d8665bb07..209f717e76911efaac15afb9611bea18f0eeed9a 100644 (file)
--- a/src/roguelike.h
+++ b/src/roguelike.h
@@ -1,6 +1,14 @@
 #ifndef ROGUELIKE_H
 #define ROGUELIKE_H
 
+#include <stdint.h>
+
+struct WinMeta;
+struct Win;
+struct KeyBinding;
+struct KeysWinData;
+struct Map;
+
 struct World {
   char interactive;
   struct KeyBinding * keybindings;
@@ -9,40 +17,22 @@ struct World {
   uint32_t turn;
   char * log;
   struct Map * map;
+  struct Item * item;
   struct Monster * monster;
   struct Player * player; };
 
-struct Map {
-  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);
-void update_log (struct World *, char *);
-
-struct Map init_map ();
-void map_scroll (struct Map *, char);
+extern uint16_t rrand(char, uint32_t);
+extern void update_log (struct World *, char *);
 
-void turn_over (struct World *, char);
-void save_game(struct World *);
+uint16_t center_offset (uint16_t, uint16_t, uint16_t);
 
-char is_passable (struct Map *, uint16_t, uint16_t);
-void move_monster (struct World *, struct Monster *);
-void move_player (struct World *, char);
-void player_wait(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