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

refactor!: globals (#717)

Browse Source 
* refactor(globals): use macro's for to_json/from_json
* refactor(globals): switch from global pointer to global instance
This commit is contained in:
Yimura
2022-12-18 23:15:52 +01:00
committed by GitHub
parent 4041370763
commit f6c00f113d
147 changed files with 1280 additions and 1902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/world/view_spawn_ped.cpp
View File

@ -241,7 +241,7 @@ namespace big
selected_ped_player_id = -1;
g_model_preview_service->stop_preview();
}
else if (!g->spawn_ped.preview_ped || (g->spawn_ped.preview_ped && !ImGui::IsAnyItemHovered()))
else if (!g.spawn_ped.preview_ped || (g.spawn_ped.preview_ped && !ImGui::IsAnyItemHovered()))
{
g_model_preview_service->stop_preview();
}
@ -272,7 +272,7 @@ namespace big
selected_ped_player_id = plyr_id;
g_model_preview_service->stop_preview();
}
else if (!g->spawn_ped.preview_ped || (g->spawn_ped.preview_ped && !ImGui::IsAnyItemHovered()))
else if (!g.spawn_ped.preview_ped || (g.spawn_ped.preview_ped && !ImGui::IsAnyItemHovered()))
{
g_model_preview_service->stop_preview();
}
@ -386,7 +386,7 @@ namespace big
ped_model_dropdown_open = ped_model_dropdown_focused;
if (!g->spawn_ped.preview_ped || (g->spawn_ped.preview_ped && (!item_hovered || !ped_model_dropdown_open)))
if (!g.spawn_ped.preview_ped || (g.spawn_ped.preview_ped && (!item_hovered || !ped_model_dropdown_open)))
{
g_model_preview_service->stop_preview();
}
@ -550,9 +550,9 @@ namespace big
ImGui::Separator();
if (ImGui::Checkbox("Preview", &g->spawn_ped.preview_ped))
if (ImGui::Checkbox("Preview", &g.spawn_ped.preview_ped))
{
if (!g->spawn_ped.preview_ped)
if (!g.spawn_ped.preview_ped)
{
g_model_preview_service->stop_preview();
}

12
src/views/world/view_time_and_weather.cpp
View File

@ -8,13 +8,13 @@ namespace big
{
if (ImGui::TreeNode("Local Time"))
{
ImGui::Checkbox("Override Time", &g->session.override_time);
ImGui::Checkbox("Override Time", &g.session.override_time);
if (g->session.override_time)
if (g.session.override_time)
{
ImGui::SliderInt("Hour", &g->session.custom_time.hour, 0, 23);
ImGui::SliderInt("Minute", &g->session.custom_time.minute, 0, 59);
ImGui::SliderInt("Second", &g->session.custom_time.second, 0, 59);
ImGui::SliderInt("Hour", &g.session.custom_time.hour, 0, 23);
ImGui::SliderInt("Minute", &g.session.custom_time.minute, 0, 59);
ImGui::SliderInt("Second", &g.session.custom_time.second, 0, 59);
}
ImGui::TreePop();
@ -27,7 +27,7 @@ namespace big
MISC::CLEAR_OVERRIDE_WEATHER();
});
if (ImGui::ListBox("", &g->session.local_weather, session::weathers, 15))
if (ImGui::ListBox("", &g.session.local_weather, session::weathers, 15))
{
g_fiber_pool->queue_job([]
{