From e34f9a54c929cc79dfda920dce6aab6f9f011605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20W=2E=20Urba=C5=84czyk?= <mwu-tow@gazeta.pl>
Date: Wed, 6 Feb 2008 07:33:53 +0000
Subject: [PATCH] * it's possible to choose a player * minor fixes

---
 CAdvmapInterface.cpp |   2 +-
 CMT.cpp              |   2 +-
 CPreGame.cpp         | Bin 124928 -> 127874 bytes
 StartInfo.h          |   2 ++
 config/townsDefs.txt |   4 ++--
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CAdvmapInterface.cpp b/CAdvmapInterface.cpp
index f66738fa8..5d2af34a5 100644
--- a/CAdvmapInterface.cpp
+++ b/CAdvmapInterface.cpp
@@ -32,7 +32,7 @@ CAdvMapInt::~CAdvMapInt()
 }
 CMinimap::CMinimap(bool draw)
 {
-	statusbarTxt = CGI->preth->zelp[291].first;
+	statusbarTxt = CGI->preth->zelp[291].first;  
 	rcText = CGI->preth->zelp[291].second;
 	pos.x=630;
 	pos.y=26;
diff --git a/CMT.cpp b/CMT.cpp
index fa8014a17..28d983020 100644
--- a/CMT.cpp
+++ b/CMT.cpp
@@ -774,7 +774,7 @@ int _tmain(int argc, _TCHAR* argv[])
 		for (int i=0; i<cgi->scenarioOps.playerInfos.size();i++) //initializing interfaces
 		{ 
 
-			if(cgi->scenarioOps.playerInfos[i].name=="Computer")
+			if(!cgi->scenarioOps.playerInfos[i].human)
 				cgi->playerint.push_back(static_cast<CGameInterface*>(CAIHandler::getNewAI(new CCallback(cgi->state,cgi->scenarioOps.playerInfos[i].color),"EmptyAI.dll")));
 			else 
 			{
diff --git a/CPreGame.cpp b/CPreGame.cpp
index e678384c324477b786676202972746459ae99047..06708c1174149cc50fe73931b5d0082b7ec91bec 100644
GIT binary patch
delta 1366
zcmb7EOGs2v82%4F=c?n3qv0gx^*!cmrce<d`5+7(LeX0IC}+mkOlpG<A~4iy;ig6Y
z)d9gm+=+`BXJP0j_ffhkq(WPyxGDu{Q}myEecXwH;&2a~|M8vg`_KR1iS>y4I}yI!
zhC&$%Y2AT7aD$6>8JsW*BeZVAAf4PWO#6u9ABIc(TL?2x+rv}TJQp~~KLY*GO;IA>
zL0P@fjZIz2fi$~Cm!t;vQNR#E1_kj+iJ8&Y7LQf-Xl!jV@X9%6z^z*{F1A?$d)MU9
zWHsHXuo+djXl_vfCW=GR(=G+9t%+foI$}IXj0E!vutFKcfCM_|A%r2Y(Af>;=-)2E
zt;<)QMKLL?g5q4<re_IgpO3?udvW;FnU&B-Wf)N8$S_7rrsPz7F_zA~4NT9gwwWIH
z>#y^5iB;m^)Y-5caTE8?F_TUu?S>w{c9o@%YoWYUD+k<F%8^H)f|cOfL%TLkt-H$F
zN&YTc-K0!abF9(x7mXe$hgxWaI>?7gT;0x(DFYAW(o$J&#IPcx2RfiYb7>A%&nM%I
zU*aEPSyrr;O$EsKwk!$l^>XZQX}FqV<_iy*^z=E?hj~fR0Dg4XxKGc*BL+$90CmG-
zzexc-F;GN|3Zw}U@a7;Z6@{(_6?O8U6koN(g*c&?PwH7UE}7zuHYkNW`ovyDpAD-I
z(o?n8Vz?mew3m{8H=L(9D{snX3H;3zOG^#*laC_YCzyo9=Q>#~p4&HQZ!bJ5pNj<d
zE3eprepAAK^YQ!>ACHy~I=<(lVcdX+&VrPq@+k^!q*5ro2qni#G37@#wm-5?PvvC>
zS5^cDCn!{ugq5Xeo}p)F@RP$T9@2oaGg5R0E{r9r{r`2ANqi-e=>s)4+aDyKj@_`*
z+HQLIeriEw1Ov05*Fq|^4)s~JmfDj^)zP#Dd#G;%bzhp9QJt&C(-FdrJ+tw2PDQVb
zz!3K@F%$Y)B=qfUn#BLDR<tFxk@&OGk4U6N9Hoi=#Tko)H=5%Di@P&v*y#@EPokNZ
bzl>s=;<QYs*X+;s42Hg(@a6XgW_kAuZp}a(

delta 187
zcmZpA&fai=eZvdy=|5T+B_<pAuuVRdC$qW8M}u>EUpOPjbeUF0o@w(LIVNxLk=gt%
zw1Z`O!cHXN%^RYWSSP#f7n<x5ueJG4rd0E0leY($H+y`vVVwLWL~Qb%Pq!vd(GZxt
zE?8)@+?QEOj2hDmr5N+4`$;k0fwAXFGj5xFN|kH!x>sV8A9%1#{^4pcc|t1J^a+xT
PUNA*S8ny#9Jh=`4bp1(x

diff --git a/StartInfo.h b/StartInfo.h
index b072438f7..a302b4e45 100644
--- a/StartInfo.h
+++ b/StartInfo.h
@@ -15,8 +15,10 @@ struct StartInfo
 		std::string heroName;
 		Ebonus bonus; 
 		Ecolor color; //from 0 - 
+		int serial;
 		int handicap;//0-no, 1-mild, 2-severe
 		std::string name;
+		bool human;
 	};
 	int difficulty; //0=easy; 4=impossible
 	std::vector<PlayerSettings> playerInfos;
diff --git a/config/townsDefs.txt b/config/townsDefs.txt
index 3414b29c2..055b9f8a9 100644
--- a/config/townsDefs.txt
+++ b/config/townsDefs.txt
@@ -1,4 +1,4 @@
-8
+9
 AVCCAST0.DEF
 AVCRAMP0.DEF
 AVCTOWR0.DEF
@@ -16,4 +16,4 @@ AVCNECZ0.DEF
 AVCDUNZ0.DEF
 AVCSTRZ0.DEF
 AVCFORZ0.DEF
-AVCHFORZ0.DEF
\ No newline at end of file
+AVCHFORZ.DEF
\ No newline at end of file