mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r7950) -Backport from trunk (r7760, r7766): 

- Sprite usage debug message showed the starting sprite, not current sprite, and only do this during activation (r7760).
 - [OSX] Remove incorrect debug message about missing grf files.
release/0.5
Darkvater 2007-01-07 12:11:54 +00:00
parent bae0695ac9
commit 1277599c30
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfxinit.c
View File

@ -121,6 +121,20 @@ static bool FileMD5(const MD5File file, bool warn)
} }
#endif #endif
#if defined SECOND_DATA_DIR
/* If we failed to find the file in the first data directory, we will try the other one */
if (f == NULL) {
snprintf(buf, lengthof(buf), "%s%s", _paths.second_data_dir, file.filename);
f = fopen(buf, "rb");
if (f == NULL) {
strtolower(buf + strlen(_paths.second_data_dir) - 1);
f = fopen(buf, "rb");
}
}
#endif
if (f != NULL) { if (f != NULL) {
md5_state_t filemd5state; md5_state_t filemd5state;
md5_byte_t buffer[1024]; md5_byte_t buffer[1024];

7
newgrf.c
View File

@ -3793,8 +3793,11 @@ void LoadNewGRF(uint load_index, uint file_index)
if (stage == GLS_LABELSCAN) InitNewGRFFile(c, _cur_spriteid); if (stage == GLS_LABELSCAN) InitNewGRFFile(c, _cur_spriteid);
LoadNewGRFFile(c, slot++, stage); LoadNewGRFFile(c, slot++, stage);
if (stage == GLS_ACTIVATION) ClearTemporaryNewGRFData();
DEBUG(spritecache, 2) ("Currently %i sprites are loaded", load_index); if (stage == GLS_ACTIVATION) {
ClearTemporaryNewGRFData();
DEBUG(spritecache, 2) ("Currently %i sprites are loaded", _cur_spriteid);
}
} }
} }