rewrote memory system entirely (hunk, cache, and zone are gone, memory pools replaced...

[xonotic/darkplaces.git] / sound.h

diff --git a/sound.h b/sound.h
index 4e8cafcab16bd2d11a1d03ffef834f70160a6dfa..bf2afa71786a701de5098a54e43869228df305d1 100644 (file)
--- a/sound.h
+++ b/sound.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -31,12 +31,6 @@ typedef struct
        int right;
 } portable_samplepair_t;
 
-typedef struct sfx_s
-{
-       char    name[MAX_QPATH];
-       cache_user_t    cache;
-} sfx_t;
-
 typedef struct
 {
        int     length;
@@ -47,6 +41,13 @@ typedef struct
        byte    data[1];                // variable sized
 } sfxcache_t;
 
+typedef struct sfx_s
+{
+       char    name[MAX_QPATH];
+       mempool_t       *mempool;
+       sfxcache_t      *sfxcache;
+} sfx_t;
+
 typedef struct
 {
        qboolean                gamealive;