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

Fix for [PSP|PC]ability menus and card view switch causes a crash. This broke as a side effect to the addition of the 'details' option that Mike added - the ActionStack had very rigid interpretations of what a valid control ID would be (either -1, or a valid id in its container). As kInfoMenuID is assigned a value of -200, this would crash when attempting to look up that index value in the vector.

Browse Source 
I've patched the problem so that ActionLayer checks for a valid ID before doing anything, and does a no-op for IDs it doesn't know how to handle. However, this only fixes the problem during gameplay.  It's quite possible that hitting the triangle button in other places in the app might equally cause a crash.


Issue: 544
This commit is contained in:
wrenczes@gmail.com
2010-12-04 04:25:43 +00:00
parent b5ec029d79
commit 92bbb78ed1
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
JGE/src/JGui.cpp
View File

@@ -90,9 +90,9 @@ void JGuiController::Render()
for (int i = 0; i < mCount; i++)
if (mObjects[i] != NULL) mObjects[i]->Render();
}
bool JGuiController::CheckUserInput(JButton key)
{
if (!mCount) return false;
if (key == mActionButton)
{
@@ -112,8 +112,8 @@ bool JGuiController::CheckUserInput(JButton key)
else if (JGE_BTN_CANCEL == key)
{
if (mListener != NULL) mListener->ButtonPressed(mId, kInfoMenuID);
return true;
}
else if ((JGE_BTN_LEFT == key) || (JGE_BTN_UP == key)) // || mEngine->GetAnalogY() < 64 || mEngine->GetAnalogX() < 64)
{
int n = mCurr;
@@ -185,6 +185,7 @@ bool JGuiController::CheckUserInput(JButton key)
}
return false;
}
void JGuiController::Update(float dt)
{
for (int i = 0; i < mCount; i++)