summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-25 19:16:41 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-25 19:16:41 +0000
commit16dfff543ca4ce8a6fa3f1e5f4ba7275a12ce4c4 (patch)
tree38b6461432c5952fd72c0773ff85630cccd53f37 /src
parentc435ea1644f70ca3acaa9f371e6d07952b5f9003 (diff)
downloadmana-16dfff543ca4ce8a6fa3f1e5f4ba7275a12ce4c4.tar.gz
mana-16dfff543ca4ce8a6fa3f1e5f4ba7275a12ce4c4.tar.bz2
mana-16dfff543ca4ce8a6fa3f1e5f4ba7275a12ce4c4.tar.xz
mana-16dfff543ca4ce8a6fa3f1e5f4ba7275a12ce4c4.zip
Moved level.ogg to new location, and put playing levelup sound under F7.
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp9
-rw-r--r--src/main.cpp6
-rw-r--r--src/main.h1
3 files changed, 7 insertions, 9 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 78299ebb..b88a8597 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -130,7 +130,7 @@ void do_init()
/*std::string pathDir = path.substr(0, path.rfind(".") + 1);
pathDir.insert(pathDir.size(), "tmx.gz");*/
-
+
tiledMap = Map::load(map_path);
std::cout << map_path << std::endl;
@@ -202,6 +202,11 @@ void do_input()
{
displayPathToMouse = !displayPathToMouse;
}
+ else if ((keysym.sym == SDLK_F7))
+ {
+ SOUND_SID id = sound.loadItem("data/sfx/level.ogg");
+ sound.startItem(id, 70);
+ }
// Emotions, Skill dialog
if (keysym.mod & KMOD_ALT && action_time)
@@ -992,7 +997,7 @@ void do_parse() {
case 0x019b:
if (RFIFOL(2) == player_node->id) {
SOUND_SID sound_id = sound.loadItem(
- "./data/sound/wavs/level.ogg");
+ "data/sfx/level.ogg");
sound.startItem(sound_id, 64);
sound.clearCache();
}
diff --git a/src/main.cpp b/src/main.cpp
index 347e0d36..2383ec96 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -286,12 +286,6 @@ void init_engine()
sound.init(32, 20);
}
sound.setVolume(64);
-
- // left here to serve as an example ;)
- /*
- SOUND_SID id = sound.loadItem("./data/sound/wavs/level.ogg");
- sound.startItem(id, 70);
- */
}
catch (const char *err) {
state = ERROR;
diff --git a/src/main.h b/src/main.h
index 2e12a68a..690fbdc3 100644
--- a/src/main.h
+++ b/src/main.h
@@ -85,7 +85,6 @@ typedef struct {
} PLAYER_INFO;
-
extern Image *login_wallpaper;
extern Spriteset *hairset, *playerset;
extern Graphics *graphics;