mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects Releases Wiki Activity

Some Windows-help to cmake/FindAudiere.cmake + non-important changes.

Browse Source
This commit is contained in:
Nicolay Korslund 2010-09-10 10:45:16 +02:00
parent 93ef530c93
commit f55362cbdc
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/FindAudiere.cmake
View File

@ -24,7 +24,9 @@
FIND_PATH(AUDIERE_INCLUDE_DIR audiere.h FIND_PATH(AUDIERE_INCLUDE_DIR audiere.h
HINTS HINTS
PATH_SUFFIXES include
PATHS PATHS
$ENV{AUDIERE_DIR}
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks
/usr/local /usr/local
@ -40,6 +42,7 @@ FIND_LIBRARY(AUDIERE_LIBRARY
HINTS HINTS
PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
PATHS PATHS
$ENV{AUDIERE_DIR}
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks
/usr/local /usr/local

18
components/esm/load_impl.cpp
View File

@ -6,6 +6,11 @@
entire engine depends on these headers. entire engine depends on these headers.
*/ */
/*
#include <iostream>
using namespace std;
*/
namespace ESM namespace ESM
{ {
void NPC::load(ESMReader &esm, const std::string& id) void NPC::load(ESMReader &esm, const std::string& id)
@ -154,4 +159,17 @@ namespace ESM
// Skip rest of record // Skip rest of record
esm.skipRecord(); 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;
*/
}
} }

7
components/esm/loadsoun.hpp
View File

@ -15,11 +15,8 @@ struct Sound
SOUNstruct data; SOUNstruct data;
std::string sound; std::string sound;
void load(ESMReader &esm) // Body moved to load_impl.cpp
{ void load(ESMReader &esm);
sound = esm.getHNString("FNAM");
esm.getHNT(data, "DATA", 3);
}
}; };
} }
#endif #endif