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

(svn r24932) -Fix [FS#5158]: Prevent more NewGRFs being selected than is possible to load.

release/1.3
peter1138 2013-01-22 03:54:40 +00:00
parent 7e8efa04fe
commit c18446951d
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lang/english.txt
View File

@ -2763,6 +2763,7 @@ STR_NEWGRF_CONFIRMATION_TEXT :{YELLOW}You are
STR_NEWGRF_DUPLICATE_GRFID :{WHITE}Can't add file: duplicate GRF ID STR_NEWGRF_DUPLICATE_GRFID :{WHITE}Can't add file: duplicate GRF ID
STR_NEWGRF_COMPATIBLE_LOADED :{ORANGE}Matching file not found (compatible GRF loaded) STR_NEWGRF_COMPATIBLE_LOADED :{ORANGE}Matching file not found (compatible GRF loaded)
STR_NEWGRF_TOO_MANY_NEWGRFS :{WHITE}Can't add file: NewGRF file limit reached
STR_NEWGRF_COMPATIBLE_LOAD_WARNING :{WHITE}Compatible GRF(s) loaded for missing files STR_NEWGRF_COMPATIBLE_LOAD_WARNING :{WHITE}Compatible GRF(s) loaded for missing files
STR_NEWGRF_DISABLED_WARNING :{WHITE}Missing GRF file(s) have been disabled STR_NEWGRF_DISABLED_WARNING :{WHITE}Missing GRF file(s) have been disabled

11
src/newgrf_gui.cpp
View File

@ -29,12 +29,17 @@
#include "newgrf_text.h" #include "newgrf_text.h"
#include "textfile_gui.h" #include "textfile_gui.h"
#include "tilehighlight_func.h" #include "tilehighlight_func.h"
#include "fios.h"
#include "widgets/newgrf_widget.h" #include "widgets/newgrf_widget.h"
#include "widgets/misc_widget.h" #include "widgets/misc_widget.h"
#include "table/sprites.h" #include "table/sprites.h"
/* Maximum number of NewGRFs that may be loaded. Six reserved slots are:
* 0 - config, 1 - sound, 2 - base, 3 - logos, 4 - climate, 5 - extra */
static const int MAX_NEWGRFS = MAX_FILE_SLOTS - 6;
/** /**
* Show the first NewGRF error we can find. * Show the first NewGRF error we can find.
*/ */
@ -1432,6 +1437,7 @@ private:
{ {
if (this->avail_sel == NULL || !this->editable || HasBit(this->avail_sel->flags, GCF_INVALID)) return false; if (this->avail_sel == NULL || !this->editable || HasBit(this->avail_sel->flags, GCF_INVALID)) return false;
int count = 0;
GRFConfig **entry = NULL; GRFConfig **entry = NULL;
GRFConfig **list; GRFConfig **list;
/* Find last entry in the list, checking for duplicate grfid on the way */ /* Find last entry in the list, checking for duplicate grfid on the way */
@ -1441,8 +1447,13 @@ private:
ShowErrorMessage(STR_NEWGRF_DUPLICATE_GRFID, INVALID_STRING_ID, WL_INFO); ShowErrorMessage(STR_NEWGRF_DUPLICATE_GRFID, INVALID_STRING_ID, WL_INFO);
return false; return false;
} }
count++;
} }
if (entry == NULL) entry = list; if (entry == NULL) entry = list;
if (count >= MAX_NEWGRFS) {
ShowErrorMessage(STR_NEWGRF_TOO_MANY_NEWGRFS, INVALID_STRING_ID, WL_INFO);
return false;
}
GRFConfig *c = new GRFConfig(*this->avail_sel); // Copy GRF details from scanned list. GRFConfig *c = new GRFConfig(*this->avail_sel); // Copy GRF details from scanned list.
c->SetParameterDefaults(); c->SetParameterDefaults();