diff options
author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-11-17 15:43:13 +0000 |
---|---|---|
committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-11-17 15:43:13 +0000 |
commit | 3dad62b22c6662d2ab290022c261375e71a9ee6e (patch) | |
tree | 3443869df7b6b0ae600e3493ac3de6fe84bfe4f2 | |
parent | 2af3aa8ca2595b507a9ab2483fd34cfdfd39ccb1 (diff) | |
download | hercules-3dad62b22c6662d2ab290022c261375e71a9ee6e.tar.gz hercules-3dad62b22c6662d2ab290022c261375e71a9ee6e.tar.bz2 hercules-3dad62b22c6662d2ab290022c261375e71a9ee6e.tar.xz hercules-3dad62b22c6662d2ab290022c261375e71a9ee6e.zip |
- Some "expire_time" = 0 considerations. Please update. (Bugreport 2451)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13373 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r-- | src/char_sql/int_auction.c | 1 | ||||
-rw-r--r-- | src/char_sql/int_mail.c | 3 | ||||
-rw-r--r-- | src/map/script.c | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/char_sql/int_auction.c b/src/char_sql/int_auction.c index 11554e9a1..fa9654f90 100644 --- a/src/char_sql/int_auction.c +++ b/src/char_sql/int_auction.c @@ -216,6 +216,7 @@ void inter_auctions_fromsql(void) item->identify = 1; item->amount = 1; + item->expire_time = 0; for( i = 0; i < MAX_SLOTS; i++ ) { diff --git a/src/char_sql/int_mail.c b/src/char_sql/int_mail.c index 968ddf3ee..5652884cb 100644 --- a/src/char_sql/int_mail.c +++ b/src/char_sql/int_mail.c @@ -61,6 +61,7 @@ static int mail_fromsql(int char_id, struct mail_data* md) Sql_GetData(sql_handle,12, &data, NULL); item->refine = atoi(data); Sql_GetData(sql_handle,13, &data, NULL); item->attribute = atoi(data); Sql_GetData(sql_handle,14, &data, NULL); item->identify = atoi(data); + item->expire_time = 0; for (j = 0; j < MAX_SLOTS; j++) { @@ -176,6 +177,8 @@ static bool mail_loadmessage(int mail_id, struct mail_message* msg) Sql_GetData(sql_handle,12, &data, NULL); msg->item.refine = atoi(data); Sql_GetData(sql_handle,13, &data, NULL); msg->item.attribute = atoi(data); Sql_GetData(sql_handle,14, &data, NULL); msg->item.identify = atoi(data); + msg->item.expire_time = 0; + for( j = 0; j < MAX_SLOTS; j++ ) { Sql_GetData(sql_handle,15 + j, &data, NULL); diff --git a/src/map/script.c b/src/map/script.c index f56d388c3..4091a4081 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -9455,7 +9455,7 @@ BUILDIN_FUNC(successremovecards) cardflag = 1; item_tmp.id=0,item_tmp.nameid=sd->status.inventory[i].card[c]; item_tmp.equip=0,item_tmp.identify=1,item_tmp.refine=0; - item_tmp.attribute=0; + item_tmp.attribute=0,item_tmp.expire_time=0; for (j = 0; j < MAX_SLOTS; j++) item_tmp.card[j]=0; @@ -9476,7 +9476,7 @@ BUILDIN_FUNC(successremovecards) struct item item_tmp; item_tmp.id=0,item_tmp.nameid=sd->status.inventory[i].nameid; item_tmp.equip=0,item_tmp.identify=1,item_tmp.refine=sd->status.inventory[i].refine; - item_tmp.attribute=sd->status.inventory[i].attribute; + item_tmp.attribute=sd->status.inventory[i].attribute,item_tmp.expire_time=0; for (j = 0; j < MAX_SLOTS; j++) item_tmp.card[j]=0; @@ -9535,7 +9535,7 @@ BUILDIN_FUNC(failedremovecards) struct item item_tmp; item_tmp.id=0,item_tmp.nameid=sd->status.inventory[i].card[c]; item_tmp.equip=0,item_tmp.identify=1,item_tmp.refine=0; - item_tmp.attribute=0; + item_tmp.attribute=0,item_tmp.expire_time=0; for (j = 0; j < MAX_SLOTS; j++) item_tmp.card[j]=0; @@ -9565,7 +9565,7 @@ BUILDIN_FUNC(failedremovecards) struct item item_tmp; item_tmp.id=0,item_tmp.nameid=sd->status.inventory[i].nameid; item_tmp.equip=0,item_tmp.identify=1,item_tmp.refine=sd->status.inventory[i].refine; - item_tmp.attribute=sd->status.inventory[i].attribute; + item_tmp.attribute=sd->status.inventory[i].attribute,item_tmp.expire_time=0; //Logs items, got from (N)PC scripts [Lupus] if(log_config.enable_logs&0x40) |