Merge branch 'merge/2021-11-19' into feature/core4-atys

ryzom/server/src/entities_game_service/client_messages.cpp

@@ -1763,7 +1763,7 @@ void cbClientBotChatTradeSell( NLNET::CMessage& msgin, const std::string &servic
 	H_AUTO(cbClientBotChatTradeSell);
 
 	uint8 inv;
-	uint8 idx;
+	uint16 idx;
 	uint16 quantity;
 	uint32 price;
 	CEntityId userId;
@@ -2550,7 +2550,7 @@ void cbClientWho( NLNET::CMessage& msgin, const std::string &serviceName, NLNET:
 			return;
 		}
 		CPlayer *p = PlayerManager.getPlayer(PlayerManager.getPlayerId(user->getId()));
-		
+
 		if (NLMISC::nlstricmp( opt.c_str(), "league" ) == 0)
 		{
 			chanID = user->getLeagueId();
@@ -3416,7 +3416,7 @@ void cbGetNpcIconDesc( NLNET::CMessage& msgin, const std::string & serviceName,
 {
 	CEntityId eid;
 	vector<uint32> npcKeys;
-	
+
 	msgin.serial( eid );
 	msgin.serialCont( npcKeys );
 
@@ -3675,7 +3675,7 @@ TUnifiedCallbackItem CbClientArray[]=
 	{ "CLIENT:RING_MISSION:MISSION_RING_SELECT",cbRingMissionSelectAction },
 
 	{ "CLIENT:NPC_ICON:GET_DESC",				cbGetNpcIconDesc },
-}; 
+};