ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

More fixes for 1.66 (#944)

Browse Source 
* fix(Menu): more update fixes
* fix(Spoofing): remove spoofing
* fix(Globals): update globals
* fix(Classes): upstream classes
* fix(Misc): remove debug code
* fix(Merge)
This commit is contained in:
maybegreat48
2023-02-04 16:35:18 +00:00
committed by GitHub
parent 5c01d393b9
commit 7f37def248
27 changed files with 139 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/friends/friends_service.cpp
View File

@ -20,7 +20,7 @@ namespace big
if (net_player == nullptr)
return false;
const auto rockstar_id = net_player->get_net_data()->m_gamer_handle_2.m_rockstar_id;
const auto rockstar_id = net_player->get_net_data()->m_gamer_handle.m_rockstar_id;
for (std::uint32_t i = 0; i < g_pointers->m_friend_registry->m_friend_count; i++)
if (rockstar_id == g_pointers->m_friend_registry->get(i)->m_rockstar_id)
return true;

8
src/services/player_database/player_database_service.cpp
View File

@ -60,13 +60,13 @@ namespace big
persistent_player* player_database_service::get_or_create_player(player_ptr player)
{
if (m_players.contains(player->get_net_data()->m_gamer_handle_2.m_rockstar_id))
return &m_players[player->get_net_data()->m_gamer_handle_2.m_rockstar_id];
if (m_players.contains(player->get_net_data()->m_gamer_handle.m_rockstar_id))
return &m_players[player->get_net_data()->m_gamer_handle.m_rockstar_id];
else
{
m_players[player->get_net_data()->m_gamer_handle_2.m_rockstar_id] = { player->get_name(), player->get_net_data()->m_gamer_handle_2.m_rockstar_id };
m_players[player->get_net_data()->m_gamer_handle.m_rockstar_id] = { player->get_name(), player->get_net_data()->m_gamer_handle.m_rockstar_id };
save();
return &m_players[player->get_net_data()->m_gamer_handle_2.m_rockstar_id];
return &m_players[player->get_net_data()->m_gamer_handle.m_rockstar_id];
}
}

27
src/services/players/player.cpp
View File

@ -3,6 +3,7 @@
#include "services/friends/friends_service.hpp"
#include "gta_util.hpp"
#include <network/Network.hpp>
#include <network/RemoteGamerInfoMsg.hpp>
namespace big
{
@ -70,7 +71,7 @@ namespace big
{
for (std::uint32_t i = 0; i < gta_util::get_network()->m_game_session_ptr->m_peer_count; i++)
{
if (gta_util::get_network()->m_game_session_ptr->m_peers[i]->m_peer_data.m_gamer_handle_2.m_rockstar_id == get_net_data()->m_gamer_handle_2.m_rockstar_id)
if (gta_util::get_network()->m_game_session_ptr->m_peers[i]->m_peer_data.m_gamer_handle.m_rockstar_id == get_net_data()->m_gamer_handle.m_rockstar_id)
{
return gta_util::get_network()->m_game_session_ptr->m_peers[i];
}
@ -79,6 +80,30 @@ namespace big
return nullptr;
}
netAddress player::get_ip_address()
{
if (this == g_player_service->get_self().get() && get_net_data())
return get_net_data()->m_external_ip;
if (auto session_player = get_session_player())
if (auto peer = g_pointers->m_get_connection_peer(gta_util::get_network()->m_game_session_ptr->m_net_connection_mgr, (int)get_session_player()->m_player_data.m_peer_id_2))
return netAddress{ ((netConnectionPeer*)peer)->m_external_ip };
return { 0 };
}
uint16_t player::get_port()
{
if (this == g_player_service->get_self().get() && get_net_data())
return get_net_data()->m_external_port;
if (auto session_player = get_session_player())
if (auto peer = g_pointers->m_get_connection_peer(gta_util::get_network()->m_game_session_ptr->m_net_connection_mgr, (int)get_session_player()->m_player_data.m_peer_id_2))
return ((netConnectionPeer*)peer)->m_external_port;
return 0;
}
uint8_t player::id() const
{
return m_net_game_player == nullptr ? -1 : m_net_game_player->m_player_id;

2
src/services/players/player.hpp
View File

@ -44,6 +44,8 @@ namespace big
[[nodiscard]] CPlayerInfo* get_player_info() const;
[[nodiscard]] class rage::snPlayer* get_session_player();
[[nodiscard]] class rage::snPeer* get_session_peer();
[[nodiscard]] netAddress get_ip_address();
[[nodiscard]] uint16_t get_port();
[[nodiscard]] uint8_t id() const;