diff options
| author | maedhros <maedhros@openttd.org> | 2007-03-06 19:33:28 +0000 |
|---|---|---|
| committer | maedhros <maedhros@openttd.org> | 2007-03-06 19:33:28 +0000 |
| commit | b838a906572d85369356d521ca292ce762bc86a1 (patch) | |
| tree | dd3c567c0980606c17509a28df3ceea5975adb03 /src/openttd.cpp | |
| parent | c59146a710a4f61bb1de015407264288ba808e24 (diff) | |
| download | openttd-b838a906572d85369356d521ca292ce762bc86a1.tar.xz | |
(svn r9031) -Codechange: Introduce grfconfig->status, and use it for states that are
mutually exclusive. At the same time, add an INITIALISED state which makes it
possible to check if a grf is not yet active but will be later on during the
GLS_ACTIVATION loading stage.
Diffstat (limited to 'src/openttd.cpp')
| -rw-r--r-- | src/openttd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index 29a57d27c..170f40e87 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -1209,12 +1209,12 @@ bool AfterLoadGame(void) if (_opt.road_side) _opt.road_side = 1; /* Check if all NewGRFs are present, we are very strict in MP mode */ - GCF_Flags gcf_res = IsGoodGRFConfigList(); - if (_networking && gcf_res != GCF_ACTIVATED) return false; + GRFListCompatibility gcf_res = IsGoodGRFConfigList(); + if (_networking && gcf_res != GLC_ALL_GOOD) return false; switch (gcf_res) { - case GCF_COMPATIBLE: _switch_mode_errorstr = STR_NEWGRF_COMPATIBLE_LOAD_WARNING; break; - case GCF_NOT_FOUND: _switch_mode_errorstr = STR_NEWGRF_DISABLED_WARNING; break; + case GLC_COMPATIBLE: _switch_mode_errorstr = STR_NEWGRF_COMPATIBLE_LOAD_WARNING; break; + case GLC_NOT_FOUND: _switch_mode_errorstr = STR_NEWGRF_DISABLED_WARNING; break; default: break; } |