Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix lazy mng loading

Browse source
This commit is contained in:
Tim Felgentreff 2022-05-30 22:20:09 +02:00
parent 4a5a9dbf67
commit 003e8b7bd0
2 changed files with 7 additions and 1 deletions
src
sound
sound.cpp
video
mng.cpp

2
src/sound/sound.cpp
View file

@ -306,7 +306,7 @@ void PlayUnitSound(const CUnit &unit, UnitVoiceGroup voice, bool sampleUnique)
SetChannelStereo(channel, CalculateStereo(unit));
#ifdef USE_MNG
const CUnitType &type = *unit.Type;
if (type.Portrait.Num && type.Portrait.Talking) {
if (type.Portrait.Num && type.Portrait.Talking && type.Portrait.Mngs) {
type.Portrait.Mngs[type.Portrait.CurrMng]->Reset();
type.Portrait.CurrMng = (MyRand() % (type.Portrait.Num - type.Portrait.Talking)) + type.Portrait.Talking;
type.Portrait.NumIterations = 1;

6
src/video/mng.cpp
View file

@ -246,6 +246,9 @@ void Mng::Free(Mng *mng)
*/
bool Mng::Load()
{
if (handle) {
return handle != MNG_NULL && surface && iteration != 0x7fffffff;
}
handle = mng_initialize(this, my_alloc, my_free, MNG_NULL);
if (handle == MNG_NULL) {
return false;
@ -277,6 +280,9 @@ bool Mng::Load()
*/
void Mng::Reset()
{
if (!handle) {
return;
}
mng_display_reset(handle);
iteration = 0;
mng_display(handle);