kgsws, let me say this: don't use "diff -rup".
I tried to apply the patch in the src directory with this command:
"patch -Np2 -i ../hitself.diff -F5 --ignore-whitespace"
and the result was:
Code: Select all
patching file actor.h
Hunk #1 succeeded at 330 with fuzz 3.
Hunk #2 succeeded at 817 with fuzz 3.
patching file p_map.cpp
Hunk #1 FAILED at 1024.
1 out of 1 hunk FAILED -- saving rejects to file p_map.cpp.rej
patching file p_mobj.cpp
Hunk #1 succeeded at 5303 with fuzz 3.
patching file thingdef/thingdef_data.cpp
Hunk #1 succeeded at 233 with fuzz 3.
Now I re-created the patch ("svn diff > canhitshooter.txt" ) with the following changes:
- Change the name HITSELF to CANHITSHOOTER;
- Moved the "return" attached to the "if( )" in p_map.cpp in a new line for a better readability.
The compiling is fine, so here it is.
kgsws, let me say this: don't use "diff -rup".
I tried to apply the patch in the src directory with this command:
"patch -Np2 -i ../hitself.diff -F5 --ignore-whitespace"
and the result was:
[code]
patching file actor.h
Hunk #1 succeeded at 330 with fuzz 3.
Hunk #2 succeeded at 817 with fuzz 3.
patching file p_map.cpp
Hunk #1 FAILED at 1024.
1 out of 1 hunk FAILED -- saving rejects to file p_map.cpp.rej
patching file p_mobj.cpp
Hunk #1 succeeded at 5303 with fuzz 3.
patching file thingdef/thingdef_data.cpp
Hunk #1 succeeded at 233 with fuzz 3.
[/code]
Now I re-created the patch ("svn diff > canhitshooter.txt" ) with the following changes:
- Change the name HITSELF to CANHITSHOOTER;
- Moved the "return" attached to the "if( )" in p_map.cpp in a new line for a better readability.
The compiling is fine, so here it is.
[attachment=0]canhitshooter.txt[/attachment]