BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
verysecrethero
2016-01-21 16:30:07 +01:00
parent 7deb32431e
commit 973ccd34c9
4 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Core/EPlayerDamage.h
-2
View File
@@ -11,8 +11,6 @@ struct PlayerDamage : Event
{ {
double DamageAmount; double DamageAmount;
EntityID PlayerDamagedID; EntityID PlayerDamagedID;
//optional TypeOfDamage
std::string TypeOfDamage;
}; };
} }
src/Engine/Network/Client.cpp
-1
View File
@@ -288,7 +288,6 @@ bool Client::OnPlayerDamage(const Events::PlayerDamage & e)
Packet packet(MessageType::OnInputCommand, m_SendPacketID); Packet packet(MessageType::OnInputCommand, m_SendPacketID);
packet.WritePrimitive(e.DamageAmount); packet.WritePrimitive(e.DamageAmount);
packet.WritePrimitive(e.PlayerDamagedID); packet.WritePrimitive(e.PlayerDamagedID);
packet.WriteString(e.TypeOfDamage);
send(packet); send(packet);
return false; return false;
} }
src/Engine/Network/Server.cpp
-1
View File
@@ -240,7 +240,6 @@ void Server::parseOnPlayerDamage(Packet & packet)
Events::PlayerDamage e; Events::PlayerDamage e;
e.DamageAmount = packet.ReadPrimitive<double>(); e.DamageAmount = packet.ReadPrimitive<double>();
e.PlayerDamagedID = packet.ReadPrimitive<EntityID>(); e.PlayerDamagedID = packet.ReadPrimitive<EntityID>();
e.TypeOfDamage = packet.ReadString();
m_EventBroker->Publish(e); 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()); //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
+4 -5
View File
@@ -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 //TODO: check if player has enough ammo and if weapon has a cooldown or not
//pick the object //pick the object
PickData somePickData = m_Renderer->Pick(std::get<1>(m_EShootVector[i - 1])); PickData pickDataFromShot = m_Renderer->Pick(std::get<1>(m_EShootVector[i - 1]));
if (somePickData.Entity == EntityID_Invalid) { if (pickDataFromShot.Entity == EntityID_Invalid) {
m_EShootVector.erase(m_EShootVector.begin() + i - 1); m_EShootVector.erase(m_EShootVector.begin() + i - 1);
continue; continue;
} }
//if its a player, do PlayerDamage event //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) { if (hasPlayerComponent) {
Events::PlayerDamage ePlayerDamage; Events::PlayerDamage ePlayerDamage;
//TODO: damage based on weapontype/class? //TODO: damage based on weapontype/class?
//TODO: multiple shots at the same time? (shotgunner) //TODO: multiple shots at the same time? (shotgunner)
ePlayerDamage.DamageAmount = 25; ePlayerDamage.DamageAmount = 25;
ePlayerDamage.PlayerDamagedID = somePickData.Entity; ePlayerDamage.PlayerDamagedID = pickDataFromShot.Entity;
ePlayerDamage.TypeOfDamage = "Some Weapon";
m_EventBroker->Publish(ePlayerDamage); m_EventBroker->Publish(ePlayerDamage);
} }
m_EShootVector.erase(m_EShootVector.begin() + i - 1); m_EShootVector.erase(m_EShootVector.begin() + i - 1);