Ta, uniezależnij, a kto zrobi obsługę kompresji 2?

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

@@ -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

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;

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)
 	{

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