aboutsummaryrefslogtreecommitdiff
path: root/engines/sword1/sound.h
diff options
context:
space:
mode:
authorJohannes Schickel2011-09-07 23:54:34 +0200
committerJohannes Schickel2011-09-07 23:54:34 +0200
commit928cb5ab1196f800049ba3e22038acf9cab3bc60 (patch)
treeae0b956c483dd157e06ae04a85e586f09757306c /engines/sword1/sound.h
parentc346bf79b472eefea2a1e6b9ce01c5c3e342de73 (diff)
downloadscummvm-rg350-928cb5ab1196f800049ba3e22038acf9cab3bc60.tar.gz
scummvm-rg350-928cb5ab1196f800049ba3e22038acf9cab3bc60.tar.bz2
scummvm-rg350-928cb5ab1196f800049ba3e22038acf9cab3bc60.zip
SWORD1: Made code conform a bit better to our formatting guidelines.
Most is automatically converted via astyle + some manual fixes, hopefully I did not miss anything astyle messed up...
Diffstat (limited to 'engines/sword1/sound.h')
-rw-r--r--engines/sword1/sound.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/sword1/sound.h b/engines/sword1/sound.h
index a6313f85eb..112ae5b6aa 100644
--- a/engines/sword1/sound.h
+++ b/engines/sword1/sound.h
@@ -36,9 +36,9 @@ class Mixer;
namespace Sword1 {
-#define TOTAL_FX_PER_ROOM 7 // total loop & random fx per room (see fx_list.c)
-#define MAX_ROOMS_PER_FX 7 // max no. of rooms in the fx's room,vol list
-#define MAX_FXQ_LENGTH 32 // max length of sound queue - ie. max number of fx that can be stored up/playing together
+#define TOTAL_FX_PER_ROOM 7 // total loop & random fx per room (see fx_list.c)
+#define MAX_ROOMS_PER_FX 7 // max no. of rooms in the fx's room,vol list
+#define MAX_FXQ_LENGTH 32 // max length of sound queue - ie. max number of fx that can be stored up/playing together
#define FX_SPOT 1
#define FX_LOOP 2
@@ -105,15 +105,15 @@ private:
bool _waveVolume[WAVE_VOL_TAB_LENGTH];
uint16 _waveVolPos;
Common::File _cowFile;
- uint32 *_cowHeader;
- uint32 _cowHeaderSize;
- uint8 _currentCowFile;
- CowMode _cowMode;
+ uint32 *_cowHeader;
+ uint32 _cowHeaderSize;
+ uint8 _currentCowFile;
+ CowMode _cowMode;
Audio::SoundHandle _speechHandle, _fxHandle;
Common::RandomSource _rnd;
QueueElement _fxQueue[MAX_FXQ_LENGTH];
- uint8 _endOfQueue;
+ uint8 _endOfQueue;
Audio::Mixer *_mixer;
ResMan *_resMan;
bool _bigEndianSpeech;