summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-12-26 09:38:41 +0000
committerrubidium <rubidium@openttd.org>2009-12-26 09:38:41 +0000
commit28c7c49855989cf854cbe72df9b733e6b4439c50 (patch)
tree5c98bda3cf0d925a043091ecc3299b6ded027384
parente7efb42a278b202807280e6b3586d7cdab6f64af (diff)
downloadopenttd-28c7c49855989cf854cbe72df9b733e6b4439c50.tar.xz
(svn r18638) -Fix: downloading music sets would fail
-rw-r--r--src/network/network_content.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp
index 5b2ce2258..2346ec3f2 100644
--- a/src/network/network_content.cpp
+++ b/src/network/network_content.cpp
@@ -87,6 +87,10 @@ DEF_CONTENT_RECEIVE_COMMAND(Client, PACKET_CONTENT_SERVER_INFO)
proc = BaseGraphics::HasSet;
break;
+ case CONTENT_TYPE_BASE_MUSIC:
+ proc = BaseMusic::HasSet;
+ break;
+
case CONTENT_TYPE_BASE_SOUNDS:
proc = BaseSounds::HasSet;
break;
@@ -158,6 +162,7 @@ void ClientNetworkContentSocketHandler::RequestContentList(ContentType type)
{
if (type == CONTENT_TYPE_END) {
this->RequestContentList(CONTENT_TYPE_BASE_GRAPHICS);
+ this->RequestContentList(CONTENT_TYPE_BASE_MUSIC);
this->RequestContentList(CONTENT_TYPE_BASE_SOUNDS);
this->RequestContentList(CONTENT_TYPE_SCENARIO);
this->RequestContentList(CONTENT_TYPE_HEIGHTMAP);
@@ -300,6 +305,7 @@ static char *GetFullFilename(const ContentInfo *ci, bool compressed)
switch (ci->type) {
default: return NULL;
case CONTENT_TYPE_BASE_GRAPHICS: dir = DATA_DIR; break;
+ case CONTENT_TYPE_BASE_MUSIC: dir = GM_DIR; break;
case CONTENT_TYPE_BASE_SOUNDS: dir = DATA_DIR; break;
case CONTENT_TYPE_NEWGRF: dir = DATA_DIR; break;
case CONTENT_TYPE_AI: dir = AI_DIR; break;