  
  /*
   * Client.cpp, part of VCMI engine
-@@ -498,9 +498,9 @@
+@@ -432,7 +432,13 @@
+ 	hotSeat = (humanPlayers > 1);
+ 
+ 	std::vector<FileInfo> scriptModules;
+-	CFileUtility::getFilesWithExt(scriptModules, "./Scripting", ".dll");
++	CFileUtility::getFilesWithExt(scriptModules,
++#ifdef ANDROID
++	LIB_DIR "/"
++#else
++	"./"
++#endif
++	"Scripting", ".dll");
+ 	BOOST_FOREACH(FileInfo &m, scriptModules)
+ 	{
+ 		CScriptingModule * nm = CDynLibHandler::getNewScriptingModule(m.name);
+@@ -505,9 +511,9 @@
  
  void CClient::handlePack( CPack * pack )
  {			

 						loader.Load(length, FDef + currentOffset);
 						currentOffset+=length;
 					}
@@ -237,12 +263,14 @@
 
 				while (TotalRowLength<sprite.width)
 				{

 	{
 		memset((void *)position, color, size);
 		position += size;
@@ -363,6 +397,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
  
+/*
 CompImageLoader::CompImageLoader(CompImage * Img):
 	image(Img),
 	position(NULL),
@@ -536,6 +571,7 @@
 		image->surf = newPtr;
 }
 
+*/
 /*************************************************************************
  *  Classes for images, support loading from file and drawing on surface *
  *************************************************************************/
@@ -641,6 +677,8 @@
 	SDL_FreeSurface(surf);
 }
 
+// Buggy, disabled for Android
+/*
 CompImage::CompImage(const CDefFile *data, size_t frame, size_t group):
 	surf(NULL),
 	line(NULL),
@@ -861,6 +899,7 @@
 	delete [] line;
 	delete [] palette;
 }
+*/
 
 /*************************************************************************
  *  CAnimation for animations handling, can load part of file if needed  *
@@ -953,9 +992,11 @@
 	//try to get image from def
 	if (source[group][frame].empty())
 	{
+		/*
 		if (compressed)
 			images[group][frame] = new CompImage(file, frame, group);
 		else
+		*/
 			images[group][frame] = new SDLImage(file, frame, group);
 	}
 	else //load from separate file
Index: client/GUIBase.h
===================================================================
--- client/GUIBase.h	(revision 2220)
+++ client/GUIBase.h	(working copy)
@@ -546,6 +546,8 @@
 	CGuiHandler();
