Browse Source

częściowy revert, żeby choć teren dało się zaobaczyć
(it should work ;])

mateuszb 18 years ago
parent
commit
91a6f3cc6c
3 changed files with 4 additions and 4 deletions
  1. 2 2
      CAmbarCendamo.cpp
  2. 1 1
      CAmbarCendamo.h
  3. 1 1
      CMT.cpp

+ 2 - 2
CAmbarCendamo.cpp

@@ -1757,13 +1757,13 @@ void CAmbarCendamo::loadDefs()
 		{
 			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);
 				defs.push_back(sdh);
 			}
 			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);
 				defs.push_back(sdh);
 			}

+ 1 - 1
CAmbarCendamo.h

@@ -21,7 +21,7 @@ public:
 	std::ifstream * is; // stream used to read map file
 	int andame; // length of map file
 	unsigned char * bufor; // here we store map bytecode
-	std::vector<CDefHandler*> defs;
+	std::vector<CSemiDefHandler*> defs;
 /////////////////funkcje skladowe
 	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

+ 1 - 1
CMT.cpp

@@ -331,7 +331,7 @@ int _tmain(int argc, _TCHAR* argv[])
 		{
 			initTable[ss] = mapstr[ss];
 		}
-#define CHOOSE
+//#define CHOOSE
 #ifdef CHOOSE
 		CAmbarCendamo * ac = new CAmbarCendamo(initTable); //4gryf
 #else