From f55362cbdcb80e6c4d6fc4376bf6bc0ecab51b56 Mon Sep 17 00:00:00 2001
From: Nicolay Korslund <korslund@gmail.com>
Date: Fri, 10 Sep 2010 10:45:16 +0200
Subject: [PATCH] Some Windows-help to cmake/FindAudiere.cmake + non-important
 changes.

---
 cmake/FindAudiere.cmake      |  3 +++
 components/esm/load_impl.cpp | 18 ++++++++++++++++++
 components/esm/loadsoun.hpp  |  7 ++-----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/cmake/FindAudiere.cmake b/cmake/FindAudiere.cmake
index 4cc1fb2df..79427309c 100644
--- a/cmake/FindAudiere.cmake
+++ b/cmake/FindAudiere.cmake
@@ -24,7 +24,9 @@
 
 FIND_PATH(AUDIERE_INCLUDE_DIR audiere.h
   HINTS
+  PATH_SUFFIXES include
   PATHS
+  $ENV{AUDIERE_DIR}
   ~/Library/Frameworks
   /Library/Frameworks
   /usr/local
@@ -40,6 +42,7 @@ FIND_LIBRARY(AUDIERE_LIBRARY
   HINTS
   PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
   PATHS
+  $ENV{AUDIERE_DIR}
   ~/Library/Frameworks
   /Library/Frameworks
   /usr/local
diff --git a/components/esm/load_impl.cpp b/components/esm/load_impl.cpp
index 8857c1ae8..a9b9f854f 100644
--- a/components/esm/load_impl.cpp
+++ b/components/esm/load_impl.cpp
@@ -6,6 +6,11 @@
     entire engine depends on these headers.
  */
 
+/*
+#include <iostream>
+using namespace std;
+*/
+
 namespace ESM
 {
   void NPC::load(ESMReader &esm, const std::string& id)
@@ -154,4 +159,17 @@ namespace ESM
       // Skip rest of record
       esm.skipRecord();
   }
+
+  void Sound::load(ESMReader &esm)
+  {
+    sound = esm.getHNString("FNAM");
+    esm.getHNT(data, "DATA", 3);
+    /*
+    cout << "vol=" << (int)data.volume
+         << " min=" << (int)data.minRange
+         << " max=" << (int)data.maxRange
+         << endl;
+    */
+  }
+
 }
diff --git a/components/esm/loadsoun.hpp b/components/esm/loadsoun.hpp
index 12495a015..597c91491 100644
--- a/components/esm/loadsoun.hpp
+++ b/components/esm/loadsoun.hpp
@@ -15,11 +15,8 @@ struct Sound
   SOUNstruct data;
   std::string sound;
 
-  void load(ESMReader &esm)
-    {
-      sound = esm.getHNString("FNAM");
-      esm.getHNT(data, "DATA", 3);
-    }
+  // Body moved to load_impl.cpp
+  void load(ESMReader &esm);
 };
 }
 #endif