Essaye avec ce protocole.
Place toi à la racine des sources, met y ton patch, ouvre ton cmd et rend toi à la racine des sources, fait la commande :
patch -p1 < TonPatch.diffou.patch
[Résolu]Adapter patch AC2 + TrinityJail C++
|
patching file sql/All/characters_jail.sql
patching file sql/All/world_command_Deutsch.sql
patching file sql/All/world_command_English.sql
patching file sql/All/world_command_Francais.sql
patching file sql/All/world_trinity_string.sql
patching file src/server/game/Chat/Chat.cpp
patch: **** malformed patch at line 206: diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
patching file src/server/game/Entities/Player/Player.cpp
Hunk #1 succeeded at 756 (offset 220 lines).
Hunk #2 succeeded at 2153 (offset 195 lines).
Hunk #3 succeeded at 2302 (offset 185 lines).
patching file src/server/game/Entities/Player/Player.h
Hunk #1 succeeded at 2657 (offset 20 lines).
patching file src/server/game/Entities/Unit/Unit.h
Hunk #1 succeeded at 2164 (offset 79 lines).
patching file src/server/game/Globals/ObjectMgr.cpp
Hunk #1 succeeded at 5631 (offset -389 lines).
Hunk #2 succeeded at 5642 (offset -389 lines).
Hunk #3 succeeded at 5663 (offset -389 lines).
Hunk #4 succeeded at 5679 (offset -389 lines).
patching file src/server/game/Globals/ObjectMgr.h
Hunk #1 succeeded at 674 (offset -28 lines).
patching file src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
Hunk #1 succeeded at 30 (offset -2 lines).
Hunk #2 succeeded at 256 (offset -2 lines).
Hunk #3 succeeded at 310 (offset -2 lines).
Hunk #4 succeeded at 322 (offset -2 lines).
Hunk #5 succeeded at 365 with fuzz 1 (offset -5 lines).
Hunk #6 succeeded at 719 (offset -5 lines).
Hunk #7 succeeded at 749 (offset -5 lines).
Hunk #8 succeeded at 916 (offset -205 lines).
patching file src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp
Hunk #1 FAILED at 49.
Hunk #2 FAILED at 94.
Hunk #3 FAILED at 134.
3 out of 6 hunks FAILED -- saving rejects to file src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp.rej
patching file src/server/game/World/World.cpp
Hunk #1 succeeded at 86 (offset 1 line).
Hunk #2 succeeded at 564 with fuzz 1.
patching file src/server/game/World/World.h
Hunk #1 succeeded at 702 (offset -27 lines).
Hunk #2 succeeded at 800 with fuzz 2 (offset -43 lines).
patching file src/server/worldserver/worldserver.conf.dist
Hunk #1 succeeded at 2479 (offset -7 lines).
(25-07-2011 08:21)tommm a écrit : L'année prochaine je vais en BTS et je vais y apprendre le c, le c++... et j'aimerais que vous m'aidiez en attendent parce que j'ai un peu de mal.
Code :
src/server/game/Entities/Player/Player.cpp | 22 +
ça me dit qu'il faut copier un truc dans player.cpp mais ça me dis pas où dans le fichier.Code :
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 57b42e2..f84f331 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ [u][b]-536,6 +536,26[/b][/u] @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputa
B
error: patch failed: src/server/game/Entities/Player/Player.cpp:536
error: src/server/game/Entities/Player/Player.cpp: patch does not apply
error: patch failed: src/server/game/Server/Protocol/Handlers/MovementHandler.cpp:344
error: src/server/game/Server/Protocol/Handlers/MovementHandler.cpp: patch does not apply
error: patch failed: src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp:49
error: src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp: patch does not apply
error: patch failed: src/server/game/World/World.cpp:85
error: src/server/game/World/World.cpp: patch does not apply
error: patch failed: src/server/game/World/World.h:729
error: src/server/game/World/World.h: patch does not apply
error: patch failed: src/server/worldserver/worldserver.conf.dist:2486
error: src/server/worldserver/worldserver.conf.dist: patch does not apply
fatal: corrupt patch at line 206
patching file src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp
Hunk #1 succeeded at 49 with fuzz 2.
Hunk #2 FAILED at 94.
Hunk #3 FAILED at 134.
2 out of 6 hunks FAILED -- saving rejects to file src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp.rej
/opt/TrinityCoreAC2/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp: In member function âvoid WorldSession::HandleMovementOpcodes(WorldPacket&)â:
/opt/TrinityCoreAC2/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp:431:31: error: âclass Vehicleâ has no member named âDieâ
/opt/TrinityCoreAC2/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp:530:35: error: âclass Vehicleâ has no member named âDieâ
/opt/TrinityCoreAC2/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp:558:43: error: âclass Vehicleâ has no member named âDieâ
/opt/TrinityCoreAC2/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp:596:35: error: âclass Vehicleâ has no member named âDieâ
/opt/TrinityCoreAC2/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp:608:35: error: âclass Vehicleâ has no member named âDieâ
/opt/TrinityCoreAC2/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp:623:35: error: âclass Vehicleâ has no member named âDieâ
/opt/TrinityCoreAC2/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp:650:35: error: âclass Vehicleâ has no member named âDieâ
/opt/TrinityCoreAC2/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp:693:43: error: âclass Vehicleâ has no member named âDieâ
make[2]: *** [src/server/game/CMakeFiles/game.dir/Server/Protocol/Handlers/MovementHandler.cpp.o] Erreur 1
make[1]: *** [src/server/game/CMakeFiles/game.dir/all] Erreur 2
make: *** [all] Erreur 2
vehMover->Die();
/opt/TrinityCoreJail/src/server/game/Chat/Commands/Level1.cpp: In member function âbool ChatHandler::HandleJailCommand(const char*)â:
/opt/TrinityCoreJail/src/server/game/Chat/Commands/Level1.cpp:674:31: error: âclass ObjectMgrâ has no member named âGetPlayerâ
/opt/TrinityCoreJail/src/server/game/Chat/Commands/Level1.cpp: In member function âbool ChatHandler::HandleUnJailCommand(const char*)â:
/opt/TrinityCoreJail/src/server/game/Chat/Commands/Level1.cpp:848:31: error: âclass ObjectMgrâ has no member named âGetPlayerâ
make[2]: *** [src/server/game/CMakeFiles/game.dir/Chat/Commands/Level1.cpp.o] Erreur 1
make[1]: *** [src/server/game/CMakeFiles/game.dir/all] Erreur 2
make: *** [all] Erreur 2
Player *chr = sObjectMgr->GetPlayer(GUID);
bool ChatHandler::HandleJailCommand(const char *args)
bool ChatHandler::HandleUnJailCommand(const char *args)