salmon-engine-projects/crystal-of-rhylil
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug fixes. Animation still doesn't work properly

Browse Source
This commit is contained in:
Samat Agishev 2018-02-06 13:07:02 +05:00
parent 992befeb45
commit ad0760dc7d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jni/match3/match3field.cpp
View File

@ -1192,16 +1192,15 @@ void TMatch3Field::Update(size_t dt)
TMatch3Logic::UpdateLogic(dt); TMatch3Logic::UpdateLogic(dt);
SE::TRenderPairList::iterator i; SE::TRenderPairList::iterator i;
for (i = TriangleListVector.begin(); i != TriangleListVector.end(); ++i) for (i = TriangleListVector.begin(); i != TriangleListVector.end(); ++i)
{ {
i->second.RefreshBuffer(); 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; 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; return true;
} }