Browse Source

update

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@526 54d463be-8e91-2dee-dedb-b68131a5f0ec
amber 20 years ago
parent
commit
539f8e4a9d
2 changed files with 3 additions and 1 deletions
  1. 2 0
      Changelog.txt
  2. 1 1
      src/map/atcommand.c

+ 2 - 0
Changelog.txt

@@ -1,4 +1,6 @@
 Date	Added
 Date	Added
+12/9
+	* Adjusted some messages in @marry [MouseJstr]
 12/8
 12/8
 	* Fixed @rings [MouseJstr]
 	* Fixed @rings [MouseJstr]
         * Added @marry, @divorce, and @rings [MouseJstr]
         * Added @marry, @divorce, and @rings [MouseJstr]

+ 1 - 1
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) {
   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;
     return 0;
   } else
   } else
     return -1;
     return -1;