From 674f1f8a62e0f0913e516576941b783efdd5c15f Mon Sep 17 00:00:00 2001
From: mateuszb <mateuszbaran89@gmail.com>
Date: Wed, 11 Jul 2007 17:47:09 +0000
Subject: [PATCH] =?UTF-8?q?Ta,=20uniezale=C5=BCnij,=20a=20kto=20zrobi=20ob?=
 =?UTF-8?q?s=C5=82ug=C4=99=20kompresji=202=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Uzależniłem co trzeba, jednak twój talent psucia znów się ujawnił - zamiast mapy dostaję czarne tło...

przy okazji drobny bugfix
---
 CAmbarCendamo.cpp | 2 +-
 CMT.cpp           | 6 +++---
 mapHandler.cpp    | 2 +-
 mapHandler.h      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CAmbarCendamo.cpp b/CAmbarCendamo.cpp
index 822a1099e..cfafc91e3 100644
--- a/CAmbarCendamo.cpp
+++ b/CAmbarCendamo.cpp
@@ -1783,7 +1783,7 @@ EDefType CAmbarCendamo::getDefType(DefInfo &a)
 		return EDefType::EVENTOBJ_DEF; //handled
 	case 33:
 		return EDefType::GARRISON_DEF; //handled
-	case 34: case 70: //70 - random hero
+	case 34: case 70: case 62: //70 - random hero //62 - prison
 		return EDefType::HERO_DEF; //handled
 	case 36:
 		return EDefType::GRAIL_DEF; //hanled
diff --git a/CMT.cpp b/CMT.cpp
index c8683aa5d..4b9863ca6 100644
--- a/CMT.cpp
+++ b/CMT.cpp
@@ -228,7 +228,7 @@ int _tmain(int argc, _TCHAR* argv[])
 			// well, there's no music, but most games don't break without music...
 		}*/
 
-		screen = SDL_SetVideoMode(800,600,24,SDL_HWSURFACE|SDL_DOUBLEBUF/*|SDL_FULLSCREEN*/);
+		screen = SDL_SetVideoMode(800,600,24,SDL_SWSURFACE|SDL_DOUBLEBUF/*|SDL_FULLSCREEN*/);
 		ekran = screen;
 		//FILE * zr = fopen("mal.txt","r");
 		//FILE * ko = fopen("wyn.txt","w");
@@ -331,11 +331,11 @@ int _tmain(int argc, _TCHAR* argv[])
 		{
 			initTable[ss] = mapstr[ss];
 		}
-//#define CHOOSE
+#define CHOOSE
 #ifdef CHOOSE
 		CAmbarCendamo * ac = new CAmbarCendamo(initTable); //4gryf
 #else
-		CAmbarCendamo * ac = new CAmbarCendamo("4gryf"); //4gryf
+		CAmbarCendamo * ac = new CAmbarCendamo("1smok"); //4gryf
 #endif
 		CMapHeader * mmhh = new CMapHeader(ac->bufor); //czytanie nag³ówka
 		cgi->ac = ac;
diff --git a/mapHandler.cpp b/mapHandler.cpp
index 43c8e38f9..d2407971e 100644
--- a/mapHandler.cpp
+++ b/mapHandler.cpp
@@ -42,7 +42,7 @@ public:
 void CMapHandler::init()
 {
 	fullHide = CGameInfo::mainObj->spriteh->giveDef("TSHRC.DEF");
-	partialHide = CGameInfo::mainObj->spriteh->giveDef("TSHRE.DEF");
+	partialHide = CGameInfo::mainObj->sspriteh->giveDef("TSHRE.DEF");
 
 	for(int i=0; i<partialHide->ourImages.size(); ++i)
 	{
diff --git a/mapHandler.h b/mapHandler.h
index 639be955c..1d2fabd6b 100644
--- a/mapHandler.h
+++ b/mapHandler.h
@@ -25,7 +25,7 @@ public:
 	SDL_Surface * terrBitmap(int x, int y);
 	SDL_Surface * undTerrBitmap(int x, int y);
 	CDefHandler * fullHide;
-	CDefHandler * partialHide;
+	CSemiDefHandler * partialHide;
 
 	std::vector< std::vector<char> > visibility; //true means that pointed place is visible
 	std::vector< std::vector<char> > undVisibility; //true means that pointed place is visible