From 40607240b4c358bf781862603e148ce5b57c936f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20W=2E=20Urba=C5=84czyk?= <mwu-tow@gazeta.pl>
Date: Tue, 24 Jul 2007 00:25:46 +0000
Subject: [PATCH] Added hero selection (buggy)

---
 CMT.cpp      |  17 ++++++++++-------
 CPreGame.cpp | Bin 106066 -> 108238 bytes
 CPreGame.h   |   2 +-
 global.h     |   1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CMT.cpp b/CMT.cpp
index dbe76ce54..ef4c8e6ae 100644
--- a/CMT.cpp
+++ b/CMT.cpp
@@ -268,6 +268,15 @@ int _tmain(int argc, _TCHAR* argv[])
 
 		cgi->townh = new CTownHandler;
 		cgi->townh->loadNames();
+
+		CAbilityHandler * abilh = new CAbilityHandler;
+		abilh->loadAbilities();
+		cgi->abilh = abilh;
+		CHeroHandler * heroh = new CHeroHandler;
+		heroh->loadHeroes();
+		heroh->loadPortraits();
+		cgi->heroh = heroh;
+
 		THC std::cout<<"Loading .lods: "<<tmh.getDif()<<std::endl;
 		CPreGame * cpg = new CPreGame(); //main menu and submenus
 		THC std::cout<<"Initialization CPreGame (together): "<<tmh.getDif()<<std::endl;
@@ -311,13 +320,7 @@ int _tmain(int argc, _TCHAR* argv[])
 		CCreatureHandler * creh = new CCreatureHandler;
 		creh->loadCreatures();
 		cgi->creh = creh;
-		CAbilityHandler * abilh = new CAbilityHandler;
-		abilh->loadAbilities();
-		cgi->abilh = abilh;
-		CHeroHandler * heroh = new CHeroHandler;
-		heroh->loadHeroes();
-		heroh->loadPortraits();
-		cgi->heroh = heroh;
+
 		CSpellHandler * spellh = new CSpellHandler;
 		spellh->loadSpells();
 		cgi->spellh = spellh;
diff --git a/CPreGame.cpp b/CPreGame.cpp
index 0b539eb65241adb3065d4adde95cf8558b2f19fa..612cb35cf28f2e1619d9ef9a79dca85e01baa707 100644
GIT binary patch
delta 1120
zcma)5TS!xJ82|n=otx&wZKmaQHf6fl=4ImLEViBHTvj@zve{X~OG>MTmm~-u!U!LH
zs4qGMr9?gUpdLyogM9Hps3dxhgdT!~-XiLy?;N*NL698&=l|V)-}V2!Tg`a$I%DB_
zE4FexuD4!c4ajjZX2%DdBTENCh{GTZ!8mRe8qv<>q}79yEc|3^ayh{Ub|?b}eMvjw
zh6ynWmx+qeEmM=Q7xX~h(7@T!>%a*v@)0SP@jK{I7=iPI9RH2S7hIt>86RUoV>%BU
zdHBkerYo^z8E$iK7Q}K-G5tADsbuk-(=wgty2pw|dn3yh%TBUP6hbAK8OXsoM-GMp
z7VNOfvRrE_Q;s|zf?743OG@@hElzr)+7!LzoyB!;k)xVA6M!(Bpno?+p;O_a&;z{+
zT}|F<zy%G8&t_cnmRIZogR{O!sUO;)o$~RhogDs?L+`Q?zx$jma@Tt(1D;MZ^{rpA
z?}rQ2{{f}@ahi(U{T)74?I4VaT?tl>`vbXZVQ>9@abbdGV_&5S`}k^Aaf^4^Qb^DL
zs>VgWSf|#GTYRC4ZQTtvUB=qPST8eUSwN3@D+SV#fL_CNxEL@pr_|UsuR(q2xHuK2
zxpw;Y;HUOV+^EWygwQLESmI`S@%|l}yE6Q1VWv+S<*5a&Rhi}CtNi@YUPCbXWbG8b
z0ctU;qf6BrR?W)8*$kO*uEX*V+a?tF0^AH0wWk{O*TBg47(^gJqqqoXl~Ky{C_VO3
zT9FaDyGawHVZ~{kQW-cf9<Yd;XIO?*eQaCDnxuWFCK#)eW>5c2V~x^GUxfxcg=TvB
z4k5yV(u`nc_(T{WfgyU81UI7(t+Z`+aO2v#OA>B;u0h}8LFw_zH->rj`IuPM<HyCY
zHbDsv(vCMRwNNRUxM9gwWnY%86906Xq5EY%et349ZWB%~Pt#qZmDidM&JG=r7M|Zd
QtaZ!Lz^25T`tknJFGxrn(*OVf

delta 538
zcmX?imhI9Wwhc`-jK-7y+J;ZQWs@|y$;M@JgRR_TA$y_8pKN3%+t_nVZnF2Ae92yB
zvzCJk`{WP0e3Ro+xHiA@*~Yl}l3yFs<RyV7lULmonEb$rWpYlS)no-{rA<Lgm?lry
z%{G1CJVv(7e&KI887($jCzdiY8g1T~^qZN{Z1dVQWv0nBSt*m>W%g|@%I;DHO8uQ6
zt20^azYJ?8gAIel<os0W$yWkQI7=8(8FCp47_27?nut%{*TOaV!$FnF75nujzp3Mx
zyl%hM<OUBuxcHq^xyeP!VqiIz11ggZc8g5z>X4ayEJT3W0A$8tOJ)Uztm%z$jPmLl
z3?P`vkjGHMpb4}hpP?McH)7CZFknby&|$~|ifS^bO}>B7bn=bE7VJ=`OkRCNo|%)O
zVDiIC(aHaecqaR(a)^R-=Q7wa7y@-D0L=qCdb0Ns#mQ$3I3@*i2`hpv$VHKs+%G-(
zg%+PS%#V5uNkC)r7)lw68Ek=0aYf>5GUx&gx8AINpp_Bqy)6e9fa#b+6F@Yh-sDCf
zNnoIIP1f<3n|$K9m^jQ>O$KWQUIs1(PKH_#J^5j->SnvW-xxQG9bRM4ZVL3N8H46z
O#)+2OnV1>RECv8#W3saV

diff --git a/CPreGame.h b/CPreGame.h
index 9ff35a56c..1440948f3 100644
--- a/CPreGame.h
+++ b/CPreGame.h
@@ -60,7 +60,7 @@ class Options : public PreGameTab
 		PlayerOptions(int serial, int player);
 		Ecolor color;
 		//SDL_Surface * bg;
-		OptionSwitch left, right;
+		OptionSwitch left, right, Hleft, Hright;
 		int nr;
 	};
 public:
diff --git a/global.h b/global.h
index 066c99de2..e3336a6ee 100644
--- a/global.h
+++ b/global.h
@@ -19,6 +19,7 @@ enum ElossCon {lossCastle, lossHero, timeExpires, lossStandard=255};
 
 const int F_NUMBER = 9; //factions quantity
 const int PLAYER_LIMIT = 8; //player limit per map
+const int HEROES_PER_TYPE=8; //amount of heroes of each type
 
 #define DEFBYPASS
 #endif //GLOBAL_H
\ No newline at end of file