From e0a423bed6979374521d401c7fbe6001041d0cca Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Mon, 8 Nov 2010 00:41:35 +0000 Subject: [PATCH] packaging cleanup git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5811 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- .../dcp/Dietmar_Pier_-_AssaultCube.ogg | Bin .../audio/{songs => soundtracks}/dcp/license.txt | 0 .../pingpong/Ping_Pong_-_Headshot.ogg | Bin .../pingpong/Ping_Pong_-_Kamikadze.ogg | Bin .../{songs => soundtracks}/pingpong/license.txt | 0 source/src/oggstream.cpp | 2 +- 6 files changed, 1 insertion(+), 1 deletion(-) rename packages/audio/{songs => soundtracks}/dcp/Dietmar_Pier_-_AssaultCube.ogg (100%) rename packages/audio/{songs => soundtracks}/dcp/license.txt (100%) rename packages/audio/{songs => soundtracks}/pingpong/Ping_Pong_-_Headshot.ogg (100%) rename packages/audio/{songs => soundtracks}/pingpong/Ping_Pong_-_Kamikadze.ogg (100%) rename packages/audio/{songs => soundtracks}/pingpong/license.txt (100%) diff --git a/packages/audio/songs/dcp/Dietmar_Pier_-_AssaultCube.ogg b/packages/audio/soundtracks/dcp/Dietmar_Pier_-_AssaultCube.ogg similarity index 100% rename from packages/audio/songs/dcp/Dietmar_Pier_-_AssaultCube.ogg rename to packages/audio/soundtracks/dcp/Dietmar_Pier_-_AssaultCube.ogg diff --git a/packages/audio/songs/dcp/license.txt b/packages/audio/soundtracks/dcp/license.txt similarity index 100% rename from packages/audio/songs/dcp/license.txt rename to packages/audio/soundtracks/dcp/license.txt diff --git a/packages/audio/songs/pingpong/Ping_Pong_-_Headshot.ogg b/packages/audio/soundtracks/pingpong/Ping_Pong_-_Headshot.ogg similarity index 100% rename from packages/audio/songs/pingpong/Ping_Pong_-_Headshot.ogg rename to packages/audio/soundtracks/pingpong/Ping_Pong_-_Headshot.ogg diff --git a/packages/audio/songs/pingpong/Ping_Pong_-_Kamikadze.ogg b/packages/audio/soundtracks/pingpong/Ping_Pong_-_Kamikadze.ogg similarity index 100% rename from packages/audio/songs/pingpong/Ping_Pong_-_Kamikadze.ogg rename to packages/audio/soundtracks/pingpong/Ping_Pong_-_Kamikadze.ogg diff --git a/packages/audio/songs/pingpong/license.txt b/packages/audio/soundtracks/pingpong/license.txt similarity index 100% rename from packages/audio/songs/pingpong/license.txt rename to packages/audio/soundtracks/pingpong/license.txt diff --git a/source/src/oggstream.cpp b/source/src/oggstream.cpp index 734450bb..fa640a66 100644 --- a/source/src/oggstream.cpp +++ b/source/src/oggstream.cpp @@ -115,7 +115,7 @@ bool oggstream::open(const char *f) loopi(sizeof(exts)/sizeof(exts[0])) { - formatstring(filepath)("packages/audio/songs/%s%s", f, exts[i]); + formatstring(filepath)("packages/audio/soundtracks/%s%s", f, exts[i]); ::stream *file = openfile(path(filepath), "rb"); if(!file) continue;