diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-03-23 01:27:13 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-03-23 01:27:13 +0000 |
| commit | 9dd811b55587aeb76344b835006cb4a01601bb5d (patch) | |
| tree | bd297391e264a09ce8467bcf780927a4cef09991 /src/engine.cpp | |
| parent | bd8a35eca8c2fa6eb33e7d9219e3fa4d287a2059 (diff) | |
| download | mana-9dd811b55587aeb76344b835006cb4a01601bb5d.tar.gz mana-9dd811b55587aeb76344b835006cb4a01601bb5d.tar.bz2 mana-9dd811b55587aeb76344b835006cb4a01601bb5d.tar.xz mana-9dd811b55587aeb76344b835006cb4a01601bb5d.zip | |
Merged revisions 3823,3825-3826,3829,3831-3839,3841-3842 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0
........
r3823 | crush_tmw | 2007-12-28 19:36:58 +0100 (Fri, 28 Dec 2007) | 1 line
Added the possibility to assign particle effects to monsters in the monster database. Added flame particle effect to fire goblin as a proof of concept.
........
r3826 | crush_tmw | 2007-12-30 01:02:14 +0100 (Sun, 30 Dec 2007) | 1 line
Added a key for targeting the nearest player character based on patches by Trinexx. Some mapping fixes at snake dungeon map.
........
r3839 | the_enemy | 2008-01-13 17:28:50 +0100 (Sun, 13 Jan 2008) | 1 line
Fixed non-default location music loading
........
r3842 | crush_tmw | 2008-01-14 11:48:13 +0100 (Mon, 14 Jan 2008) | 1 line
ixed an error in Davids last commit (couldn't compile that way).
........
Diffstat (limited to 'src/engine.cpp')
| -rw-r--r-- | src/engine.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/engine.cpp b/src/engine.cpp index 31a13b9f..b38ca0a8 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -111,8 +111,7 @@ void Engine::changeMap(const std::string &mapPath) std::string newMusic = newMap->getProperty("music"); if (newMusic != oldMusic) { - newMusic = std::string(TMW_DATADIR) + "data/music/" + newMusic; - sound.playMusic(newMusic.c_str(), -1); + sound.playMusic(newMusic, -1); } mCurrentMap = newMap; |