X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fworld.h;h=a71f772db401b0d7ea5b5adfd432ac5b97c42308;hb=b6c140e3bd19ede26e3992c03c576515487f0a10;hp=4e92bb2341ea718e56e40f08e0416cdaa398707d;hpb=e8e8f91cff96eebc1b440df18d9c3ef4ced1ca60;p=plomrogue
diff --git a/src/client/world.h b/src/client/world.h
index 4e92bb2..a71f772 100644
--- a/src/client/world.h
+++ b/src/client/world.h
@@ -12,31 +12,30 @@
#include "../common/yx_uint16.h" /* struct yx_uint16 */
#include "keybindings.h" /* stuct KeyBindingDB */
#include "command_db.h" /* struct CommandDB */
-#include "windows.h" /* struct WinMeta */
-#include "wincontrol.h" /* WinConfDB */
+#include "windows.h" /* WinDB */
struct World
{
- struct WinMeta wmeta;
- struct WinConfDB winconf_db;
- struct CommandDB cmd_db; /* Command database. */
- struct KeyBindingDB kb_global; /* Global keybindings. */
- struct KeyBindingDB kb_wingeom; /* Window geometry config keybindings. */
- struct KeyBindingDB kb_winkeys; /* Window keybinding config keybindings.*/
- struct Map map; /* Pointer to the game map cells. */
- time_t last_update;
- struct yx_uint16 player_pos;
- char * log;
- char * path_server_in;
- char * path_interface_conf;
- char * player_inventory;
- uint16_t turn;
- uint16_t score;
- uint8_t halfdelay;
- uint8_t player_inventory_select;
- uint8_t player_lifepoints;
+ struct WinDB winDB; /* data for window management and individual windows */
+ struct CommandDB commandDB; /* data on commands from commands config file */
+ struct KeyBindingDB kb_global; /* globally availabe keybindings */
+ struct KeyBindingDB kb_wingeom; /* Win geometry config view keybindings */
+ struct KeyBindingDB kb_winkeys; /* Win keybindings config view keybindings*/
+ struct Map map; /* game map geometry and content */
+ time_t last_update; /* used for comparison with server outfile' mtime */
+ struct yx_uint16 player_pos; /* coordinates of player on map */
+ char * log; /* log of player's activities */
+ char * path_server_in; /* path of server's input fifo */
+ char * path_interface_conf; /* path of interface configuration file */
+ char * path_commands; /* path of commands config file */
+ char * player_inventory; /* one-item-per-line string list of owned items */
+ uint16_t turn; /* world/game turn */
+ uint16_t player_score; /* player's score*/
+ uint8_t halfdelay; /* how long to wait for getch() input in io_loop() */
+ uint8_t player_inventory_select; /* index of selected item in inventory */
+ uint8_t player_lifepoints; /* how alive the player is */
uint8_t winch; /* if set, SIGWINCH was registered; trigger reset_windows()*/
};