From e0289eb0acef0e2dccc95fb7a0432b0a20d7ec60 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 7 Apr 2022 15:11:20 +0200 Subject: [PATCH] - fixed Font struct export and removed the duplicate handler. --- src/common/scripting/core/imports.cpp | 2 +- src/scripting/thingdef_data.cpp | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/common/scripting/core/imports.cpp b/src/common/scripting/core/imports.cpp index 6db68bc46f..c5a8cf9c5e 100644 --- a/src/common/scripting/core/imports.cpp +++ b/src/common/scripting/core/imports.cpp @@ -175,7 +175,7 @@ static int fieldcmp(const void * a, const void * b) void InitImports() { - auto fontstruct = NewStruct("FFont", nullptr, true); + auto fontstruct = NewStruct("Font", nullptr, true); fontstruct->Size = sizeof(FFont); fontstruct->Align = alignof(FFont); NewPointer(fontstruct, false)->InstallHandlers( diff --git a/src/scripting/thingdef_data.cpp b/src/scripting/thingdef_data.cpp index 9b20e2d518..f3e1c910f8 100644 --- a/src/scripting/thingdef_data.cpp +++ b/src/scripting/thingdef_data.cpp @@ -727,21 +727,6 @@ void InitThingdef() } ); - auto fontstruct = NewStruct("FFont", nullptr, true); - fontstruct->Size = sizeof(FFont); - fontstruct->Align = alignof(FFont); - NewPointer(fontstruct, false)->InstallHandlers( - [](FSerializer &ar, const char *key, const void *addr) - { - ar(key, *(FFont **)addr); - }, - [](FSerializer &ar, const char *key, void *addr) - { - Serialize(ar, key, *(FFont **)addr, nullptr); - return true; - } - ); - auto wbplayerstruct = NewStruct("WBPlayerStruct", nullptr, true); wbplayerstruct->Size = sizeof(wbplayerstruct_t); wbplayerstruct->Align = alignof(wbplayerstruct_t);