浏览代码

Partial fix for mantiss #2237

AlexVinS 10 年之前
父节点
当前提交
40d3bb40c3
共有 2 个文件被更改,包括 11 次插入0 次删除
  1. 2 0
      lib/VCMI_lib.cbp
  2. 9 0
      server/CGameHandler.cpp

+ 2 - 0
lib/VCMI_lib.cbp

@@ -30,6 +30,7 @@
 					<Add option="-lboost_thread$(#boost.libsuffix)" />
 					<Add option="-lboost_chrono$(#boost.libsuffix)" />
 					<Add option="-lboost_locale$(#boost.libsuffix)" />
+					<Add option="-liconv" />
 					<Add directory="$(#sdl2.lib)" />
 					<Add directory="$(#boost.lib32)" />
 					<Add directory="$(#zlib.lib)" />
@@ -57,6 +58,7 @@
 					<Add option="-lboost_thread$(#boost.libsuffix)" />
 					<Add option="-lboost_chrono$(#boost.libsuffix)" />
 					<Add option="-lboost_locale$(#boost.libsuffix)" />
+					<Add option="-liconv" />
 					<Add directory="$(#sdl2.lib)" />
 					<Add directory="$(#boost.lib32)" />
 					<Add directory="$(#zlib.lib)" />

+ 9 - 0
server/CGameHandler.cpp

@@ -1605,6 +1605,15 @@ void CGameHandler::run(bool resume)
 				}
 			}
 		}
+		//additional check that game is not finished
+		bool activePlayer = false;
+		for(auto player : playerTurnOrder)
+		{
+			if(gs->players[player].status == EPlayerStatus::INGAME)
+					activePlayer = true;
+		}
+		if(!activePlayer)
+			end2 = true;
 	}
 	while(conns.size() && (*conns.begin())->isOpen())
 		boost::this_thread::sleep(boost::posix_time::milliseconds(5)); //give time client to close socket