From 36b50981ffe87f36728008b76f36fca978f46994 Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Fri, 5 Apr 2024 11:38:14 -0700 Subject: [PATCH] fix conditional breakpoints, post demon2/ctrl passes --- src/ctrl/ctrl_core.c | 2 +- src/df/core/df_core.c | 4 ++-- src/df/gfx/df_view_rules.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ctrl/ctrl_core.c b/src/ctrl/ctrl_core.c index f96c8ed8..2f24fb8c 100644 --- a/src/ctrl/ctrl_core.c +++ b/src/ctrl/ctrl_core.c @@ -2923,7 +2923,7 @@ ctrl_thread__run(DMN_CtrlCtx *ctrl_ctx, CTRL_Msg *msg) // CTRL_Entity *thread = ctrl_entity_from_machine_id_handle(ctrl_state->ctrl_thread_entity_store, CTRL_MachineID_Local, event->thread); Architecture arch = thread->arch; - U64 thread_rip_vaddr = dmn_rsp_from_thread(event->thread); + U64 thread_rip_vaddr = dmn_rip_from_thread(event->thread); DMN_Handle module = {0}; String8 module_name = {0}; U64 module_base_vaddr = 0; diff --git a/src/df/core/df_core.c b/src/df/core/df_core.c index e2c45d07..310d0607 100644 --- a/src/df/core/df_core.c +++ b/src/df/core/df_core.c @@ -8036,9 +8036,9 @@ df_core_begin_frame(Arena *arena, DF_CmdList *cmds, F32 dt) { df_entity_equip_color_hsva(bp_ent, hsva); } - if(cond_cfg->string.size != 0) + if(cond_cfg->first->string.size != 0) { - String8 cond_raw = df_cfg_raw_from_escaped_string(scratch.arena, cond_cfg->string); + String8 cond_raw = df_cfg_raw_from_escaped_string(scratch.arena, cond_cfg->first->string); DF_Entity *cond = df_entity_alloc(0, bp_ent, DF_EntityKind_Condition); df_entity_equip_name(0, cond, cond_raw); } diff --git a/src/df/gfx/df_view_rules.c b/src/df/gfx/df_view_rules.c index 290f52f0..2d65813b 100644 --- a/src/df/gfx/df_view_rules.c +++ b/src/df/gfx/df_view_rules.c @@ -979,7 +979,7 @@ DF_GFX_VIEW_RULE_BLOCK_UI_FUNCTION_DEF(bitmap) UI_Column UI_Padding(ui_pct(1.f, 0.f)) UI_PrefHeight(ui_px(img_dim, 1.f)) { - ui_image(texture, r2f32(v2f32(0, 0), v2f32((F32)topology_info.width, (F32)topology_info.height)), v4f32(1, 1, 1, 1), 10.f*(1-state->loaded_t), str8_lit("image_box")); + ui_image(texture, r2f32(v2f32(0, 0), v2f32((F32)topology_info.width, (F32)topology_info.height)), v4f32(1, 1, 1, state->loaded_t), 10.f*(1-state->loaded_t), str8_lit("image_box")); } }