1 files changed, 243 insertions, 175 deletions

diff --git a/src/char/int_storage.c b/src/char/int_storage.c
index e46a1c80f..d82440270 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.c
@@ -2,8 +2,8 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2012-2015  Hercules Dev Team
- * Copyright (C)  Athena Dev Teams
+ * Copyright (C) 2012-2020 Hercules Dev Team
+ * Copyright (C) Athena Dev Teams
  *
  * Hercules is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,34 +37,154 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-struct inter_storage_interface inter_storage_s;
+static struct inter_storage_interface inter_storage_s;
 struct inter_storage_interface *inter_storage;
 
 /// Save storage data to sql
-int inter_storage_tosql(int account_id, struct storage_data* p)
+static int inter_storage_tosql(int account_id, const struct storage_data *p)
 {
+	int i = 0, j = 0;
+	bool matched_p[MAX_STORAGE] = { false };
+	int delete[MAX_STORAGE] = { 0 };
+	int total_deletes = 0, total_updates = 0, total_inserts = 0;
+	int total_changes = 0;
+	struct storage_data cp = { 0 };
+	StringBuf buf;
+
 	nullpo_ret(p);
-	chr->memitemdata_to_sql(p->items, MAX_STORAGE, account_id, TABLE_STORAGE);
-	return 0;
+
+	VECTOR_INIT(cp.item);
+	inter_storage->fromsql(account_id, &cp);
+
+	StrBuf->Init(&buf);
+
+	if (VECTOR_LENGTH(cp.item) > 0) {
+		/**
+		 * Compare and update items, if any.
+		 */
+		for (i = 0; i < VECTOR_LENGTH(cp.item); i++) {
+			struct item *cp_it = &VECTOR_INDEX(cp.item, i);
+			struct item *p_it = NULL;
+
+			ARR_FIND(0, VECTOR_LENGTH(p->item), j,
+					 matched_p[j] != true
+					 && (p_it = &VECTOR_INDEX(p->item, j)) != NULL
+					 && cp_it->nameid == p_it->nameid
+					 && cp_it->unique_id == p_it->unique_id
+					 && memcmp(p_it->card, cp_it->card, sizeof(int) * MAX_SLOTS) == 0
+					 && memcmp(p_it->option, cp_it->option, 5 * MAX_ITEM_OPTIONS) == 0);
+
+			if (j < VECTOR_LENGTH(p->item)) {
+				int k = 0;
+				if (memcmp(cp_it, p_it, sizeof(struct item)) != 0) {
+					if (total_updates == 0) {
+						StrBuf->Printf(&buf, "REPLACE INTO `%s` (`id`, `account_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`", storage_db);
+						for (k = 0; k < MAX_SLOTS; k++)
+							StrBuf->Printf(&buf, ", `card%d`", k);
+						for (k = 0; k < MAX_ITEM_OPTIONS; k++)
+							StrBuf->Printf(&buf, ", `opt_idx%d`, `opt_val%d`", k, k);
+						StrBuf->AppendStr(&buf, ", `expire_time`, `bound`, `unique_id`) VALUES");
+					}
+
+					StrBuf->Printf(&buf, "%s('%d', '%d', '%d', '%d', '%u', '%d', '%d', '%d'",
+								   total_updates > 0 ? ", " : "", cp_it->id, account_id, p_it->nameid, p_it->amount, p_it->equip, p_it->identify, p_it->refine, p_it->attribute);
+					for (k = 0; k < MAX_SLOTS; k++)
+						StrBuf->Printf(&buf, ", '%d'", p_it->card[k]);
+					for (k = 0; k < MAX_ITEM_OPTIONS; ++k)
+						StrBuf->Printf(&buf, ", '%d', '%d'", p_it->option[k].index, p_it->option[k].value);
+					StrBuf->Printf(&buf, ", '%u', '%d', '%"PRIu64"')", p_it->expire_time, p_it->bound, p_it->unique_id);
+
+					total_updates++;
+				}
+				matched_p[j] = true;
+			} else { // Does not exist, so set for deletion.
+				delete[total_deletes++] = cp_it->id;
+			}
+		}
+
+		if (total_updates > 0 && SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf)))
+			Sql_ShowDebug(inter->sql_handle);
+
+		/**
+		 * Handle deletions, if any.
+		 */
+		if (total_deletes > 0) {
+			StrBuf->Clear(&buf);
+			StrBuf->Printf(&buf, "DELETE FROM `%s` WHERE `id` IN (", storage_db);
+			for (i = 0; i < total_deletes; i++) {
+				StrBuf->Printf(&buf, "%s'%d'", i == 0 ? "" : ", ", delete[i]);
+			}
+			StrBuf->AppendStr(&buf, ");");
+
+			if (SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf)))
+				Sql_ShowDebug(inter->sql_handle);
+		}
+	}
+
+	/**
+	 * Check for new items.
+	 */
+	for (i = 0; i < VECTOR_LENGTH(p->item); i++) {
+		struct item *p_it = &VECTOR_INDEX(p->item, i);
+
+		if (matched_p[i])
+			continue; // Item is not a new entry, so lets continue.
+
+		// Store the remaining items.
+		if (total_inserts == 0) {
+			StrBuf->Clear(&buf);
+			StrBuf->Printf(&buf, "INSERT INTO `%s` (`account_id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `bound`, `unique_id`", storage_db);
+			for (j = 0; j < MAX_SLOTS; ++j)
+				StrBuf->Printf(&buf, ", `card%d`", j);
+			for (j = 0; j < MAX_ITEM_OPTIONS; ++j)
+				StrBuf->Printf(&buf, ", `opt_idx%d`, `opt_val%d`", j, j);
+			StrBuf->AppendStr(&buf, ") VALUES ");
+		}
+
+		StrBuf->Printf(&buf, "%s('%d', '%d', '%d', '%u', '%d', '%d', '%d', '%u', '%d', '%"PRIu64"'",
+					   total_inserts > 0 ? ", " : "", account_id, p_it->nameid, p_it->amount, p_it->equip, p_it->identify, p_it->refine,
+					   p_it->attribute, p_it->expire_time, p_it->bound, p_it->unique_id);
+		for (j = 0; j < MAX_SLOTS; ++j)
+			StrBuf->Printf(&buf, ", '%d'", p_it->card[j]);
+		for (j = 0; j < MAX_ITEM_OPTIONS; ++j)
+			StrBuf->Printf(&buf, ", '%d', '%d'", p_it->option[j].index, p_it->option[j].value);
+		StrBuf->AppendStr(&buf, ")");
+
+		total_inserts++;
+	}
+
+	if (total_inserts > 0 && SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf)))
+		Sql_ShowDebug(inter->sql_handle);
+
+	StrBuf->Destroy(&buf);
+	VECTOR_CLEAR(cp.item);
+
+	total_changes = total_inserts + total_updates + total_deletes;
+	ShowInfo("storage save complete - id: %d (total: %d)\n", account_id, total_changes);
+	return total_changes;
 }
 
 /// Load storage data to mem
