amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-24 03:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r16539) [0.7] -Backport from trunk:

Browse Source 
- Fix: When finding duplicate graphics sets favour the more complete one (r16538)
- Fix: [Squirrel] Crash that occured when an AI was halted while one or more generators were still in a 'running' state [FS#2942] (r16534)
- Fix: [Squirrel] Do not copy an object when we just checked that the pointer to it is NULL (r16532)
- Fix: Notify small UFOs on deletion of road vehicles, so they can head for somewhere else instead of stumbling over a ghost (r16525)
- Update: a few languages.
This commit is contained in:
rubidium
2009-06-08 22:53:39 +00:00
parent b1d2a8876b
commit a00a4b5ad8
18 changed files with 361 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gfxinit.cpp
+3 -1
View File
@@ -468,7 +468,9 @@ bool OBGFileScanner::AddFile(const char *filename, size_t basepath_length)
}
}
if (duplicate != NULL) {
if (duplicate->version >= graphics->version) {
/* The more complete graphics set takes precedence over the version number. */
if ((duplicate->files == graphics->files && duplicate->version >= graphics->version) ||
duplicate->files > graphics->files) {
DEBUG(grf, 1, "Not adding %s (%i) as base graphics set (duplicate)", graphics->name, graphics->version);
delete graphics;
} else {