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

Jeck - Potential crash fix, removed unused variable.

Browse Source
This commit is contained in:
wagic.jeck
2010-02-11 21:03:27 +00:00
parent b7c66657f6
commit 470e3321e4
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/GameStateDeckViewer.h
-1
View File
@@ -119,7 +119,6 @@ private:
DeckDataWrapper * displayed_deck; DeckDataWrapper * displayed_deck;
DeckDataWrapper * myDeck; DeckDataWrapper * myDeck;
DeckDataWrapper * myCollection; DeckDataWrapper * myCollection;
MTGCard * currentCard;
MTGCard * cardIndex[7]; MTGCard * cardIndex[7];
int hudAlpha; int hudAlpha;
int delSellMenu; int delSellMenu;
projects/mtg/src/GameStateDeckViewer.cpp
+2 -5
View File
@@ -114,7 +114,6 @@ void GameStateDeckViewer::switchDisplay(){
}else{ }else{
displayed_deck = myCollection; displayed_deck = myCollection;
} }
currentCard = NULL;
updateFilters(); updateFilters();
loadIndexes(); loadIndexes();
} }
@@ -199,7 +198,6 @@ void GameStateDeckViewer::Start()
mSlide = 0; mSlide = 0;
mAlpha = 255; mAlpha = 255;
currentCard = NULL;
loadIndexes(); loadIndexes();
last_user_activity = NO_USER_ACTIVITY_HELP_DELAY + 1; last_user_activity = NO_USER_ACTIVITY_HELP_DELAY + 1;
onScreenTransition = 0; onScreenTransition = 0;
@@ -284,12 +282,10 @@ void GameStateDeckViewer::Update(float dt)
{ {
case PSP_CTRL_LEFT : case PSP_CTRL_LEFT :
last_user_activity = 0; last_user_activity = 0;
currentCard = displayed_deck->getCard(1);
mStage = STAGE_TRANSITION_LEFT; mStage = STAGE_TRANSITION_LEFT;
break; break;
case PSP_CTRL_RIGHT : case PSP_CTRL_RIGHT :
last_user_activity = 0; last_user_activity = 0;
currentCard = displayed_deck->getCard(-1);
mStage = STAGE_TRANSITION_RIGHT; mStage = STAGE_TRANSITION_RIGHT;
break; break;
case PSP_CTRL_UP : case PSP_CTRL_UP :
@@ -1437,7 +1433,6 @@ int GameStateDeckViewer::loadDeck(int deckid){
myCollection->Remove(current,myDeck->count(current)); myCollection->Remove(current,myDeck->count(current));
} }
currentCard = NULL;
// Load deck statistics // Load deck statistics
// TODO: Code cleanup (Copypasted with slight changes from GameStateMenu.cpp) // TODO: Code cleanup (Copypasted with slight changes from GameStateMenu.cpp)
char buffer[512]; char buffer[512];
@@ -1521,6 +1516,8 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
SAFE_DELETE(myCollection); SAFE_DELETE(myCollection);
myCollection = NEW DeckDataWrapper(playerdata->collection); myCollection = NEW DeckDataWrapper(playerdata->collection);
myCollection->Sort(WSrcCards::SORT_ALPHA); myCollection->Sort(WSrcCards::SORT_ALPHA);
displayed_deck = myCollection;
loadIndexes();
break; break;
case 0: case 0:
myDeck->save(); myDeck->save();