summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexander Baldeck <alexander@archlinux.org>2004-09-29 11:39:31 +0000
committerAlexander Baldeck <alexander@archlinux.org>2004-09-29 11:39:31 +0000
commit6ad0010e3356664c43418e5aad584cddc5498451 (patch)
tree312dc0d401e6cd2b532dd875e399e3e212aae803 /src
parent1093dcc912e7547c96ee23b0523549eac3549440 (diff)
downloadmana-6ad0010e3356664c43418e5aad584cddc5498451.tar.gz
mana-6ad0010e3356664c43418e5aad584cddc5498451.tar.bz2
mana-6ad0010e3356664c43418e5aad584cddc5498451.tar.xz
mana-6ad0010e3356664c43418e5aad584cddc5498451.zip
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/sound/sound.cpp49
1 files changed, 21 insertions, 28 deletions
diff --git a/src/sound/sound.cpp b/src/sound/sound.cpp
index f7874a0a..909f78b7 100644
--- a/src/sound/sound.cpp
+++ b/src/sound/sound.cpp
@@ -1,42 +1,33 @@
/*
-
The Mana World
Copyright 2004 The Mana World Development Team
- This file is part of The Mana World.
-
- The Mana World is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- any later version.
+ This file is part of The Mana World.
- The Mana World is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ The Mana World is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ any later version.
- You should have received a copy of the GNU General Public License
- along with The Mana World; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ The Mana World is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
-*/
-
-/**
- rewrite of non-existend sdl-soundengine using allegro
-
- Author: kth5 aka Alexander Baldeck
- pipe your question, suggestions and flames to: kth5@gawab.com
+ You should have received a copy of the GNU General Public License
+ along with The Mana World; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifdef WIN32
- #pragma warning(disable:4312)
+ #pragma warning(disable:4312)
#endif
#include <allegro.h>
- #include <jgmod.h>
- #include "sound.h"
+#include <jgmod.h>
+#include "sound.h"
/**
\brief install the sound engine
@@ -191,10 +182,9 @@ void TmwSound::StartMOD(char * in, int loop) {
NOTE:
you need to stop all playback when you want to
switch from mod to midi. playing a new track is
- usually possibe simply by calling StartMIDI() ir
- SartMOD() again.
- passing NULL to the playing functions only means
- to make playback stop.
+ usually simple as calling StartMIDI() or StartMOD() again.
+ passing NULL to the playing functions only means to make
+ playback stop.
*/
void TmwSound::StopBGM() {
if(isOk==-1)
@@ -252,6 +242,9 @@ void TmwSound::StartWAV(char * in, int pan) {
please make sure that the object is not loaded more
than once since the function will not be able to run
checks for its own!
+
+ the return value should be kept as a reference to the
+ object loaded. if not it is practicaly lost.
*/
TMWSOUND_SID TmwSound::LoadItem(char *fpath, char type) {
POOL_ITEM item;