From 64b8bd8019d123ba5f1ddc2559186ec2c3b60e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20W=2E=20Urba=C5=84czyk?= <mwu-tow@gazeta.pl>
Date: Fri, 1 Feb 2008 00:38:17 +0000
Subject: [PATCH] * Support for Dungeon * VCMI won't crash on entering neutral
 town

---
 CCastleInterface.cpp  |  3 ++-
 config/buildings.txt  | 39 ++++++++++++++++++++++++++++++++++++++-
 config/buildings2.txt | 22 ++++++++++++++++++++++
 config/buildings3.txt | 39 ++++++++++++++++++++++++++++++++++++++-
 config/buildings4.txt |  6 ++++++
 5 files changed, 106 insertions(+), 3 deletions(-)

diff --git a/CCastleInterface.cpp b/CCastleInterface.cpp
index 735a8b372..0c2e869ad 100644
--- a/CCastleInterface.cpp
+++ b/CCastleInterface.cpp
@@ -349,7 +349,8 @@ void CCastleInterface::showAll(SDL_Surface * to)
 	blitAt(bigTownPic->ourImages[pom].bitmap,15,387,to);
 
 	//flag
-	blitAt(flag->ourImages[town->getOwner()].bitmap,241,387,to);
+	if(town->getOwner()<PLAYER_LIMIT)
+		blitAt(flag->ourImages[town->getOwner()].bitmap,241,387,to);
 
 	//print garrison
 	//for(
diff --git a/config/buildings.txt b/config/buildings.txt
index 49502b5a4..b6b91a1fd 100644
--- a/config/buildings.txt
+++ b/config/buildings.txt
@@ -193,4 +193,41 @@
 4 41 TBNCUP_4.def 222 171
 4 42 TBNCUP_5.def 0 30
 4 43 TBNCUP_6.def 662 23
-4 20 TBNCBOAT.def 617 265
\ No newline at end of file
+4 20 TBNCBOAT.def 617 265
+5 16 TBDNBLAK.def 544 248
+5 9 TBDNCAS3.def 363 87
+5 7 TBDNCSTL.def 363 87
+5 30 TBDNDW_0.def 0 326
+5 31 TBDNDW_1.def 0 26
+5 32 TBDNDW_2.def 118 308
+5 33 TBDNDW_3.def 300 29
+5 34 TBDNDW_4.def 551 186
+5 35 TBDNDW_5.def 270 253
+5 36 TBDNDW_6.def 550 0
+5 21 TBDNEXT0.def 131 26
+5 22 TBDNEXT1.def 687 177
+5 23 TBDNEXT2.def 313 298
+5 11 TBDNHAL2.def 0 223
+5 12 TBDNHAL3.def 0 223
+5 13 TBDNHAL4.def 0 203
+5 10 TBDNHALL.def 0 234
+5 26 TBDNHOLY.def 562 24
+5 18 TBDNHRD1.def 0 326
+5 19 TBDNHRD2.def 0 300
+5 1 TBDNMAG2.def 164 97
+5 2 TBDNMAG3.def 164 77
+5 3 TBDNMAG4.def 164 61
+5 4 TBDNMAG5.def 164 15
+5 0 TBDNMAGE.def 164 119
+5 14 TBDNMARK.def 590 318
+5 15 TBDNSILO.def 624 335
+5 17 TBDNSPEC.def 746 294
+5 5 TBDNTVRN.def 211 297
+5 37 TBDNUP_0.def 0 300
+5 38 TBDNUP_1.def 0 26
+5 39 TBDNUP_2.def 118 256
+5 40 TBDNUP_3.def 300 29
+5 41 TBDNUP_4.def 519 172
+5 42 TBDNUP_5.def 270 253
+5 43 TBDNUP_6.def 550 0
+5 8 TBDNCAS2.def 363 87
\ No newline at end of file
diff --git a/config/buildings2.txt b/config/buildings2.txt
index 077707c3c..08ea0b480 100644
--- a/config/buildings2.txt
+++ b/config/buildings2.txt
@@ -139,6 +139,28 @@ CASTLE 4
 22
 20
 END
+CASTLE 5
+0
+1
+2
+3
+4
+21
+35
+42
+5
+30
+18
+37
+19
+32
+39
+26
+7
+8
+9
+23
+END
 EOD
 
 ------------------------------------------------------------------
