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

gframe/duelclient.cpp

@@ -1729,6 +1729,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		int count = BufferIO::ReadInt8(pbuf);
 		mainGame->dField.selectable_cards.clear();
 		mainGame->dField.selected_cards.clear();
+		mainGame->dField.select_panalmode = false;
 		int c, l, s, t;
 		unsigned int code;
 		ClientCard* pcard;

gframe/game.cpp

@@ -16,7 +16,7 @@
 #include <dirent.h>
 #endif
 
-unsigned short PRO_VERSION = 0x133D;
+unsigned short PRO_VERSION = 0x1340;
 
 namespace ygo {
 

gframe/gframe.cpp

@@ -2,6 +2,9 @@
 #include "game.h"
 #include "data_manager.h"
 #include <event2/thread.h>
+#ifdef __APPLE__
+#import <CoreFoundation/CoreFoundation.h>
+#endif
 
 int enable_log = 0;
 bool exit_on_return = false;
@@ -36,6 +39,15 @@ int main(int argc, char* argv[]) {
 #ifndef _WIN32
 	setlocale(LC_CTYPE, "UTF-8");
 #endif
+#ifdef __APPLE__
+	CFURLRef bundle_url = CFBundleCopyBundleURL(CFBundleGetMainBundle());
+	CFURLRef bundle_base_url = CFURLCreateCopyDeletingLastPathComponent(NULL, bundle_url);
+	CFRelease(bundle_url);
+	CFStringRef path = CFURLCopyFileSystemPath(bundle_base_url, kCFURLPOSIXPathStyle);
+	CFRelease(bundle_base_url);
+	chdir(CFStringGetCStringPtr(path, kCFStringEncodingUTF8));
+	CFRelease(path);
+#endif //__APPLE__
 #ifdef _WIN32
 #ifndef _DEBUG
 	wchar_t exepath[MAX_PATH];

strings.conf

@@ -80,7 +80,7 @@
 !system 510 Select a card to flip-up
 !system 511 Select a card to use as Fusion Material
 !system 512 Select a card to use as Synchro Material
-!system 513 Select a card to be Xyz Material
+!system 513 Select a card to use as Xyz Material
 !system 514 Select a card on opponent's side
 !system 515 Select a card on your side
 !system 516 Select a monster in attack position
@@ -100,6 +100,7 @@
 !system 530 Select opponent card
 !system 531 Select the highest level monsters for tribute:
 !system 532 Select a monster to detach Xyz Material
+!system 533 Select a card to use as Link Material
 !system 549 Select an attack target
 !system 550 Select an effect you want to activate
 !system 551 Select the target of the effect