diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/mail.c | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 24 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/map/mail.c b/src/map/mail.c index 733fce646..6fa605bb8 100644 --- a/src/map/mail.c +++ b/src/map/mail.c @@ -76,7 +76,7 @@ unsigned char mail_setitem(struct map_session_data *sd, int idx, int amount) amount = 0; sd->mail.zeny = amount; - clif_updatestatus(sd, SP_ZENY); + // clif_updatestatus(sd, SP_ZENY); return 0; } else diff --git a/src/map/pc.c b/src/map/pc.c index 5d0c1a914..c98016418 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -6743,7 +6743,7 @@ int pc_divorce(struct map_session_data *sd) struct map_session_data *p_sd; int i; - if (sd == NULL || !pc_ismarried(sd)) + if( sd == NULL || !pc_ismarried(sd) ) return -1; if( !sd->status.partner_id ) @@ -6758,23 +6758,23 @@ int pc_divorce(struct map_session_data *sd) return 0; #else ShowError("pc_divorce: p_sd nullpo\n"); - return -1; + return -1; #endif - } + } // Both players online, lets do the divorce manually - sd->status.partner_id = 0; - p_sd->status.partner_id = 0; + sd->status.partner_id = 0; + p_sd->status.partner_id = 0; for( i = 0; i < MAX_INVENTORY; i++ ) { - if (sd->status.inventory[i].nameid == WEDDING_RING_M || sd->status.inventory[i].nameid == WEDDING_RING_F) - pc_delitem(sd, i, 1, 0); - if (p_sd->status.inventory[i].nameid == WEDDING_RING_M || p_sd->status.inventory[i].nameid == WEDDING_RING_F) - pc_delitem(p_sd, i, 1, 0); - } + if( sd->status.inventory[i].nameid == WEDDING_RING_M || sd->status.inventory[i].nameid == WEDDING_RING_F ) + pc_delitem(sd, i, 1, 0); + if( p_sd->status.inventory[i].nameid == WEDDING_RING_M || p_sd->status.inventory[i].nameid == WEDDING_RING_F ) + pc_delitem(p_sd, i, 1, 0); + } - clif_divorced(sd, p_sd->status.name); - clif_divorced(p_sd, sd->status.name); + clif_divorced(sd, p_sd->status.name); + clif_divorced(p_sd, sd->status.name); return 0; } diff --git a/src/map/script.c b/src/map/script.c index d9671516e..01d3470d5 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -3385,7 +3385,7 @@ static int script_load_mapreg(void) int s = add_str(varname); int i = index; int v = atoi(value); - idb_put(mapreg_db, (i<<24)|s, (void *)v); + idb_put(mapreg_db, (i<<24)|s, (void *)v); } } |