tweak: cleanup

tiltedphoques · Apr 7, 2022 · 8f0f1bc · 8f0f1bc
1 parent 24d255b
commit 8f0f1bc
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 23 deletions.
diff --git a/Code/client/Games/Skyrim/Actor.cpp b/Code/client/Games/Skyrim/Actor.cpp
@@ -274,12 +274,12 @@ Inventory Actor::GetActorInventory() const noexcept
 {
     Inventory inventory = GetInventory();
 
-    inventory.CurrentMagicEquipment = GetEquipment();
+    inventory.CurrentMagicEquipment = GetMagicEquipment();
 
     return inventory;
 }
 
-MagicEquipment Actor::GetEquipment() const noexcept
+MagicEquipment Actor::GetMagicEquipment() const noexcept
 {
     MagicEquipment equipment;
 

diff --git a/Code/client/Games/Skyrim/Actor.h b/Code/client/Games/Skyrim/Actor.h
@@ -191,7 +191,7 @@ struct Actor : TESObjectREFR
     float GetActorValue(uint32_t aId) const noexcept;
     float GetActorMaxValue(uint32_t aId) const noexcept;
     Inventory GetActorInventory() const noexcept;
-    MagicEquipment GetEquipment() const noexcept;
+    MagicEquipment GetMagicEquipment() const noexcept;
 
     Factions GetFactions() const noexcept;
     ActorValues GetEssentialActorValues() const noexcept;

diff --git a/Code/client/Games/Skyrim/TESObjectREFR.cpp b/Code/client/Games/Skyrim/TESObjectREFR.cpp
@@ -502,11 +502,6 @@ void TESObjectREFR::AddOrRemoveItem(const Inventory::Entry& arEntry) noexcept
         {
             isWorn = pExtraDataList->Contains(ExtraData::Worn);
             isWornLeft = pExtraDataList->Contains(ExtraData::WornLeft);
-
-            if (isWorn)
-                spdlog::error("Entry worn: {}", arEntry.ExtraWorn);
-            if (isWornLeft)
-                spdlog::critical("Entry worn left: {}", arEntry.ExtraWornLeft);
         }
 
         AddObjectToContainer(pObject, pExtraDataList, arEntry.Count, nullptr);

diff --git a/Code/client/Services/Generic/CharacterService.cpp b/Code/client/Services/Generic/CharacterService.cpp
@@ -227,7 +227,6 @@ void CharacterService::OnAssignCharacter(const AssignCharacterResponse& acMessag
         if (!pActor)
             return;
 
-        // TODO: verify these code paths (and simplify them maybe)
         if (pActor->IsDead() != acMessage.IsDead)
             acMessage.IsDead ? pActor->Kill() : pActor->Respawn();
 
@@ -267,8 +266,6 @@ void CharacterService::OnAssignCharacter(const AssignCharacterResponse& acMessag
 
         pActor->SetActorValues(acMessage.AllActorValues);
 
-        //  TODO: verify this code path too while you're at it
-        // in fact, this whole function annoys me
         if (pActor->IsDead() != acMessage.IsDead)
             acMessage.IsDead ? pActor->Kill() : pActor->Respawn();
 

diff --git a/Code/encoding/Messages/NotifyEquipmentChanges.h b/Code/encoding/Messages/NotifyEquipmentChanges.h
@@ -30,7 +30,7 @@ struct NotifyEquipmentChanges final : ServerMessage
     uint32_t ServerId{};
     GameId ItemId{};
     GameId EquipSlotId{};
-    uint32_t Count{}; // TODO: count can probably be removed
+    uint32_t Count{};
     bool Unequip = false;
     bool IsSpell = false;
     bool IsShout = false;

diff --git a/Code/encoding/Messages/RequestEquipmentChanges.h b/Code/encoding/Messages/RequestEquipmentChanges.h
@@ -34,7 +34,7 @@ struct RequestEquipmentChanges final : ClientMessage
     uint32_t ServerId{};
     GameId ItemId{};
     GameId EquipSlotId{};
-    uint32_t Count{}; // TODO: count can probably be removed
+    uint32_t Count{};
     bool Unequip = false;
     bool IsSpell = false;
     bool IsShout = false;

diff --git a/Code/encoding/Structs/Inventory.cpp b/Code/encoding/Structs/Inventory.cpp
@@ -156,8 +156,6 @@ void Inventory::UpdateEquipment(const Inventory& acNewInventory) noexcept
         wornEntry->ExtraWorn = wornEntry->ExtraWornLeft = false;
     }
 
-    // TODO: this is definitely not the fastest algorithm in the west
-    // but it'll do for now, cause tracking inventory equipment is ass
     for (const auto& newEntry : acNewInventory.Entries)
     {
         if (!newEntry.IsWorn())

diff --git a/Code/encoding/Structs/Inventory.h b/Code/encoding/Structs/Inventory.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <TiltedCore/Stl.hpp>
-#include "Equipment.h"
+#include "MagicEquipment.h"
 
 using TiltedPhoques::Buffer;
 using TiltedPhoques::String;

diff --git a/Code/encoding/Structs/Equipment.cpp → Code/encoding/Structs/MagicEquipment.cpp b/Code/encoding/Structs/Equipment.cpp → Code/encoding/Structs/MagicEquipment.cpp
@@ -1,4 +1,4 @@
-#include <Structs/Equipment.h>
+#include <Structs/MagicEquipment.h>
 #include <TiltedCore/Serialization.hpp>
 #include <Messages/RequestEquipmentChanges.h>
 

diff --git a/Code/encoding/Structs/Equipment.h → Code/encoding/Structs/MagicEquipment.h b/Code/encoding/Structs/Equipment.h → Code/encoding/Structs/MagicEquipment.h
diff --git a/Code/server/Services/InventoryService.cpp b/Code/server/Services/InventoryService.cpp
@@ -56,12 +56,6 @@ void InventoryService::OnEquipmentChanges(const PacketEvent<RequestEquipmentChan
     {
         auto& inventoryComponent = view.get<InventoryComponent>(*it);
         inventoryComponent.Content.UpdateEquipment(message.CurrentInventory);
-        /*
-        spdlog::info("Updating equipment, RightHandSpell: {:X}, RightHandWeapon: {:X}, LeftHandSpell: {:X}, LeftHandWeapon: {:X}, Shout: {:X}, Ammo: {:X}",
-                     inventoryComponent.Content.CurrentEquipment.RightHandSpell.BaseId, inventoryComponent.Content.CurrentEquipment.RightHandWeapon.BaseId, 
-                     inventoryComponent.Content.CurrentEquipment.LeftHandSpell.BaseId, inventoryComponent.Content.CurrentEquipment.LeftHandWeapon.BaseId,
-                     inventoryComponent.Content.CurrentEquipment.Shout.BaseId, inventoryComponent.Content.CurrentEquipment.Ammo.BaseId);
-        */
     }
 
     NotifyEquipmentChanges notify;