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

Fixed #1809

Browse Source 
Thanks to @Tokeiburu
This commit is contained in:
Lemongrass3110 2016-12-20 00:13:48 +01:00
parent d1f8c8ca6c
commit 552c39acc3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/atcommand.c
View File

@ -5815,7 +5815,7 @@ ACMD_FUNC(marry)
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
if (!message || !*message || sscanf(message, "%23s", player_name) != 1) { if (!message || !*message || sscanf(message, "%23[^\n]", player_name) != 1) {
clif_displaymessage(fd, msg_txt(sd,1172)); // Usage: @marry <char name> clif_displaymessage(fd, msg_txt(sd,1172)); // Usage: @marry <char name>
return -1; return -1;
} }
@ -5828,6 +5828,8 @@ ACMD_FUNC(marry)
if (pc_marriage(sd, pl_sd)) { if (pc_marriage(sd, pl_sd)) {
clif_displaymessage(fd, msg_txt(sd,1173)); // They are married... wish them well. clif_displaymessage(fd, msg_txt(sd,1173)); // They are married... wish them well.
clif_wedding_effect(&pl_sd->bl); //wedding effect and music [Lupus] clif_wedding_effect(&pl_sd->bl); //wedding effect and music [Lupus]
if( pl_sd->bl.m != sd->bl.m )
clif_wedding_effect(&sd->bl);
getring(sd); // Auto-give named rings (Aru) getring(sd); // Auto-give named rings (Aru)
getring(pl_sd); getring(pl_sd);
return 0; return 0;