dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r10149) -Fix r10143: MSVC warnings... (tnx boekabart and glx)

Browse Source
This commit is contained in:
truelight
2007-06-13 19:05:42 +00:00
parent 063c4f7862
commit 402052509f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/spritecache.cpp
View File

@@ -252,13 +252,16 @@ bool LoadNextSprite(int load_index, byte file_index)
sc->lru = 0; sc->lru = 0;
sc->id = load_index; sc->id = load_index;
char *grf_name = strrchr(FioGetFilename(), PATHSEPCHAR); const char *fio_grf_name = FioGetFilename();
if (grf_name == NULL) grf_name = (char *)FioGetFilename(); const char *t = strrchr(fio_grf_name, PATHSEPCHAR);
/* Copy the string, make it lowercase, strip .grf */ char *grf_name;
grf_name = strdup(grf_name); if (t == NULL) grf_name = strdup(fio_grf_name);
char *t = strrchr(grf_name, '.'); else grf_name = strdup(t);
if (t != NULL) *t = '\0'; /* Make the string lowercase and strip extension */
char *t2 = strrchr(grf_name, '.');
if (t2 != NULL) *t2 = '\0';
strtolower(grf_name); strtolower(grf_name);
free((char *)sc->grf_name); free((char *)sc->grf_name);
sc->grf_name = grf_name; sc->grf_name = grf_name;