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

Jeck - Restored cache resets between game states, fixed minor issue with deck editor displaying the wrong first 7 cards when starting to edit a deck.

Browse Source
This commit is contained in:
wagic.jeck
2009-09-27 00:50:30 +00:00
parent 74170e9ee9
commit 28cb659a2e
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
projects/mtg/src/GameStateDeckViewer.cpp
View File

@@ -586,20 +586,21 @@ void GameStateDeckViewer::renderCard(int id, float rotation){
JQuad * quad = NULL;
int showName = 0;
#ifdef DEBUG_CACHE
quad = resources.RetrieveCard(card,RETRIEVE_NORMAL);
#else
quad = resources.RetrieveCard(card,RETRIEVE_EXISTING);
#endif
if (!quad && resources.RetrieveError() != CACHE_ERROR_404){
if(last_user_activity > (abs(2-id) + 1)* NO_USER_ACTIVITY_SHOWCARD_DELAY)
quad = resources.RetrieveCard(card);
else{
quad = backQuad;
showName = 1;
int cacheError = CACHE_ERROR_NONE;
if(!options[Options::DISABLECARDS].number){
quad = resources.RetrieveCard(card,RETRIEVE_EXISTING);
cacheError = resources.RetrieveError();
if (!quad && cacheError != CACHE_ERROR_404){
if(last_user_activity > (abs(2-id) + 1)* NO_USER_ACTIVITY_SHOWCARD_DELAY)
quad = resources.RetrieveCard(card);
else{
quad = backQuad;
showName = 1;
}
}
}
if (quad){
showName = 0;
@@ -723,6 +724,8 @@ int GameStateDeckViewer::loadDeck(int deckid){
}
current = myDeck->getNext(current);
}
currentCard = NULL;
loadIndexes();
return 1;
}