mirror of
https://github.com/vcmi/vcmi.git
synced 2025-07-01 00:45:26 +02:00
Merged most of the changes from trunk.
Because of really huge amount of modifications here I've probably missed some minor stuff. I doubt if it's still compatible with gcc - some changes should be reapplied.
This commit is contained in:
@ -53,7 +53,7 @@ int internalFunc(void * callback)
|
||||
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"),"data");
|
||||
txth->init(std::string(DATA_DIR "Data" PATHSEPARATOR "H3bitmap.lod"),"data");
|
||||
std::cout<<"done.\nScanning .lod file\n";
|
||||
int curp=0;
|
||||
std::string pattern = ".TXT";
|
||||
@ -74,6 +74,9 @@ int internalFunc(void * callback)
|
||||
std::cout<<"\rExtracting done :)\n";
|
||||
}
|
||||
vector<Coordinate>* p;
|
||||
int heroX;
|
||||
int heroY;
|
||||
int heroZ;
|
||||
switch (*cn.c_str())
|
||||
{
|
||||
//case 'P':
|
||||
@ -144,6 +147,7 @@ int internalFunc(void * callback)
|
||||
//SDL_Delay(100);
|
||||
//delete p;
|
||||
}
|
||||
SDL_Delay(10);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user