games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00
Code Issues Releases Activity

gcc fixes(bad idea to call global vars such as log2, this name used by math function). Colored log support on some non-win32 platforms. Small Automake project update

Browse Source
This commit is contained in:
Vadim Glazunov
2008-09-18 20:24:53 +00:00
parent 5ee37eeb3d
commit a1dd7f22f9
16 changed files with 227 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
map.cpp
View File

@ -448,25 +448,25 @@ void Mapa::initFromBytes(unsigned char * bufor)
th.getDif();
int i=0;
readHeader(bufor, i);
log0<<"\tReading header: "<<th.getDif()<<std::endl;
_log0<<"\tReading header: "<<th.getDif()<<std::endl;
readRumors(bufor, i);
log0<<"\tReading rumors: "<<th.getDif()<<std::endl;
_log0<<"\tReading rumors: "<<th.getDif()<<std::endl;
readPredefinedHeroes(bufor, i);
log0<<"\tReading predefined heroes: "<<th.getDif()<<std::endl;
_log0<<"\tReading predefined heroes: "<<th.getDif()<<std::endl;
readTerrain(bufor, i);
log0<<"\tReading terrain: "<<th.getDif()<<std::endl;
_log0<<"\tReading terrain: "<<th.getDif()<<std::endl;
readDefInfo(bufor, i);
log0<<"\tReading defs info: "<<th.getDif()<<std::endl;
_log0<<"\tReading defs info: "<<th.getDif()<<std::endl;
readObjects(bufor, i);
log0<<"\tReading objects: "<<th.getDif()<<std::endl;
_log0<<"\tReading objects: "<<th.getDif()<<std::endl;
readEvents(bufor, i);
log0<<"\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]);
}
log0<<"\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)
{
log0<<"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];
}
log0<<"done."<<std::endl;
_log0<<"done."<<std::endl;
boost::crc_32_type result;
result.process_bytes(initTable,mapstr.size());
checksum = result.checksum();
log0 << "\tOur map checksum: "<<result.checksum() << std::endl;
_log0 << "\tOur map checksum: "<<result.checksum() << std::endl;
initFromBytes(initTable);
}
@ -2465,4 +2465,4 @@ bool Mapa::isInTheMap( int3 pos )
if(pos.x<0 || pos.y<0 || pos.z<0 || pos.x >= width || pos.y >= height || pos.z > twoLevel)
return false;
else return true;
}
}