summaryrefslogtreecommitdiff
path: root/src/level-import.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/level-import.cpp')
-rw-r--r--src/level-import.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/level-import.cpp b/src/level-import.cpp
index 0890f52..876ad85 100644
--- a/src/level-import.cpp
+++ b/src/level-import.cpp
@@ -206,12 +206,12 @@ pke_ui_box *pke_at_level_import_build_ui_list_item(pke_ui_box *parent_box, pk_cs
bx->pos_top_left.x = 0;
bx->pos_top_left.y = 0;
if (box_type == PKE_UI_BOX_TYPE_TEXT) {
- bx->type_data->text.font_type_render = FontType_AddStringRender(FontTypeHandle{0,0}, std::move(str), &frs);
+ bx->type_data->text.font_type_render = FontType_AddStringRender(FontTypeHandle{0,0}, std::move(str), &frs, bx);
}
if (box_type == PKE_UI_BOX_TYPE_BUTTON_TEXT) {
ev = ECS_GetEv(bx->type_data->button_text.pke_event_handle);
pk_ev_register_cb(ev->ev_mgr_id, ev->ev_id, fn, item_ptr);
- bx->type_data->button_text.font_type_render = FontType_AddStringRender(FontTypeHandle{0,0}, std::move(str), &frs);
+ bx->type_data->button_text.font_type_render = FontType_AddStringRender(FontTypeHandle{0,0}, std::move(str), &frs, bx);
}
return bx;
}
@@ -229,7 +229,6 @@ void pke_at_level_import_init() {
lvl_mstr.state = state_get_service_types;
bx = pke_ui_box_new_root();
bx->flags |= PKE_UI_BOX_FLAG_POSITION_TYPE_STATIC;
- // root->flags |= PKE_UI_BOX_FLAG_CENTER_BOTH;
bx->flags |= PKE_UI_BOX_FLAG_VISIBILITY_INVISIBLE;
bx->flex_direction = 1;
bx->flex_padding = 4;
@@ -275,6 +274,12 @@ void pke_at_level_import_init() {
lvl_mstr.ui.btn_import->color_background = glm::vec4(0,1,0,1);
lvl_mstr.ui.btn_import->flags |= PKE_UI_BOX_FLAG_VISIBILITY_DISABLED;
+ lvl_mstr.data.selected_service_type = nullptr;
+ lvl_mstr.data.selected_plan = nullptr;
+ lvl_mstr.data.service_types = {};
+ lvl_mstr.data.plans = {};
+ lvl_mstr.data.plan_items = {};
+
pke_at_level_import_recalc_ui();
}
@@ -359,7 +364,6 @@ void pke_at_level_import_build_ui_setlist_import_details() {
void pke_at_level_import_tick(double delta) {
(void)delta;
- unsigned int u;
// state management
if (pkeSettings.rt.was_framebuffer_resized) {
pke_at_level_import_recalc_ui();