diff options
| -rw-r--r-- | src/network/network_udp.cpp | 3 | ||||
| -rw-r--r-- | src/newgrf.cpp | 8 | ||||
| -rw-r--r-- | src/newgrf_config.cpp | 14 | ||||
| -rw-r--r-- | src/newgrf_config.h | 2 |
4 files changed, 27 insertions, 0 deletions
diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp index 3f7e8e087..974b0bf6b 100644 --- a/src/network/network_udp.cpp +++ b/src/network/network_udp.cpp @@ -421,6 +421,9 @@ void ClientNetworkUDPSocketHandler::HandleIncomingNetworkGameInfoGRFConfig(GRFCo config->info->Release(); config->info = f->info; config->info->AddRef(); + config->url->Release(); + config->url = f->url; + config->url->AddRef(); } SetBit(config->flags, GCF_COPY); } diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 52de2703c..844d1fdae 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -7065,6 +7065,13 @@ static bool ChangeGRFDescription(byte langid, const char *str) return true; } +/** Callback function for 'INFO'->'URL_' to set the newgrf url. */ +static bool ChangeGRFURL(byte langid, const char *str) +{ + AddGRFTextToList(&_cur.grfconfig->url->text, langid, _cur.grfconfig->ident.grfid, false, str); + return true; +} + /** Callback function for 'INFO'->'NPAR' to set the number of valid parameters. */ static bool ChangeGRFNumUsedParams(size_t len, ByteReader *buf) { @@ -7412,6 +7419,7 @@ static bool HandleParameterInfo(ByteReader *buf) AllowedSubtags _tags_info[] = { AllowedSubtags('NAME', ChangeGRFName), AllowedSubtags('DESC', ChangeGRFDescription), + AllowedSubtags('URL_', ChangeGRFURL), AllowedSubtags('NPAR', ChangeGRFNumUsedParams), AllowedSubtags('PALS', ChangeGRFPalette), AllowedSubtags('BLTR', ChangeGRFBlitter), diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp index de4462879..6333a24d0 100644 --- a/src/newgrf_config.cpp +++ b/src/newgrf_config.cpp @@ -44,11 +44,13 @@ GRFTextWrapper::~GRFTextWrapper() GRFConfig::GRFConfig(const char *filename) : name(new GRFTextWrapper()), info(new GRFTextWrapper()), + url(new GRFTextWrapper()), num_valid_params(lengthof(param)) { if (filename != NULL) this->filename = strdup(filename); this->name->AddRef(); this->info->AddRef(); + this->url->AddRef(); } /** @@ -60,6 +62,7 @@ GRFConfig::GRFConfig(const GRFConfig &config) : ident(config.ident), name(config.name), info(config.info), + url(config.url), version(config.version), min_loadable_version(config.min_loadable_version), flags(config.flags & ~(1 << GCF_COPY)), @@ -75,6 +78,7 @@ GRFConfig::GRFConfig(const GRFConfig &config) : if (config.filename != NULL) this->filename = strdup(config.filename); this->name->AddRef(); this->info->AddRef(); + this->url->AddRef(); if (config.error != NULL) this->error = new GRFError(*config.error); for (uint i = 0; i < config.param_info.Length(); i++) { if (config.param_info[i] == NULL) { @@ -95,6 +99,7 @@ GRFConfig::~GRFConfig() } this->name->Release(); this->info->Release(); + this->url->Release(); for (uint i = 0; i < this->param_info.Length(); i++) delete this->param_info[i]; } @@ -119,6 +124,15 @@ const char *GRFConfig::GetDescription() const return GetGRFStringFromGRFText(this->info->text); } +/** + * Get the grf url. + * @return A string with an url of this grf. + */ +const char *GRFConfig::GetURL() const +{ + return GetGRFStringFromGRFText(this->url->text); +} + /** Set the default value for all parameters as specified by action14. */ void GRFConfig::SetParameterDefaults() { diff --git a/src/newgrf_config.h b/src/newgrf_config.h index 4e2057fca..c08ae1c63 100644 --- a/src/newgrf_config.h +++ b/src/newgrf_config.h @@ -169,6 +169,7 @@ struct GRFConfig : ZeroedMemoryAllocator { char *filename; ///< Filename - either with or without full path GRFTextWrapper *name; ///< NOSAVE: GRF name (Action 0x08) GRFTextWrapper *info; ///< NOSAVE: GRF info (author, copyright, ...) (Action 0x08) + GRFTextWrapper *url; ///< NOSAVE: URL belonging to this GRF. GRFError *error; ///< NOSAVE: Error/Warning during GRF loading (Action 0x0B) uint32 version; ///< NOSAVE: Version a NewGRF can set so only the newest NewGRF is shown @@ -190,6 +191,7 @@ struct GRFConfig : ZeroedMemoryAllocator { const char *GetTextfile(TextfileType type) const; const char *GetName() const; const char *GetDescription() const; + const char *GetURL() const; void SetParameterDefaults(); void SetSuitablePalette(); |