Jeck - Keypad and deck editor fixes.
* Fixed a call to profileFile() in deck editor that was using the wrong form. * Spacebar works, keypad now does smart capitalization (switches to lower case on second letter)
This commit is contained in:
@@ -98,7 +98,7 @@ void GameStateDeckViewer::Start()
|
|||||||
|
|
||||||
menu = NEW SimpleMenu(11,this,menuFont,SCREEN_WIDTH/2-100,20);
|
menu = NEW SimpleMenu(11,this,menuFont,SCREEN_WIDTH/2-100,20);
|
||||||
menu->Add(11,"Save");
|
menu->Add(11,"Save");
|
||||||
menu->Add(12,"Rename deck");
|
menu->Add(12,"Save & Rename");
|
||||||
menu->Add(13,"Switch decks without saving");
|
menu->Add(13,"Switch decks without saving");
|
||||||
menu->Add(14,"Back to main menu");
|
menu->Add(14,"Back to main menu");
|
||||||
menu->Add(15,"Cancel");
|
menu->Add(15,"Cancel");
|
||||||
@@ -216,8 +216,10 @@ void GameStateDeckViewer::Update(float dt)
|
|||||||
|
|
||||||
if(newDeckname != ""){
|
if(newDeckname != ""){
|
||||||
loadDeck(deckNum);
|
loadDeck(deckNum);
|
||||||
if(myDeck && myDeck->parent)
|
if(myDeck && myDeck->parent){
|
||||||
myDeck->parent->meta_name = newDeckname;
|
myDeck->parent->meta_name = newDeckname;
|
||||||
|
myDeck->save();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
newDeckname = "";
|
newDeckname = "";
|
||||||
}
|
}
|
||||||
@@ -708,7 +710,7 @@ int GameStateDeckViewer::loadDeck(int deckid){
|
|||||||
char deckname[256];
|
char deckname[256];
|
||||||
sprintf(deckname,"deck%i.txt",deckid);
|
sprintf(deckname,"deck%i.txt",deckid);
|
||||||
SAFE_DELETE(myDeck);
|
SAFE_DELETE(myDeck);
|
||||||
myDeck = NEW DeckDataWrapper(NEW MTGDeck(options.profileFile(deckname).c_str(), mParent->collection));
|
myDeck = NEW DeckDataWrapper(NEW MTGDeck(options.profileFile(deckname,"",false,false).c_str(), mParent->collection));
|
||||||
MTGCard * current = myDeck->getNext();
|
MTGCard * current = myDeck->getNext();
|
||||||
while (current){
|
while (current){
|
||||||
int howmanyinDeck = myDeck->cards[current];
|
int howmanyinDeck = myDeck->cards[current];
|
||||||
|
|||||||
@@ -145,6 +145,15 @@ void SimplePad::pressKey(unsigned char key){
|
|||||||
cursor++;
|
cursor++;
|
||||||
|
|
||||||
buffer.insert(cursor,input);
|
buffer.insert(cursor,input);
|
||||||
|
|
||||||
|
//Auto swap capitalization
|
||||||
|
if(bCapslock && buffer.size() == 1)
|
||||||
|
bCapslock = !bCapslock;
|
||||||
|
}
|
||||||
|
else if(key == KPD_SPACE){
|
||||||
|
if(cursor < buffer.size())
|
||||||
|
cursor++;
|
||||||
|
buffer.insert(cursor," ");
|
||||||
}
|
}
|
||||||
else if(key == KPD_CAPS)
|
else if(key == KPD_CAPS)
|
||||||
bCapslock = !bCapslock;
|
bCapslock = !bCapslock;
|
||||||
|
|||||||
Reference in New Issue
Block a user