mirror of
https://github.com/vcmi/vcmi.git
synced 2024-11-24 08:32:34 +02:00
częściowy revert, żeby choć teren dało się zaobaczyć
(it should work ;])
This commit is contained in:
parent
674f1f8a62
commit
91a6f3cc6c
@ -1757,13 +1757,13 @@ void CAmbarCendamo::loadDefs()
|
|||||||
{
|
{
|
||||||
if (loadedTypes.find(map.terrain[i][j].tertype)==loadedTypes.end())
|
if (loadedTypes.find(map.terrain[i][j].tertype)==loadedTypes.end())
|
||||||
{
|
{
|
||||||
CDefHandler *sdh = CGI->spriteh->giveDef(CSemiDefHandler::nameFromType(map.terrain[i][j].tertype).c_str());
|
CSemiDefHandler *sdh = CGI->sspriteh->giveDef(CSemiDefHandler::nameFromType(map.terrain[i][j].tertype).c_str());
|
||||||
loadedTypes.insert(map.terrain[i][j].tertype);
|
loadedTypes.insert(map.terrain[i][j].tertype);
|
||||||
defs.push_back(sdh);
|
defs.push_back(sdh);
|
||||||
}
|
}
|
||||||
if (map.twoLevel && loadedTypes.find(map.undergroungTerrain[i][j].tertype)==loadedTypes.end())
|
if (map.twoLevel && loadedTypes.find(map.undergroungTerrain[i][j].tertype)==loadedTypes.end())
|
||||||
{
|
{
|
||||||
CDefHandler *sdh = CGI->spriteh->giveDef(CSemiDefHandler::nameFromType(map.undergroungTerrain[i][j].tertype).c_str());
|
CSemiDefHandler *sdh = CGI->sspriteh->giveDef(CSemiDefHandler::nameFromType(map.undergroungTerrain[i][j].tertype).c_str());
|
||||||
loadedTypes.insert(map.undergroungTerrain[i][j].tertype);
|
loadedTypes.insert(map.undergroungTerrain[i][j].tertype);
|
||||||
defs.push_back(sdh);
|
defs.push_back(sdh);
|
||||||
}
|
}
|
||||||
|
@ -21,7 +21,7 @@ public:
|
|||||||
std::ifstream * is; // stream used to read map file
|
std::ifstream * is; // stream used to read map file
|
||||||
int andame; // length of map file
|
int andame; // length of map file
|
||||||
unsigned char * bufor; // here we store map bytecode
|
unsigned char * bufor; // here we store map bytecode
|
||||||
std::vector<CDefHandler*> defs;
|
std::vector<CSemiDefHandler*> defs;
|
||||||
/////////////////funkcje skladowe
|
/////////////////funkcje skladowe
|
||||||
CAmbarCendamo (const char * tie); // c-tor; tie is the path of the map file
|
CAmbarCendamo (const char * tie); // c-tor; tie is the path of the map file
|
||||||
CAmbarCendamo (unsigned char * map); // c-tor; map is pointer to array containing map; it is not copied, so don't delete
|
CAmbarCendamo (unsigned char * map); // c-tor; map is pointer to array containing map; it is not copied, so don't delete
|
||||||
|
2
CMT.cpp
2
CMT.cpp
@ -331,7 +331,7 @@ int _tmain(int argc, _TCHAR* argv[])
|
|||||||
{
|
{
|
||||||
initTable[ss] = mapstr[ss];
|
initTable[ss] = mapstr[ss];
|
||||||
}
|
}
|
||||||
#define CHOOSE
|
//#define CHOOSE
|
||||||
#ifdef CHOOSE
|
#ifdef CHOOSE
|
||||||
CAmbarCendamo * ac = new CAmbarCendamo(initTable); //4gryf
|
CAmbarCendamo * ac = new CAmbarCendamo(initTable); //4gryf
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user