Various fixes

This commit is contained in:
korenkonder
2023-08-27 14:03:51 +03:00
parent 9a9d4cdd13
commit d1484bd0fd
4 changed files with 18 additions and 2 deletions
+3
View File
@@ -5787,6 +5787,9 @@ static void auth_3d_object_load(auth_3d* auth, auth_3d_object* o,
static void auth_3d_object_curve_load(auth_3d* auth, auth_3d_object_curve* oc,
std::string& name, float_t frame_offset) {
if (!name.size())
return;
oc->curve = 0;
oc->name.assign(name);
oc->frame_offset = 0.0f;
+4
View File
@@ -37,7 +37,11 @@ namespace prj {
#endif
if (allocate) {
#if PRJ_STACK_ALLOCATOR_ORIGINAL_CODE
size_t data_size = this->size;
#else
size_t data_size = node ? (node->capacity + sizeof(stack_allocator_node)) * 2 : this->size;
#endif
size_t _size = size + sizeof(stack_allocator_node);
size_t mults = 0;
while (data_size < _size) {
+7
View File
@@ -165,6 +165,13 @@ void data_view_auth_3d_imgui(class_data* data) {
ImGui::TreePop();
}
if (auth->curve.size() > 0
&& ImGui::TreeNodeEx("Curve", tree_node_flags)) {
for (auth_3d_curve& l : auth->curve)
data_view_auth_3d_imgui_auth_3d_curve(&l);
ImGui::TreePop();
}
data_view_auth_3d_imgui_auth_3d_dof(&auth->dof);
if (auth->fog.size() > 0
+4 -2
View File
@@ -3886,12 +3886,14 @@ void x_pv_game_stage::unload() {
auth_3d_ids.clear();
for (x_pv_game_stage_effect& i : effect)
for (x_pv_game_stage_effect_glitter& j : i.glitter)
for (int32_t i = 0; i < X_PV_GAME_STAGE_EFFECT_COUNT; i++) {
x_pv_game_stage_effect& eff = effect[i];
for (x_pv_game_stage_effect_glitter& j : eff.glitter)
if (j.scene_counter) {
Glitter::glt_particle_manager->FreeSceneEffect(j.scene_counter, false);
j.scene_counter = 0;
}
}
if (stage_effect_transition_state == 1)
stop_stage_change_effect();