- Mercenary Packets (Server to Client). Still need a little more info.

- Packet for Mercenary Menu.
- Some other progress as creation but need more code.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13116 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 9 insertions, 2 deletions

diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index 51fdea787..a56ecf628 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -16,9 +16,10 @@ struct s_mercenary_db {
 	unsigned short lv;
 	short range2, range3;
 	struct status_data status;
+	struct view_data vd;
 	struct {
 		unsigned short id, lv;
-	} skill[MAX_MERCENARY_SKILL];
+	} skill[MAX_MERCSKILL];
 };
 
 extern struct s_mercenary_db mercenary_db[MAX_MERCENARY_CLASS];
@@ -27,14 +28,20 @@ struct mercenary_data {
 	struct block_list bl;
 	struct unit_data ud;
 	struct view_data *vd;
-	struct status_change *base_status, battle_status;
+	struct status_data *base_status, battle_status;
 	struct status_change sc;
 	struct regen_data regen;
 
 	struct s_mercenary_db *db;
 	struct s_mercenary mercenary;
+
+	struct map_session_data *master; // Master of mercenary
 };
 
+bool merc_class(int class_);
+struct view_data * merc_get_viewdata(int class_);
+int merc_data_received(struct s_mercenary *merc, bool flag);
+
 // Homunculus DB Structures
 // ===================================