From 7c4a2f857d67648fd778e9300823f15681498c10 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Thu, 12 Nov 2020 14:38:41 +0800 Subject: [PATCH] Restore PvP challenge message callbacks --- .../src/entities_game_service/client_messages.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ryzom/server/src/entities_game_service/client_messages.cpp b/ryzom/server/src/entities_game_service/client_messages.cpp index f12d22495..e7a3566c1 100644 --- a/ryzom/server/src/entities_game_service/client_messages.cpp +++ b/ryzom/server/src/entities_game_service/client_messages.cpp @@ -3620,13 +3620,16 @@ TUnifiedCallbackItem CbClientArray[]= { "CLIENT:DUEL:REFUSE", cbClientDuelRefuse }, { "CLIENT:DUEL:ABANDON", cbClientDuelAbandon }, - // TODO_RYZOMCLASSIC: Revert this, add additional client messages for 'League'. -Kaetemi - // { "CLIENT:PVP_CHALLENGE:ASK", cbClientPVPChallengeAsked }, - // { "CLIENT:PVP_CHALLENGE:ACCEPT", cbClientPVPChallengeAccept }, - // { "CLIENT:PVP_CHALLENGE:REFUSE", cbClientPVPChallengeRefuse }, +#ifdef RYZOM_FORGE + // FIXME { "CLIENT:PVP_CHALLENGE:ASK", cbClientLeagueJoinProposal }, { "CLIENT:PVP_CHALLENGE:ACCEPT", cbClientLeagueJoin }, { "CLIENT:PVP_CHALLENGE:REFUSE", cbClientLeagueJoinProposalDecline }, +#else + { "CLIENT:PVP_CHALLENGE:ASK", cbClientPVPChallengeAsked }, + { "CLIENT:PVP_CHALLENGE:ACCEPT", cbClientPVPChallengeAccept }, + { "CLIENT:PVP_CHALLENGE:REFUSE", cbClientPVPChallengeRefuse }, +#endif { "CLIENT:PVP_CHALLENGE:ABANDON", cbClientPVPChallengeAbandon }, // { "CLIENT:PVP_VERSUS:CLAN", cbClientPvpChooseClan },