diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-10 04:33:12 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-10 04:33:12 +0000 |
| commit | a1427a9fd0b12fd8da24e8e322917ab992c6252a (patch) | |
| tree | a4942af67e1f4602bf53fe2bbb9dd50e620f0d79 | |
| parent | dc623e42cce95bdecf60c2253a9c847a920807a1 (diff) | |
| download | hercules-a1427a9fd0b12fd8da24e8e322917ab992c6252a.tar.gz hercules-a1427a9fd0b12fd8da24e8e322917ab992c6252a.tar.bz2 hercules-a1427a9fd0b12fd8da24e8e322917ab992c6252a.tar.xz hercules-a1427a9fd0b12fd8da24e8e322917ab992c6252a.zip | |
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@526 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog.txt | 2 | ||||
| -rw-r--r-- | src/map/atcommand.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt index 64e8f1fc3..dc87a7211 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,4 +1,6 @@ Date Added +12/9 + * Adjusted some messages in @marry [MouseJstr] 12/8 * Fixed @rings [MouseJstr] * Added @marry, @divorce, and @rings [MouseJstr] diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 32f0e4bef..503e64e7d 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -7442,7 +7442,7 @@ atcommand_marry(const int fd, struct map_session_data* sd, } if (pc_marriage(pl_sd1, pl_sd2) == 0) { - clif_displaymessage(fd, "The marriage has failed.. talk to the judge.."); + clif_displaymessage(fd, "They are married.. wish them well"); return 0; } else return -1; |