X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmain.h;h=5ef6a0e963d550cb9dcc3b22d3031d20316db4c4;hb=3a4e6fcaf5e774cda536d46e10287fcf8a1dfe85;hp=a2900997a76873ec6a66ab7b87fd2eb8050bb418;hpb=fb8ddca6abc66eb7e52a007850689309b4cda938;p=plomrogue diff --git a/src/main.h b/src/main.h index a290099..5ef6a0e 100644 --- a/src/main.h +++ b/src/main.h @@ -6,16 +6,14 @@ #ifndef MAIN_H #define MAIN_H - - #include /* for uint32_t*/ -#include "keybindings.h" +#include "keybindings.h" /* for KeyBiData struct */ struct WinMeta; struct WinConf; -struct Win; struct Map; struct MapObjDef; struct MapObj; +struct MapObjAct; @@ -26,6 +24,7 @@ struct World struct KeyBiData kb_wingeom; /* Window geometry config keybindings. */ struct KeyBiData kb_winkeys; /* Window keybinding config keybindings.*/ uint32_t seed; /* Randomness seed. */ + uint32_t mapseed; /* Initial randomness seed used for map.*/ uint32_t turn; /* Current game turn. */ uint16_t score; /* Player's score. */ char * log; /* Pointer to the game log string. */ @@ -34,11 +33,12 @@ struct World struct WinMeta * wmeta; /* Pointer to window manager's WinMeta. */ struct WinConf * winconfs; /* Pointer to windows' configurations. */ char * winconf_ids; /* Pointer to string of Winconfs' ids. */ - struct Player * player; /* Pointer to the player data. */ uint8_t map_obj_count; /* Counts map objects generated so far. */ struct MapObjDef * map_obj_defs; /* Map object type definitions chain. */ - struct MapObj * map_objs; /* Map objects chain. */ -}; + struct MapObj * map_objs; /* Pointer to map objects chain start. */ + uint8_t inventory_select; /* Player's inventory selection index. */ + struct MapObjAct * map_obj_acts; /* Pointer to map object actions chain. */ +} world;