diff options
author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-08 22:58:53 +0000 |
---|---|---|
committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-08 22:58:53 +0000 |
commit | 28d601ca0f843d5c6b6ccaddf4a7eccf6f6472b9 (patch) | |
tree | 9fd4e275188c78dcbe61f6a82bd0bee6a81c1fc4 /src/map | |
parent | 5c0f510e8e7b0fb9cdf269f0408d1686c7f405d9 (diff) | |
download | hercules-28d601ca0f843d5c6b6ccaddf4a7eccf6f6472b9.tar.gz hercules-28d601ca0f843d5c6b6ccaddf4a7eccf6f6472b9.tar.bz2 hercules-28d601ca0f843d5c6b6ccaddf4a7eccf6f6472b9.tar.xz hercules-28d601ca0f843d5c6b6ccaddf4a7eccf6f6472b9.zip |
cleanup
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@517 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/atcommand.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index ddd1d60c4..2c547f432 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -7441,7 +7441,11 @@ atcommand_marry(const int fd, struct map_session_data* sd, return -1; } - return pc_marriage(pl_sd1, pl_sd2); + if (pc_marriage(pl_sd1, pl_sd2) == 0) { + clif_displaymessage(fd, "The marriage has failed.. talk to the judge.."); + return 0; + } else + return -1; } /*========================================== @@ -7461,8 +7465,11 @@ atcommand_divorce(const int fd, struct map_session_data* sd, if (!message || !*message) return -1; - if((pl_sd=map_nick2sd((char *) message)) != NULL) + if((pl_sd=map_nick2sd((char *) message)) != NULL) { return pc_divorce(pl_sd); + clif_displaymessage(fd, "They are now divorced."); + } else + clif_displaymessage(fd, "The divorce has failed.. talk to the judge.."); return 0; } @@ -7493,6 +7500,8 @@ atcommand_rings(const int fd, struct map_session_data* sd, if ((flag = pc_additem((struct map_session_data*)sd, &item_tmp, get_count))) clif_additem((struct map_session_data*)sd, 0, 0, flag); + clif_displaymessage(fd, "You have rings! Give them to the lovers."); + return 0; } |