fix: setCell for ui display

tiltedphoques · Jun 17, 2022 · b99af4c · b99af4c
1 parent 6043c34
commit b99af4c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 17 deletions.
diff --git a/Code/client/Services/Generic/OverlayService.cpp b/Code/client/Services/Generic/OverlayService.cpp
@@ -393,7 +393,7 @@ void OverlayService::OnPlayerCellChanged(const NotifyPlayerCellChanged& acMessag
     auto pArguments = CefListValue::Create();
     pArguments->SetInt(0, acMessage.PlayerId);
     String cellName = GetCellName(acMessage.WorldSpaceId, acMessage.CellId);
-    pArguments->SetString(3, cellName.c_str());
+    pArguments->SetString(1, cellName.c_str());
     m_pOverlay->ExecuteAsync("setCell", pArguments);
 }
 

diff --git a/Code/client/Services/Generic/TransportService.cpp b/Code/client/Services/Generic/TransportService.cpp
@@ -105,7 +105,7 @@ void TransportService::OnConsume(const void* apData, uint32_t aSize)
 
 void TransportService::OnConnected()
 {
-    AuthenticationRequest request;
+    AuthenticationRequest request{};
     request.Version = BUILD_COMMIT;
     request.SKSEActive = IsScriptExtenderLoaded();
     request.MO2Active = GetModuleHandleW(kMO2DllName);

diff --git a/Code/encoding/Messages/AuthenticationRequest.h b/Code/encoding/Messages/AuthenticationRequest.h
@@ -33,14 +33,14 @@ struct AuthenticationRequest final : ClientMessage
             Level == achRhs.Level;
     }
 
-    uint64_t DiscordId;
-    bool SKSEActive;
-    bool MO2Active; 
-    String Token;
-    String Version;
-    Mods UserMods;
-    String Username;
-    GameId WorldSpaceId;
-    GameId CellId;
-    uint16_t Level;
+    uint64_t DiscordId{};
+    bool SKSEActive{};
+    bool MO2Active{};
+    String Token{};
+    String Version{};
+    Mods UserMods{};
+    String Username{};
+    GameId WorldSpaceId{};
+    GameId CellId{};
+    uint16_t Level{};
 };
diff --git a/Code/encoding/Messages/NotifyPlayerJoined.h b/Code/encoding/Messages/NotifyPlayerJoined.h
@@ -28,9 +28,9 @@ struct NotifyPlayerJoined final : ServerMessage
                Level == acRhs.Level;
     }
 
-    uint32_t PlayerId;
-    String Username;
-    GameId WorldSpaceId;
-    GameId CellId;
-    uint16_t Level;
+    uint32_t PlayerId{};
+    String Username{};
+    GameId WorldSpaceId{};
+    GameId CellId{};
+    uint16_t Level{};
 };
diff --git a/Code/skyrim_ui/src/app/services/player-list.service.ts b/Code/skyrim_ui/src/app/services/player-list.service.ts
@@ -14,6 +14,7 @@ export class PlayerListService {
   private connectionSubscription: Subscription;
   private playerConnectedSubscription: Subscription;
   private playerDisconnectedSubscription: Subscription;
+  private cellSubscription: Subscription;
   private partyInviteReceivedSubscription: Subscription;
 
   private isConnect = false;
@@ -22,13 +23,15 @@ export class PlayerListService {
     this.onConnectionStateChanged();
     this.onPlayerConnected();
     this.onPlayerDisconnected();
+    this.onCellChange();
     this.onPartyInviteReceived();
   }
 
   ngOnDestroy() {
     this.connectionSubscription.unsubscribe();
     this.playerConnectedSubscription.unsubscribe();
     this.playerDisconnectedSubscription.unsubscribe();
+    this.cellSubscription.unsubscribe();
     this.partyInviteReceivedSubscription.unsubscribe();
   }
 
@@ -74,6 +77,19 @@ export class PlayerListService {
     });
   }
 
+  private onCellChange() {
+    this.cellSubscription = this.clientService.cellChange.subscribe((player: Player) => {
+      const playerList = this.createPlayerList(this.playerList.value);
+
+      if (playerList) {
+        const p = playerList.players.get(player.serverId);
+        if (p) {
+          p.cellName = player.cellName;
+        }
+      }
+    })
+  }
+
   private onPartyInviteReceived() {
     this.partyInviteReceivedSubscription = this.clientService.partyInviteReceivedChange.subscribe((inviterId: number) => {
       const playerList = this.createPlayerList(this.playerList.value);