diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2005-07-02 12:22:17 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2005-07-02 12:22:17 +0000 |
| commit | 57966d67923562c6d3bb10532c09175e8dddf882 (patch) | |
| tree | c1162364b5f8de6f75acad591efdd23e93285ec9 /src/game.cpp | |
| parent | 76afaa810068cad82efa05cbac71c92f9531dd09 (diff) | |
| download | mana-client-57966d67923562c6d3bb10532c09175e8dddf882.tar.gz mana-client-57966d67923562c6d3bb10532c09175e8dddf882.tar.bz2 mana-client-57966d67923562c6d3bb10532c09175e8dddf882.tar.xz mana-client-57966d67923562c6d3bb10532c09175e8dddf882.zip | |
Music doesn't restart anymore if it's the same between maps.
(I hope Bjorn likes it this way :P)
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game.cpp b/src/game.cpp index 45ef2ccc..e834410f 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1073,10 +1073,10 @@ void do_parse() strncat(map_path, RFIFOP(2), 497 - strlen(map_path)); logger->log("Warping to %s (%d, %d)", map_path, RFIFOW(18), RFIFOW(20)); - sound.stopMusic(); strcpy(strrchr(map_path, '.') + 1, "tmx.gz"); - - if (tiledMap) delete tiledMap; + + Map *oldMap; + oldMap = tiledMap; tiledMap = MapReader::readMap(map_path); if (tiledMap) @@ -1110,6 +1110,7 @@ void do_parse() { logger->error("Could not find map file"); } + if (oldMap) delete oldMap; break; // Skill ... case 0x011a: |