Merge branch 'master' into another

.travis.yml

@@ -16,18 +16,13 @@ addons:
       - libgl1-mesa-dev
       - libglu-dev
       - p7zip-full
-  homebrew:
-    packages:
-      - freetype
-      - libevent
-      - sqlite
-      - dylibbundler
-      - p7zip
 env:
 - USE_IRRKLANG=1
 before_install:
 - git submodule update --init --recursive
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
+  brew update;
+  brew install freetype libevent sqlite dylibbundler p7zip;
   sudo rm -rf /usr/local/include/unistring;
   sudo rm -rf /usr/local/include/lzma;
   sudo rm -f /usr/local/include/CGAL/stddef.h; fi

gframe/duelclient.cpp

@@ -27,7 +27,7 @@ bool DuelClient::is_swapping = false;
 int DuelClient::select_hint = 0;
 int DuelClient::select_unselect_hint = 0;
 int DuelClient::last_select_hint = 0;
-char DuelClient::last_successful_msg[2048];
+char DuelClient::last_successful_msg[0x2000];
 unsigned int DuelClient::last_successful_msg_length = 0;
 wchar_t DuelClient::event_string[256];
 mtrandom DuelClient::rnd;

gframe/duelclient.h

@@ -33,7 +33,7 @@ private:
 	static int select_hint;
 	static int select_unselect_hint;
 	static int last_select_hint;
-	static char last_successful_msg[2048];
+	static char last_successful_msg[0x2000];
 	static unsigned int last_successful_msg_length;
 	static wchar_t event_string[256];
 	static mtrandom rnd;

gframe/event_handler.cpp

@@ -1540,8 +1540,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 							myswprintf(formatBuffer, L"%ls", dataManager.GetName(mcard->code));
 							str.append(formatBuffer);
 							if(mcard->type & TYPE_MONSTER) {
-								if(mcard->alias && (mcard->alias < mcard->code - 10 || mcard->alias > mcard->code + 10)
-								        && wcscmp(dataManager.GetName(mcard->code), dataManager.GetName(mcard->alias))) {
+								if(mcard->alias && wcscmp(dataManager.GetName(mcard->code), dataManager.GetName(mcard->alias))) {
 									myswprintf(formatBuffer, L"\n(%ls)", dataManager.GetName(mcard->alias));
 									str.append(formatBuffer);
 								}
@@ -1563,7 +1562,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 									str.append(formatBuffer);
 								}
 							} else {
-								if(mcard->alias && (mcard->alias < mcard->code - 10 || mcard->alias > mcard->code + 10)) {
+								if(mcard->alias && wcscmp(dataManager.GetName(mcard->code), dataManager.GetName(mcard->alias))) {
 									myswprintf(formatBuffer, L"\n(%ls)", dataManager.GetName(mcard->alias));
 									str.append(formatBuffer);
 								}

gframe/single_mode.cpp

@@ -130,6 +130,7 @@ int SingleMode::SinglePlayThread(void* param) {
 		}
 	}
 	last_replay.EndRecord();
+	mainGame->gMutex.Lock();
 	time_t nowtime = time(NULL);
 	tm* localedtime = localtime(&nowtime);
 	wchar_t timetext[40];

ocgcore @ 338c4e1c

-Subproject commit dc02ae0a86d1ff0b3113dd7c828234da9fa33e72
+Subproject commit 338c4e1cbe1f130f1dadc3c8cc358a7783b5af35

script @ f4ddb0c0

-Subproject commit 573645ee990be70d8e7c7ae2fa8a8fad33e9d62e
+Subproject commit f4ddb0c0248dc4f813640f0bd7e91ab5cf8b6bbd

strings.conf

@@ -9,9 +9,9 @@
 !system 5 特殊召唤成功
 !system 6 反转召唤成功
 !system 7 发动
-!system 10 移除指示物
+!system 10 取除指示物
 !system 11 支付基本分
-!system 12 移除本身的素材
+!system 12 取除本身的素材
 !system 20 抽卡阶段中
 !system 21 准备阶段中
 !system 22 主要阶段中
@@ -57,7 +57,7 @@
 !system 201 此时没有可以发动的效果
 !system 202 是否要确认场上的情况？
 !system 203 是否要进行连锁？
-!system 204 请移除%d个[%ls]
+!system 204 请取除%d个[%ls]
 !system 205 请选择排列顺序
 !system 206 请选择连锁顺序
 !system 207 翻开卡组上方%d张卡：
@@ -338,7 +338,7 @@
 !system 1294 可用时点
 !system 1295 取消操作
 !system 1296 完成选择
-!system 1297 切洗手卡
+!system 1297 洗切手卡
 !system 1298 辅助功能
 !system 1299 加快动画效果
 !system 1300 卡组分类：
@@ -504,7 +504,7 @@
 !system 1615 我方回复%d基本分
 !system 1616 对方回复%d基本分
 !system 1617 [%ls]放置了%d个[%ls]
-!system 1618 [%ls]移除了%d个[%ls]
+!system 1618 [%ls]取除了%d个[%ls]
 !system 1619 [%ls]攻击[%ls]
 !system 1620 [%ls]直接攻击
 !system 1621 攻击被无效

system.conf

@@ -2,7 +2,7 @@
 #nickname & gamename should be less than 20 characters
 use_d3d = 0
 use_image_scale = 1
-pro_version = 4938
+pro_version = 4939
 antialias = 2
 errorlog = 3
 nickname = Komeiji Koishi