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

Jeck - Resolved issue 101, fixed "Cancel" after "Switch decks without saving".

Browse Source
This commit is contained in:
wagic.jeck
2009-10-14 20:58:38 +00:00
parent ad1492b888
commit e23fac82e0
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/GameStateDeckViewer.h
+1
View File
@@ -109,6 +109,7 @@ private:
int delSellMenu; int delSellMenu;
string newDeckname; string newDeckname;
StatsWrapper stw; StatsWrapper stw;
bool mSwitching;
public: public:
GameStateDeckViewer(GameApp* parent); GameStateDeckViewer(GameApp* parent);
projects/mtg/src/GameStateDeckViewer.cpp
+16 -3
View File
@@ -14,6 +14,7 @@ GameStateDeckViewer::GameStateDeckViewer(GameApp* parent): GameState(parent) {
scrollSpeed = MED_SPEED; scrollSpeed = MED_SPEED;
nbDecks = 0; nbDecks = 0;
deckNum = 0; deckNum = 0;
mSwitching = false;
} }
GameStateDeckViewer::~GameStateDeckViewer() { GameStateDeckViewer::~GameStateDeckViewer() {
@@ -88,6 +89,7 @@ void GameStateDeckViewer::Start()
{ {
newDeckname = ""; newDeckname = "";
hudAlpha = 0; hudAlpha = 0;
mSwitching = false;
delSellMenu = 0; delSellMenu = 0;
pricelist = NEW PriceList(RESPATH"/settings/prices.dat",mParent->collection); pricelist = NEW PriceList(RESPATH"/settings/prices.dat",mParent->collection);
playerdata = NEW PlayerData(mParent->collection); playerdata = NEW PlayerData(mParent->collection);
@@ -1033,7 +1035,8 @@ void GameStateDeckViewer::renderCard(int id, float rotation){
}else{ }else{
Pos pos = Pos(x, y, scale* 285/250, 0.0, 255); Pos pos = Pos(x, y, scale* 285/250, 0.0, 255);
CardGui::alternateRender(card, pos); CardGui::alternateRender(card, pos);
quad = resources.RetrieveCard(card,CACHE_THUMB); if(!options[Options::DISABLECARDS].number)
quad = resources.RetrieveCard(card,CACHE_THUMB);
if (quad){ if (quad){
float _scale = 285 * scale / quad->mHeight; float _scale = 285 * scale / quad->mHeight;
quad->SetColor(ARGB(40,255,255,255)); quad->SetColor(ARGB(40,255,255,255));
@@ -1119,7 +1122,11 @@ void GameStateDeckViewer::Render()
int GameStateDeckViewer::loadDeck(int deckid){ int GameStateDeckViewer::loadDeck(int deckid){
SAFE_DELETE(myCollection); SAFE_DELETE(myCollection);
stw.currentPage = 0;
stw.pageCount = 5;
stw.needUpdate = true;
string profile = options[Options::ACTIVE_PROFILE].str; string profile = options[Options::ACTIVE_PROFILE].str;
myCollection = NEW DeckDataWrapper(NEW MTGDeck(options.profileFile(PLAYER_COLLECTION).c_str(), mParent->collection)); myCollection = NEW DeckDataWrapper(NEW MTGDeck(options.profileFile(PLAYER_COLLECTION).c_str(), mParent->collection));
displayed_deck = myCollection; displayed_deck = myCollection;
@@ -1189,7 +1196,12 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
switch(controllerId){ switch(controllerId){
case 10: //Deck menu case 10: //Deck menu
if (controlId == -1){ if (controlId == -1){
mParent->SetNextState(GAME_STATE_MENU); if(!mSwitching)
mParent->SetNextState(GAME_STATE_MENU);
else
mStage = STAGE_WAITING;
mSwitching = false;
break; break;
} }
loadDeck(controlId); loadDeck(controlId);
@@ -1214,6 +1226,7 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
case 2: case 2:
updateDecks(); updateDecks();
mStage = STAGE_WELCOME; mStage = STAGE_WELCOME;
mSwitching = true;
break; break;
case 3: case 3:
mParent->SetNextState(GAME_STATE_MENU); mParent->SetNextState(GAME_STATE_MENU);