Removed unnecessary string in EPlayerDamage (TypeOfDamage). Renamed a variable in WeaponSystem

include/Engine/Core/EPlayerDamage.h

@@ -11,8 +11,6 @@ struct PlayerDamage : Event
 {
     double DamageAmount;
     EntityID PlayerDamagedID;
-    //optional TypeOfDamage
-    std::string TypeOfDamage;
 };
 
 }

src/Engine/Network/Client.cpp

@@ -288,7 +288,6 @@ bool Client::OnPlayerDamage(const Events::PlayerDamage & e)
     Packet packet(MessageType::OnInputCommand, m_SendPacketID);
     packet.WritePrimitive(e.DamageAmount);
     packet.WritePrimitive(e.PlayerDamagedID);
-    packet.WriteString(e.TypeOfDamage);
     send(packet);
     return false;
 }

src/Engine/Network/Server.cpp

@@ -240,7 +240,6 @@ void Server::parseOnPlayerDamage(Packet & packet)
     Events::PlayerDamage e;
     e.DamageAmount = packet.ReadPrimitive<double>();
     e.PlayerDamagedID = packet.ReadPrimitive<EntityID>();
-    e.TypeOfDamage = packet.ReadString();
     m_EventBroker->Publish(e);
     //LOG_DEBUG("Server::parseOnPlayerDamage: Command is %s. Value is %f. PlayerID is %i.", e.DamageAmount, e.PlayerDamagedID, e.TypeOfDamage.c_str());
 }

src/Game/Systems/WeaponSystem.cpp

@@ -16,20 +16,19 @@ void WeaponSystem::Update(World* world, double dt)
         //TODO: check if player has enough ammo and if weapon has a cooldown or not
 
         //pick the object
-        PickData somePickData = m_Renderer->Pick(std::get<1>(m_EShootVector[i - 1]));
-        if (somePickData.Entity == EntityID_Invalid) {
+        PickData pickDataFromShot = m_Renderer->Pick(std::get<1>(m_EShootVector[i - 1]));
+        if (pickDataFromShot.Entity == EntityID_Invalid) {
             m_EShootVector.erase(m_EShootVector.begin() + i - 1);
             continue;
         }
         //if its a player, do PlayerDamage event
-        const bool hasPlayerComponent = world->HasComponent(somePickData.Entity, "Player");
+        const bool hasPlayerComponent = world->HasComponent(pickDataFromShot.Entity, "Player");
         if (hasPlayerComponent) {
             Events::PlayerDamage ePlayerDamage;
             //TODO: damage based on weapontype/class?
             //TODO: multiple shots at the same time? (shotgunner)
             ePlayerDamage.DamageAmount = 25;
-            ePlayerDamage.PlayerDamagedID = somePickData.Entity;
-            ePlayerDamage.TypeOfDamage = "Some Weapon";
+            ePlayerDamage.PlayerDamagedID = pickDataFromShot.Entity;
             m_EventBroker->Publish(ePlayerDamage);
         }
         m_EShootVector.erase(m_EShootVector.begin() + i - 1);