Excuse me but I'm here to report some bugs.
I diffed the file, and when I recompiled, I got errors :
patching file map/npc.c
Hunk #1 succeeded at 1203 (offset -10 lines).
Hunk #2 succeeded at 1308 (offset -10 lines).
Hunk #3 succeeded at 1357 (offset -10 lines).
Hunk #4 succeeded at 1440 (offset -10 lines).
Hunk #5 succeeded at 1488 (offset -10 lines).
Hunk #6 succeeded at 1867 (offset -11 lines).
Hunk #7 succeeded at 2213 (offset -9 lines).
Hunk #8 FAILED at 2337.
Hunk #9 FAILED at 2638.
Hunk #10 FAILED at 2691.
Hunk #11 succeeded at 3713 (offset -46 lines).
patching file map/npc.h
Hunk #1 FAILED at 37.
Can you please help me ? Guess I did everything right. Thanks in advance.