TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix sdlmixer=0 build

Browse source
This commit is contained in:
Kp 2020-11-30 05:12:00 +00:00
parent 3b5fa6f30b
commit dcecc6b9f7
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
similar/arch/sdl/digi.cpp
View file

@ -94,7 +94,7 @@ void report_invalid_table()
}
#if DXX_SOUND_TABLE_STYLE == DXX_STS_MIXER_WITH_POINTER
#if DXX_SOUND_TABLE_STYLE != DXX_STS_MIXER_WITH_COPY
namespace dsx
#else
namespace dcx
@ -127,7 +127,6 @@ sound_function_pointers_t &sound_function_pointers_t::operator=(const sound_func
return *this;
}
#elif DXX_SOUND_TABLE_STYLE == DXX_STS_MIXER_WITH_POINTER
sound_function_pointers_t &sound_function_pointers_t::operator=(const sound_function_table_t &t)
{
table = &t;
@ -136,11 +135,6 @@ sound_function_pointers_t &sound_function_pointers_t::operator=(const sound_func
return *this;
}
#elif DXX_SOUND_TABLE_STYLE == DXX_STS_NO_MIXER
const sound_function_table_t *sound_function_pointers_t::operator->()
{
return &digi_audio_table;
}
sound_function_pointers_t &sound_function_pointers_t::operator=(const sound_function_table_t &)
{
return *this;
@ -201,6 +195,11 @@ const sound_function_table_t *sound_function_pointers_t::operator->()
report_invalid_table();
return table;
}
#elif DXX_SOUND_TABLE_STYLE == DXX_STS_NO_MIXER
const sound_function_table_t *sound_function_pointers_t::operator->()
{
return &digi_audio_table;
}
#endif
}