-int inter_storage_fromsql(int account_id, struct storage_data* p)
+static int inter_storage_fromsql(int account_id, struct storage_data *p)
 {
 	StringBuf buf;
 	char* data;
 	int i;
 	int j;
+	int num_rows = 0;
 
 	nullpo_ret(p);
-	memset(p, 0, sizeof(struct storage_data)); //clean up memory
-	p->storage_amount = 0;
+
+	if (VECTOR_LENGTH(p->item) > 0)
+		VECTOR_CLEAR(p->item);
 
 	// storage {`account_id`/`id`/`nameid`/`amount`/`equip`/`identify`/`refine`/`attribute`/`card0`/`card1`/`card2`/`card3`}
 	StrBuf->Init(&buf);
 	StrBuf->AppendStr(&buf, "SELECT `id`,`nameid`,`amount`,`equip`,`identify`,`refine`,`attribute`,`expire_time`,`bound`,`unique_id`");
-	for( j = 0; j < MAX_SLOTS; ++j )
+	for (j = 0; j < MAX_SLOTS; ++j)
 		StrBuf->Printf(&buf, ",`card%d`", j);
+	for (j = 0; j < MAX_ITEM_OPTIONS; ++j)
+		StrBuf->Printf(&buf, ",`opt_idx%d`,`opt_val%d`", j, j);
 	StrBuf->Printf(&buf, " FROM `%s` WHERE `account_id`='%d' ORDER BY `nameid`", storage_db, account_id);
 
 	if (SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf)))
