backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Merge branch 'master' into wip/landscape

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-10-23 19:31:12 +02:00
commit af31192f73
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/event.cxx
View File

@ -4638,6 +4638,8 @@ CEvent::ReadInfo ()
if (file == nullptr) if (file == nullptr)
goto error; goto error;
SDL_memset (&info, 0, sizeof (info));
nb = fread (&info, sizeof (DescInfo), 1, file); nb = fread (&info, sizeof (DescInfo), 1, file);
if (nb < 1) if (nb < 1)
goto error; goto error;
@ -4657,7 +4659,11 @@ CEvent::ReadInfo ()
m_pSound->SetMidiVolume (info.midiVolume); m_pSound->SetMidiVolume (info.midiVolume);
if ((info.majRev == 1 && info.minRev >= 1) || info.majRev >= 2) if ((info.majRev == 1 && info.minRev >= 1) || info.majRev >= 2)
{
if (info.language >= static_cast<int> (Language::end))
info.language = 0;
this->SetLanguage (static_cast<Language> (info.language)); this->SetLanguage (static_cast<Language> (info.language));
}
fclose (file); fclose (file);
return true; return true;

5
src/event.h
View File

@ -84,9 +84,8 @@ enum class Language {
fr = 2, fr = 2,
de = 3, de = 3,
it = 4, it = 4,
// Left some space for Korean and Hebrew as I think original translations pl = 5,
// should be first, see issue #23 end,
pl = 7,
}; };
class CEvent class CEvent