Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed duplicate message output bugreport:7349

Browse Source 
Fixed a issue with a SQL value bugreport:7346

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17196 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
lemongrass3110 2013-03-13 14:16:40 +00:00
parent dfa3bdbe17
commit c3572cd2c8
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql-files/item_db_re.sql
View File

@ -5856,7 +5856,7 @@ REPLACE INTO `item_db_re` VALUES (12773,'Victory_Hat_Box2','Victory Hat Box2',2,
# #
REPLACE INTO `item_db_re` VALUES (12775,'Ancient_Spirit_Amulet','Ancient Spirit Amulet',2,20,NULL,600,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (12775,'Ancient_Spirit_Amulet','Ancient Spirit Amulet',2,20,NULL,600,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
# #
REPLACE INTO `item_db_re` VALUES (12786,'Change_Slot_Card','Character Position Change Coupon',2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'set CharMoves, CharMoves + 1;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (12786,'Change_Slot_Card','Character Position Change Coupon',2,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'set CharMoves, CharMoves + 1;',NULL,NULL);
# #
REPLACE INTO `item_db_re` VALUES (12848,'Falcon_Flute','Falcon Flute',11,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if(getskilllv("HT_FALCON")) { if(checkoption(Option_Wug)||checkoption(Option_Wugrider)) end; if(checkfalcon()==1) { setfalcon 0; } else { setfalcon 1; } }',NULL,NULL); REPLACE INTO `item_db_re` VALUES (12848,'Falcon_Flute','Falcon Flute',11,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if(getskilllv("HT_FALCON")) { if(checkoption(Option_Wug)||checkoption(Option_Wugrider)) end; if(checkfalcon()==1) { setfalcon 0; } else { setfalcon 1; } }',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (12900,'Battle_Manual_Box','Battle Manual Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12208,10;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (12900,'Battle_Manual_Box','Battle Manual Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem 12208,10;',NULL,NULL);

6
src/map/atcommand.c
View File

@ -7851,15 +7851,21 @@ ACMD_FUNC(cash)
{ {
if( value > 0 ) { if( value > 0 ) {
if( (ret=pc_getcash(sd, value, 0)) >= 0){ if( (ret=pc_getcash(sd, value, 0)) >= 0){
// If this option is set, the message is already sent by pc function
if( !battle_config.cashshop_show_points ){
sprintf(output, msg_txt(505), ret, sd->cashPoints); sprintf(output, msg_txt(505), ret, sd->cashPoints);
clif_disp_onlyself(sd, output, strlen(output)); clif_disp_onlyself(sd, output, strlen(output));
} }
}
else clif_displaymessage(fd, msg_txt(149)); // Unable to decrease the number/value. else clif_displaymessage(fd, msg_txt(149)); // Unable to decrease the number/value.
} else { } else {
if( (ret=pc_paycash(sd, -value, 0)) >= 0){ if( (ret=pc_paycash(sd, -value, 0)) >= 0){
// If this option is set, the message is already sent by pc function
if( !battle_config.cashshop_show_points ){
sprintf(output, msg_txt(410), ret, sd->cashPoints); sprintf(output, msg_txt(410), ret, sd->cashPoints);
clif_disp_onlyself(sd, output, strlen(output)); clif_disp_onlyself(sd, output, strlen(output));
} }
}
else clif_displaymessage(fd, msg_txt(41)); // Unable to decrease the number/value. else clif_displaymessage(fd, msg_txt(41)); // Unable to decrease the number/value.
} }
} }