diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-24 22:45:32 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-24 22:45:32 +0000 |
| commit | 9bf4c93d86a081c0c1254613d5115e8210e035ec (patch) | |
| tree | 7047ed6cbdfca59eb5860e42dc9a5fbc1c9245c3 /src/map/mercenary.h | |
| parent | 2600d527592c3e5c6ed6ab827ce69c24f3c6b35b (diff) | |
| download | hercules-9bf4c93d86a081c0c1254613d5115e8210e035ec.tar.gz hercules-9bf4c93d86a081c0c1254613d5115e8210e035ec.tar.bz2 hercules-9bf4c93d86a081c0c1254613d5115e8210e035ec.tar.xz hercules-9bf4c93d86a081c0c1254613d5115e8210e035ec.zip | |
- Implemented Mercenary Scrolls (item_db)
- There are some little problems, like remaining time going to 0, but you can summon it, make it walk, follow you.
- Feel free to test it.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13126 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.h')
| -rw-r--r-- | src/map/mercenary.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h index 3bca79485..bc2046dc7 100644 --- a/src/map/mercenary.h +++ b/src/map/mercenary.h @@ -32,7 +32,8 @@ struct mercenary_data { struct s_mercenary_db *db; struct s_mercenary mercenary; - struct map_session_data *master; // Master of mercenary + struct map_session_data *master; + int contract_timer; }; bool merc_class(int class_); @@ -41,5 +42,7 @@ int merc_create(struct map_session_data *sd, int class_, unsigned int lifetime); int merc_data_received(struct s_mercenary *merc, bool flag); int mercenary_save(struct mercenary_data *md); int do_init_mercenary(void); +int merc_delete(struct mercenary_data *md, int reply); +void merc_contract_stop(struct mercenary_data *md); #endif /* _MERCENARY_H_ */ |