Commit 19a63c3a authored by edo9300's avatar edo9300

Removed shiftpress, updated deck searching by code

parent 8cb44c11
...@@ -117,7 +117,9 @@ public: ...@@ -117,7 +117,9 @@ public:
ret = ret * 10 + (*pstr - L'0'); ret = ret * 10 + (*pstr - L'0');
pstr++; pstr++;
} }
return ret; if(*pstr == 0)
return ret;
return 0;
} }
}; };
......
...@@ -80,7 +80,6 @@ void DeckBuilder::Initialize() { ...@@ -80,7 +80,6 @@ void DeckBuilder::Initialize() {
is_draging = false; is_draging = false;
prev_deck = mainGame->cbDBDecks->getSelected(); prev_deck = mainGame->cbDBDecks->getSelected();
prev_operation = 0; prev_operation = 0;
shiftpress = false;
mainGame->device->setEventReceiver(this); mainGame->device->setEventReceiver(this);
} }
void DeckBuilder::Terminate() { void DeckBuilder::Terminate() {
...@@ -560,7 +559,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -560,7 +559,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
auto pointer = dataManager.GetCodePointer(hovered_code); auto pointer = dataManager.GetCodePointer(hovered_code);
if(pointer == dataManager._datas.end()) if(pointer == dataManager._datas.end())
break; break;
if(shiftpress) if(event.MouseInput.Shift)
push_side(pointer); push_side(pointer);
else { else {
if (!check_limit(pointer)) if (!check_limit(pointer))
...@@ -633,18 +632,6 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -633,18 +632,6 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
} }
break; break;
} }
case irr::EET_KEY_INPUT_EVENT: {
switch (event.KeyInput.Key) {
case irr::KEY_SHIFT:
case irr::KEY_LSHIFT:
case irr::KEY_RSHIFT: {
shiftpress = event.KeyInput.PressedDown;
return true;
break;
}
}
break;
}
default: break; default: break;
} }
return false; return false;
......
...@@ -60,7 +60,6 @@ public: ...@@ -60,7 +60,6 @@ public:
code_pointer draging_pointer; code_pointer draging_pointer;
int prev_deck; int prev_deck;
s32 prev_operation; s32 prev_operation;
bool shiftpress;
std::unordered_map<int, int>* filterList; std::unordered_map<int, int>* filterList;
std::vector<code_pointer> results; std::vector<code_pointer> results;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment