OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-12-22 12:00:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a wrapper for U16toU8, called AUTOU16TOU8

Browse Source 
- U16toU8 now requires a max arument to be passed
This commit is contained in:
CPunch
2021-03-17 23:41:47 -05:00
parent 610a683804
commit 574f0cab09
9 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/PlayerManager.cpp
View File

@@ -209,7 +209,7 @@ static void enterPlayer(CNSocket* sock, CNPacketData* data) {
DEBUGLOG(
std::cout << "P_CL2FE_REQ_PC_ENTER:" << std::endl;
std::cout << "\tID: " << U16toU8(enter->szID) << std::endl;
std::cout << "\tID: " << AUTOU16TOU8(enter->szID) << std::endl;
std::cout << "\tSerial: " << enter->iEnterSerialKey << std::endl;
std::cout << "\tTemp: " << enter->iTempValue << std::endl;
std::cout << "\tPC_UID: " << plr.PCStyle.iPC_UID << std::endl;
@@ -607,7 +607,7 @@ std::string PlayerManager::getPlayerName(Player *plr, bool id) {
if (id && plr->accountLevel <= 30)
ret += "(GM) ";
ret += U16toU8(plr->PCStyle.szFirstName) + " " + U16toU8(plr->PCStyle.szLastName);
ret += AUTOU16TOU8(plr->PCStyle.szFirstName) + " " + AUTOU16TOU8(plr->PCStyle.szLastName);
if (id)
ret += " [" + std::to_string(plr->iID) + "]";
@@ -662,8 +662,8 @@ CNSocket *PlayerManager::getSockFromID(int32_t iID) {
CNSocket *PlayerManager::getSockFromName(std::string firstname, std::string lastname) {
for (auto& pair : players)
if (U16toU8(pair.second->PCStyle.szFirstName) == firstname
&& U16toU8(pair.second->PCStyle.szLastName) == lastname)
if (AUTOU16TOU8(pair.second->PCStyle.szFirstName) == firstname
&& AUTOU16TOU8(pair.second->PCStyle.szLastName) == lastname)
return pair.first;
return nullptr;