[Gemrb-commits] gemrb/gemrb/plugins/Core SaveGameIterator.h,1.8,1.9 SaveGameIterator.cpp,1.12,1.13 Core.cpp,1.10,1.11

[<edh...@pr...>]

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15985/plugins/Core

Modified Files:
	SaveGameIterator.h SaveGameIterator.cpp Core.cpp 
Log Message:
Fix for SaveGameIterator when case sensitive
ResolveFilePath() can be called at windows etc.



Index: SaveGameIterator.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/SaveGameIterator.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SaveGameIterator.h	29 Jan 2004 20:37:27 -0000	1.8
--- SaveGameIterator.h	1 Feb 2004 18:02:44 -0000	1.9
***************
*** 50,53 ****
--- 50,54 ----
  		struct stat my_stat;
  		sprintf(nPath, "%s%s%s.bmp", Path, SPathDelimiter, Prefix);
+ 		ResolveFilePath (nPath);
  		stat(nPath, &my_stat);
  		strftime(Date, _MAX_PATH, "%c",localtime(&my_stat.st_mtime));
***************
*** 66,69 ****
--- 67,71 ----
  		char nPath[_MAX_PATH];
  		sprintf(nPath, "%s%sPORTRT%d.bmp", Path, SPathDelimiter, index);
+ 		ResolveFilePath (nPath);
  		FileStream * fs = new FileStream();
  		fs->Open(nPath, true);
***************
*** 74,77 ****
--- 76,80 ----
  		char nPath[_MAX_PATH];
  		sprintf(nPath, "%s%s%s.bmp", Path, SPathDelimiter, Prefix);
+ 		ResolveFilePath (nPath);
  		FileStream * fs = new FileStream();
  		fs->Open(nPath, true);
***************
*** 82,85 ****
--- 85,89 ----
  		char nPath[_MAX_PATH];
  		sprintf(nPath, "%s%s%s.gam", Path, SPathDelimiter, Prefix);
+ 		ResolveFilePath (nPath);
  		FileStream * fs = new FileStream();
  		fs->Open(nPath, true);
***************
*** 90,93 ****
--- 94,98 ----
  		char nPath[_MAX_PATH];
  		sprintf(nPath, "%s%s%s.sav", Path, SPathDelimiter, Prefix);
+ 		ResolveFilePath (nPath);
  		FileStream * fs = new FileStream();
  		fs->Open(nPath, true);

Index: SaveGameIterator.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/SaveGameIterator.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** SaveGameIterator.cpp	29 Jan 2004 20:37:27 -0000	1.12
--- SaveGameIterator.cpp	1 Feb 2004 18:02:44 -0000	1.13
***************
*** 147,150 ****
--- 147,151 ----
  			char ftmp[_MAX_PATH];
  			sprintf(ftmp, "%s%s%s.bmp", dtmp, SPathDelimiter, core->GameNameResRef);
+ 			ResolveFilePath (ftmp);
  			FILE * exist = fopen(ftmp, "rb");
  			if(!exist)
***************
*** 229,232 ****
--- 230,234 ----
  			char ftmp[_MAX_PATH];
  			sprintf(ftmp, "%s%s%s.bmp", dtmp, SPathDelimiter, core->GameNameResRef);
+ 			ResolveFilePath (ftmp);
  			FILE * exist = fopen(ftmp, "rb");
  			if(!exist)

Index: Core.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Core.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Core.cpp	31 Jan 2004 18:45:19 -0000	1.10
--- Core.cpp	1 Feb 2004 18:02:44 -0000	1.11
***************
*** 47,50 ****
--- 47,51 ----
  
  #include "../../includes/globals.h"
+ #include "Interface.h" 
  
  #ifndef S_ISDIR
***************
*** 144,151 ****
--- 145,156 ----
  void ResolveFilePath(char *FilePath)
  {
+ #ifndef WIN32
          char TempFilePath[_MAX_PATH];
          char TempFileName[_MAX_PATH];
          int j, pos;
  
+ 	if (!core || !core->CaseSensitive) return;
+ 
+ 
          TempFilePath[0]=FilePath[0];
          for(pos=1;FilePath[pos] && FilePath[pos]!='/';pos++)
***************
*** 175,178 ****
--- 180,184 ----
          //should work (same size)
          strcpy(FilePath,TempFilePath);
+ #endif  //! WIN32
  }