@@ -1,4 +1,5 @@ #include "GResourceMap.h" +#include "RAI.h" #include <set> #include "Sim/Features/FeatureDef.h" //#include <time.h> @@ -34,7 +35,8 @@ float ResourceSite::GetResourceDistance(ResourceSite* RS, const int& pathType) return RSD->minDistance; } -GlobalResourceMap::GlobalResourceMap(IAICallback* cb, cLogFile* l, GlobalTerrainMap* TM) +GlobalResourceMap::GlobalResourceMap(IAICallback* _cb, cLogFile* l, GlobalTerrainMap* TM) : + cb(_cb) { // l = logfile; *l<<"\n Loading the Resource-Map ..."; @@ -98,21 +100,26 @@ GlobalResourceMap::GlobalResourceMap(IAICallback* cb, cLogFile* l, GlobalTerrain fList[i] = fList[--fSize]; } - string cacheDirectory = cLogFile::GetDir(cb, true, "cache"); + relResourceFileName = "cache/" + string(cb->GetModName()); + relResourceFileName.resize(relResourceFileName.size()-4); + relResourceFileName += "-" + string(cb->GetMapName()); + relResourceFileName.resize(relResourceFileName.size()-3); + relResourceFileName += "res"; + + string resourceFileName_r; + FILE* resourceFile_r = NULL; + // get absolute file name + if (cRAI::LocateFile(cb, relResourceFileName, resourceFileName_r, false)) { + resourceFile_r = fopen(resourceFileName_r.c_str(), "rb"); + } - resourceFileName = cacheDirectory + string(cb->GetModName()); - resourceFileName.resize(resourceFileName.size()-4); - resourceFileName += "-" + string(cb->GetMapName()); - resourceFileName.resize(resourceFileName.size()-3); - resourceFileName += "res"; - FILE *resourceFile = fopen(resourceFileName.c_str(),"rb"); bool useResourceFile = false; - if( resourceFile ) + if( resourceFile_r ) { useResourceFile = true; *l<<"\n Loading Resource-Site Data ..."; int udL2Size; - fread(&udL2Size, sizeof(int), 1, resourceFile); + fread(&udL2Size, sizeof(int), 1, resourceFile_r); if( udSize != udL2Size ) useResourceFile = false; else @@ -120,7 +127,7 @@ GlobalResourceMap::GlobalResourceMap(IAICallback* cb, cLogFile* l, GlobalTerrain int ID; for( int i=0; i<udSize; i++ ) { - fread(&ID, sizeof(int), 1, resourceFile); + fread(&ID, sizeof(int), 1, resourceFile_r); if( udList[i]->id != ID ) { // The order or types of definitions have changed useResourceFile = false; @@ -130,14 +137,14 @@ GlobalResourceMap::GlobalResourceMap(IAICallback* cb, cLogFile* l, GlobalTerrain if( useResourceFile ) { int featureSites; - fread(&featureSites, sizeof(int), 1, resourceFile); + fread(&featureSites, sizeof(int), 1, resourceFile_r); if( fSize != featureSites ) useResourceFile = false; else { // Checks if the feature resource list has changed for( int i=0; i<fSize; i++ ) { - fread(&ID, sizeof(int), 1, resourceFile); + fread(&ID, sizeof(int), 1, resourceFile_r); if( fList[i] != ID ) { // The order or types of features have changed useResourceFile = false; @@ -156,20 +163,20 @@ GlobalResourceMap::GlobalResourceMap(IAICallback* cb, cLogFile* l, GlobalTerrain int optionID; for( int iT=0; iT<2; iT++ ) { - fread(&RSize[iT], sizeof(int), 1, resourceFile); + fread(&RSize[iT], sizeof(int), 1, resourceFile_r); for( int iR=0; iR<RSize[iT]; iR++ ) { - fread(&featureID, sizeof(int), 1, resourceFile); - fread(&position, sizeof(float3), 1, resourceFile); + fread(&featureID, sizeof(int), 1, resourceFile_r); + fread(&position, sizeof(float3), 1, resourceFile_r); if( featureID >= 0 ) R[iT][iR] = new ResourceSite(position,featureID,cb->GetFeatureDef(featureID)); else R[iT][iR] = new ResourceSite(position); - fread(&R[iT][iR]->amount, sizeof(float), 1, resourceFile); - fread(&size, sizeof(int), 1, resourceFile); + fread(&R[iT][iR]->amount, sizeof(float), 1, resourceFile_r); + fread(&size, sizeof(int), 1, resourceFile_r); for( int i=0; i<size; i++ ) { - fread(&optionID, sizeof(int), 1, resourceFile); + fread(&optionID, sizeof(int), 1, resourceFile_r); R[iT][iR]->options.insert(optionID); } } @@ -177,26 +184,26 @@ GlobalResourceMap::GlobalResourceMap(IAICallback* cb, cLogFile* l, GlobalTerrain for( int iT=0; iT<2; iT++ ) for( int iR=0; iR<RSize[iT]; iR++ ) { - fread(&size, sizeof(int), 1, resourceFile); + fread(&size, sizeof(int), 1, resourceFile_r); for( int i=0; i<size; i++ ) { - fread(&iT2, sizeof(int), 1, resourceFile); - fread(&iR2, sizeof(int), 1, resourceFile); + fread(&iT2, sizeof(int), 1, resourceFile_r); + fread(&iR2, sizeof(int), 1, resourceFile_r); R[iT][iR]->siteDistance.insert(rrPair(R[iT2][iR2],ResourceSiteDistance(0.0))); ResourceSiteDistance* RSD = &R[iT][iR]->siteDistance.find(R[iT2][iR2])->second; - fread(&RSD->minDistance, sizeof(float), 1, resourceFile); - fread(&RSD->bestPathType, sizeof(int), 1, resourceFile); - fread(&dSize, sizeof(int), 1, resourceFile); + fread(&RSD->minDistance, sizeof(float), 1, resourceFile_r); + fread(&RSD->bestPathType, sizeof(int), 1, resourceFile_r); + fread(&dSize, sizeof(int), 1, resourceFile_r); for( int i=0; i<dSize; i++ ) { - fread(&optionID, sizeof(int), 1, resourceFile); - fread(&distance, sizeof(float), 1, resourceFile); + fread(&optionID, sizeof(int), 1, resourceFile_r); + fread(&distance, sizeof(float), 1, resourceFile_r); RSD->distance.insert(ifPair(optionID,distance)); } - fread(&dSize, sizeof(int), 1, resourceFile); + fread(&dSize, sizeof(int), 1, resourceFile_r); for( int i=0; i<dSize; i++ ) { - fread(&position, sizeof(float3), 1, resourceFile); + fread(&position, sizeof(float3), 1, resourceFile_r); RSD->pathDebug.push_back(position); } if( RSD->bestPathType == -2 ) @@ -205,14 +212,14 @@ GlobalResourceMap::GlobalResourceMap(IAICallback* cb, cLogFile* l, GlobalTerrain RSD->bestDistance = &RSD->distance.find(RSD->bestPathType)->second; } } - fread(&averageMetalSite, sizeof(float), 1, resourceFile); - fread(&isMetalMap, sizeof(bool), 1, resourceFile); + fread(&averageMetalSite, sizeof(float), 1, resourceFile_r); + fread(&isMetalMap, sizeof(bool), 1, resourceFile_r); if( isMetalMap ) { sector = new MetalMapSector[TM->sectorXSize*TM->sectorZSize]; for( int iS=0; iS<TM->sectorXSize*TM->sectorZSize; iS++ ) { - fread(&sector[iS].isMetalSector, sizeof(bool), 1, resourceFile); + fread(&sector[iS].isMetalSector, sizeof(bool), 1, resourceFile_r); sector[iS].S = &TM->sector[iS]; } } @@ -220,7 +227,7 @@ GlobalResourceMap::GlobalResourceMap(IAICallback* cb, cLogFile* l, GlobalTerrain } } } - fclose(resourceFile); + fclose(resourceFile_r); if( !useResourceFile ) *l<<"\n A change has been detected in the map/mod, the resource data will be reloaded."; } @@ -704,62 +711,70 @@ GlobalResourceMap::~GlobalResourceMap() { if( saveResourceFile ) { - FILE *resourceFile = fopen(resourceFileName.c_str(),"wb"); + string resourceFileName_w; + FILE* resourceFile_w = NULL; + // get absolute file name + if (cRAI::LocateFile(cb, relResourceFileName, resourceFileName_w, true)) { + resourceFile_w = fopen(resourceFileName_w.c_str(), "wb"); + } else { + throw 12; + } + int size; - fwrite(&(size=saveUD.size()), sizeof(int), 1, resourceFile); + fwrite(&(size=saveUD.size()), sizeof(int), 1, resourceFile_w); for(vector<int>::iterator i=saveUD.begin(); i!=saveUD.end(); i++) - fwrite(&*i, sizeof(int), 1, resourceFile); - fwrite(&(size=saveF.size()), sizeof(int), 1, resourceFile); + fwrite(&*i, sizeof(int), 1, resourceFile_w); + fwrite(&(size=saveF.size()), sizeof(int), 1, resourceFile_w); for(vector<int>::iterator i=saveF.begin(); i!=saveF.end(); i++) - fwrite(&*i, sizeof(int), 1, resourceFile); + fwrite(&*i, sizeof(int), 1, resourceFile_w); for( int iT=0; iT<2; iT++ ) { - fwrite(&RSize[iT], sizeof(int), 1, resourceFile); + fwrite(&RSize[iT], sizeof(int), 1, resourceFile_w); for( int iR=0; iR<RSize[iT]; iR++ ) { - fwrite(&R[iT][iR]->featureID, sizeof(int), 1, resourceFile); - fwrite(&R[iT][iR]->position, sizeof(float3), 1, resourceFile); - fwrite(&R[iT][iR]->amount, sizeof(float), 1, resourceFile); - fwrite(&(size=R[iT][iR]->options.size()), sizeof(int), 1, resourceFile); + fwrite(&R[iT][iR]->featureID, sizeof(int), 1, resourceFile_w); + fwrite(&R[iT][iR]->position, sizeof(float3), 1, resourceFile_w); + fwrite(&R[iT][iR]->amount, sizeof(float), 1, resourceFile_w); + fwrite(&(size=R[iT][iR]->options.size()), sizeof(int), 1, resourceFile_w); for( set<int>::iterator i=R[iT][iR]->options.begin(); i!=R[iT][iR]->options.end(); i++ ) - fwrite(&*i, sizeof(int), 1, resourceFile); + fwrite(&*i, sizeof(int), 1, resourceFile_w); } } for( int iT=0; iT<2; iT++ ) for( int iR=0; iR<RSize[iT]; iR++ ) { - fwrite(&(size=R[iT][iR]->siteDistance.size()), sizeof(int), 1, resourceFile); + fwrite(&(size=R[iT][iR]->siteDistance.size()), sizeof(int), 1, resourceFile_w); for( map<ResourceSite*,ResourceSiteDistance>::iterator iRS=R[iT][iR]->siteDistance.begin(); iRS!=R[iT][iR]->siteDistance.end(); iRS++ ) { - fwrite(&iRS->first->type, sizeof(int), 1, resourceFile); + fwrite(&iRS->first->type, sizeof(int), 1, resourceFile_w); ResourceSiteDistance* RSD = &iRS->second; for(int i=0; i<RSize[iRS->first->type]; i++) if( R[iRS->first->type][i] == iRS->first ) { - fwrite(&i, sizeof(int), 1, resourceFile); + fwrite(&i, sizeof(int), 1, resourceFile_w); break; } - fwrite(&RSD->minDistance, sizeof(float), 1, resourceFile); + fwrite(&RSD->minDistance, sizeof(float), 1, resourceFile_w); if( RSD->bestPathType == -1 && RSD->bestDistance != 0 ) RSD->bestPathType = -2; - fwrite(&RSD->bestPathType, sizeof(int), 1, resourceFile); - fwrite(&(size=RSD->distance.size()), sizeof(int), 1, resourceFile); + fwrite(&RSD->bestPathType, sizeof(int), 1, resourceFile_w); + fwrite(&(size=RSD->distance.size()), sizeof(int), 1, resourceFile_w); for( map<int,float>::iterator i=RSD->distance.begin(); i!=RSD->distance.end(); i++ ) { - fwrite(&i->first, sizeof(int), 1, resourceFile); - fwrite(&i->second, sizeof(float), 1, resourceFile); + fwrite(&i->first, sizeof(int), 1, resourceFile_w); + fwrite(&i->second, sizeof(float), 1, resourceFile_w); } - fwrite(&(size=RSD->pathDebug.size()), sizeof(int), 1, resourceFile); + fwrite(&(size=RSD->pathDebug.size()), sizeof(int), 1, resourceFile_w); for( vector<float3>::iterator i=RSD->pathDebug.begin(); i!=RSD->pathDebug.end(); i++ ) - fwrite(&*i, sizeof(float3), 1, resourceFile); + fwrite(&*i, sizeof(float3), 1, resourceFile_w); } } - fwrite(&averageMetalSite, sizeof(float), 1, resourceFile); - fwrite(&isMetalMap, sizeof(bool), 1, resourceFile); + fwrite(&averageMetalSite, sizeof(float), 1, resourceFile_w); + fwrite(&isMetalMap, sizeof(bool), 1, resourceFile_w); if( isMetalMap ) for( int iS=0; iS<saveSectorSize; iS++ ) - fwrite(&sector[iS].isMetalSector, sizeof(bool), 1, resourceFile); - fclose(resourceFile); + fwrite(&sector[iS].isMetalSector, sizeof(bool), 1, resourceFile_w); + fclose(resourceFile_w); } if( sector != 0 ) AI/Skirmish/RAI/GResourceMap.cpp @@ -105,8 +105,10 @@ private: int MMXSize; int MMExtractorRadiusI; + IAICallback* cb; + // needed to save the file - string resourceFileName; + string relResourceFileName; bool saveResourceFile; vector<int> saveUD; vector<int> saveF; AI/Skirmish/RAI/GResourceMap.h @@ -1,4 +1,5 @@ #include "GTerrainMap.h" +#include "RAI.h" #include <set> #include "Sim/MoveTypes/MoveInfo.h" #include "CUtils/Util.h" @@ -11,32 +12,35 @@ GlobalTerrainMap::GlobalTerrainMap(IAICallback* cb, cLogFile* l) // l = logfile; *l<<"\n Loading the Terrain-Map ..."; - string cacheDirectory = cLogFile::GetDir(cb, true, "cache"); - - if (cacheDirectory.empty()) { - *l<<"\nERROR: Could not create the cache dir: "<<cacheDirectory; - } - // Reading the WaterDamage entry from the map file const int mapFileVersion = 2; waterIsHarmful = false; - string mapFileName = cb->GetMapName(); - mapFileName = cacheDirectory + mapFileName.substr(0,int(mapFileName.size())-3) + "res"; - FILE *mapFile = fopen(mapFileName.c_str(),"rb"); + + string relMapFileName = string("cache/") + cb->GetMapName(); + relMapFileName = relMapFileName.substr(0, ((int) relMapFileName.size()) - 3) + "res"; + + string mapFileName_r; + FILE* mapFile_r = NULL; + if (cRAI::LocateFile(cb, relMapFileName, mapFileName_r, false)) { + mapFile_r = fopen(mapFileName_r.c_str(), "rb"); + } else { + *l<<"\nCould not find cache file for reading: "<<relMapFileName; + } + bool mapFileLoaded = false; - if( mapFile ) + if( mapFile_r ) { int version; - fread(&version, sizeof(int), 1, mapFile); + fread(&version, sizeof(int), 1, mapFile_r); if( version == mapFileVersion ) { - fread(&waterIsHarmful, sizeof(bool), 1, mapFile); - fread(&waterIsAVoid, sizeof(bool), 1, mapFile); + fread(&waterIsHarmful, sizeof(bool), 1, mapFile_r); + fread(&waterIsAVoid, sizeof(bool), 1, mapFile_r); mapFileLoaded = true; } else - *l<<"\n The cashed map-file is using a different version format, reloading..."; - fclose(mapFile); + *l<<"\n The cached map-file is using a different version format, reloading..."; + fclose(mapFile_r); } if( !mapFileLoaded ) { @@ -70,17 +74,19 @@ GlobalTerrainMap::GlobalTerrainMap(IAICallback* cb, cLogFile* l) } // *l<<"\n Map-Archive Timer: "<<(clock()-mapArchiveTimer)/CLOCKS_PER_SEC<<" seconds"; - mapFile = fopen(mapFileName.c_str(),"wb"); - if (mapFile) - { - fwrite(&mapFileVersion,sizeof(int),1,mapFile); - fwrite(&waterIsHarmful,sizeof(bool),1,mapFile); - fwrite(&waterIsAVoid,sizeof(bool),1,mapFile); - fclose(mapFile); + string mapFileName_w; + FILE* mapFile_w = NULL; + if (cRAI::LocateFile(cb, relMapFileName, mapFileName_w, true)) { + mapFile_w = fopen(mapFileName_w.c_str(), "wb"); } - else - { - *l<<"\nERROR: Could not write to file: "<<mapFileName; + + if (mapFile_w) { + fwrite(&mapFileVersion,sizeof(int),1,mapFile_w); + fwrite(&waterIsHarmful,sizeof(bool),1,mapFile_w); + fwrite(&waterIsAVoid,sizeof(bool),1,mapFile_w); + fclose(mapFile_w); + } else { + *l<<"\nERROR: Could not write to file: "<<relMapFileName; } } AI/Skirmish/RAI/GTerrainMap.cpp @@ -1,5 +1,6 @@ #include "LogFile.h" +#include "RAI.h" #include "ExternalAI/IAICallback.h" #include <string> @@ -12,13 +13,18 @@ using std::string; cLogFile::cLogFile(IAICallback* cb, string sFilename, bool bAppend) { - logFileName = cLogFile::GetDir(cb) + sFilename; + string sFilename_w; + const bool located = cRAI::LocateFile(cb, sFilename, sFilename_w, true); + if (!located) { + throw 11; + } + if( bAppend ) - logFile = fopen(logFileName.c_str(),"a"); + logFile = fopen(sFilename_w.c_str(), "a"); // logFile = new ofstream(); // logFile->open( logFileName.c_str(), ios::app ); else - logFile = fopen(logFileName.c_str(),"w"); + logFile = fopen(sFilename_w.c_str(), "w"); // ofstream oLog( logFileName.c_str() ); // oLog.close(); @@ -86,28 +92,3 @@ void cLogFile::Write(int message) // logFile->flush(); } */ - -std::string cLogFile::GetDir(IAICallback* cb, bool writeableAndCreate, std::string relPath) { - - std::string returnedPath = ""; - - AIHCGetDataDir cmdData = { - relPath.c_str(), - writeableAndCreate, - writeableAndCreate, - true, - false, - NULL - }; - - int ret = cb->HandleCommand(AIHCGetDataDirId, &cmdData); - - if (ret == 1 && cmdData.ret_path != NULL) { - // nothing failed - std::string returnedPath = std::string(cmdData.ret_path); - free(cmdData.ret_path); - cmdData.ret_path = NULL; - } - - return returnedPath; -} AI/Skirmish/RAI/LogFile.cpp @@ -22,8 +22,6 @@ public: cLogFile& operator<<(float message); cLogFile& operator<<(string message); - static std::string GetDir(IAICallback* cb, bool writeableAndCreate = true, string relPath = ""); - private: string logFileName; FILE *logFile; AI/Skirmish/RAI/LogFile.h @@ -1074,42 +1074,62 @@ void cRAI::DebugDrawLine(float3 StartPos, float distance, int direction, float x EndPos.z-=distance; break; } - cb->CreateLineFigure(StartPos,EndPos,width,arrow,lifetime,group); + cb->CreateLineFigure(StartPos, EndPos, width, arrow, lifetime, group); } -void cRAI::DebugDrawShape(float3 CenterPos, float linelength, float width, int arrow, float yposoffset, int lifetime, int sides, int group) +void cRAI::DebugDrawShape(float3 centerPos, float lineLength, float width, int arrow, float yPosOffset, int lifeTime, int sides, int group) { - DebugDrawLine(CenterPos,linelength,0,-linelength/2,linelength/2,yposoffset,lifetime,arrow,width,group); - DebugDrawLine(CenterPos,linelength,1,-linelength/2,-linelength/2,yposoffset,lifetime,arrow,width,group); - DebugDrawLine(CenterPos,linelength,2,linelength/2,-linelength/2,yposoffset,lifetime,arrow,width,group); - DebugDrawLine(CenterPos,linelength,3,linelength/2,linelength/2,yposoffset,lifetime,arrow,width,group); + DebugDrawLine(centerPos, lineLength, 0, -lineLength/2, lineLength/2, yPosOffset, lifeTime, arrow, width, group); + DebugDrawLine(centerPos, lineLength, 1, -lineLength/2, -lineLength/2, yPosOffset, lifeTime, arrow, width, group); + DebugDrawLine(centerPos, lineLength, 2, lineLength/2, -lineLength/2, yPosOffset, lifeTime, arrow, width, group); + DebugDrawLine(centerPos, lineLength, 3, lineLength/2, lineLength/2, yPosOffset, lifeTime, arrow, width, group); +} + +bool cRAI::LocateFile(IAICallback* cb, const string& relFileName, string& absFileName, bool forWriting) { + + int action = AIVAL_LOCATE_FILE_R; + if (forWriting) { + action = AIVAL_LOCATE_FILE_W; + } + + const size_t absFN_sizeMax = 512 + relFileName.size(); + char absFN[absFN_sizeMax]; + STRCPYS(absFN, absFN_sizeMax, relFileName.c_str()); + const bool located = cb->GetValue(action, absFN); + + if (located) { + absFileName = absFN; + } else { + absFileName = ""; + } + + return located; +} + +void cRAI::RemoveLogFile(string relFileName) const { + + string absFileName; + if (cRAI::LocateFile(cb, relFileName, absFileName, true)) { + remove(absFileName.c_str()); + } } void cRAI::ClearLogFiles() { - string logDir = cLogFile::GetDir(cb); + string logDir = ""; - string logFileName; - for( int i=0; i<16; i++ ) + for( int i=0; i<32; i++ ) { char c[3]; SNPRINTF(c, 3, "%i", i); - logFileName = logDir+"RAI"+string(c)+"_LastGame.log"; - remove(logFileName.c_str()); + RemoveLogFile(logDir+"RAI"+string(c)+"_LastGame.log"); } - logFileName=logDir+"RAIGlobal_LastGame.log"; - remove(logFileName.c_str()); - logFileName=logDir+"TerrainMapDebug.log"; - remove(logFileName.c_str()); -// logFileName=logDir+"PathfinderDebug.log"; -// remove(logFileName.c_str()); -// logFileName=logDir+"PathFinderAPNDebug.log"; -// remove(logFileName.c_str()); -// logFileName=logDir+"PathFinderNPNDebug.log"; -// remove(logFileName.c_str()); -// logFileName=logDir+"Prerequisite.log"; -// remove(logFileName.c_str()); -// logFileName=logDir+"Debug.log"; -// remove(logFileName.c_str()); + RemoveLogFile(logDir+"RAIGlobal_LastGame.log"); + RemoveLogFile(logDir+"TerrainMapDebug.log"); +// RemoveLogFile(logDir+"PathfinderDebug.log"); +// RemoveLogFile(logDir+"PathFinderAPNDebug.log"); +// RemoveLogFile(logDir+"PathFinderNPNDebug.log"); +// RemoveLogFile(logDir+"Prerequisite.log"); +// RemoveLogFile(logDir+"Debug.log"); } AI/Skirmish/RAI/RAI.cpp @@ -140,6 +140,8 @@ public: bool ValidateUnitList(map<int,UnitInfo*>* UL); // returns true if at least one unit on the list is valid void ValidateAllUnits(); + static bool LocateFile(IAICallback* cb, const string& relFileName, string& absFileName, bool forWriting); + map<int,UnitInfo> Units; // Complete record of all owned units, key value = unit id map<int,UnitInfo*> UImmobile; map<int,UnitInfo*> UMobile; @@ -161,6 +163,7 @@ public: typedef pair<int,EnemyInfo*> iepPair; private: + void RemoveLogFile(string relFileName) const; void UpdateEventRemove(UpdateEvent* e); void UpdateEventReorderFirst(); UpdateEvent* eventList[10000]; AI/Skirmish/RAI/RAI.h eb490b1d33f09d9b86fe8990c95726b0617e2637 hoijui hoijui.quaero@gmail.com http://github.com/spring/spring/commit/7cd3974f8a4dec3adf8156fc104e6a2fe8c697b6 7cd3974f8a4dec3adf8156fc104e6a2fe8c697b6 2009-11-15T04:35:52-08:00 2009-11-15T04:33:54-08:00 AI: RAI: fix for file location fetching Cache and log files will end up in the right place now. 34db520b8609e466f3f00e62ceb21ebdc3d7a330 hoijui hoijui.quaero@gmail.com