Merge remote-tracking branch 'refs/remotes/Fluorohydride/master'

gframe/deck_con.cpp

@@ -798,7 +798,8 @@ void DeckBuilder::FilterCards() {
 			if(filter_scltype) {
 				if((filter_scltype == 1 && data.lscale != filter_scl) || (filter_scltype == 2 && data.lscale < filter_scl)
 				        || (filter_scltype == 3 && data.lscale <= filter_scl) || (filter_scltype == 4 && (data.lscale > filter_scl || data.lscale == 0))
-				        || (filter_scltype == 5 && (data.lscale >= filter_scl || data.lscale == 0)) || filter_scltype == 6)
+				        || (filter_scltype == 5 && (data.lscale >= filter_scl || data.lscale == 0)) || filter_scltype == 6
+				        || !(data.type & TYPE_PENDULUM))
 					continue;
 			}
 			break;

gframe/gframe.cpp

@@ -34,11 +34,13 @@ void ClickButton(irr::gui::IGUIElement* btn) {
 
 int main(int argc, char* argv[]) {
 #ifdef _WIN32
+#ifndef _DEBUG
 	wchar_t exepath[MAX_PATH];
 	GetModuleFileNameW(NULL, exepath, MAX_PATH);
 	wchar_t* p = wcsrchr(exepath, '\\');
 	*p = '\0';
 	SetCurrentDirectoryW(exepath);
+#endif //_DEBUG
 #endif //_WIN32
 #ifdef _WIN32
 	WORD wVersionRequested;