<?xml version="1.0"?>
<?xml-stylesheet type="text/css" href="https://wiki.herc.ws/w/skins/common/feed.css?303"?>
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
		<id>https://wiki.herc.ws/w/index.php?action=history&amp;feed=atom&amp;title=Diff</id>
		<title>Diff - Revision history</title>
		<link rel="self" type="application/atom+xml" href="https://wiki.herc.ws/w/index.php?action=history&amp;feed=atom&amp;title=Diff"/>
		<link rel="alternate" type="text/html" href="https://wiki.herc.ws/w/index.php?title=Diff&amp;action=history"/>
		<updated>2026-05-01T09:12:15Z</updated>
		<subtitle>Revision history for this page on the wiki</subtitle>
		<generator>MediaWiki 1.21.11</generator>

	<entry>
		<id>https://wiki.herc.ws/w/index.php?title=Diff&amp;diff=198&amp;oldid=prev</id>
		<title>Nameless2you: Created page with &quot;{{OtherUse|the text difference file format|the binary patches mainly used for client modification|Hexing}} =Diff files= A diff file is a file to make: *implementation of a mod...&quot;</title>
		<link rel="alternate" type="text/html" href="https://wiki.herc.ws/w/index.php?title=Diff&amp;diff=198&amp;oldid=prev"/>
				<updated>2013-01-15T17:06:26Z</updated>
		
		<summary type="html">&lt;p&gt;Created page with &amp;quot;{{OtherUse|the text difference file format|the binary patches mainly used for client modification|Hexing}} =Diff files= A diff file is a file to make: *implementation of a mod...&amp;quot;&lt;/p&gt;
&lt;p&gt;&lt;b&gt;New page&lt;/b&gt;&lt;/p&gt;&lt;div&gt;{{OtherUse|the text difference file format|the binary patches mainly used for client modification|Hexing}}&lt;br /&gt;
=Diff files=&lt;br /&gt;
A diff file is a file to make:&lt;br /&gt;
*implementation of a modification easier&lt;br /&gt;
*check what and where you modified things&lt;br /&gt;
*share your modifications with the rest of the world&lt;br /&gt;
*it is also an easy way for people that give support on forums to check themselves what is wrong to the modifications you made&lt;br /&gt;
&lt;br /&gt;
==Creating .diff files using the tortoise menu==&lt;br /&gt;
#right click on the folder&lt;br /&gt;
#goto TortoiseSVN menu&lt;br /&gt;
#click create patch&lt;br /&gt;
#save as .diff file&lt;br /&gt;
&lt;br /&gt;
==Manually Creating .diff files (knowing the mechanics and repairing .diffs if needed)==&lt;br /&gt;
#create a new txt file&lt;br /&gt;
#rename the .txt extention to .diff&lt;br /&gt;
#start with pointing out the index (path where the diff files will patch)&lt;br /&gt;
#*example:[code]Index: src[/code]&lt;br /&gt;
#add a ========================================= line to indicate the next file&lt;br /&gt;
#*example:[code]=========================================[/code]&lt;br /&gt;
#add the patch of the file where content will be removed (---) and add the revision&lt;br /&gt;
#*example:[code]--- src/common/mmo.c	(revision 12300 Stable)[/code]&lt;br /&gt;
#add the path of the file where content will be added (+++) and add (working copy)&lt;br /&gt;
#*example:[code]+++ src/common/mmo.c	(working copy)[/code]&lt;br /&gt;
#add the location of the lines that need to be modified in this way:&lt;br /&gt;
##@@&lt;br /&gt;
##-100: start reading original lines at line 100&lt;br /&gt;
##,5: read 5 original lines&lt;br /&gt;
##+100: start reading new lines at line 100&lt;br /&gt;
##,7: read 7 new lines&lt;br /&gt;
##@@&lt;br /&gt;
#*example:[code]@@ -100,5 +100,7 @@[/code]&lt;br /&gt;
#add a &amp;lt;space&amp;gt; and write a line that is from the original text (this line will be unmodified) and all others starting with a space&lt;br /&gt;
#*[color=red]A SPACE IS NEEDED, IF YOU COPY A DIFF FROM A FORUM APPLY THE SPACES YOURSELF[/color]&lt;br /&gt;
#*example:[code]		this line will be unmodified[/code]&lt;br /&gt;
#add a &amp;quot;-&amp;quot; and write the line that must be modified&lt;br /&gt;
#*example:[code]-this line will be removed from the original code[/code]&lt;br /&gt;
#add a &amp;quot;+&amp;quot; and write the line that need to be placed to replace or added to the original code&lt;br /&gt;
#*example:[code]+this line will be added in the new code[/code]&lt;br /&gt;
#**full example on a @@ -x,7 +x,8 @@:[code]line1: this line will be unmodified&lt;br /&gt;
line2: this line will be unmodified&lt;br /&gt;
line3:-this line will be deleted&lt;br /&gt;
line4:+this line will replace line 3&lt;br /&gt;
line5:+this line will add a line of code&lt;br /&gt;
line6: this line will be unmodified, but will move down one line&lt;br /&gt;
line7: &lt;br /&gt;
line8: this line will be unmodified, move down one line (same as the line above since an &amp;lt;enter&amp;gt; counts as a line)[/code]&lt;br /&gt;
#**[color=red]NOTICE= THE &amp;lt;enter&amp;gt; ON LINE 7 MUST START WITH A &amp;lt;space&amp;gt; as well[/color]&lt;br /&gt;
&lt;br /&gt;
==Using .diff/.patch files to patch your server==&lt;br /&gt;
'''Windows''':&lt;br /&gt;
#go place the folder in the index folder&lt;br /&gt;
#richt click the *.diff file and go to TortoiseSVN menu&lt;br /&gt;
#click patch&lt;br /&gt;
&lt;br /&gt;
'''Linux''':&lt;br /&gt;
 cd /path/to/your/server/folder&lt;br /&gt;
 patch -p0 &amp;lt; /path/to/patch/file/filename.extension&lt;br /&gt;
