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

Fixed minor things

Browse Source
This commit is contained in:
PlatinumSkink
2015-10-06 18:33:18 +02:00
parent 4617dd95b7
commit 6205e84ff1
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Game/BallSystem.cpp
+4 -6
View File
@@ -278,9 +278,7 @@ bool dd::Systems::BallSystem::Contact(const Events::Contact &event)
EntityID dd::Systems::BallSystem::CreateBall() EntityID dd::Systems::BallSystem::CreateBall()
{ {
auto ent = m_World->CloneEntity(Ball()); auto ent = m_World->CloneEntity(Ball());
m_World->RemoveComponent<Components::Template>(ent); m_World->RemoveComponent<Components::Template>(ent);
//m_World->CommitEntity(ent); //m_World->CommitEntity(ent);
return ent; return ent;
@@ -332,11 +330,11 @@ bool dd::Systems::BallSystem::OnMultiBall(const dd::Events::MultiBall &event)
auto ball2 = m_World->GetComponent<Components::Ball>(ent2); auto ball2 = m_World->GetComponent<Components::Ball>(ent2);
auto padTransform = event.padTransform; auto padTransform = event.padTransform;
float x1 = padTransform->Position.x - 2, x2 = padTransform->Position.x + 2; float x1 = padTransform->Position.x - 2, x2 = padTransform->Position.x + 2;
if (x1 < -3.1) { if (x1 < -m_EdgeX) {
x1 = 3; x1 = m_EdgeX - 0.2;
} }
if (x2 > 3.1) { if (x2 > m_EdgeX) {
x2 = -3; x2 = -m_EdgeX + 0.2;
} }
transform1->Position = glm::vec3(x1, -5.5, -10); transform1->Position = glm::vec3(x1, -5.5, -10);
transform2->Position = glm::vec3(x2, -5.5, -10); transform2->Position = glm::vec3(x2, -5.5, -10);
src/game/Game/LevelSystem.cpp
+5 -2
View File
@@ -87,16 +87,18 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID
} else { } else {
if (ball != nullptr && MultiBalls() > 0) { if (ball != nullptr && MultiBalls() > 0) {
SetMultiBalls(MultiBalls()-1); SetMultiBalls(MultiBalls()-1);
//std::cout << "Multi Balls: " << MultiBalls() << std::endl;
m_World->RemoveEntity(entity); m_World->RemoveEntity(entity);
} else { } else {
auto powerUp = m_World->GetComponent<Components::PowerUp>(entity); auto powerUp = m_World->GetComponent<Components::PowerUp>(entity);
if (powerUp != nullptr) { if (powerUp != nullptr) {
SetPowerUps(PowerUps() - 1); SetPowerUps(PowerUps() - 1);
//std::cout << "Power Ups: " << PowerUps() << std::endl;
m_World->RemoveEntity(entity); m_World->RemoveEntity(entity);
} else { } else {
if (brick != nullptr) { if (brick != nullptr) {
m_LooseBricks--; m_LooseBricks--;
//std::cout << m_LooseBricks << std::endl; //std::cout << "Loose Bricks: " << m_LooseBricks << std::endl;
m_World->RemoveEntity(entity); m_World->RemoveEntity(entity);
} }
} }
@@ -151,8 +153,9 @@ void dd::Systems::LevelSystem::CreateLevel()
CreateBrick(i, j, SpaceBetweenBricks(), SpaceToEdge(), num, m_Bricks[getter]); CreateBrick(i, j, SpaceBetweenBricks(), SpaceToEdge(), num, m_Bricks[getter]);
getter++; getter++;
} }
if (num == 1) if (num == 1) {
num = Lines(); num = Lines();
}
} }
m_LooseBricks = NumberOfBricks(); m_LooseBricks = NumberOfBricks();
SetRestarting(false); SetRestarting(false);
src/game/Game/PadSystem.cpp
+3 -3
View File
@@ -222,8 +222,8 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event)
bool dd::Systems::PadSystem::OnContactPowerUp(const dd::Events::Contact &event) bool dd::Systems::PadSystem::OnContactPowerUp(const dd::Events::Contact &event)
{ {
EntityID entityPower; EntityID entityPower = 0;
EntityID entityPad; EntityID entityPad = 0;
auto powerUp = m_World->GetComponent<Components::PowerUp>(event.Entity1); auto powerUp = m_World->GetComponent<Components::PowerUp>(event.Entity1);
auto pad = m_World->GetComponent<Components::Pad>(event.Entity2); auto pad = m_World->GetComponent<Components::Pad>(event.Entity2);
if (powerUp != nullptr) { if (powerUp != nullptr) {
@@ -243,7 +243,7 @@ bool dd::Systems::PadSystem::OnContactPowerUp(const dd::Events::Contact &event)
} }
} }
if (entityPower == NULL || entityPad == NULL) { if (entityPower == 0 || entityPad == 0) {
return false; return false;
} }