From 399d8e834deb9776cd96a4f73711c243218e33a6 Mon Sep 17 00:00:00 2001 From: Jan Date: Wed, 23 Aug 2023 20:51:11 +0200 Subject: [PATCH] Make IW4 menu rect def align be unsigned like IW5 --- src/Common/Game/IW4/IW4_Assets.h | 4 ++-- src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Common/Game/IW4/IW4_Assets.h b/src/Common/Game/IW4/IW4_Assets.h index 255664ae..aa8243c2 100644 --- a/src/Common/Game/IW4/IW4_Assets.h +++ b/src/Common/Game/IW4/IW4_Assets.h @@ -2084,8 +2084,8 @@ namespace IW4 float y; float w; float h; - char horzAlign; - char vertAlign; + unsigned char horzAlign; + unsigned char vertAlign; }; enum WindowDefStaticFlag : unsigned int diff --git a/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp b/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp index 7788d757..24590a30 100644 --- a/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp +++ b/src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp @@ -34,8 +34,8 @@ namespace IW4 static_cast(rect.y), static_cast(rect.w), static_cast(rect.h), - static_cast(rect.horizontalAlign), - static_cast(rect.verticalAlign) + static_cast(rect.horizontalAlign), + static_cast(rect.verticalAlign) }; } @@ -46,8 +46,8 @@ namespace IW4 static_cast(rectRelativeTo.y + rect.y), static_cast(rect.w), static_cast(rect.h), - static_cast(rect.horizontalAlign), - static_cast(rect.verticalAlign) + static_cast(rect.horizontalAlign), + static_cast(rect.verticalAlign) }; }