summaryrefslogtreecommitdiff
path: root/src/map/mercenary.h
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-22 18:53:11 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-22 18:53:11 +0000
commit507d5f485deddbd551d844aefb5c6646ad18b461 (patch)
treede1c61b30e8f77d801aa1b6e46f310e46d26253d /src/map/mercenary.h
parentdb0184a272d0fbb1b09d4eba6527181b85890357 (diff)
downloadhercules-507d5f485deddbd551d844aefb5c6646ad18b461.tar.gz
hercules-507d5f485deddbd551d844aefb5c6646ad18b461.tar.bz2
hercules-507d5f485deddbd551d844aefb5c6646ad18b461.tar.xz
hercules-507d5f485deddbd551d844aefb5c6646ad18b461.zip
- Mercenary data structures.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13110 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.h')
-rw-r--r--src/map/mercenary.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index 726fae4e4..51fdea787 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -23,6 +23,18 @@ struct s_mercenary_db {
extern struct s_mercenary_db mercenary_db[MAX_MERCENARY_CLASS];
+struct mercenary_data {
+ struct block_list bl;
+ struct unit_data ud;
+ struct view_data *vd;
+ struct status_change *base_status, battle_status;
+ struct status_change sc;
+ struct regen_data regen;
+
+ struct s_mercenary_db *db;
+ struct s_mercenary mercenary;
+};
+
// Homunculus DB Structures
// ===================================
@@ -58,7 +70,7 @@ struct homun_data {
struct status_change sc;
struct regen_data regen;
struct s_homunculus_db *homunculusDB; //[orn]
- struct s_homunculus homunculus ; //[orn]
+ struct s_homunculus homunculus; //[orn]
struct map_session_data *master; //pointer back to its master
int hungry_timer; //[orn]