From ad0760dc7db1443a538f3fadbdf21416c90645a1 Mon Sep 17 00:00:00 2001 From: Samat Agishev Date: Tue, 6 Feb 2018 13:07:02 +0500 Subject: [PATCH] bug fixes. Animation still doesn't work properly --- jni/match3/match3field.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/jni/match3/match3field.cpp b/jni/match3/match3field.cpp index bbcb47c..9ece082 100644 --- a/jni/match3/match3field.cpp +++ b/jni/match3/match3field.cpp @@ -1192,16 +1192,15 @@ void TMatch3Field::Update(size_t dt) TMatch3Logic::UpdateLogic(dt); + SE::TRenderPairList::iterator i; for (i = TriangleListVector.begin(); i != TriangleListVector.end(); ++i) { i->second.RefreshBuffer(); - } - int y = 6; - y = 6 + y; - + + SE::ResourceManager->HalibutAnimationManager.Update(dt); } @@ -1344,9 +1343,9 @@ bool TMatch3Field::CheckClick(Eigen::Vector2f mousePos) { Eigen::Vector2f fieldPos = mousePos - LeftBottomPos; - if (fieldPos[0] >= 0 && fieldPos[0] <= Match3FieldParams.FieldWidth*Match3FieldParams.CellWidth) + if (fieldPos[0] >= 0 && fieldPos[0] < Match3FieldParams.FieldWidth*Match3FieldParams.CellWidth) { - if (fieldPos[1] >= 0 && fieldPos[1] <= Match3FieldParams.FieldHeight*Match3FieldParams.CellHeight) + if (fieldPos[1] >= 0 && fieldPos[1] < Match3FieldParams.FieldHeight*Match3FieldParams.CellHeight) { return true; }