error ExtendedBG_rev5.diff

C:\Users\alex>cd desktop

C:\Users\alex\Desktop>cd rathena-master

C:\Users\alex\Desktop\rathena-master>git apply --reject --whitespace=fix Extende
dBG_rev5.diff
ExtendedBG_rev5.diff:175: trailing whitespace.

ExtendedBG_rev5.diff:214: trailing whitespace.

ExtendedBG_rev5.diff:361: trailing whitespace.

ExtendedBG_rev5.diff:481: space before tab in indent.
        int i;
ExtendedBG_rev5.diff:483: space before tab in indent.
        struct battleground_data *bgd = bg_team_search(bg_id);
Checking patch conf/battle/battleground.conf...
Checking patch conf/maps_athena.conf...
Checking patch src/common/mmo.hpp...
Checking patch src/map/atcommand.cpp...
Hunk #2 succeeded at 10020 (offset 20 lines).
Hunk #3 succeeded at 10454 (offset 20 lines).
Checking patch src/map/battle.cpp...
Hunk #1 succeeded at 8563 (offset 48 lines).
Checking patch src/map/battle.hpp...
Hunk #1 succeeded at 644 (offset -1 lines).
Checking patch src/map/battleground.cpp...
Checking patch src/map/battleground.hpp...
Checking patch src/map/buyingstore.cpp...
Checking patch src/map/clif.cpp...
error: while searching for:
                                clif_specialeffect(bl,EF_GIANTBODY2,AREA);
                        else if(sd->state.size==SZ_MEDIUM)
                                clif_specialeffect(bl,EF_BABYBODY2,AREA);
                        if( sd->bg_id && map_getmapflag(sd->bl.m, MF_BATTLEGROUN
D) )
                                clif_sendbgemblem_area(sd);
                        if (sd->spiritcharm_type != CHARM_TYPE_NONE && sd->spiri
tcharm > 0)
                                clif_spiritcharm(sd);

error: patch failed: src/map/clif.cpp:1445
error: while searching for:
                                clif_specialeffect_single(bl,EF_GIANTBODY2,sd->f
d);
                        else if(tsd->state.size==SZ_MEDIUM)
                                clif_specialeffect_single(bl,EF_BABYBODY2,sd->fd
);
                        if( tsd->bg_id && map_getmapflag(tsd->bl.m, MF_BATTLEGRO
UND) )
                                clif_sendbgemblem_single(sd->fd,tsd);
                        if ( tsd->status.robe )
                                clif_refreshlook(&sd->bl,bl->id,LOOK_ROBE,tsd->s
tatus.robe,SELF);

error: patch failed: src/map/clif.cpp:4642
Checking patch src/map/clif.hpp...
Checking patch src/map/map.cpp...
Hunk #1 succeeded at 1862 (offset 2 lines).
Checking patch src/map/map.hpp...
error: while searching for:
        MF_HIDEMOBHPBAR,
        MF_NOLOOT,
        MF_NOEXP,
        MF_MAX
};


error: patch failed: src/map/map.hpp:586
Hunk #2 succeeded at 625 (offset -108 lines).
Checking patch src/map/npc.hpp...
Checking patch src/map/pc.cpp...
warning: src/map/pc.cpp has type 100644, expected 100755
Hunk #2 succeeded at 5118 (offset -4 lines).
Hunk #3 succeeded at 9147 (offset -4 lines).
Checking patch src/map/pc.hpp...
Hunk #3 succeeded at 1350 (offset -1 lines).
Checking patch src/map/script.cpp...
Hunk #1 succeeded at 5506 (offset 38 lines).
Hunk #2 succeeded at 19596 (offset 258 lines).
Hunk #3 succeeded at 19616 (offset 258 lines).
Hunk #4 succeeded at 19698 (offset 258 lines).
Hunk #5 succeeded at 19709 (offset 258 lines).
Hunk #6 succeeded at 20441 (offset 258 lines).
Hunk #7 succeeded at 20501 (offset 258 lines).
Hunk #8 succeeded at 20559 (offset 258 lines).
Hunk #9 succeeded at 20571 (offset 258 lines).
Hunk #10 succeeded at 20595 (offset 258 lines).
Hunk #11 succeeded at 25368 (offset 258 lines).
Checking patch src/map/script_constants.hpp...
error: while searching for:
        export_constant(MF_HIDEMOBHPBAR);
        export_constant(MF_NOLOOT);
        export_constant(MF_NOEXP);

        /* setcell types */
        export_constant(CELL_WALKABLE);

error: patch failed: src/map/script_constants.hpp:453
Checking patch src/map/skill.cpp...
warning: src/map/skill.cpp has type 100644, expected 100755
Hunk #8 succeeded at 15962 (offset -4 lines).
Checking patch src/map/storage.cpp...
Hunk #2 succeeded at 658 (offset -4 lines).
Checking patch src/map/trade.cpp...
Checking patch src/map/unit.cpp...
Checking patch src/map/vending.cpp...
warning: src/map/vending.cpp has type 100644, expected 100755
Applied patch conf/battle/battleground.conf cleanly.
Applied patch conf/maps_athena.conf cleanly.
Applied patch src/common/mmo.hpp cleanly.
Applied patch src/map/atcommand.cpp cleanly.
Applied patch src/map/battle.cpp cleanly.
Applied patch src/map/battle.hpp cleanly.
Applied patch src/map/battleground.cpp cleanly.
Applied patch src/map/battleground.hpp cleanly.
Applied patch src/map/buyingstore.cpp cleanly.
Applying patch src/map/clif.cpp with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Rejected hunk #6.
Hunk #7 applied cleanly.
Rejected hunk #8.
Hunk #9 applied cleanly.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
Hunk #12 applied cleanly.
Hunk #13 applied cleanly.
Hunk #14 applied cleanly.
Hunk #15 applied cleanly.
Hunk #16 applied cleanly.
Hunk #17 applied cleanly.
Hunk #18 applied cleanly.
Hunk #19 applied cleanly.
Hunk #20 applied cleanly.
Hunk #21 applied cleanly.
Hunk #22 applied cleanly.
Hunk #23 applied cleanly.
Hunk #24 applied cleanly.
Hunk #25 applied cleanly.
Hunk #26 applied cleanly.
Hunk #27 applied cleanly.
Hunk #28 applied cleanly.
Hunk #29 applied cleanly.
Hunk #30 applied cleanly.
Hunk #31 applied cleanly.
Hunk #32 applied cleanly.
Hunk #33 applied cleanly.
Hunk #34 applied cleanly.
Hunk #35 applied cleanly.
Hunk #36 applied cleanly.
Hunk #37 applied cleanly.
Applied patch src/map/clif.hpp cleanly.
Applied patch src/map/map.cpp cleanly.
Applying patch src/map/map.hpp with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Applied patch src/map/npc.hpp cleanly.
Applied patch src/map/pc.cpp cleanly.
Applied patch src/map/pc.hpp cleanly.
Applied patch src/map/script.cpp cleanly.
Applying patch src/map/script_constants.hpp with 1 reject...
Rejected hunk #1.
Applied patch src/map/skill.cpp cleanly.
Applied patch src/map/storage.cpp cleanly.
Applied patch src/map/trade.cpp cleanly.
Applied patch src/map/unit.cpp cleanly.
Applied patch src/map/vending.cpp cleanly.

C:\Users\alex\Desktop\rathena-master>