mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-06 14:27:16 +00:00
(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:
parent
7b5c5d4432
commit
7f245b22dc
@ -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--;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user