diff options
| author | Max Horn | 2003-06-15 01:00:43 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-15 01:00:43 +0000 |
| commit | acec45a4834c4254a3e43427a204690414e8d6c8 (patch) | |
| tree | 46e14cd026be1ff3ef2dc73bc6a925f1d26c67a0 /scumm/player_v2.h | |
| parent | f1fc68773d32783eea28d9ae711a26dd461cea1a (diff) | |
| download | scummvm-rg350-acec45a4834c4254a3e43427a204690414e8d6c8.tar.gz scummvm-rg350-acec45a4834c4254a3e43427a204690414e8d6c8.tar.bz2 scummvm-rg350-acec45a4834c4254a3e43427a204690414e8d6c8.zip | |
cleanup
svn-id: r8494
Diffstat (limited to 'scumm/player_v2.h')
| -rw-r--r-- | scumm/player_v2.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/scumm/player_v2.h b/scumm/player_v2.h index b532f8c7b6..32ec8345f9 100644 --- a/scumm/player_v2.h +++ b/scumm/player_v2.h @@ -24,8 +24,10 @@ #define PLAYER_V2_H #include "common/scummsys.h" -#include "sound/mixer.h" -class Scumm; + +#if !defined(__GNUC__) + #pragma START_PACK_STRUCTS +#endif struct channel_data { uint16 time_left; // 00 @@ -52,12 +54,20 @@ struct channel_data { uint16 music_script_nr; // 48 } GCC_PACK; +#if !defined(__GNUC__) + #pragma END_PACK_STRUCTS +#endif + + union ChannelInfo { channel_data d; uint16 array[sizeof(channel_data)/2]; }; +class Scumm; +class SoundMixer; + class Player_V2 { public: |