* console is closed when application exits

CConsoleHandler.cpp

@@ -16,6 +16,13 @@
 #include "hch/CLodHandler.h"
 #include "boost/filesystem/operations.hpp"
 #include <boost/algorithm/string.hpp>
+#ifdef WIN32
+#include <conio.h>
+#else
+#endif
+
+bool continueReadingConsole = true;
+
 int internalFunc(void * callback)
 {
 	CCallback * cb = (CCallback*)callback;
@@ -23,119 +30,127 @@ int internalFunc(void * callback)
 	std::string readed;
 	while(true)
 	{
-		std::cin.getline(usersMessage, 500);
-		std::istringstream readed;
-		std::string pom(usersMessage);
-		readed.str(pom);
-		std::string cn; //command name
-		readed >> cn;
-		int3 src, dst;
+#ifdef WIN32
+		if(continueReadingConsole && kbhit())
+#else
+#endif
+		{
+			std::cin.getline(usersMessage, 500);
+			std::istringstream readed;
+			std::string pom(usersMessage);
+			readed.str(pom);
+			std::string cn; //command name
+			readed >> cn;
+			int3 src, dst;
 
-		int heronum;
-		int3 dest;
+			int heronum;
+			int3 dest;
 
-		if(pom==std::string("die, fool"))
-			exit(0);
-		else if(pom==std::string("get txt"))
-		{
-			boost::filesystem::create_directory("Extracted_txts");
-			std::cout<<"Command accepted. Opening .lod file...\t";
-			CLodHandler * txth = new CLodHandler;
-			txth->init(std::string("Data\\H3bitmap.lod"));
-			std::cout<<"done.\nScanning .lod file\n";
-			int curp=0;
-			std::string pattern = ".TXT";
-			for(int i=0;i<txth->entries.size(); i++)
+			if(pom==std::string("die, fool"))
+				exit(0);
+			else if(pom==std::string("get txt"))
 			{
-				std::string pom = txth->entries[i].nameStr;
-				if(boost::algorithm::find_last(pom,pattern))
+				boost::filesystem::create_directory("Extracted_txts");
+				std::cout<<"Command accepted. Opening .lod file...\t";
+				CLodHandler * txth = new CLodHandler;
+				txth->init(std::string("Data\\H3bitmap.lod"));
+				std::cout<<"done.\nScanning .lod file\n";
+				int curp=0;
+				std::string pattern = ".TXT";
+				for(int i=0;i<txth->entries.size(); i++)
 				{
-					txth->extractFile(std::string("Extracted_txts\\")+pom,pom);
-				}
-				int p2 = ((float)i/(float)txth->entries.size())*(float)100;
-				if(p2!=curp)
-				{
-					curp = p2;
-					std::cout<<"\r"<<curp<<"%";
+					std::string pom = txth->entries[i].nameStr;
+					if(boost::algorithm::find_last(pom,pattern))
+					{
+						txth->extractFile(std::string("Extracted_txts\\")+pom,pom);
+					}
+					int p2 = ((float)i/(float)txth->entries.size())*(float)100;
+					if(p2!=curp)
+					{
+						curp = p2;
+						std::cout<<"\r"<<curp<<"%";
+					}
 				}
+				std::cout<<"\rExtracting done :)\n";
 			}
-			std::cout<<"\rExtracting done :)\n";
-		}
-		vector<Coordinate>* p;
-		switch (*cn.c_str())
-		{
-		case 'P':
-			std::cout<<"Policzyc sciezke."<<std::endl;		
-			readed>>src>>dst;
-			
-			p = CGI->pathf->GetPath(Coordinate(src),Coordinate(dst),CGI->heroh->heroInstances[0]);
-			LOCPLINT->adventureInt->terrain.currentPath = CGI->pathf->ConvertToOldFormat(p);
-			//LOCPLINT->adventureInt->terrain.currentPath = CGI->pathf->getPath(src,dst,CGI->heroh->heroInstances[0]);
-			break;
-		case 'm': //number of heroes
-			std::cout<<"Number of heroes: "<<CGI->heroh->heroInstances.size()<<std::endl;
-			break;
-		case 'H': //position of hero
-			readed>>heronum;
-			std::cout<<"Position of hero "<<heronum<<": "<<CGI->heroh->heroInstances[heronum]->getPosition(false)<<std::endl;
-			break;
-		case 'M': //move heroa
+			vector<Coordinate>* p;
+			switch (*cn.c_str())
 			{
-				readed>>heronum>>dest;
-				const CGHeroInstance * hero = cb->getHeroInfo(0,heronum,0);
-				p = CGI->pathf->GetPath(Coordinate(hero->getPosition(false)),Coordinate(dest),hero);
-				cb->moveHero(heronum, CGI->pathf->ConvertToOldFormat(p), 0, 0);
+			case 'P':
+				std::cout<<"Policzyc sciezke."<<std::endl;		
+				readed>>src>>dst;
+				
+				p = CGI->pathf->GetPath(Coordinate(src),Coordinate(dst),CGI->heroh->heroInstances[0]);
+				LOCPLINT->adventureInt->terrain.currentPath = CGI->pathf->ConvertToOldFormat(p);
 				//LOCPLINT->adventureInt->terrain.currentPath = CGI->pathf->getPath(src,dst,CGI->heroh->heroInstances[0]);
 				break;
-			}
-		case 'D': //pos description
-			readed>>src;
-			CGI->mh->getObjDescriptions(src);
-			break;
-		case 'I': 
-			{
-				SDL_Surface * temp = LOCPLINT->infoWin(NULL);
-				blitAtWR(temp,605,389);
-				SDL_FreeSurface(temp);
+			case 'm': //number of heroes
+				std::cout<<"Number of heroes: "<<CGI->heroh->heroInstances.size()<<std::endl;
 				break;
-			}
-		case 'T': //test rect
-			readed>>src;
-			for(int g=0; g<8; ++g)
-			{
-				for(int v=0; v<8; ++v)
+			case 'H': //position of hero
+				readed>>heronum;
+				std::cout<<"Position of hero "<<heronum<<": "<<CGI->heroh->heroInstances[heronum]->getPosition(false)<<std::endl;
+				break;
+			case 'M': //move heroa
 				{
-					int3 csrc = src;
-					csrc.y+=g;
-					csrc.x+=v;
-					if(CGI->mh->getObjDescriptions(csrc).size())
-						std::cout<<'x';
-					else
-						std::cout<<'o';
+					readed>>heronum>>dest;
+					const CGHeroInstance * hero = cb->getHeroInfo(0,heronum,0);
+					p = CGI->pathf->GetPath(Coordinate(hero->getPosition(false)),Coordinate(dest),hero);
+					cb->moveHero(heronum, CGI->pathf->ConvertToOldFormat(p), 0, 0);
+					//LOCPLINT->adventureInt->terrain.currentPath = CGI->pathf->getPath(src,dst,CGI->heroh->heroInstances[0]);
+					break;
 				}
-				std::cout<<std::endl;
-			}
-			break;
-		case 'A':  //hide everything from map
-			for(int c=0; c<CGI->objh->objInstances.size(); ++c)
-			{
-				CGI->mh->hideObject(CGI->objh->objInstances[c]);
-			}
-			break;
-		case 'R': //restora all objects after A has been pressed
-			for(int c=0; c<CGI->objh->objInstances.size(); ++c)
-			{
-				CGI->mh->printObject(CGI->objh->objInstances[c]);
+			case 'D': //pos description
+				readed>>src;
+				CGI->mh->getObjDescriptions(src);
+				break;
+			case 'I': 
+				{
+					SDL_Surface * temp = LOCPLINT->infoWin(NULL);
+					blitAtWR(temp,605,389);
+					SDL_FreeSurface(temp);
+					break;
+				}
+			case 'T': //test rect
+				readed>>src;
+				for(int g=0; g<8; ++g)
+				{
+					for(int v=0; v<8; ++v)
+					{
+						int3 csrc = src;
+						csrc.y+=g;
+						csrc.x+=v;
+						if(CGI->mh->getObjDescriptions(csrc).size())
+							std::cout<<'x';
+						else
+							std::cout<<'o';
+					}
+					std::cout<<std::endl;
+				}
+				break;
+			case 'A':  //hide everything from map
+				for(int c=0; c<CGI->objh->objInstances.size(); ++c)
+				{
+					CGI->mh->hideObject(CGI->objh->objInstances[c]);
+				}
+				break;
+			case 'R': //restora all objects after A has been pressed
+				for(int c=0; c<CGI->objh->objInstances.size(); ++c)
+				{
+					CGI->mh->printObject(CGI->objh->objInstances[c]);
+				}
+				break;
 			}
-			break;
+			//SDL_Delay(100);
+			delete p;
 		}
-		//SDL_Delay(100);
-		delete p;
 	}
 	return -1;
 }
 
+SDL_Thread * consoleReadingThread;
+
 void CConsoleHandler::runConsole()
 {
-	SDL_Thread * myth = SDL_CreateThread(&internalFunc, cb);
+	consoleReadingThread = SDL_CreateThread(&internalFunc, cb);
 }

CPlayerInterface.cpp

@@ -28,6 +28,7 @@
 using namespace CSDL_Ext;
 
 extern TTF_Font * GEOR16;
+extern bool continueReadingConsole;
 
 class OCM_HLP_CGIN
 {
@@ -1796,6 +1797,7 @@ void CPlayerInterface::handleKeyDown(SDL_Event *sEvent)
 		}
 	case (SDLK_q):
 		{
+			continueReadingConsole = false;
 			exit(0);
 			break;
 		}