Update plugin for new hercules.

6 files changed, 12 insertions, 10 deletions

diff --git a/src/echar/char.c b/src/echar/char.c
index 965fd35..205f703 100644
--- a/src/echar/char.c
+++ b/src/echar/char.c
@@ -13,6 +13,7 @@
 #include "common/mmo.h"
 #include "common/socket.h"
 #include "common/strlib.h"
+#include "common/sql.h"
 #include "common/timer.h"
 #include "char/char.h"
 #include "char/inter.h"
@@ -225,7 +226,7 @@ void send_additional_slots(int fd, struct char_session_data* sd)
     if (!sd || sd->version < 9)
         return;
 
-    SqlStmt* stmt = SQL->StmtMalloc(inter->sql_handle);
+    struct SqlStmt* stmt = SQL->StmtMalloc(inter->sql_handle);
     if (stmt == NULL)
     {
         SqlStmt_ShowDebug(stmt);
diff --git a/src/echar/init.c b/src/echar/init.c
index 10d18eb..c8cf58a 100644
--- a/src/echar/init.c
+++ b/src/echar/init.c
@@ -13,6 +13,7 @@
 #include "common/mmo.h"
 #include "common/socket.h"
 #include "common/strlib.h"
+#include "common/sql.h"
 #include "common/timer.h"
 #include "char/char.h"
 #include "char/geoip.h"
diff --git a/src/emap/craft.c b/src/emap/craft.c
index 59ebfa0..87310e5 100644
--- a/src/emap/craft.c
+++ b/src/emap/craft.c
@@ -47,8 +47,8 @@ static void delete_craft_var(struct craft_vardata *craft)
     }
 }
 
-static int delete_craftvar_sub(DBKey key __attribute__ ((unused)),
-                               DBData *data,
+static int delete_craftvar_sub(union DBKey key __attribute__ ((unused)),
+                               struct DBData *data,
                                va_list args __attribute__ ((unused)))
 {
     struct craft_vardata *craft = DB->data2ptr(data);
@@ -665,7 +665,7 @@ static int craft_get_recipe(TBL_PC *sd,
 
     init_inventory_copy(sd, &local_inventory[0]);
 
-    DBIterator* iter = db_iterator(craftconf_db);
+    struct DBIterator* iter = db_iterator(craftconf_db);
 
     for (entry = dbi_first(iter); dbi_exists(iter); entry = dbi_next(iter))
     {
diff --git a/src/emap/craftconf.c b/src/emap/craftconf.c
index f4e52bd..89b31ea 100644
--- a/src/emap/craftconf.c
+++ b/src/emap/craftconf.c
@@ -422,8 +422,8 @@ static void delete_craft_entry(struct craft_db_entry *entry)
     VECTOR_CLEAR(entry->create_items);
 }
 
-static int delete_craftconf_sub(DBKey key __attribute__ ((unused)),
-                                DBData *data,
+static int delete_craftconf_sub(union DBKey key __attribute__ ((unused)),
+                                struct DBData *data,
                                 va_list args __attribute__ ((unused)))
 {
     struct craft_db_entry *craft = DB->data2ptr(data);
diff --git a/src/emap/lang.c b/src/emap/lang.c
index 2cd838e..9952c3a 100644
--- a/src/emap/lang.c
+++ b/src/emap/lang.c
@@ -37,8 +37,8 @@ void do_init_langs (void)
     langsdb_readdb ();
 }
 
-static int delete_lang_sub(DBKey key __attribute__ ((unused)),
-                           DBData *data,
+static int delete_lang_sub(union DBKey key __attribute__ ((unused)),
+                           struct DBData *data,
                            va_list args __attribute__ ((unused)))
 {
     int f;
diff --git a/src/emap/map.c b/src/emap/map.c
index 4392132..428853d 100644
--- a/src/emap/map.c
+++ b/src/emap/map.c
@@ -122,7 +122,7 @@ void emap_online_list(int fd)
     const int gpoupLevel = pc_get_group_level(ssd);
     data1->onlinelistlasttime = t;
 
-    DBIterator* iter = db_iterator(map->pc_db);
+    struct DBIterator* iter = db_iterator(map->pc_db);
 
     for (sd = dbi_first(iter); dbi_exists(iter); sd = dbi_next(iter))
     {
@@ -412,7 +412,7 @@ void emap_iwall_get(struct map_session_data *sd)
         return;
     }
 
-    DBIterator* iter = db_iterator(map->iwall_db);
+    struct DBIterator* iter = db_iterator(map->iwall_db);
     struct WallData *wall;
     for (wall = dbi_first(iter); dbi_exists(iter); wall = dbi_next(iter))
     {