Add most functions from int_mercenary.c to interfaces.

1 files changed, 10 insertions, 8 deletions

diff --git a/src/char/int_mercenary.h b/src/char/int_mercenary.h
index 504b2fca6..1d84a931a 100644
--- a/src/char/int_mercenary.h
+++ b/src/char/int_mercenary.h
@@ -8,15 +8,17 @@
 
 struct mmo_charstatus;
 
-int inter_mercenary_sql_init(void);
-void inter_mercenary_sql_final(void);
-int inter_mercenary_parse_frommap(int fd);
+void inter_mercenary_defaults(void);
 
-// Mercenary Owner Database
-bool inter_mercenary_owner_fromsql(int char_id, struct mmo_charstatus *status);
-bool inter_mercenary_owner_tosql(int char_id, struct mmo_charstatus *status);
-bool inter_mercenary_owner_delete(int char_id);
+struct inter_mercenary_interface {
+    bool (*owner_fromsql) (int char_id, struct mmo_charstatus *status);
+    bool (*owner_tosql) (int char_id, struct mmo_charstatus *status);
+    bool (*owner_delete) (int char_id);
+    int (*sql_init) (void);
+    void (*sql_final) (void);
+    int (*parse_frommap) (int fd);
+};
 
-bool mapif_mercenary_delete(int merc_id);
+struct inter_mercenary_interface *inter_mercenary;
 
 #endif /* CHAR_INT_MERCENARY_H */