[Scummvm-cvs-logs] SF.net SVN: scummvm:[43136] scummvm/branches/gsoc2009-mods/engines/kyra
nolange at users.sourceforge.net
nolange at users.sourceforge.net
Sat Aug 8 22:00:28 CEST 2009
Revision: 43136
http://scummvm.svn.sourceforge.net/scummvm/?rev=43136&view=rev
Author: nolange
Date: 2009-08-08 20:00:28 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
moved table-definition from header to cpp file
Modified Paths:
--------------
scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp
scummvm/branches/gsoc2009-mods/engines/kyra/sound_intern.h
Modified: scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp 2009-08-08 19:44:29 UTC (rev 43135)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp 2009-08-08 20:00:28 UTC (rev 43136)
@@ -32,6 +32,18 @@
#include "sound/mods/maxtrax.h"
#include "sound/audiostream.h"
+namespace {
+struct EffectEntry {
+ uint16 duration;
+ uint8 note;
+ uint8 patch;
+ int8 volume;
+ int8 pan;
+};
+extern const EffectEntry tableEffectsIntro[40];
+extern const EffectEntry tableEffectsGame[120];
+}
+
namespace Kyra {
SoundAmiga::SoundAmiga(KyraEngine_v1 *vm, Audio::Mixer *mixer)
@@ -97,7 +109,7 @@
static const byte loopIngame[23] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01,
- 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00,
+ 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00
};
switch (_fileLoaded) {
@@ -186,8 +198,11 @@
}
}
+} // end of namespace Kyra
-const SoundAmiga::EffectEntry SoundAmiga::tableEffectsIntro[40] = {
+namespace {
+
+const EffectEntry tableEffectsIntro[40] = {
{ 0x0000, 0x00, 0x00, 0, 0 },
{ 0x0000, 0x00, 0x00, 0, 0 },
{ 0x0000, 0x00, 0x00, 0, 0 },
@@ -230,7 +245,7 @@
{ 0x0000, 0x00, 0x00, 0, 0 }
};
-const SoundAmiga::EffectEntry SoundAmiga::tableEffectsGame[120] = {
+const EffectEntry tableEffectsGame[120] = {
{ 0x0000, 0x00, 0x00, 0, 0 },
{ 0x0000, 0x01, 0x00, 0, 0 },
{ 0x0000, 0x00, 0x00, 0, 0 },
@@ -353,4 +368,4 @@
{ 0x0156, 0x3C, 0x13, 120, 2 }
};
-} // end of namespace Kyra
\ No newline at end of file
+} // end of namespace
\ No newline at end of file
Modified: scummvm/branches/gsoc2009-mods/engines/kyra/sound_intern.h
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/sound_intern.h 2009-08-08 19:44:29 UTC (rev 43135)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/sound_intern.h 2009-08-08 20:00:28 UTC (rev 43136)
@@ -309,14 +309,6 @@
Audio::MaxTrax *_driver;
Audio::SoundHandle _musicHandle;
enum FileType { kFileNone = -1, kFileIntro = 0, kFileGame = 1, kFileFinal = 2 } _fileLoaded;
-
- static const struct EffectEntry {
- uint16 duration;
- uint8 note;
- uint8 patch;
- int8 volume;
- int8 pan;
- } tableEffectsIntro[40], tableEffectsGame[120];
};
} // end of namespace Kyra
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list