forked from pieeebot/cafeberry
feat: Orbis & PSVita builds, Durango postbuild & More (#10)
This fixes Orbis & PSVita builds along with adds a Durango postbuild and moves PS3 to the new SonyLeaderboardManager introduced in TU19 This also fixes the Orbis strings and gets some of the other Windows64 build configurations mostly building. --------- Co-authored-by: str1k3r <115313679+S1l3ntStr1ke87@users.noreply.github.com> Co-authored-by: str1k3r <1+str1k3r@noreply.localhost> Co-authored-by: 552eden <552eden@gmail.com> Co-authored-by: ubergamer-pie <16+ubergamer-pie@noreply.localhost> Co-authored-by: str1k3r <15+str1k3r@noreply.neolegacy.dev> Co-authored-by: pieeebot <10+pieeebot@noreply.neolegacy.dev> Reviewed-on: pieeebot/cafeberry#10
This commit is contained in:
@@ -1964,6 +1964,7 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
|
||||
#elif defined __PSVITA__
|
||||
sce::Toolkit::NP::Utilities::Future<sce::Toolkit::NP::FriendsList> friendList;
|
||||
int ret = -1;
|
||||
/*
|
||||
if(!CGameNetworkManager::usingAdhocMode()) // we don't need to be friends in PSN for adhoc mode
|
||||
{
|
||||
int ret = sce::Toolkit::NP::Friends::Interface::getFriendslist(&friendList, false);
|
||||
@@ -1974,10 +1975,11 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
|
||||
friendCount = friendList.get()->size();
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
#else // __ORBIS__
|
||||
|
||||
sce::Toolkit::NP::Utilities::Future<sce::Toolkit::NP::FriendsList> friendList;
|
||||
/*
|
||||
//sce::Toolkit::NP::Utilities::Future<sce::Toolkit::NP::FriendsList> friendList;
|
||||
std::vector<sce::Toolkit::NP::FriendsList> friendList;
|
||||
|
||||
sce::Toolkit::NP::FriendInfoRequest requestParam;
|
||||
memset(&requestParam,0,sizeof(requestParam));
|
||||
@@ -1986,14 +1988,16 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
|
||||
requestParam.offset = 0;
|
||||
requestParam.userInfo.userId = ProfileManager.getUserID(ProfileManager.GetPrimaryPad());
|
||||
|
||||
int ret = sce::Toolkit::NP::Friends::Interface::getFriendslist(&friendList, &requestParam, false);
|
||||
//int ret = sce::Toolkit::NP::Friends::Interface::getFriendslist(&friendList, &requestParam, false);
|
||||
int ret = 42069;
|
||||
if( ret == 0 )
|
||||
{
|
||||
if( friendList.hasResult() )
|
||||
if( friendList.hasResult())
|
||||
{
|
||||
friendCount = friendList.get()->size();
|
||||
}
|
||||
}
|
||||
}*/
|
||||
int ret = 42069;
|
||||
#endif
|
||||
if( ret == 0 )
|
||||
{
|
||||
@@ -2003,12 +2007,18 @@ void ClientConnection::handlePreLogin(shared_ptr<PreLoginPacket> packet)
|
||||
{
|
||||
#ifdef __PS3__
|
||||
ret = sceNpBasicGetFriendListEntry( i, &npid );
|
||||
#elif defined __ORBIS__
|
||||
//dont touch npid
|
||||
#else
|
||||
npid = friendList.get()->at(i).npid;
|
||||
#endif
|
||||
if( ret == 0 )
|
||||
{
|
||||
#ifndef __ORBIS__
|
||||
if(strcmp(npid.handle.data, packet->m_playerXuids[packet->m_hostIndex].getOnlineID()) == 0)
|
||||
#else
|
||||
if(1==2)
|
||||
#endif
|
||||
{
|
||||
isFriend = true;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user