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

Minor adjustments.

Browse Source
This commit is contained in:
PlatinumSkink
2015-10-08 10:45:01 +02:00
parent 07e59bd0e2
commit d038855fb7
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Game/BallSystem.cpp
+1 -1
View File
@@ -385,7 +385,7 @@ bool dd::Systems::BallSystem::OnMultiBall(const dd::Events::MultiBall &event)
ball1->Waiting = false; ball1->Waiting = false;
ball2->Waiting = false; ball2->Waiting = false;
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 < -m_EdgeX) { if (x1 < -m_EdgeX) {
x1 = m_EdgeX - 0.2; x1 = m_EdgeX - 0.2;
} }
src/game/Physics/PhysicsSystem.cpp
+3 -1
View File
@@ -285,7 +285,9 @@ void dd::Systems::PhysicsSystem::OnEntityRemoved(EntityID entity)
bool dd::Systems::PhysicsSystem::OnStageCleared(const dd::Events::StageCleared &event) bool dd::Systems::PhysicsSystem::OnStageCleared(const dd::Events::StageCleared &event)
{ {
m_Travelling = true; if (event.ClearedStage < 5) {
m_Travelling = true;
}
return true; return true;
} }