summaryrefslogtreecommitdiff
path: root/src/sound/sound.h
diff options
context:
space:
mode:
authorAlexander Baldeck <alexander@archlinux.org>2004-10-03 12:34:01 +0000
committerAlexander Baldeck <alexander@archlinux.org>2004-10-03 12:34:01 +0000
commitea5ec6195a1df9059a89bfc7131af1d4fcdcbe7f (patch)
treefc37c7ff087845905726078e5e47bd5182531260 /src/sound/sound.h
parent52506f9c24ad80366df76fe15b7e8eb6936eb6cf (diff)
downloadmana-ea5ec6195a1df9059a89bfc7131af1d4fcdcbe7f.tar.gz
mana-ea5ec6195a1df9059a89bfc7131af1d4fcdcbe7f.tar.bz2
mana-ea5ec6195a1df9059a89bfc7131af1d4fcdcbe7f.tar.xz
mana-ea5ec6195a1df9059a89bfc7131af1d4fcdcbe7f.zip
code cleanup, doxygen comments & unecessary-include-removal
Diffstat (limited to 'src/sound/sound.h')
-rw-r--r--src/sound/sound.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/sound/sound.h b/src/sound/sound.h
index 58054c59..502889c1 100644
--- a/src/sound/sound.h
+++ b/src/sound/sound.h
@@ -34,7 +34,6 @@
#include <allegro.h>
#include <jgmod.h>
#include <string>
-using namespace std;
/** mod file */
#define TMWSOUND_MOD 1
@@ -100,14 +99,14 @@ class TmwSound {
/** type of item */
char type;
/** (file-)name of sfx only kept for human reasons ^_^ */
- string fname;
+ std::string fname;
/** generic data */
void * data;
};
/** list of preloaded sound data / items */
- list<POOL_ITEM> soundpool;
- list<POOL_ITEM>::iterator sounditem;
+ std::list<POOL_ITEM> soundpool;
+ std::list<POOL_ITEM>::iterator sounditem;
TMWSOUND_SID items;
bool isMaxVol(int);