diff --git a/config/buildings3.txt b/config/buildings3.txt
index 83db31c1a..3473999c2 100644
--- a/config/buildings3.txt
+++ b/config/buildings3.txt
@@ -185,4 +185,41 @@
 4	40	TBNCUP_3.def	TONVAM2.bmp	TZNVAM2.bmp
 4	41	TBNCUP_4.def	TONLICH2.bmp	TZNLICH2.bmp
 4	42	TBNCUP_5.def	TONBKN2.bmp	TZNBKN2.bmp
-4	43	TBNCUP_6.def	TONBON2.bmp	TZNBON2.bmp
\ No newline at end of file
+4	43	TBNCUP_6.def	TONBON2.bmp	TZNBON2.bmp
+5	16	TBDNBLAK.def	TODSMITH.bmp	TZDSMITH.bmp
+5	8	TBDNCAS2.def	TODCAS2.bmp	TZDCAS2.bmp
+5	9	TBDNCAS3.def	TODCAS3.bmp	TZDCAS3.bmp
+5	7	TBDNCSTL.def	TODCAS1.bmp	TZDCAS1.bmp
+5	30	TBDNDW0_.def	TODTRG1A.bmp	TZDTRG1A.bmp
+5	31	TBDNDW_1.def	TODHAR1.bmp	TZDHAR1.bmp
+5	32	TBDNDW_2.def	TODBEH1A.bmp	TZDBEH1A.bmp
+5	33	TBDNDW_3.def	TODMED1.bmp	TZDMED1.bmp
+5	34	TBDNDW_4.def	TODMIN1.bmp	TZDMIN1.bmp
+5	35	TBDNDW_5.def	TODMAN1.bmp	TZDMAN1.bmp
+5	36	TBDNDW_6.def	TODDRA1A.bmp	TZDDRA1A.bmp
+5	21	TBDNEXT0.def	TODVOR1A.bmp	TZDVOR1A.bmp
+5	22	TBDNEXT1.def	TODPORTA.bmp	TZDPORTA.bmp
+5	23	TBDNEXT2.def	TODACAD.bmp	TZDACAD.bmp
+5	11	TBDNHAL2.def	TODHALL2.bmp	TZDHALL2.bmp
+5	12	TBDNHAL3.def	TODHALL3.bmp	TZDHALL3.bmp
+5	13	TBDNHAL4.def	TODHALL4.bmp	TZDHALL4.bmp
+5	10	TBDNHALL.def	TODHALL1.bmp	TZDHALL1.bmp
+5	26	TBDNHOLY.def	TODHOLY.bmp	TZDHOLY.bmp
+5	18	TBDNHRD1.def	TODTR1HA.bmp	TZDTR1HA.bmp
+5	19	TBDNHRD2.def	TODTR2HA.bmp	TZDTR2HA.bmp
+5	1	TBDNMAG2.def	TODMAG2.bmp	TZDMAG2.bmp
+5	2	TBDNMAG3.def	TODMAG3.bmp	TZDMAG3.bmp
+5	3	TBDNMAG4.def	TODMAG4.bmp	TZDMAG4.bmp
+5	4	TBDNMAG5.def	TODMAG5.bmp	TZDMAG5.bmp
+5	0	TBDNMAGE.def	TODMAG1.bmp	TZDMAG1.bmp
+5	14	TBDNMARK.def	TODMARK.bmp	TZDMARK.bmp
+5	15	TBDNSILO.def	TODSILO.bmp	TZDSILO.bmp
+5	17	TBDNSPEC.def	TODART.bmp	TZDART.bmp
+5	5	TBDNTVRN.def	TODTAV.bmp	TZDTAV.bmp
+5	37	TBDNUP0_.def	TODTRG2A.bmp	TZDTRG2A.bmp
+5	38	TBDNUP_1.def	TODHAR2.bmp	TZDHAR2.bmp
+5	39	TBDNUP_2.def	TODBEH2A.bmp	TZDBEH2A.bmp
+5	40	TBDNUP_3.def	TODMED2.bmp	TZDMED2.bmp
+5	41	TBDNUP_4.def	TODMIN2.bmp	TZDMIN2.bmp
+5	42	TBDNUP_5.def	TODMAN2.bmp	TZDMAN2.bmp
+5	43	TBDNUP_6.def	TODDRA2A.bmp	TZDDRA2A.bmp
\ No newline at end of file
diff --git a/config/buildings4.txt b/config/buildings4.txt
index 4f6e49281..b0257c66a 100644
--- a/config/buildings4.txt
+++ b/config/buildings4.txt
@@ -71,4 +71,10 @@ GROUP
 37
 18
 19
+CASTLE 5
+GROUP
+30
+37
+18
+19
 EOD
\ No newline at end of file