Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for shop crash. in the shop there is no "game" so cards in booster packs are never assigned a observer as no observer is ever created at this point.

Browse Source
This commit is contained in:
omegablast2002@yahoo.com
2011-11-27 14:25:24 +00:00
parent 4c56842cf5
commit d01a5531d9
2 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
projects/mtg/src/CardDisplay.cpp
View File

@@ -178,48 +178,51 @@ bool CardDisplay::CheckUserInput(JButton key)
int n = mCurr;
int x1,y1;
JButton key;
JGE* jge = observer->getInput();
if (jge && jge->GetLeftClickCoordinates(x1, y1))
JGE* jge = observer?observer->getInput():JGE::GetInstance();
if(jge)
{
for (size_t i = 0; i < mObjects.size(); i++)
if (jge->GetLeftClickCoordinates(x1, y1))
{
float top, left;
if (mObjects[i]->getTopLeft(top, left))
for (size_t i = 0; i < mObjects.size(); i++)
{
distance2 = static_cast<unsigned int>((top - y1) * (top - y1) + (left - x1) * (left - x1));
if (distance2 < minDistance2)
float top, left;
if (mObjects[i]->getTopLeft(top, left))
{
minDistance2 = distance2;
n = i;
distance2 = static_cast<unsigned int>((top - y1) * (top - y1) + (left - x1) * (left - x1));
if (distance2 < minDistance2)
{
minDistance2 = distance2;
n = i;
}
}
}
}
if (n < mCurr)
key = JGE_BTN_LEFT;
else
key = JGE_BTN_RIGHT;
if (n < mCurr)
key = JGE_BTN_LEFT;
else
key = JGE_BTN_RIGHT;
if (n < start_item)
{
rotateLeft();
}
else if (n >= (int)(mObjects.size()) && mObjects.size())
{
n = mObjects.size() - 1;
}
if (n >= start_item + nb_displayed_items)
{
rotateRight();
}
if (n < start_item)
{
rotateLeft();
}
else if (n >= (int)(mObjects.size()) && mObjects.size())
{
n = mObjects.size() - 1;
}
if (n >= start_item + nb_displayed_items)
{
rotateRight();
}
if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(key))
{
mCurr = n;
mObjects[mCurr]->Entering();
result = true;
if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(key))
{
mCurr = n;
mObjects[mCurr]->Entering();
result = true;
}
jge->LeftClickedProcessed();
}
jge->LeftClickedProcessed();
}
return result;
}