summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2010-07-31 09:33:39 +0000
committeryexo <yexo@openttd.org>2010-07-31 09:33:39 +0000
commitd3c1be9abd2507fc5e77e5310e97bc1f31c28e65 (patch)
treebec0ca8eec0327145cc2b575795d9f154ac24404 /src/network
parent1ca16aa979fab1d7a60fb40def0374433362d265 (diff)
downloadopenttd-d3c1be9abd2507fc5e77e5310e97bc1f31c28e65.tar.xz
(svn r20249) -Codechange: change the newgrf name/description from a char* to a GRFText* to make translations possible
Diffstat (limited to 'src/network')
-rw-r--r--src/network/network_gamelist.cpp3
-rw-r--r--src/network/network_udp.cpp5
2 files changed, 5 insertions, 3 deletions
diff --git a/src/network/network_gamelist.cpp b/src/network/network_gamelist.cpp
index 0ef8b1b2e..97dc0f953 100644
--- a/src/network/network_gamelist.cpp
+++ b/src/network/network_gamelist.cpp
@@ -20,6 +20,7 @@
#include "network_internal.h"
#include "network_udp.h"
#include "network_gamelist.h"
+#include "../newgrf_text.h"
NetworkGameList *_network_game_list = NULL;
@@ -175,7 +176,7 @@ void NetworkAfterNewGRFScan()
/* Don't know the GRF, so mark game incompatible and the (possibly)
* already resolved name for this GRF (another server has sent the
* name of the GRF already */
- c->name = FindUnknownGRFName(c->ident.grfid, c->ident.md5sum, true);
+ AddGRFTextToList(&c->name, FindUnknownGRFName(c->ident.grfid, c->ident.md5sum, true));
c->status = GCS_NOT_FOUND;
/* If we miss a file, we're obviously incompatible */
diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp
index 9d5ce98a2..dadf0525f 100644
--- a/src/network/network_udp.cpp
+++ b/src/network/network_udp.cpp
@@ -28,6 +28,7 @@
#include "../company_base.h"
#include "../thread/thread.h"
#include "../rev.h"
+#include "../newgrf_text.h"
#include "core/udp.h"
@@ -366,11 +367,11 @@ void ClientNetworkUDPSocketHandler::HandleIncomingNetworkGameInfoGRFConfig(GRFCo
/* Don't know the GRF, so mark game incompatible and the (possibly)
* already resolved name for this GRF (another server has sent the
* name of the GRF already */
- config->name = FindUnknownGRFName(config->ident.grfid, config->ident.md5sum, true);
+ AddGRFTextToList(&config->name, FindUnknownGRFName(config->ident.grfid, config->ident.md5sum, true));
config->status = GCS_NOT_FOUND;
} else {
config->filename = f->filename;
- config->name = f->name;
+ config->name = DuplicateGRFText(f->name);
config->info = f->info;
}
SetBit(config->flags, GCF_COPY);