From 2b897b4fa0dd22334ba21a96ca7df5960b2c3355 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 14 Nov 2011 21:34:27 +0000 Subject: (svn r23219) -Change: different directories for basesets and newgrfs. So data to baseset or newgrf, and gm to baseset --- src/network/network_content.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/network/network_content.cpp') 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)); } -- cgit v1.2.3-54-g00ecf