zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed Font struct export and removed the duplicate handler.

This commit is contained in:
Christoph Oelckers 2022-04-07 15:11:20 +02:00
parent 049124ed21
commit e0289eb0ac
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/scripting/core/imports.cpp
View File

@ -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(

15
src/scripting/thingdef_data.cpp
View File

@ -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<FFont>(ar, key, *(FFont **)addr, nullptr);
return true;
}
);
auto wbplayerstruct = NewStruct("WBPlayerStruct", nullptr, true);
wbplayerstruct->Size = sizeof(wbplayerstruct_t);
wbplayerstruct->Align = alignof(wbplayerstruct_t);