mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-08-19 12:39:11 +00:00
(svn r15221) -Change [FS#2574]: only show missing NewGRFs when opening the content download window from a NewGRF list and there are missing NewGRFs, otherwise show just all NewGRFs the system knows.
This commit is contained in:
@@ -218,7 +218,7 @@ void ClientNetworkContentSocketHandler::RequestContentList(ContentVector *cv, bo
|
||||
ContentInfo *ci = *iter;
|
||||
bool found = false;
|
||||
for (ContentIterator iter2 = this->infos.Begin(); iter2 != this->infos.End(); iter2++) {
|
||||
ContentInfo *ci2 = *iter;
|
||||
ContentInfo *ci2 = *iter2;
|
||||
if (ci->type == ci2->type && ci->unique_id == ci2->unique_id &&
|
||||
(!send_md5sum || memcmp(ci->md5sum, ci2->md5sum, sizeof(ci->md5sum)) == 0)) {
|
||||
found = true;
|
||||
@@ -746,6 +746,13 @@ void ClientNetworkContentSocketHandler::CheckDependencyState(ContentInfo *ci)
|
||||
}
|
||||
}
|
||||
|
||||
void ClientNetworkContentSocketHandler::Clear()
|
||||
{
|
||||
for (ContentIterator iter = this->infos.Begin(); iter != this->infos.End(); iter++) delete *iter;
|
||||
|
||||
this->infos.Clear();
|
||||
}
|
||||
|
||||
/*** CALLBACK ***/
|
||||
|
||||
void ClientNetworkContentSocketHandler::OnConnect(bool success)
|
||||
|
@@ -117,6 +117,8 @@ public:
|
||||
ConstContentIterator Get(uint32 index) const { return this->infos.Get(index); }
|
||||
/** Get the end of the content inf iterator. */
|
||||
ConstContentIterator End() const { return this->infos.End(); }
|
||||
/** Clear all downloaded content information. */
|
||||
void Clear();
|
||||
|
||||
/** Add a callback to this class */
|
||||
void AddCallback(ContentCallback *cb) { this->callbacks.Include(cb); }
|
||||
|
@@ -684,6 +684,7 @@ static const WindowDesc _network_content_list_desc = {
|
||||
void ShowNetworkContentListWindow(ContentVector *cv, ContentType type)
|
||||
{
|
||||
#if defined(WITH_ZLIB)
|
||||
_network_content_client.Clear();
|
||||
if (cv == NULL) {
|
||||
_network_content_client.RequestContentList(type);
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user