ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

Merge branch 'master' into fix-cache-openfile-fail

Browse Source
This commit is contained in:
Andreas Maerten 2024-04-05 10:52:56 +02:00 committed by GitHub
commit 03165284b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/renderer/font_mgr.cpp
View File

@ -14,6 +14,7 @@ namespace big
{eAlphabetType::CYRILLIC, {"msyh.ttc", "msyh.ttf", "arial.ttf"}},
{eAlphabetType::JAPANESE, {"msyh.ttc", "msyh.ttf", "arial.ttf"}},
{eAlphabetType::KOREAN, {"malgun.ttf", "arial.ttf"}},
{eAlphabetType::TURKISH, {"msyh.ttc", "msyh.ttf", "arial.ttf"}},
})
{
}
@ -99,9 +100,8 @@ namespace big
void font_mgr::update_required_alphabet_type(eAlphabetType type)
{
m_require_extra = type;
g_thread_pool->push([this]
{
g_thread_pool->push([this] {
rebuild();
});
}
@ -160,10 +160,32 @@ namespace big
const ImWchar* font_mgr::GetGlyphRangesTurkish()
{
static const ImWchar icons_ranges_Turkish[] = {
0x0020, 0x00FF, // Basic Latin + Latin Supplement
0x011E, 0x011F, // G with breve
0x0130, 0x0131, // dotted I
0x015E, 0x015F, // S-cedilla
0x0020,
0x00FF, // Basic Latin + Latin Supplement
0x00c7,
0x00c7, // Ç
0x00e7,
0x00e7, // ç
0x011e,
0x011e, // Ğ
0x011f,
0x011f, // ğ
0x0130,
0x0130, // İ
0x0131,
0x0131, // ı
0x00d6,
0x00d6, // Ö
0x00f6,
0x00f6, // ö
0x015e,
0x015e, // Ş
0x015f,
0x015f, // ş
0x00dc,
0x00dc, // Ü
0x00fc,
0x00fc, // ü
0,
};
return &icons_ranges_Turkish[0];

2
src/services/model_preview/model_preview_service.cpp
View File

@ -159,6 +159,8 @@ namespace big
ENTITY::FREEZE_ENTITY_POSITION(m_current_ent, true);
ENTITY::SET_ENTITY_ALPHA(m_current_ent, 0, false);
ENTITY::SET_ENTITY_COLLISION(m_current_ent, false, false);
ENTITY::SET_ENTITY_CAN_BE_DAMAGED(m_current_ent, false);
ENTITY::SET_ENTITY_PROOFS(m_current_ent, true, true, true, true, true, true, true, true);
ENTITY::SET_CAN_CLIMB_ON_ENTITY(m_current_ent, false);
OBJECT::SET_OBJECT_ALLOW_LOW_LOD_BUOYANCY(m_current_ent, false);
}

2
src/util/vehicle.cpp
View File

@ -158,7 +158,7 @@ namespace big::vehicle
STREAMING::SET_MODEL_AS_NO_LONGER_NEEDED(hash);
if (*g_pointers->m_gta.m_is_session_started)
if (is_networked && *g_pointers->m_gta.m_is_session_started)
{
set_mp_bitset(veh);
}