mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r15476) -Fix [FS#2630]: crash when opening the game options when the currently loaded base graphics pack has less than 2 valid graphics files. For example when someone replaces all his/her original base graphics with custom work (but keeps the name) or renames the dos ones to windows or vice versa.

This commit is contained in:
rubidium 2009-02-14 01:42:12 +00:00
parent 7b5c5d4432
commit 7f245b22dc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gfxinit.cpp
View File

@ -577,7 +577,7 @@ int GetNumGraphicsSets()
{
int n = 0;
for (const GraphicsSet *g = _available_graphics_sets; g != NULL; g = g->next) {
if (g->found_grfs <= 1) continue;
if (g != _used_graphics_set && g->found_grfs <= 1) continue;
n++;
}
return n;
@ -590,8 +590,8 @@ int GetIndexOfCurrentGraphicsSet()
{
int n = 0;
for (const GraphicsSet *g = _available_graphics_sets; g != NULL; g = g->next) {
if (g->found_grfs <= 1) continue;
if (g == _used_graphics_set) return n;
if (g->found_grfs <= 1) continue;
n++;
}
return -1;
@ -603,7 +603,7 @@ int GetIndexOfCurrentGraphicsSet()
const char *GetGraphicsSetName(int index)
{
for (const GraphicsSet *g = _available_graphics_sets; g != NULL; g = g->next) {
if (g->found_grfs <= 1) continue;
if (g != _used_graphics_set && g->found_grfs <= 1) continue;
if (index == 0) return g->name;
index--;
}