summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/clif.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e688ee192..b4d822279 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2008/10/24
+ * Commented out unused function clif_marriage_process. [Paradox924X]
2008/10/21
* Added a check to make sure a player wasn't in a guild when they accepted a guild invitation. [Paradox924X]
2008/10/18
diff --git a/src/map/clif.c b/src/map/clif.c
index 94af1ad01..ffc447b95 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -6769,7 +6769,7 @@ void clif_callpartner(struct map_session_data *sd)
/*==========================================
* Marry [DracoRPG]
- *------------------------------------------*/
+ *------------------------------------------
void clif_marriage_process(struct map_session_data *sd)
{
int fd;
@@ -6780,6 +6780,7 @@ void clif_marriage_process(struct map_session_data *sd)
WFIFOW(fd,0)=0x1e4;
WFIFOSET(fd,packet_len(0x1e4));
}
+*/
/*==========================================