summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/SOURCE/tmw.doxcfg6
-rw-r--r--src/gui/chat.h1
-rw-r--r--src/main.cpp2
-rw-r--r--src/main.h4
-rw-r--r--src/map.cpp2
-rw-r--r--src/map.h2
-rw-r--r--src/sound/sound.cpp28
-rw-r--r--tmw.ini6
8 files changed, 26 insertions, 25 deletions
diff --git a/docs/SOURCE/tmw.doxcfg b/docs/SOURCE/tmw.doxcfg
index 8856f562..114394d7 100644
--- a/docs/SOURCE/tmw.doxcfg
+++ b/docs/SOURCE/tmw.doxcfg
@@ -17,7 +17,7 @@
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = The Mana World - A portable MMORPG game
+PROJECT_NAME = The Mana World
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
@@ -243,14 +243,14 @@ EXTRACT_LOCAL_METHODS = NO
# various overviews, but no documentation section is generated.
# This option has no effect if EXTRACT_ALL is enabled.
-HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_MEMBERS = YES
# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
# undocumented classes that are normally visible in the class hierarchy.
# If set to NO (the default) these classes will be included in the various
# overviews. This option has no effect if EXTRACT_ALL is enabled.
-HIDE_UNDOC_CLASSES = NO
+HIDE_UNDOC_CLASSES = YES
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
# friend (class|struct|union) declarations.
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
diff --git a/src/main.h b/src/main.h
index 5f22e0cb..35e20456 100644
--- a/src/main.h
+++ b/src/main.h
@@ -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
diff --git a/src/map.h b/src/map.h
index 4c33928d..0ddccf2e 100644
--- a/src/map.h
+++ b/src/map.h
@@ -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;
}
diff --git a/tmw.ini b/tmw.ini
index 8d6876e0..3796768f 100644
--- a/tmw.ini
+++ b/tmw.ini
@@ -4,8 +4,8 @@ keyboard = en
language =
[server]
-;host = animesites.de
-host = themanaworld.homeip.net
+host = animesites.de
+;host = themanaworld.homeip.net
;host = telekommunisten.dyndns.org
port = 6901
@@ -28,4 +28,4 @@ stretch = 1
[login]
remember = 1
-username = elven
+username = kth5