From acec45a4834c4254a3e43427a204690414e8d6c8 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sun, 15 Jun 2003 01:00:43 +0000 Subject: cleanup svn-id: r8494 --- scumm/player_v2.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'scumm/player_v2.h') 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: -- cgit v1.2.3