ModdingRX/TmpMenu
1
0
Fork 0
mirror of https://github.com/Mr-X-GTA/YimMenu.git synced 2025-06-23 09:02:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat(PlayerList): Show self at the top, separated by a divider (#271)

Browse Source 
Additionally I redesigned how the player service worked.

Co-authored-by: Yimura <andreas.maerten@scarlet.be>
This commit is contained in:
mentolixite
2022-06-24 19:48:03 +02:00
committed by GitHub
parent 3fca488876
commit 8626bf2184
8 changed files with 141 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
BigBaseV2/src/services/player_service.cpp
View File

@ -1,5 +1,5 @@
#include "gta_util.hpp"
#include "friends_service.hpp"
#include "gta_util.hpp"
#include "player_service.hpp"
namespace big
@ -7,74 +7,74 @@ namespace big
player::player(CNetGamePlayer* net_game_player)
: m_net_game_player(net_game_player)
{
m_is_friend = friends_service::is_friend(net_game_player);
}
CAutomobile* player::get_current_vehicle()
CAutomobile* player::get_current_vehicle() const
{
if (CPed* ped = this->get_ped(); ped != nullptr)
if (CAutomobile* vehicle = ped->m_vehicle; vehicle != nullptr)
if (const auto ped = this->get_ped(); ped != nullptr)
if (const auto vehicle = ped->m_vehicle; vehicle != nullptr)
return vehicle;
return nullptr;
}
const char* player::get_name()
const char* player::get_name() const
{
return m_net_game_player == nullptr ? "" : m_net_game_player->get_name();
}
rage::netPlayerData* player::get_net_data()
rage::netPlayerData* player::get_net_data() const
{
return m_net_game_player == nullptr ? nullptr : m_net_game_player->get_net_data();
}
CNetGamePlayer* player::get_net_game_player()
CNetGamePlayer* player::get_net_game_player() const
{
return m_net_game_player;
}
CPed* player::get_ped()
CPed* player::get_ped() const
{
if (CPlayerInfo* player_info = this->get_player_info(); player_info != nullptr)
if (CPed* ped = player_info->m_ped; ped != nullptr)
if (const auto player_info = this->get_player_info(); player_info != nullptr)
if (const auto ped = player_info->m_ped; ped != nullptr)
return ped;
return nullptr;
}
CPlayerInfo* player::get_player_info()
CPlayerInfo* player::get_player_info() const
{
if (m_net_game_player != nullptr && m_net_game_player->m_player_info != nullptr)
return m_net_game_player->m_player_info;
return nullptr;
}
uint8_t player::id()
uint8_t player::id() const
{
return m_net_game_player == nullptr ? -1 : m_net_game_player->m_player_id;
}
bool player::is_host()
bool player::is_host() const
{
return m_net_game_player == nullptr ? false : m_net_game_player->is_host();
}
bool player::is_friend()
bool player::is_friend() const
{
return m_is_friend;
}
bool player::is_valid()
bool player::is_valid() const
{
return m_net_game_player == nullptr ? false : m_net_game_player->is_valid();
}
bool player::equals(CNetGamePlayer* net_game_player)
bool player::equals(const CNetGamePlayer* net_game_player) const
{
return net_game_player == m_net_game_player;
}
std::string player::to_lowercase_identifier()
std::string player::to_lowercase_identifier() const
{
std::string lower = this->get_name();
std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
@ -83,82 +83,70 @@ namespace big
}
player_service::player_service()
: m_selected_player(m_dummy)
{
g_player_service = this;
m_dummy_player = new player(nullptr);
auto network_player_mgr = gta_util::get_network_player_mgr();
const auto network_player_mgr = gta_util::get_network_player_mgr();
if (!network_player_mgr)
return;
auto net_game_player = network_player_mgr->m_local_net_player;
if (!net_game_player)
return;
m_self = &network_player_mgr->m_local_net_player;
for (uint16_t i = 0; i < network_player_mgr->m_player_limit; ++i)
{
net_game_player = network_player_mgr->m_player_list[i];
player_join(net_game_player);
}
player_join(network_player_mgr->m_player_list[i]);
}
player_service::~player_service()
{
g_player_service = nullptr;
delete m_dummy_player;
}
void player_service::do_cleanup()
{
m_selected_player = nullptr;
m_players.clear();
}
player* player_service::get_by_name(std::string name)
player_ptr player_service::get_by_name(std::string name)
{
std::transform(name.begin(), name.end(), name.begin(), ::tolower);
if (auto it = m_players.find(name); it != m_players.end())
return it->second.get();
if (const auto it = m_players.find(name); it != m_players.end())
return it->second;
return nullptr;
}
player* player_service::get_by_msg_id(uint32_t msg_id)
player_ptr player_service::get_by_msg_id(uint32_t msg_id) const
{
std::map<std::string, std::unique_ptr<player>>::iterator it;
for (it = m_players.begin(); it != m_players.end(); it++)
{
if (it->second.get()->get_net_game_player()->m_msg_id == msg_id)
return it->second.get();
}
for (const auto& [name, player] : m_players)
if (player->get_net_game_player()->m_msg_id == msg_id)
return player;
return nullptr;
}
player* player_service::get_by_host_token(uint64_t token)
player_ptr player_service::get_by_host_token(uint64_t token) const
{
std::map<std::string, std::unique_ptr<player>>::iterator it;
for (it = m_players.begin(); it != m_players.end(); it++)
{
if (it->second.get()->get_net_data()->m_host_token == token)
return it->second.get();
}
for (const auto& [name, player] : m_players)
if (player->get_net_data()->m_host_token == token)
return player;
return nullptr;
}
player* player_service::get_selected()
player_ptr player_service::get_selected() const
{
return m_selected_player == nullptr ? m_dummy_player : m_selected_player;
return m_selected_player;
}
player_ptr player_service::get_self() const
{
return std::make_shared<player>(*m_self);
}
void player_service::player_join(CNetGamePlayer* net_game_player)
{
if (net_game_player == nullptr) return;
std::unique_ptr<player> plyr = std::make_unique<player>(net_game_player);
plyr->m_is_friend = friends_service::is_friend(plyr);
if (net_game_player == nullptr || net_game_player == *m_self) return;
auto plyr = std::make_shared<player>(net_game_player);
m_players.emplace(
plyr->to_lowercase_identifier(),
std::move(plyr)
@ -169,13 +157,13 @@ namespace big
{
if (net_game_player == nullptr) return;
if (m_selected_player && m_selected_player->equals(net_game_player))
m_selected_player = nullptr;
m_selected_player = m_dummy;
std::unique_ptr<player> plyr = std::make_unique<player>(net_game_player);
auto plyr = std::make_unique<player>(net_game_player);
m_players.erase(plyr->to_lowercase_identifier());
}
void player_service::set_selected(player* plyr)
void player_service::set_selected(player_ptr plyr)
{
m_selected_player = plyr;
}