From 78360c1888724831d61de2ed18b01df0fb6b692f Mon Sep 17 00:00:00 2001 From: Player701 Date: Fri, 30 Sep 2022 10:44:27 +0300 Subject: [PATCH] - Exported GetDisplayTopOffset for font characters to ZScript --- src/common/scripting/interface/vmnatives.cpp | 13 +++++++++++++ wadsrc/static/zscript/engine/base.zs | 1 + 2 files changed, 14 insertions(+) diff --git a/src/common/scripting/interface/vmnatives.cpp b/src/common/scripting/interface/vmnatives.cpp index 8f9f8dfad8..842c85994d 100644 --- a/src/common/scripting/interface/vmnatives.cpp +++ b/src/common/scripting/interface/vmnatives.cpp @@ -719,6 +719,19 @@ DEFINE_ACTION_FUNCTION_NATIVE(FFont, GetDefaultKerning, GetDefaultKerning) ACTION_RETURN_INT(self->GetDefaultKerning()); } +static double GetDisplayTopOffset(FFont* font, int c) +{ + auto texc = font->GetChar(c, CR_UNDEFINED, nullptr); + return texc ? texc->GetDisplayTopOffset() : 0; +} + +DEFINE_ACTION_FUNCTION_NATIVE(FFont, GetDisplayTopOffset, GetDisplayTopOffset) +{ + PARAM_SELF_STRUCT_PROLOGUE(FFont); + PARAM_INT(code); + ACTION_RETURN_FLOAT(GetDisplayTopOffset(self, code)); +} + //========================================================================== // // file system diff --git a/wadsrc/static/zscript/engine/base.zs b/wadsrc/static/zscript/engine/base.zs index e8b58c3e79..0dbb86811c 100644 --- a/wadsrc/static/zscript/engine/base.zs +++ b/wadsrc/static/zscript/engine/base.zs @@ -649,6 +649,7 @@ struct Font native native static int FindFontColor(Name color); native double GetBottomAlignOffset(int code); + native double GetDisplayTopOffset(int code); native static Font FindFont(Name fontname); native static Font GetFont(Name fontname); native BrokenLines BreakLines(String text, int maxlen);