aboutsummaryrefslogtreecommitdiff
path: root/scumm/player_mod.h
diff options
context:
space:
mode:
authorMax Horn2003-10-03 18:33:57 +0000
committerMax Horn2003-10-03 18:33:57 +0000
commitd7660a2662be298dad3cf9b320137dac8744d456 (patch)
treec80ddb2c4fb1917660db0010bb0b3d6ed8d57b24 /scumm/player_mod.h
parenteabeb62e20a8ed2117e19ca3bf04bb1d33637b79 (diff)
downloadscummvm-rg350-d7660a2662be298dad3cf9b320137dac8744d456.tar.gz
scummvm-rg350-d7660a2662be298dad3cf9b320137dac8744d456.tar.bz2
scummvm-rg350-d7660a2662be298dad3cf9b320137dac8744d456.zip
introduced namespace Scumm; made #include statements use scumm/ prefix explicitly
svn-id: r10571
Diffstat (limited to 'scumm/player_mod.h')
-rw-r--r--scumm/player_mod.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/scumm/player_mod.h b/scumm/player_mod.h
index d815d9cfc4..bdc4bc5cf0 100644
--- a/scumm/player_mod.h
+++ b/scumm/player_mod.h
@@ -23,11 +23,13 @@
#ifndef PLAYER_MOD_H
#define PLAYER_MOD_H
-#include "scumm.h"
+#include "scumm/scumm.h"
#include "sound/mixer.h"
#include "sound/audiostream.h"
#include "sound/rate.h"
+namespace Scumm {
+
#define MOD_MAXCHANS 16
class Player_MOD {
@@ -75,4 +77,6 @@ private:
void *_playparam;
};
+} // End of namespace Scumm
+
#endif