OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Save pointer to Player struct in CNSocket.

Browse Source 
This is an insignificant optimization now, but will be necessary when we
start switching around the the algorithms and datastructures used in
proximity detection.
This commit is contained in:
dongresource 2020-09-12 01:22:58 +02:00
parent 3865249387
commit 579aa9d31d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CNProtocol.hpp
View File

@ -132,6 +132,8 @@ enum ACTIVEKEY {
SOCKETKEY_FE SOCKETKEY_FE
}; };
struct Player;
class CNSocket; class CNSocket;
typedef void (*PacketHandler)(CNSocket* sock, CNPacketData* data); typedef void (*PacketHandler)(CNSocket* sock, CNPacketData* data);
@ -153,6 +155,7 @@ private:
public: public:
SOCKET sock; SOCKET sock;
PacketHandler pHandler; PacketHandler pHandler;
Player *plr = nullptr;
CNSocket(SOCKET s, PacketHandler ph); CNSocket(SOCKET s, PacketHandler ph);

8
src/PlayerManager.cpp
View File

@ -6,6 +6,8 @@
#include "settings.hpp" #include "settings.hpp"
#include <assert.h>
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include <cmath> #include <cmath>
@ -45,6 +47,8 @@ void PlayerManager::addPlayer(CNSocket* key, Player plr) {
players[key].plr = p; players[key].plr = p;
players[key].lastHeartbeat = 0; players[key].lastHeartbeat = 0;
key->plr = p;
std::cout << U16toU8(plr.PCStyle.szFirstName) << " " << U16toU8(plr.PCStyle.szLastName) << " has joined!" << std::endl; std::cout << U16toU8(plr.PCStyle.szFirstName) << " " << U16toU8(plr.PCStyle.szLastName) << " has joined!" << std::endl;
std::cout << players.size() << " players" << std::endl; std::cout << players.size() << " players" << std::endl;
} }
@ -66,6 +70,7 @@ void PlayerManager::removePlayer(CNSocket* key) {
std::cout << U16toU8(cachedView.plr->PCStyle.szFirstName) << " " << U16toU8(cachedView.plr->PCStyle.szLastName) << " has left!" << std::endl; std::cout << U16toU8(cachedView.plr->PCStyle.szFirstName) << " " << U16toU8(cachedView.plr->PCStyle.szLastName) << " has left!" << std::endl;
std::cout << players.size() << " players" << std::endl; std::cout << players.size() << " players" << std::endl;
key->plr = nullptr;
delete cachedView.plr; delete cachedView.plr;
players.erase(key); players.erase(key);
} }
@ -692,7 +697,8 @@ void PlayerManager::changePlayerGuide(CNSocket *sock, CNPacketData *data) {
#pragma region Helper methods #pragma region Helper methods
Player *PlayerManager::getPlayer(CNSocket* key) { Player *PlayerManager::getPlayer(CNSocket* key) {
return players[key].plr; assert(key->plr != nullptr);
return key->plr;
} }
WarpLocation PlayerManager::getRespawnPoint(Player *plr) { WarpLocation PlayerManager::getRespawnPoint(Player *plr) {