Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7943fc7ad6 |
@@ -47,7 +47,7 @@ int UDPClient::readBuffer()
|
|||||||
memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
|
memcpy(&sizeOfPacket, m_ReadBuffer, sizeof(int));
|
||||||
if (sizeOfPacket > m_Socket->available()) {
|
if (sizeOfPacket > m_Socket->available()) {
|
||||||
LOG_WARNING("UDPClient::readBuffer(): We haven't got the whole packet yet.");
|
LOG_WARNING("UDPClient::readBuffer(): We haven't got the whole packet yet.");
|
||||||
return 0;
|
//return 0;
|
||||||
}
|
}
|
||||||
// if the buffer is to small increase the size of it
|
// if the buffer is to small increase the size of it
|
||||||
if (sizeOfPacket > m_BufferSize) {
|
if (sizeOfPacket > m_BufferSize) {
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ int UDPServer::readBuffer()
|
|||||||
|
|
||||||
if (sizeOfPacket > m_Socket->available()) {
|
if (sizeOfPacket > m_Socket->available()) {
|
||||||
LOG_WARNING("UDPServer::readBuffer(): We haven't got the whole packet yet.");
|
LOG_WARNING("UDPServer::readBuffer(): We haven't got the whole packet yet.");
|
||||||
return 0;
|
//return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if the buffer is to small increase the size of it
|
// if the buffer is to small increase the size of it
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ void DefenderWeaponBehaviour::dealDamage(WeaponInfo& wi, glm::vec3 direction, do
|
|||||||
if (!wi.Player.Valid()) {
|
if (!wi.Player.Valid()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
glm::vec3 maxRange = direction * 2.f;
|
glm::vec3 maxRange = direction * 2.f;
|
||||||
EntityWrapper camera = wi.Player.FirstChildByName("Camera");
|
EntityWrapper camera = wi.Player.FirstChildByName("Camera");
|
||||||
glm::vec3 cameraPosition = Transform::AbsolutePosition(camera);
|
glm::vec3 cameraPosition = Transform::AbsolutePosition(camera);
|
||||||
@@ -147,9 +147,8 @@ void DefenderWeaponBehaviour::dealDamage(WeaponInfo& wi, glm::vec3 direction, do
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check for friendly fire
|
// 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"]) {
|
if ((ComponentInfo::EnumType)victim["Team"]["Team"] == (ComponentInfo::EnumType)wi.Player["Team"]["Team"]) {
|
||||||
damage = 0;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Deal damage!
|
// Deal damage!
|
||||||
@@ -178,11 +177,11 @@ Camera DefenderWeaponBehaviour::cameraFromEntity(EntityWrapper camera)
|
|||||||
ComponentWrapper cTransform = camera["Transform"];
|
ComponentWrapper cTransform = camera["Transform"];
|
||||||
ComponentWrapper cCamera = camera["Camera"];
|
ComponentWrapper cCamera = camera["Camera"];
|
||||||
Camera cam(
|
Camera cam(
|
||||||
(float)m_Renderer->Resolution().Width / m_Renderer->Resolution().Height,
|
(float)m_Renderer->Resolution().Width / m_Renderer->Resolution().Height,
|
||||||
(double)cCamera["FOV"],
|
(double)cCamera["FOV"],
|
||||||
(double)cCamera["NearClip"],
|
(double)cCamera["NearClip"],
|
||||||
(double)cCamera["FarClip"]
|
(double)cCamera["FarClip"]
|
||||||
);
|
);
|
||||||
cam.SetPosition(cTransform["Position"]);
|
cam.SetPosition(cTransform["Position"]);
|
||||||
cam.SetOrientation(glm::quat((const glm::vec3&)cTransform["Orientation"]));
|
cam.SetOrientation(glm::quat((const glm::vec3&)cTransform["Orientation"]));
|
||||||
return cam;
|
return cam;
|
||||||
|
|||||||
Reference in New Issue
Block a user