X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fworld.h;h=5c80143a2b70b1ae255ccfceaf94ae57af87ad7b;hb=1990a013f8dcab2d7c0908cd6b3060f62c96cdcc;hp=d27a0a3ff363ed23eb5161e18103fbe7dc68980f;hpb=d12efb0addf420adc045cfb96647dff6241310ee;p=plomrogue diff --git a/src/client/world.h b/src/client/world.h index d27a0a3..5c80143 100644 --- a/src/client/world.h +++ b/src/client/world.h @@ -1,4 +1,8 @@ /* src/client/world.h + * + * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3 + * or any later version. For details on its copyright, license, and warranties, + * see the file NOTICE in the root directory of the PlomRogue source package. * * Contains the World struct holding all quasi-global game data together. */ @@ -9,7 +13,7 @@ #include /* uint8_t, uint16_t */ #include /* FILE */ #include /* time_t */ -#include "map.h" /* struct Map */ +#include "../common/map.h" /* struct Map */ #include "../common/yx_uint8.h" /* struct yx_uint8 */ #include "keybindings.h" /* stuct KeyBindingDB */ #include "command_db.h" /* struct CommandDB */ @@ -26,19 +30,28 @@ struct World 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 */ + struct Map map; /* game map geometry and content of player's map view */ time_t last_update; /* used for comparison with worldstate file's mtime */ char * log; /* log of player's activities */ + char * things_here; /* list of things below the player */ char * path_interface; /* 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 */ - char * delim; /* delimiter for multi-line blocks in config files */ + char * mem_map; /* map cells of player's map memory */ + char * meta_map_0; /* map cells metadata */ // 7DRL + char * meta_map_1; /* map cells metadata */ // 7DRL + char * queue; /* stores un-processed messages read from the input file */ struct yx_uint8 player_pos; /* coordinates of player on map */ + struct yx_uint8 look_pos; /* coordinates of look cursor */ uint16_t turn; /* world/game turn */ - uint8_t halfdelay; /* how long to wait for getch() input in io_loop() */ + uint16_t things_here_scroll; /* scroll position things here win */ // 7DRL + int16_t player_satiation; /* player's belly fullness */ + int16_t godsmood; /* island god's mood */ // 7DRL + int16_t godsfavor; /* island god's favor to player */ // 7DRL 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()*/ + uint8_t look; /* if set, move look cursor over map intead of player */ };