mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-19 22:23:51 +00:00
Merge remote branch 'zini/master' into sound
This commit is contained in:
commit
33a63d88a5
3 changed files with 37 additions and 9 deletions
|
@ -142,8 +142,8 @@ namespace MWScript
|
|||
InterpreterContext& context
|
||||
= static_cast<InterpreterContext&> (runtime.getContext());
|
||||
|
||||
const ESM::Cell *cell = context.getWorld().getPlayer().getPlayer().getCell()->cell;
|
||||
runtime.push (cell->water);
|
||||
MWWorld::Ptr::CellStore *cell = context.getWorld().getPlayer().getPlayer().getCell();
|
||||
runtime.push (cell->mWaterLevel);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -441,6 +441,27 @@ void OpenAL_Output::init(const std::string &devname)
|
|||
try
|
||||
{
|
||||
ALCuint maxtotal = std::min<ALCuint>(maxmono+maxstereo, 256);
|
||||
if (maxtotal == 0) // workaround for broken implementations
|
||||
{
|
||||
maxtotal = 256;
|
||||
bool stop = false;
|
||||
for(size_t i = 0;i < maxtotal && !stop;i++) // generate source until error returned
|
||||
{
|
||||
ALuint src = 0;
|
||||
alGenSources(1, &src);
|
||||
ALenum err = alGetError();
|
||||
if(err != AL_NO_ERROR)
|
||||
{
|
||||
stop = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
mFreeSources.push_back(src);
|
||||
}
|
||||
}
|
||||
}
|
||||
else // normal case
|
||||
{
|
||||
for(size_t i = 0;i < maxtotal;i++)
|
||||
{
|
||||
ALuint src = 0;
|
||||
|
@ -449,6 +470,7 @@ void OpenAL_Output::init(const std::string &devname)
|
|||
mFreeSources.push_back(src);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch(std::exception &e)
|
||||
{
|
||||
std::cout <<"Error: "<<e.what()<<", trying to continue"<< std::endl;
|
||||
|
|
|
@ -21,8 +21,14 @@ void Cell::load(ESMReader &esm)
|
|||
if (data.flags & Interior)
|
||||
{
|
||||
// Interior cells
|
||||
|
||||
esm.getHNT(water, "WHGT", 4);
|
||||
if (esm.isNextSub("INTV"))
|
||||
{
|
||||
int waterl;
|
||||
esm.getHT(waterl);
|
||||
water = (float) waterl;
|
||||
}
|
||||
else if (esm.isNextSub("WHGT"))
|
||||
esm.getHT(water);
|
||||
|
||||
// Quasi-exterior cells have a region (which determines the
|
||||
// weather), pure interior cells have ambient lighting
|
||||
|
|
Loading…
Reference in a new issue