summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-02-20 03:00:09 +0100
committerHaru <haru@dotalux.com>2016-03-20 18:32:07 +0100
commit13dcf1e6c32b672e72f70a6cdbb42b4c3a2df3d8 (patch)
tree28d87e3e5219d5beb5e2dcf0f714e27184818940 /src/map/script.c
parent68c5122499f0cc2f4ce224c1ac82b6ec47d6abbe (diff)
downloadhercules-13dcf1e6c32b672e72f70a6cdbb42b4c3a2df3d8.tar.gz
hercules-13dcf1e6c32b672e72f70a6cdbb42b4c3a2df3d8.tar.bz2
hercules-13dcf1e6c32b672e72f70a6cdbb42b4c3a2df3d8.tar.xz
hercules-13dcf1e6c32b672e72f70a6cdbb42b4c3a2df3d8.zip
Dropped typedefs from union DBKey and struct DBData
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/map/script.c b/src/map/script.c
index aeff221d4..bb6651ca5 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -3052,7 +3052,8 @@ unsigned int script_array_highest_key(struct script_state *st, struct map_sessio
}
return 0;
}
-int script_free_array_db(DBKey key, DBData *data, va_list ap) {
+int script_free_array_db(union DBKey key, struct DBData *data, va_list ap)
+{
struct script_array *sa = DB->data2ptr(data);
aFree(sa->members);
ers_free(script->array_ers, sa);
@@ -4595,7 +4596,7 @@ int script_config_read(char *cfgName) {
/**
* @see DBApply
*/
-int db_script_free_code_sub(DBKey key, DBData *data, va_list ap)
+int db_script_free_code_sub(union DBKey key, struct DBData *data, va_list ap)
{
struct script_code *code = DB->data2ptr(data);
if (code)
@@ -4671,7 +4672,8 @@ void script_setarray_pc(struct map_session_data* sd, const char* varname, uint32
/**
* Clears persistent variables from memory
**/
-int script_reg_destroy(DBKey key, DBData *data, va_list ap) {
+int script_reg_destroy(union DBKey key, struct DBData *data, va_list ap)
+{
struct script_reg_state *src;
if( data->type != DB_DATA_PTR )/* got no need for those! */
@@ -5130,7 +5132,8 @@ void script_clear_translations(bool reload) {
/**
*
**/
-int script_translation_db_destroyer(DBKey key, DBData *data, va_list ap) {
+int script_translation_db_destroyer(union DBKey key, struct DBData *data, va_list ap)
+{
DBMap *string_db = DB->data2ptr(data);
if( db_size(string_db) ) {