OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2026-04-01 17:20:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test: Add enter vehicle

Browse Source
This commit is contained in:
Onii-chan
2020-08-23 14:26:07 +02:00
parent 213a8385ec
commit 65398307c4
2 changed files with 377 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

873
src/PlayerManager.cpp
View File

File diff suppressed because it is too large Load Diff

11
src/PlayerManager.hpp
View File

@@ -13,7 +13,7 @@ struct PlayerView {
std::list<CNSocket*> viewable; std::list<CNSocket*> viewable;
std::list<int32_t> viewableNPCs; std::list<int32_t> viewableNPCs;
Player plr; Player plr;
int long lastHeartbeat; uint64_t lastHeartbeat;
}; };
@@ -41,15 +41,10 @@ namespace PlayerManager {
void gotoPlayer(CNSocket* sock, CNPacketData* data); void gotoPlayer(CNSocket* sock, CNPacketData* data);
void setSpecialPlayer(CNSocket* sock, CNPacketData* data); void setSpecialPlayer(CNSocket* sock, CNPacketData* data);
void heartbeatPlayer(CNSocket* sock, CNPacketData* data); void heartbeatPlayer(CNSocket* sock, CNPacketData* data);
void revivePlayer(CNSocket* sock, CNPacketData* data);
void exitGame(CNSocket* sock, CNPacketData* data); void exitGame(CNSocket* sock, CNPacketData* data);
<<<<<<< Updated upstream
void onPlayerSpawn(CNSocket* sock, CNPacketData* data);
=======
void makePlayerBuddy(CNSocket* sock, CNPacketData* data); void enterPlayerVehicle(CNSocket* sock, CNPacketData* data);
void invitePlayerGroup(CNSocket* sock, CNPacketData* data);
void acceptPlayerGroup(CNSocket* sock, CNPacketData* data);
>>>>>>> Stashed changes
} }
#endif #endif