Sync with master

This commit is contained in:
cam900 2022-09-17 12:48:03 +09:00
parent 74bf0171f0
commit c981319295
2 changed files with 3 additions and 3 deletions

View File

@ -16,7 +16,7 @@ void vox_core::vox_decoder_t::decoder_state_t::reset()
} }
// copy from source // copy from source
void vox_core::vox_decoder_t::decoder_state_t::copy(decoder_state_t src) void vox_core::vox_decoder_t::decoder_state_t::copy_state(decoder_state_t src)
{ {
m_index = src.index(); m_index = src.index();
m_step = src.step(); m_step = src.step();

View File

@ -42,14 +42,14 @@ class vox_core : public vgsound_emu_core
decoder_state_t &operator=(decoder_state_t src) decoder_state_t &operator=(decoder_state_t src)
{ {
copy(src); copy_state(src);
return *this; return *this;
} }
private: private:
const bool m_wraparound = false; // wraparound or clamp? const bool m_wraparound = false; // wraparound or clamp?
void copy(decoder_state_t src); void copy_state(decoder_state_t src);
vox_core &m_vox; vox_core &m_vox;
s8 m_index = 0; s8 m_index = 0;