Merge branch 'fh' into sound

gframe/duelclient.cpp

@@ -1485,6 +1485,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

@@ -14,7 +14,7 @@
 #include <dirent.h>
 #endif
 
-const unsigned short PRO_VERSION = 0x133D;
+const 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];

ocgcore @ 1f1d9cba

-Subproject commit 82fb81ad35f999cb1c5d97273d9b429faea99625
+Subproject commit 1f1d9cba25969e85760185a3fbb6f2070beba1aa

script @ 0f2bb610

-Subproject commit 1d9275b1479a82386d7871f4d9275e8986657157
+Subproject commit 0f2bb610e85d5d61faefbf91c6f4c5aa4e52ec3c

strings.conf

@@ -100,6 +100,7 @@
 !system 530 请选择对方的卡
 !system 531 请选择上级召唤用需要解放的怪兽
 !system 532 请选择要取除超量素材的怪兽
+!system 533 请选择连接召唤的素材
 !system 549 请选择攻击的对象
 !system 550 请选择要发动的效果
 !system 551 请选择效果的对象
@@ -851,3 +852,4 @@
 !setname 0x107 方程式运动员	F.A.
 !setname 0x108 魔弹	魔弾
 !setname 0x109 天气	天気
+!setname 0x10a 珀耳修斯	パーシアス