Merge remote-tracking branch 'upstream/master' into Test

2026-04-01 17:20:04 +00:00 · 2020-08-21 12:24:55 +02:00
parent 2c09401ab7 1669ee3660
commit 4f49eb652a
23 changed files with 806 additions and 554 deletions
--- a/src/PlayerManager.hpp
+++ b/src/PlayerManager.hpp
@@ -11,6 +11,7 @@

 struct PlayerView {
    std::list<CNSocket*> viewable;
+    std::list<int32_t> viewableNPCs;
    Player plr;
    int long lastHeartbeat;
 };