Compare commits
43 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e7de7ccf8c | |||
| fe36e8b423 | |||
| bfcf7b240e | |||
| 73b8bff1f3 | |||
| 1deb506fb2 | |||
| 7ea26d10ee | |||
| 28e9ba1208 | |||
| 5a6374f013 | |||
| 1ae2f3f5f3 | |||
| 1961c16fe2 | |||
| d32a483bb4 | |||
| e23ea78aeb | |||
| 4153a31e3a | |||
| 0908be1e02 | |||
| 2ed5fad699 | |||
| 70374fa10e | |||
| 20468cba1b | |||
| 7749fc5474 | |||
| 6dd7f1a657 | |||
| 14b0a64720 | |||
| 8647267cad | |||
| ecab5de056 | |||
| 38d8cdded2 | |||
| 22c391df54 | |||
| f220d8088c | |||
| df2e4abb52 | |||
| 8867e7ac3c | |||
| 73a4336206 | |||
| f2ab02d860 | |||
| bf376f54b6 | |||
| 178402e964 | |||
| 36043010af | |||
| cb77c1ff97 | |||
| 69db32337d | |||
| 6af167675d | |||
| ecd823cb9f | |||
| 847c539373 | |||
| cb7f06573f | |||
| 6542d1b444 | |||
| bbf6058c17 | |||
| 0e51ae7dc9 | |||
| c912cd7a42 | |||
| 7f1016476b |
@@ -117,7 +117,7 @@ void DefenderWeaponBehaviour::dealDamage(WeaponInfo& wi, glm::vec3 direction, do
|
||||
if (!wi.Player.Valid()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
glm::vec3 maxRange = direction * 2.f;
|
||||
EntityWrapper camera = wi.Player.FirstChildByName("Camera");
|
||||
glm::vec3 cameraPosition = Transform::AbsolutePosition(camera);
|
||||
@@ -147,8 +147,9 @@ void DefenderWeaponBehaviour::dealDamage(WeaponInfo& wi, glm::vec3 direction, do
|
||||
}
|
||||
|
||||
// Check for friendly fire
|
||||
//this needs to not return, for the boosts. in all weaponclasses: assault,defender,sniper
|
||||
if ((ComponentInfo::EnumType)victim["Team"]["Team"] == (ComponentInfo::EnumType)wi.Player["Team"]["Team"]) {
|
||||
return;
|
||||
damage = 0;
|
||||
}
|
||||
|
||||
// Deal damage!
|
||||
@@ -177,11 +178,11 @@ Camera DefenderWeaponBehaviour::cameraFromEntity(EntityWrapper camera)
|
||||
ComponentWrapper cTransform = camera["Transform"];
|
||||
ComponentWrapper cCamera = camera["Camera"];
|
||||
Camera cam(
|
||||
(float)m_Renderer->Resolution().Width / m_Renderer->Resolution().Height,
|
||||
(double)cCamera["FOV"],
|
||||
(double)cCamera["NearClip"],
|
||||
(float)m_Renderer->Resolution().Width / m_Renderer->Resolution().Height,
|
||||
(double)cCamera["FOV"],
|
||||
(double)cCamera["NearClip"],
|
||||
(double)cCamera["FarClip"]
|
||||
);
|
||||
);
|
||||
cam.SetPosition(cTransform["Position"]);
|
||||
cam.SetOrientation(glm::quat((const glm::vec3&)cTransform["Orientation"]));
|
||||
return cam;
|
||||
|
||||
Reference in New Issue
Block a user