From 16dfff543ca4ce8a6fa3f1e5f4ba7275a12ce4c4 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 25 Mar 2005 19:16:41 +0000
Subject: Moved level.ogg to new location, and put playing levelup sound under
 F7.

---
 src/game.cpp | 9 +++++++--
 src/main.cpp | 6 ------
 src/main.h   | 1 -
 3 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'src')

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;
-- 
cgit v1.2.3-70-g09d2