@@ -72,41 +192,70 @@ int inter_storage_fromsql(int account_id, struct storage_data* p)
 
 	StrBuf->Destroy(&buf);
 
-	for (i = 0; i < MAX_STORAGE && SQL_SUCCESS == SQL->NextRow(inter->sql_handle); ++i) {
-		struct item *item = &p->items[i];
-		SQL->GetData(inter->sql_handle, 0, &data, NULL); item->id = atoi(data);
-		SQL->GetData(inter->sql_handle, 1, &data, NULL); item->nameid = atoi(data);
-		SQL->GetData(inter->sql_handle, 2, &data, NULL); item->amount = atoi(data);
-		SQL->GetData(inter->sql_handle, 3, &data, NULL); item->equip = atoi(data);
-		SQL->GetData(inter->sql_handle, 4, &data, NULL); item->identify = atoi(data);
-		SQL->GetData(inter->sql_handle, 5, &data, NULL); item->refine = atoi(data);
-		SQL->GetData(inter->sql_handle, 6, &data, NULL); item->attribute = atoi(data);
-		SQL->GetData(inter->sql_handle, 7, &data, NULL); item->expire_time = (unsigned int)atoi(data);
-		SQL->GetData(inter->sql_handle, 8, &data, NULL); item->bound = atoi(data);
-		SQL->GetData(inter->sql_handle, 9, &data, NULL); item->unique_id = strtoull(data, NULL, 10);
-		for( j = 0; j < MAX_SLOTS; ++j )
-		{
-			SQL->GetData(inter->sql_handle, 10+j, &data, NULL); item->card[j] = atoi(data);
+	if ((num_rows = (int)SQL->NumRows(inter->sql_handle)) != 0) {
+
+		VECTOR_ENSURE(p->item, num_rows > MAX_STORAGE ? MAX_STORAGE : num_rows, 1);
+
+		for (i = 0; i < MAX_STORAGE && SQL_SUCCESS == SQL->NextRow(inter->sql_handle); ++i) {
+			struct item item = { 0 };
+			SQL->GetData(inter->sql_handle, 0, &data, NULL); item.id = atoi(data);
+			SQL->GetData(inter->sql_handle, 1, &data, NULL); item.nameid = atoi(data);
+			SQL->GetData(inter->sql_handle, 2, &data, NULL); item.amount = atoi(data);
+			SQL->GetData(inter->sql_handle, 3, &data, NULL); item.equip = atoi(data);
+			SQL->GetData(inter->sql_handle, 4, &data, NULL); item.identify = atoi(data);
+			SQL->GetData(inter->sql_handle, 5, &data, NULL); item.refine = atoi(data);
+			SQL->GetData(inter->sql_handle, 6, &data, NULL); item.attribute = atoi(data);
+			SQL->GetData(inter->sql_handle, 7, &data, NULL); item.expire_time = (unsigned int)atoi(data);
+			SQL->GetData(inter->sql_handle, 8, &data, NULL); item.bound = atoi(data);
+			SQL->GetData(inter->sql_handle, 9, &data, NULL); item.unique_id = strtoull(data, NULL, 10);
+
+			/* Card Slots */
+			for (j = 0; j < MAX_SLOTS; ++j) {
+				SQL->GetData(inter->sql_handle, 10 + j, &data, NULL);
+				item.card[j] = atoi(data);
+			}
+
+			/* Item Options */
+			for (j = 0; j < MAX_ITEM_OPTIONS; ++j) {
+				SQL->GetData(inter->sql_handle, 10 + MAX_SLOTS + j * 2, &data, NULL);
+				item.option[j].index = atoi(data);
+				SQL->GetData(inter->sql_handle, 11 + MAX_SLOTS + j * 2, &data, NULL);
+				item.option[j].value = atoi(data);
+			}
+
+			VECTOR_PUSH(p->item, item);
 		}
 	}
-	p->storage_amount = i;
+
 	SQL->FreeResult(inter->sql_handle);
 
-	ShowInfo("storage load complete from DB - id: %d (total: %d)\n", account_id, p->storage_amount);
-	return 1;
+	ShowInfo("storage load complete from DB - id: %d (total: %d)\n", account_id, VECTOR_LENGTH(p->item));
+
+	return VECTOR_LENGTH(p->item);
 }
 
 /// Save guild_storage data to sql
-int inter_storage_guild_storage_tosql(int guild_id, const struct guild_storage *p)
+static bool inter_storage_guild_storage_tosql(int guild_id, const struct guild_storage *p)
 {
 	nullpo_ret(p);
-	chr->memitemdata_to_sql(p->items, MAX_GUILD_STORAGE, guild_id, TABLE_GUILD_STORAGE);
+
+	if (SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `guild_id` FROM `%s` WHERE `guild_id`='%d'", guild_db, guild_id)) {
+		Sql_ShowDebug(inter->sql_handle);
+		return false;
+	} else if (SQL->NumRows(inter->sql_handle) < 1) {
+		// guild doesn't exist
+		SQL->FreeResult(inter->sql_handle);
+		return false;
+	}
+	SQL->FreeResult(inter->sql_handle);
+
+	chr->memitemdata_to_sql(p->items, guild_id, TABLE_GUILD_STORAGE);
 	ShowInfo ("guild storage save to DB - guild: %d\n", guild_id);
-	return 0;
+	return true;
 }
 
 /// Load guild_storage data to mem
-int inter_storage_guild_storage_fromsql(int guild_id, struct guild_storage* p)
+static int inter_storage_guild_storage_fromsql(int guild_id, struct guild_storage* p)
 {
 	StringBuf buf;
 	char* data;
@@ -121,8 +270,10 @@ int inter_storage_guild_storage_fromsql(int guild_id, struct guild_storage* p)
 	// storage {`guild_id`/`id`/`nameid`/`amount`/`equip`/`identify`/`refine`/`attribute`/`card0`/`card1`/`card2`/`card3`}
 	StrBuf->Init(&buf);
 	StrBuf->AppendStr(&buf, "SELECT `id`,`nameid`,`amount`,`equip`,`identify`,`refine`,`attribute`,`bound`,`unique_id`");
-	for( j = 0; j < MAX_SLOTS; ++j )
+	for (j = 0; j < MAX_SLOTS; ++j)
 		StrBuf->Printf(&buf, ",`card%d`", j);
+	for (j = 0; j < MAX_ITEM_OPTIONS; ++j)
+		StrBuf->Printf(&buf, ", `opt_idx%d`, `opt_val%d`", j, j);
 	StrBuf->Printf(&buf, " FROM `%s` WHERE `guild_id`='%d' ORDER BY `nameid`", guild_storage_db, guild_id);
 
 	if( SQL_ERROR == SQL->QueryStr(inter->sql_handle, StrBuf->Value(&buf)))
@@ -142,9 +293,17 @@ int inter_storage_guild_storage_fromsql(int guild_id, struct guild_storage* p)
 		SQL->GetData(inter->sql_handle, 7, &data, NULL); item->bound = atoi(data);
 		SQL->GetData(inter->sql_handle, 8, &data, NULL); item->unique_id = strtoull(data, NULL, 10);
 		item->expire_time = 0;
-
-		for( j = 0; j < MAX_SLOTS; ++j ) {
-			SQL->GetData(inter->sql_handle, 9+j, &data, NULL); item->card[j] = atoi(data);
+		/* Card Slots */
+		for (j = 0; j < MAX_SLOTS; ++j) {
+			SQL->GetData(inter->sql_handle, 9 + j, &data, NULL);
+			item->card[j] = atoi(data);
+		}
+		/* Item Options */
+		for (j = 0; j < MAX_ITEM_OPTIONS; ++j) {
+			SQL->GetData(inter->sql_handle, 9 + MAX_SLOTS + j * 2, &data, NULL);
+			item->option[j].index = atoi(data);
+			SQL->GetData(inter->sql_handle, 10 + MAX_SLOTS + j * 2, &data, NULL);
+			item->option[j].value = atoi(data);
 		}
 	}
 	p->storage_amount = i;
@@ -156,124 +315,35 @@ int inter_storage_guild_storage_fromsql(int guild_id, struct guild_storage* p)
 
 //---------------------------------------------------------
 // storage data initialize
-int inter_storage_sql_init(void)
+static int inter_storage_sql_init(void)
 {
 	return 1;
 }
 // storage data finalize
-void inter_storage_sql_final(void)
+static void inter_storage_sql_final(void)
 {
 	return;
 }
 
 // q?f[^?
-int inter_storage_delete(int account_id)
+static int inter_storage_delete(int account_id)
 {
 	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `account_id`='%d'", storage_db, account_id) )
 		Sql_ShowDebug(inter->sql_handle);
 	return 0;
 }
-int inter_storage_guild_storage_delete(int guild_id)
+static int inter_storage_guild_storage_delete(int guild_id)
 {
 	if( SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `guild_id`='%d'", guild_storage_db, guild_id) )
 		Sql_ShowDebug(inter->sql_handle);
 	return 0;
 }
 
-//---------------------------------------------------------
-// packet from map server
-
-int mapif_load_guild_storage(int fd, int account_id, int guild_id, char flag)
-{
-	if( SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `guild_id` FROM `%s` WHERE `guild_id`='%d'", guild_db, guild_id) )
-		Sql_ShowDebug(inter->sql_handle);
-	else if( SQL->NumRows(inter->sql_handle) > 0 )
-	{// guild exists
-		WFIFOHEAD(fd, sizeof(struct guild_storage)+13);
-		WFIFOW(fd,0) = 0x3818;
-		WFIFOW(fd,2) = sizeof(struct guild_storage)+13;
-		WFIFOL(fd,4) = account_id;
-		WFIFOL(fd,8) = guild_id;
-		WFIFOB(fd,12) = flag; //1 open storage, 0 don't open
-		inter_storage->guild_storage_fromsql(guild_id, WFIFOP(fd,13));
-		WFIFOSET(fd, WFIFOW(fd,2));
-		return 0;
-	}
-	// guild does not exist
-	SQL->FreeResult(inter->sql_handle);
-	WFIFOHEAD(fd, 12);
-	WFIFOW(fd,0) = 0x3818;
-	WFIFOW(fd,2) = 12;
-	WFIFOL(fd,4) = account_id;
-	WFIFOL(fd,8) = 0;
-	WFIFOSET(fd, 12);
-	return 0;
-}
-int mapif_save_guild_storage_ack(int fd, int account_id, int guild_id, int fail)
-{
-	WFIFOHEAD(fd,11);
-	WFIFOW(fd,0)=0x3819;
-	WFIFOL(fd,2)=account_id;
-	WFIFOL(fd,6)=guild_id;
-	WFIFOB(fd,10)=fail;
-	WFIFOSET(fd,11);
-	return 0;
-}
-
-//---------------------------------------------------------
-// packet from map server
-
-int mapif_parse_LoadGuildStorage(int fd)
-{
-	RFIFOHEAD(fd);
-	mapif->load_guild_storage(fd,RFIFOL(fd,2),RFIFOL(fd,6),1);
-	return 0;
-}
-
-int mapif_parse_SaveGuildStorage(int fd)
-{
-	int guild_id;
-	int len;
-
-	RFIFOHEAD(fd);
-	guild_id = RFIFOL(fd,8);
-	len = RFIFOW(fd,2);
-
-	if (sizeof(struct guild_storage) != len - 12) {
-		ShowError("inter storage: data size mismatch: %d != %"PRIuS"\n", len - 12, sizeof(struct guild_storage));
-	} else {
-		if (SQL_ERROR == SQL->Query(inter->sql_handle, "SELECT `guild_id` FROM `%s` WHERE `guild_id`='%d'", guild_db, guild_id)) {
-			Sql_ShowDebug(inter->sql_handle);
-		} else if(SQL->NumRows(inter->sql_handle) > 0) {
-			// guild exists
-			SQL->FreeResult(inter->sql_handle);
-			inter_storage->guild_storage_tosql(guild_id, RFIFOP(fd,12));
-			mapif->save_guild_storage_ack(fd, RFIFOL(fd,4), guild_id, 0);
-			return 0;
-		}
-		SQL->FreeResult(inter->sql_handle);
-	}
-	mapif->save_guild_storage_ack(fd, RFIFOL(fd,4), guild_id, 1);
-	return 0;
-}
-
-int mapif_itembound_ack(int fd, int aid, int guild_id)
-{
-#ifdef GP_BOUND_ITEMS
-	WFIFOHEAD(fd,8);
-	WFIFOW(fd,0) = 0x3856;
-	WFIFOL(fd,2) = aid;/* the value is not being used, drop? */
-	WFIFOW(fd,6) = guild_id;
-	WFIFOSET(fd,8);
-#endif
-	return 0;
-}
-
 //------------------------------------------------
 //Guild bound items pull for offline characters [Akinari]
 //Revised by [Mhalicot]
 //------------------------------------------------
-int mapif_parse_ItemBoundRetrieve_sub(int fd)
+static bool inter_storage_retrieve_bound_items(int char_id, int account_id, int guild_id)
 {
 #ifdef GP_BOUND_ITEMS
 	StringBuf buf;
@@ -282,14 +352,13 @@ int mapif_parse_ItemBoundRetrieve_sub(int fd)
 	int j, i=0, s=0, bound_qt=0;
 	struct item items[MAX_INVENTORY];
 	unsigned int bound_item[MAX_INVENTORY] = {0};
-	int char_id = RFIFOL(fd,2);
-	int aid = RFIFOL(fd,6);
-	int guild_id = RFIFOW(fd,10);
 
 	StrBuf->Init(&buf);
 	StrBuf->AppendStr(&buf, "SELECT `id`, `nameid`, `amount`, `equip`, `identify`, `refine`, `attribute`, `expire_time`, `bound`, `unique_id`");
-	for( j = 0; j < MAX_SLOTS; ++j )
+	for (j = 0; j < MAX_SLOTS; ++j)
 		StrBuf->Printf(&buf, ", `card%d`", j);
+	for (j = 0; j < MAX_ITEM_OPTIONS; ++j)
+		StrBuf->Printf(&buf, ", `opt_idx%d`, `opt_val%d`", j, j);
 	StrBuf->Printf(&buf, " FROM `%s` WHERE `char_id`='%d' AND `bound` = '%d'",inventory_db,char_id,IBT_GUILD);
 
 	stmt = SQL->StmtMalloc(inter->sql_handle);
@@ -299,34 +368,39 @@ int mapif_parse_ItemBoundRetrieve_sub(int fd)
 		Sql_ShowDebug(inter->sql_handle);
 		SQL->StmtFree(stmt);
 		StrBuf->Destroy(&buf);
-		return 1;
+		return false;
 	}
 
 	memset(&item, 0, sizeof(item));
-	SQL->StmtBindColumn(stmt, 0, SQLDT_INT,       &item.id,          0, NULL, NULL);
-	SQL->StmtBindColumn(stmt, 1, SQLDT_SHORT,     &item.nameid,      0, NULL, NULL);
-	SQL->StmtBindColumn(stmt, 2, SQLDT_SHORT,     &item.amount,      0, NULL, NULL);
-	SQL->StmtBindColumn(stmt, 3, SQLDT_USHORT,    &item.equip,       0, NULL, NULL);
-	SQL->StmtBindColumn(stmt, 4, SQLDT_CHAR,      &item.identify,    0, NULL, NULL);
-	SQL->StmtBindColumn(stmt, 5, SQLDT_CHAR,      &item.refine,      0, NULL, NULL);
-	SQL->StmtBindColumn(stmt, 6, SQLDT_CHAR,      &item.attribute,   0, NULL, NULL);
-	SQL->StmtBindColumn(stmt, 7, SQLDT_UINT,      &item.expire_time, 0, NULL, NULL);
-	SQL->StmtBindColumn(stmt, 8, SQLDT_UCHAR,     &item.bound,       0, NULL, NULL);
-	SQL->StmtBindColumn(stmt, 9, SQLDT_UINT64,    &item.unique_id,   0, NULL, NULL);
-	for( j = 0; j < MAX_SLOTS; ++j )
-		SQL->StmtBindColumn(stmt, 10+j, SQLDT_SHORT, &item.card[j], 0, NULL, NULL);
-
-	while( SQL_SUCCESS == SQL->StmtNextRow(stmt)) {
+	SQL->StmtBindColumn(stmt, 0, SQLDT_INT,       &item.id,          sizeof item.id,          NULL, NULL);
+	SQL->StmtBindColumn(stmt, 1, SQLDT_INT,       &item.nameid,      sizeof item.nameid,      NULL, NULL);
+	SQL->StmtBindColumn(stmt, 2, SQLDT_SHORT,     &item.amount,      sizeof item.amount,      NULL, NULL);
+	SQL->StmtBindColumn(stmt, 3, SQLDT_UINT,      &item.equip,       sizeof item.equip,       NULL, NULL);
+	SQL->StmtBindColumn(stmt, 4, SQLDT_CHAR,      &item.identify,    sizeof item.identify,    NULL, NULL);
+	SQL->StmtBindColumn(stmt, 5, SQLDT_CHAR,      &item.refine,      sizeof item.refine,      NULL, NULL);
+	SQL->StmtBindColumn(stmt, 6, SQLDT_CHAR,      &item.attribute,   sizeof item.attribute,   NULL, NULL);
+	SQL->StmtBindColumn(stmt, 7, SQLDT_UINT,      &item.expire_time, sizeof item.expire_time, NULL, NULL);
+	SQL->StmtBindColumn(stmt, 8, SQLDT_UCHAR,     &item.bound,       sizeof item.bound,       NULL, NULL);
+	SQL->StmtBindColumn(stmt, 9, SQLDT_UINT64,    &item.unique_id,   sizeof item.unique_id,   NULL, NULL);
+	/* Card Slots */
+	for (j = 0; j < MAX_SLOTS; ++j)
+		SQL->StmtBindColumn(stmt, 10 + j, SQLDT_INT, &item.card[j], sizeof item.card[j], NULL, NULL);
+	/* Item Options */
+	for (j = 0; j < MAX_ITEM_OPTIONS; ++j) {
+		SQL->StmtBindColumn(stmt, 10 + MAX_SLOTS + j * 2, SQLDT_INT16, &item.option[j].index, sizeof item.option[j].index, NULL, NULL);
+		SQL->StmtBindColumn(stmt, 11 + MAX_SLOTS + j * 2, SQLDT_INT16, &item.option[j].value, sizeof item.option[j].value, NULL, NULL);
+	}
+	while (SQL_SUCCESS == SQL->StmtNextRow(stmt)) {
 		Assert_retb(i < MAX_INVENTORY);
 		memcpy(&items[i],&item,sizeof(struct item));
 		i++;
 	}
 	SQL->FreeResult(inter->sql_handle);
 
-	if(!i) { //No items found - No need to continue
+	if (i == 0) { //No items found - No need to continue
 		StrBuf->Destroy(&buf);
 		SQL->StmtFree(stmt);
-		return 0;
+		return true;
 	}
 
 	//First we delete the character's items
@@ -359,7 +433,7 @@ int mapif_parse_ItemBoundRetrieve_sub(int fd)
 		Sql_ShowDebug(inter->sql_handle);
 		SQL->StmtFree(stmt);
 		StrBuf->Destroy(&buf);
-		return 1;
+		return false;
 	}
 
 	// Removes any view id that was set by an item that was removed
@@ -393,7 +467,7 @@ int mapif_parse_ItemBoundRetrieve_sub(int fd)
 			Sql_ShowDebug(inter->sql_handle);
 			SQL->StmtFree(stmt);
 			StrBuf->Destroy(&buf);
-			return 1;
+			return false;
 		}
 #undef CHECK_REMOVE
 	}
@@ -408,54 +482,47 @@ int mapif_parse_ItemBoundRetrieve_sub(int fd)
 	StrBuf->Printf(&buf,"INSERT INTO `%s` (`guild_id`,`nameid`,`amount`,`equip`,`identify`,`refine`,"
 						"`attribute`,`expire_time`,`bound`,`unique_id`",
 					guild_storage_db);
-	for( s = 0; s < MAX_SLOTS; ++s )
+	for (s = 0; s < MAX_SLOTS; ++s)
 		StrBuf->Printf(&buf, ", `card%d`", s);
+	for (s = 0; s < MAX_ITEM_OPTIONS; ++s)
+		StrBuf->Printf(&buf, ", `opt_idx%d`, `opt_val%d`", s, s);
 	StrBuf->AppendStr(&buf," ) VALUES ");
 
-	for( j = 0; j < i; ++j ) {
-		if( j )
+	for (j = 0; j < i; ++j) {
+		if (j != 0)
 			StrBuf->AppendStr(&buf, ",");
 
 		StrBuf->Printf(&buf, "('%d', '%d', '%d', '%u', '%d', '%d', '%d', '%u', '%d', '%"PRIu64"'",
 			guild_id, items[j].nameid, items[j].amount, items[j].equip, items[j].identify, items[j].refine,
 			items[j].attribute, items[j].expire_time, items[j].bound, items[j].unique_id);
-		for( s = 0; s < MAX_SLOTS; ++s )
+		for (s = 0; s < MAX_SLOTS; ++s)
 			StrBuf->Printf(&buf, ", '%d'", items[j].card[s]);
+		for (s = 0; s < MAX_ITEM_OPTIONS; ++s)
+			StrBuf->Printf(&buf, ", '%d', '%d'", items[j].option[s].index, items[j].option[s].value);
 		StrBuf->AppendStr(&buf, ")");
 	}
 
-	if( SQL_ERROR == SQL->StmtPrepareStr(stmt, StrBuf->Value(&buf))
-	||  SQL_ERROR == SQL->StmtExecute(stmt) )
+	if (SQL_ERROR == SQL->StmtPrepareStr(stmt, StrBuf->Value(&buf))
+	||  SQL_ERROR == SQL->StmtExecute(stmt))
 	{
 		Sql_ShowDebug(inter->sql_handle);
 		SQL->StmtFree(stmt);
 		StrBuf->Destroy(&buf);
-		return 1;
+		return false;
 	}
 
 	StrBuf->Destroy(&buf);
 	SQL->StmtFree(stmt);
-
-	//Finally reload storage and tell map we're done
-	mapif->load_guild_storage(fd,aid,guild_id,0);
-
-	// If character is logged in char, disconnect
-	chr->disconnect_player(aid);
 #endif
-	return 0;
-}
-
-void mapif_parse_ItemBoundRetrieve(int fd)
-{
-	mapif->parse_ItemBoundRetrieve_sub(fd);
-	/* tell map server the operation is over and it can unlock the storage */
-	mapif->itembound_ack(fd,RFIFOL(fd,6),RFIFOW(fd,10));
+	return true;
 }
 
-int inter_storage_parse_frommap(int fd)
+static int inter_storage_parse_frommap(int fd)
 {
 	RFIFOHEAD(fd);
 	switch(RFIFOW(fd,0)){
+		case 0x3010: mapif->pAccountStorageLoad(fd); break;
+		case 0x3011: mapif->pAccountStorageSave(fd); break;
 		case 0x3018: mapif->parse_LoadGuildStorage(fd); break;
 		case 0x3019: mapif->parse_SaveGuildStorage(fd); break;
 #ifdef GP_BOUND_ITEMS
@@ -480,4 +547,5 @@ void inter_storage_defaults(void)
 	inter_storage->delete_ = inter_storage_delete;
 	inter_storage->guild_storage_delete = inter_storage_guild_storage_delete;
 	inter_storage->parse_frommap = inter_storage_parse_frommap;
+	inter_storage->retrieve_bound_items = inter_storage_retrieve_bound_items;
 }