diff options
| author | Haru <haru@dotalux.com> | 2018-07-24 05:22:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 05:22:42 +0200 |
| commit | 1f1b82f737809a44aaabb98499293aa75eee8125 (patch) | |
| tree | ddbe3ee0b93db54a5febe237524bdf4823596911 /src/map/map.h | |
| parent | 019f60feb9272ac5a527c8cdb430c2328108417c (diff) | |
| parent | 90f7ef5dfb75ba3d819a4ac93518ebeadcfe7cc5 (diff) | |
| download | hercules-1f1b82f737809a44aaabb98499293aa75eee8125.tar.gz hercules-1f1b82f737809a44aaabb98499293aa75eee8125.tar.bz2 hercules-1f1b82f737809a44aaabb98499293aa75eee8125.tar.xz hercules-1f1b82f737809a44aaabb98499293aa75eee8125.zip | |
Merge pull request #2107 from Asheraf/questinfo_vec
Questinfo System overhaul
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/map/map.h b/src/map/map.h index d6779ca91..04525b4d5 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -773,14 +773,31 @@ struct map_drop_list { int drop_per; }; +struct questinfo_qreq { + int id; + int state; +}; struct questinfo { struct npc_data *nd; unsigned short icon; unsigned char color; - int quest_id; bool hasJob; unsigned short job;/* perhaps a mapid mask would be most flexible? */ + bool sex_enabled; + int sex; + struct { + int min; + int max; + } base_level; + struct { + int min; + int max; + } job_level; + VECTOR_DECL(struct item) items; + struct s_homunculus homunculus; + int homunculus_type; + VECTOR_DECL(struct questinfo_qreq) quest_requirement; }; @@ -922,8 +939,7 @@ struct map_data { } cell_buf; /* ShowEvent Data Cache */ - struct questinfo *qi_data; - unsigned short qi_count; + VECTOR_DECL(struct questinfo) qi_data; /* speeds up clif_updatestatus processing by causing hpmeter to run only when someone with the permission can view it */ unsigned short hpmeter_visible; |