dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r27729) -Codechange: Do not count static NewGRF when checking for the maximum number of NewGRFs in a game.

Browse Source 
-Codechange: Remove LAST_GRF_SLOT and MAX_NEWGRFS. Now NETWORK_MAX_GRF_COUNT is the only constant to specify the maximum number of non-static NewGRF.
-Codechange: Increase the number of file slots, effectively increasing the maximum number of static NewGRF and baseset GRFs.
This commit is contained in:
frosch
2017-01-14 13:12:49 +00:00
parent 9f858cefd1
commit 8bd3a8a991
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf_gui.cpp
View File

@@ -39,10 +39,6 @@
#include <map>
#include "safeguards.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.
*/
@@ -1509,7 +1505,7 @@ private:
{
if (this->avail_sel == NULL || !this->editable || HasBit(this->avail_sel->flags, GCF_INVALID)) return false;
int count = 0;
uint count = 0;
GRFConfig **entry = NULL;
GRFConfig **list;
/* Find last entry in the list, checking for duplicate grfid on the way */
@@ -1519,10 +1515,10 @@ private:
ShowErrorMessage(STR_NEWGRF_DUPLICATE_GRFID, INVALID_STRING_ID, WL_INFO);
return false;
}
count++;
if (!HasBit((*list)->flags, GCF_STATIC)) count++;
}
if (entry == NULL) entry = list;
if (count >= MAX_NEWGRFS) {
if (count >= NETWORK_MAX_GRF_COUNT) {
ShowErrorMessage(STR_NEWGRF_TOO_MANY_NEWGRFS, INVALID_STRING_ID, WL_INFO);
return false;
}