From 8fbeadda53243b701957a26dba1113d84ad5c7c4 Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Thu, 17 Jul 2025 14:50:05 -0400 Subject: pke: handle pk.h breaking changes --- src/serialization-font.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/serialization-font.cpp') diff --git a/src/serialization-font.cpp b/src/serialization-font.cpp index f31016e..0ca0a94 100644 --- a/src/serialization-font.cpp +++ b/src/serialization-font.cpp @@ -34,7 +34,7 @@ pk_handle pke_serialize_font_render(srlztn_serialize_helper *h, FontRender *fr) compt_a<160==sizeof(FontRender)>(); { kve.key = SRLZTN_UI_FONT_RENDER_UUID; - s = pk_new(37, h->bkt); + s = pk_new_arr(37, h->bkt); sprintf(s, pk_uuid_printf_format, pk_uuid_printf_var(fr->uuid)); kve.val = s; kve.end = SRLZTN_KVE_END; @@ -44,7 +44,7 @@ pk_handle pke_serialize_font_render(srlztn_serialize_helper *h, FontRender *fr) kve.key = SRLZTN_UI_FONT_RENDER_FONT_TYPE_TITLE; FontType *ft = FontType_Get(fr->fr_handle.index_ft); len = snprintf(nullptr, 0, "%s", ft->title.val); - s = pk_new(len+1, h->bkt); + s = pk_new_arr(len+1, h->bkt); sprintf(s, "%s", ft->title.val); kve.val = s; kve.end = SRLZTN_KVE_END; @@ -52,7 +52,7 @@ pk_handle pke_serialize_font_render(srlztn_serialize_helper *h, FontRender *fr) } if (fr->text.val != nullptr) { kve.key = SRLZTN_UI_FONT_RENDER_TEXT_BEGIN; - s = pk_new(strlen(fr->text.val) + 3, h->bkt); + s = pk_new_arr(strlen(fr->text.val) + 3, h->bkt); sprintf(s, "\n%s\n", fr->text.val); kve.val = s; kve.end = SRLZTN_MULTILINE_END; @@ -91,7 +91,7 @@ void pke_deserialize_font_render(srlztn_deserialize_helper *h, pke_kve_container pk_cstr font_type_title; font_type_title.length = strlen(kve->val) + 1; font_type_title.reserved = font_type_title.length + 1; - s = pk_new(font_type_title.reserved, h->bkt); + s = pk_new_arr(font_type_title.reserved, h->bkt); sprintf(s, "%s", kve->val); font_type_title.val = s; font_type_ent = FontType_GetByTitle(font_type_title); @@ -101,7 +101,7 @@ void pke_deserialize_font_render(srlztn_deserialize_helper *h, pke_kve_container str.length = strlen(kve->val) + 1; str.reserved = str.length + 1; // TODO specific bkt? - s = pk_new(str.reserved, NULL); + s = pk_new_arr(str.reserved, NULL); sprintf(s, "%s", kve->val); str.val = s; continue; @@ -131,7 +131,7 @@ pk_handle pke_serialize_font_render_settings(srlztn_serialize_helper *h, FontRen { kve.key = SRLZTN_UI_FONT_RENDER_SETTINGS_CHAR_SCALE; len = snprintf(NULL, 0, "%f", frs->char_scale); - s = pk_new(len+1, h->bkt); + s = pk_new_arr(len+1, h->bkt); sprintf(s, "%f", frs->char_scale); kve.val = s; kve.end = SRLZTN_KVE_END; @@ -140,7 +140,7 @@ pk_handle pke_serialize_font_render_settings(srlztn_serialize_helper *h, FontRen { kve.key = SRLZTN_UI_FONT_RENDER_SETTINGS_LINE_HEIGHT_SCALE; len = snprintf(NULL, 0, "%f", frs->line_height_scale); - s = pk_new(len+1, h->bkt); + s = pk_new_arr(len+1, h->bkt); sprintf(s, "%f", frs->line_height_scale); kve.val = s; kve.end = SRLZTN_KVE_END; @@ -149,7 +149,7 @@ pk_handle pke_serialize_font_render_settings(srlztn_serialize_helper *h, FontRen { kve.key = SRLZTN_UI_FONT_RENDER_SETTINGS_CHAR_SPACING_SCALE; len = snprintf(NULL, 0, "%f", frs->char_spacing_scale); - s = pk_new(len+1, h->bkt); + s = pk_new_arr(len+1, h->bkt); sprintf(s, "%f", frs->char_spacing_scale); kve.val = s; kve.end = SRLZTN_KVE_END; @@ -158,7 +158,7 @@ pk_handle pke_serialize_font_render_settings(srlztn_serialize_helper *h, FontRen { kve.key = SRLZTN_UI_FONT_RENDER_SETTINGS_SURFACE_AREA_SIZE; len = snprintf(NULL, 0, "%d%s%d", frs->surface_area_size.x, SRLZTN_NUM_SEPARATOR, frs->surface_area_size.y); - s = pk_new(len+1, h->bkt); + s = pk_new_arr(len+1, h->bkt); sprintf(s, "%d%s%d", frs->surface_area_size.x, SRLZTN_NUM_SEPARATOR, frs->surface_area_size.y); kve.val = s; kve.end = SRLZTN_KVE_END; @@ -167,7 +167,7 @@ pk_handle pke_serialize_font_render_settings(srlztn_serialize_helper *h, FontRen { kve.key = SRLZTN_UI_FONT_RENDER_SETTINGS_SURFACE_AREA_POS; len = snprintf(NULL, 0, "%d%s%d", frs->surface_area_pos.x, SRLZTN_NUM_SEPARATOR, frs->surface_area_pos.y); - s = pk_new(len+1, h->bkt); + s = pk_new_arr(len+1, h->bkt); sprintf(s, "%d%s%d", frs->surface_area_pos.x, SRLZTN_NUM_SEPARATOR, frs->surface_area_pos.y); kve.val = s; kve.end = SRLZTN_KVE_END; @@ -175,7 +175,7 @@ pk_handle pke_serialize_font_render_settings(srlztn_serialize_helper *h, FontRen } { kve.key = SRLZTN_UI_FONT_RENDER_SETTINGS_SURFACE_AREA_FLAGS; - s = pk_new(5, h->bkt); + s = pk_new_arr(5, h->bkt); sprintf(s, "0x%.2X", FONT_RENDER_SURFACE_AREA_TYPE_FLAG_T(frs->surface_area_type_flags)); kve.val = s; kve.end = SRLZTN_KVE_END; @@ -184,7 +184,7 @@ pk_handle pke_serialize_font_render_settings(srlztn_serialize_helper *h, FontRen { kve.key = SRLZTN_UI_FONT_RENDER_SETTINGS_COLOR_FOREGROUND; len = snprintf(NULL, 0, "%f%s%f%s%f%s%f", frs->color_foreground[0], SRLZTN_NUM_SEPARATOR, frs->color_foreground[1], SRLZTN_NUM_SEPARATOR, frs->color_foreground[2], SRLZTN_NUM_SEPARATOR, frs->color_foreground[3]); - s = pk_new(len+1, h->bkt); + s = pk_new_arr(len+1, h->bkt); sprintf(s, "%f%s%f%s%f%s%f", frs->color_foreground[0], SRLZTN_NUM_SEPARATOR, frs->color_foreground[1], SRLZTN_NUM_SEPARATOR, frs->color_foreground[2], SRLZTN_NUM_SEPARATOR, frs->color_foreground[3]); kve.val = s; kve.end = SRLZTN_KVE_END; @@ -193,7 +193,7 @@ pk_handle pke_serialize_font_render_settings(srlztn_serialize_helper *h, FontRen { kve.key = SRLZTN_UI_FONT_RENDER_SETTINGS_COLOR_BACKGROUND; len = snprintf(NULL, 0, "%f%s%f%s%f%s%f", frs->color_background[0], SRLZTN_NUM_SEPARATOR, frs->color_background[1], SRLZTN_NUM_SEPARATOR, frs->color_background[2], SRLZTN_NUM_SEPARATOR, frs->color_background[3]); - s = pk_new(len+1, h->bkt); + s = pk_new_arr(len+1, h->bkt); sprintf(s, "%f%s%f%s%f%s%f", frs->color_background[0], SRLZTN_NUM_SEPARATOR, frs->color_background[1], SRLZTN_NUM_SEPARATOR, frs->color_background[2], SRLZTN_NUM_SEPARATOR, frs->color_background[3]); kve.val = s; kve.end = SRLZTN_KVE_END; -- cgit v1.2.3