&lt;br /&gt;
=Example of a .diff file=&lt;br /&gt;
 &amp;lt;nowiki&amp;gt;Index: map/clif.c&lt;br /&gt;
===================================================================&lt;br /&gt;
--- map/clif.c	(revision 13318)&lt;br /&gt;
+++ map/clif.c	(working copy)&lt;br /&gt;
@@ -6745,7 +6745,7 @@&lt;br /&gt;
 	/*==========================================&lt;br /&gt;
 	 * Marry [DracoRPG]&lt;br /&gt;
 	 *------------------------------------------*/&lt;br /&gt;
-	void clif_marriage_process(struct map_session_data *sd)&lt;br /&gt;
+	/*void clif_marriage_process(struct map_session_data *sd)&lt;br /&gt;
 	{&lt;br /&gt;
 		int fd;&lt;br /&gt;
 		nullpo_retv(sd);&lt;br /&gt;
@@ -6755,8 +6755,8 @@&lt;br /&gt;
 		WFIFOW(fd,0)=0x1e4;&lt;br /&gt;
 		WFIFOSET(fd,packet_len(0x1e4));&lt;br /&gt;
 	}&lt;br /&gt;
+	*/&lt;br /&gt;
-	&lt;br /&gt;
	 /*==========================================&lt;br /&gt;
	  * Notice of divorce&lt;br /&gt;
	  *------------------------------------------*/&lt;br /&gt;
Index: map/clif.h&lt;br /&gt;
===================================================================&lt;br /&gt;
--- map/clif.h	(revision 13318)&lt;br /&gt;
+++ map/clif.h	(working copy)&lt;br /&gt;
@@ -53,8 +53,8 @@&lt;br /&gt;
	 #endif&lt;br /&gt;
	 &lt;br /&gt;
	 // packet DB&lt;br /&gt;
-#define MAX_PACKET_DB		0x400&lt;br /&gt;
-#define MAX_PACKET_VER		22&lt;br /&gt;
+#define MAX_PACKET_DB		0x500&lt;br /&gt;
+#define MAX_PACKET_VER		23&lt;br /&gt;
	 &lt;br /&gt;
	 struct s_packet_db {&lt;br /&gt;
	 	short len;&amp;lt;/nowiki&amp;gt;&lt;br /&gt;
&lt;br /&gt;
== See Also ==&lt;br /&gt;
* [[wikipedia:Diff#Unified_format]]&lt;br /&gt;
&lt;br /&gt;
[[Category:File Formats]]&lt;/div&gt;</summary>
		<author><name>Nameless2you</name></author>	</entry>

	</feed>