Mercurial > mm7

diff AudioPlayer.h @ 1477:7ef4b64f6329

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* LODFile::LoadBitmaps & LODFile::LoadIconsOrEvents are merged into LODFile::Load Added support for most of mm6 resources, placeholders for mm8 resources. Fixed few C4258
author Nomad
date Wed, 28 Aug 2013 18:43:07 +0200
parents 2ca62c9e7b3c
children 421c29d4ab3e
line wrap: on
line diff
--- a/AudioPlayer.h	Wed Aug 28 14:39:01 2013 +0600
+++ b/AudioPlayer.h	Wed Aug 28 18:43:07 2013 +0200
@@ -253,7 +253,7 @@
   char         pData[1];
 };
 
-struct SoundDesc
+struct SoundDesc_mm6
 {
   inline bool Is3D()  {return (uFlags & SOUND_DESC_3D) != 0;}
 
@@ -262,6 +262,10 @@
   SOUND_DESC_TYPE eType;
   int uFlags;
   SoundData *pSoundData[17];
+};
+
+struct SoundDesc: public SoundDesc_mm6
+{
   void *p3DSound;
   int bDecompressed;
 };
@@ -283,7 +287,7 @@
   void _4A9D79(int a2);
   void UnloadSound(unsigned int uSoundID, char a3);
   void ToFile();
-  void *FromFile(void *pSerialized);
+  void FromFile(void *data_mm6, void *data_mm7, void *data_mm8);
   int FromFileTxt(const char *Args);
 
   signed int sNumSounds;