games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

* moved CConsoleHandler to lib (update project files)

Browse Source 
* using winapi for better console handling with MSVC (I hope I didn't break anything at GCC)
* new logging system (use log0 - log5 for different priorities and colors (at msvc))
* using lists for storing activated interface objects
* more proper closing of server
This commit is contained in:
Michał W. Urbańczyk
2008-09-17 10:18:22 +00:00
parent c5c9127673
commit 629d934810
21 changed files with 462 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
map.cpp
View File

@@ -448,25 +448,25 @@ void Mapa::initFromBytes(unsigned char * bufor)
th.getDif();
int i=0;
readHeader(bufor, i);
std::cout<<"\tReading header: "<<th.getDif()<<std::endl;
log0<<"\tReading header: "<<th.getDif()<<std::endl;
readRumors(bufor, i);
std::cout<<"\tReading rumors: "<<th.getDif()<<std::endl;
log0<<"\tReading rumors: "<<th.getDif()<<std::endl;
readPredefinedHeroes(bufor, i);
std::cout<<"\tReading predefined heroes: "<<th.getDif()<<std::endl;
log0<<"\tReading predefined heroes: "<<th.getDif()<<std::endl;
readTerrain(bufor, i);
std::cout<<"\tReading terrain: "<<th.getDif()<<std::endl;
log0<<"\tReading terrain: "<<th.getDif()<<std::endl;
readDefInfo(bufor, i);
std::cout<<"\tReading defs info: "<<th.getDif()<<std::endl;
log0<<"\tReading defs info: "<<th.getDif()<<std::endl;
readObjects(bufor, i);
std::cout<<"\tReading objects: "<<th.getDif()<<std::endl;
log0<<"\tReading objects: "<<th.getDif()<<std::endl;
readEvents(bufor, i);
std::cout<<"\tReading events: "<<th.getDif()<<std::endl;
log0<<"\tReading events: "<<th.getDif()<<std::endl;
//map readed, bufor no longer needed
delete[] bufor; bufor=NULL;
@@ -478,7 +478,7 @@ void Mapa::initFromBytes(unsigned char * bufor)
continue;
addBlockVisTiles(objects[f]);
}
std::cout<<"\tCalculating blocked/visitable tiles: "<<th.getDif()<<std::endl;
log0<<"\tCalculating blocked/visitable tiles: "<<th.getDif()<<std::endl;
}
void Mapa::removeBlockVisTiles(CGObjectInstance * obj)
{
@@ -534,7 +534,7 @@ void Mapa::addBlockVisTiles(CGObjectInstance * obj)
}
Mapa::Mapa(std::string filename)
{
std::cout<<"Opening map file: "<<filename<<"\t "<<std::flush;
log0<<"Opening map file: "<<filename<<"\t "<<std::flush;
gzFile map = gzopen(filename.c_str(),"rb");
std::vector<unsigned char> mapstr; int pom;
while((pom=gzgetc(map))>=0)
@@ -547,11 +547,11 @@ Mapa::Mapa(std::string filename)
{
initTable[ss] = mapstr[ss];
}
std::cout<<"done."<<std::endl;
log0<<"done."<<std::endl;
boost::crc_32_type result;
result.process_bytes(initTable,mapstr.size());
checksum = result.checksum();
std::cout << "\tOur map checksum: "<<result.checksum() << std::endl;
log0 << "\tOur map checksum: "<<result.checksum() << std::endl;
initFromBytes(initTable);
}