diff options
author | Alexander Baldeck <alexander@archlinux.org> | 2004-09-29 07:53:23 +0000 |
---|---|---|
committer | Alexander Baldeck <alexander@archlinux.org> | 2004-09-29 07:53:23 +0000 |
commit | 1c8949bc6890c5ab126e7f5914b852485e7ff02f (patch) | |
tree | 6d17ff516f52846e006f489420931053b9db69e4 /src | |
parent | 55bb2e71ca2497e0f63b1917d4a5eb512f04a867 (diff) | |
download | mana-1c8949bc6890c5ab126e7f5914b852485e7ff02f.tar.gz mana-1c8949bc6890c5ab126e7f5914b852485e7ff02f.tar.bz2 mana-1c8949bc6890c5ab126e7f5914b852485e7ff02f.tar.xz mana-1c8949bc6890c5ab126e7f5914b852485e7ff02f.zip |
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/chat.h | 1 | ||||
-rw-r--r-- | src/main.cpp | 2 | ||||
-rw-r--r-- | src/main.h | 4 | ||||
-rw-r--r-- | src/map.cpp | 2 | ||||
-rw-r--r-- | src/map.h | 2 | ||||
-rw-r--r-- | src/sound/sound.cpp | 28 |
6 files changed, 20 insertions, 19 deletions
diff --git a/src/gui/chat.h b/src/gui/chat.h index cfe16beb..ea1637b4 100644 --- a/src/gui/chat.h +++ b/src/gui/chat.h @@ -28,7 +28,6 @@ #include <list> #include <string> #include <fstream> -#include <string> using namespace std; diff --git a/src/main.cpp b/src/main.cpp index 62f3eba1..cc347ec4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -/** +/* The Mana World Copyright 2004 The Mana World Development Team @@ -1,4 +1,4 @@ -/** +/* The Mana World Copyright 2004 The Mana World Development Team @@ -33,7 +33,7 @@ #include <alfont.h> #include "log.h" -#include "game.h" +#include "game.h" #include "./net/protocol.h" #include "./gui/login.h" #include "./gui/gui.h" diff --git a/src/map.cpp b/src/map.cpp index f539bcc6..39f38010 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1,4 +1,4 @@ -/** +/* The Mana World Copyright 2004 The Mana World Development Team @@ -1,4 +1,4 @@ -/** +/* The Mana World Copyright 2004 The Mana World Development Team diff --git a/src/sound/sound.cpp b/src/sound/sound.cpp index 3df95e65..078d0f91 100644 --- a/src/sound/sound.cpp +++ b/src/sound/sound.cpp @@ -174,15 +174,15 @@ void TmwSound::StartMIDI(char *in, int loop) { and S3M (in UMX extension) */ void TmwSound::StartMOD(char * in, int loop) { - if(isOk==-1) - return; - - mod = load_mod(in); - if(!mod) { - isOk=-1; - throw("Error reading MOD file..."); - } - play_mod(mod, TRUE); + if(isOk==-1) + return; + + mod = load_mod(in); + if(!mod) { + isOk=-1; + throw("Error reading MOD file..."); + } + play_mod(mod, TRUE); } /** @@ -291,9 +291,11 @@ void TmwSound::Close(void) { isOk = -1; } -/** PRIVATE */ - +/** + checks if value equals min-/maximum volume and returns + true if that's the case. +*/ bool TmwSound::isMaxVol(int vol) { - if( vol > 0 && vol < 255 ) return false; - else return true; + if( vol > 0 && vol < 255 ) return false; + else return true; } |