From 00b812a5ff474517a4673968312e1845d4f2b553 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 9 Oct 2022 13:47:55 +0200 Subject: [PATCH] - un-deprecated the integer MSTime variant. Due to undefined downconversion rules from double to int, there is no way to safely downcast the return from MSTimef, meaning the function is completely useless for retrieving integral time stamps. The old version is essential for these cases and must be kept around. --- source/common/platform/posix/i_system.h | 2 +- wadsrc/static/zscript/engine/base.zs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/common/platform/posix/i_system.h b/source/common/platform/posix/i_system.h index 3b3489310..02acf0e3e 100644 --- a/source/common/platform/posix/i_system.h +++ b/source/common/platform/posix/i_system.h @@ -49,7 +49,7 @@ TArray I_GetGogPaths(); TArray I_GetBethesdaPath(); // The ini could not be saved at exit -bool I_WriteIniFailed (); +bool I_WriteIniFailed (const char* filename); class FGameTexture; bool I_SetCursor(FGameTexture *); diff --git a/wadsrc/static/zscript/engine/base.zs b/wadsrc/static/zscript/engine/base.zs index 75fb62b9d..650487c2a 100644 --- a/wadsrc/static/zscript/engine/base.zs +++ b/wadsrc/static/zscript/engine/base.zs @@ -650,6 +650,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); @@ -722,7 +723,7 @@ class Object native private native static Class BuiltinNameToClass(Name nm, Class filter); private native static Object BuiltinClassCast(Object inptr, Class test); - deprecated("4.8", "Use MSTimeF instead") native static uint MSTime(); + native static uint MSTime(); native static double MSTimeF(); native vararg static void ThrowAbortException(String fmt, ...);