Multiplayer explosion

unibuc-cs · Jan 30, 2025 · 3835a21 · 3835a21
1 parent 92d84a5
commit 3835a21
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/DeadZone/source/Client/Client.cpp b/DeadZone/source/Client/Client.cpp
@@ -485,14 +485,13 @@ void Client::sendBullet(const std::shared_ptr<Bullet>& const entity)
 	}
 
 	nlohmann::json jsonData;
-
 	jsonData["bullet"]["isThrownGrenade"] = isThrownGrenade;
 	jsonData["bullet"]["x"] = entity->getX();
 	jsonData["bullet"]["y"] = entity->getY();
 	jsonData["bullet"]["rotateAngle"] = entity->getRotateAngle();
 	jsonData["bullet"]["speed"] = entity->getSpeed();
-	jsonData["bullet"]["textureName2D"] = entity->getTextureName2D();
-	jsonData["bullet"]["damage"] = entity->getDamage();
+	jsonData["bullet"]["textureName2D"] = entity->getTextureName2D();	
+	jsonData["bullet"]["damage"] = isThrownGrenade ? std::dynamic_pointer_cast<ThrownGrenade>(entity)->getExplosionDamage() : entity->getDamage();
 
 	// TODO: trimite si ceilalti parametrii daca vrem sa avem mai multi modificatori
 

diff --git a/DeadZone/source/Entity/Bullet/ThrownGrenade.h b/DeadZone/source/Entity/Bullet/ThrownGrenade.h
@@ -27,4 +27,7 @@ class ThrownGrenade : public virtual Bullet
 	virtual void update() override;
 
 	virtual void onCollide(CollidableEntity& other, glm::vec2 overlap) override;
+
+	// Getters
+	double getExplosionDamage() const { return explosionDamage; }
 };
diff --git a/DeadZone/source/Server/Server.cpp b/DeadZone/source/Server/Server.cpp
@@ -476,7 +476,7 @@ void Server::update()
 					jsonData["bullets"][otherConnectedClient.first]["rotateAngle"] = otherConnectedClient.second.bulletData.get()->getRotateAngle();
 					jsonData["bullets"][otherConnectedClient.first]["speed"] = otherConnectedClient.second.bulletData.get()->getSpeed();
 					jsonData["bullets"][otherConnectedClient.first]["textureName2D"] = otherConnectedClient.second.bulletData.get()->getTextureName2D();
-					jsonData["bullets"][otherConnectedClient.first]["damage"] = otherConnectedClient.second.bulletData.get()->getDamage();
+					jsonData["bullets"][otherConnectedClient.first]["damage"] = std::dynamic_pointer_cast<ThrownGrenade>(otherConnectedClient.second.bulletData)->getExplosionDamage();
 				}
 
 				// closeRangeDamage