summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-11-14 21:34:27 +0000
committerrubidium <rubidium@openttd.org>2011-11-14 21:34:27 +0000
commit2b897b4fa0dd22334ba21a96ca7df5960b2c3355 (patch)
tree9574e5285750ecad60b076cb8d0cca35b631129e /src/network
parent9e7174e5406cf59a7f0ae79c6dc280b1958ef95d (diff)
downloadopenttd-2b897b4fa0dd22334ba21a96ca7df5960b2c3355.tar.xz
(svn r23219) -Change: different directories for basesets and newgrfs. So data to baseset or newgrf, and gm to baseset
Diffstat (limited to 'src/network')
-rw-r--r--src/network/network_content.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp
index d327b71d0..40bf03f97 100644
--- a/src/network/network_content.cpp
+++ b/src/network/network_content.cpp
@@ -376,7 +376,7 @@ static char *GetFullFilename(const ContentInfo *ci, bool compressed)
switch (ci->type) {
default: return NULL;
case CONTENT_TYPE_BASE_GRAPHICS: dir = BASESET_DIR; break;
- case CONTENT_TYPE_BASE_MUSIC: dir = GM_DIR; break;
+ case CONTENT_TYPE_BASE_MUSIC: dir = BASESET_DIR; break;
case CONTENT_TYPE_BASE_SOUNDS: dir = BASESET_DIR; break;
case CONTENT_TYPE_NEWGRF: dir = NEWGRF_DIR; break;
case CONTENT_TYPE_AI: dir = AI_DIR; break;
@@ -535,7 +535,7 @@ void ClientNetworkContentSocketHandler::AfterDownload()
if (this->curInfo->type == CONTENT_TYPE_BASE_MUSIC) {
/* Music can't be in a tar. So extract the tar! */
- ExtractTar(GetFullFilename(this->curInfo, false), GM_DIR);
+ ExtractTar(GetFullFilename(this->curInfo, false), BASESET_DIR);
unlink(GetFullFilename(this->curInfo, false));
}