-
Notifications
You must be signed in to change notification settings - Fork 2
Diff
A diff file is a file to make:
- Implementation of a modification easier
- Check what and where you modified things
- Share your modifications with the rest of the world
- It is also an easy way for people that give support on forums to check themselves what is wrong to the modifications you made
- right click on the folder
- goto TortoiseSVN menu
- click create patch
- save as .diff file
-
create a new txt file
-
rename the .txt extention to .diff
-
start with pointing out the index (path where the diff files will patch)
- example:
Index: src
- example:
-
add a ========================================= line to indicate the next file
- example:
=========================================
- example:
-
add the patch of the file where content will be removed (---) and add the revision
- example:
--- src/common/mmo.c (revision 12300 Stable)
- example:
-
add the path of the file where content will be added (+++) and add (working copy)
- example:
+++ src/common/mmo.c (working copy)
- example:
-
add the location of the lines that need to be modified in this way:
@@
-
-100
: start reading original lines at line 100 -
,5
: read 5 original lines -
+100
: start reading new lines at line 100 -
,7
: read 7 new lines @@
- example:
@@ -100,5 +100,7 @@
-
add a and write a line that is from the original text (this line will be unmodified) and all others starting with a space
- A SPACE IS NEEDED, IF YOU COPY A DIFF FROM A FORUM APPLY THE SPACES YOURSELF
- example:
this line will be unmodified
-
add a "-" and write the line that must be modified
- example:
-this line will be removed from the original code
- example:
-
add a "+" and write the line that need to be placed to replace or added to the original code
- example:
+this line will be added in the new code
- full example:
- example:
on a `@@ -x,7 +x,8 @@`
this line will be unmodified
this line will be unmodified
-this line will be deleted
+this line will replace line 3
+this line will add a line of code
this line will be unmodified, but will move down one line
this line will be unmodified, move down one line (same as the line above since an <enter> counts as a line)
** NOTICE THE ON LINE 7 MUST START WITH A as well **
- Go to the root folder
- Right click the *.diff file and go to TortoiseGIT menu
- Click patch
cd /path/to/your/server/folder
patch -p0 < /path/to/patch/file/filename.extension
Index: map/clif.c
===================================================================
--- map/clif.c (revision 13318)
+++ map/clif.c (working copy)
@@ -6745,7 +6745,7 @@
/*==========================================
* Marry [DracoRPG]
*------------------------------------------*/
- void clif_marriage_process(struct map_session_data *sd)
+ /*void clif_marriage_process(struct map_session_data *sd)
{
int fd;
nullpo_retv(sd);
@@ -6755,8 +6755,8 @@
WFIFOW(fd,0)=0x1e4;
WFIFOSET(fd,packet_len(0x1e4));
}
+ */
-
/*==========================================
* Notice of divorce
*------------------------------------------*/
Index: map/clif.h
===================================================================
--- map/clif.h (revision 13318)
+++ map/clif.h (working copy)
@@ -53,8 +53,8 @@
#endif
// packet DB
-#define MAX_PACKET_DB 0x400
-#define MAX_PACKET_VER 22
+#define MAX_PACKET_DB 0x500
+#define MAX_PACKET_VER 23
struct s_packet_db {
short len;
- Installation instructions
- Transitioning from SVN to GIT
- Compiling on your OS
- Connecting & Starting rAthena
- Scripting like a pro!
- Server Modifications and what to expect
- Database Configuration
- Adding Custom Items
- Adding Custom Monsters
- GRF Encryption
- Data folder
- Diff files