From e5c9ef5b55d350f5226d7ae573656d71682db107 Mon Sep 17 00:00:00 2001 From: AconiteX <63141077+AconiteX@users.noreply.github.com> Date: Sat, 29 May 2021 22:24:00 -0400 Subject: [PATCH] Fix for CuiWidget3dObjectListViewer [E] --- .../src/shared/widget/CuiWidget3dObjectListViewer.cpp | 4 +++- .../src/shared/page/SwgCuiAppearanceTab.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/engine/client/library/clientUserInterface/src/shared/widget/CuiWidget3dObjectListViewer.cpp b/src/engine/client/library/clientUserInterface/src/shared/widget/CuiWidget3dObjectListViewer.cpp index ec99f4ea6..8030d0999 100644 --- a/src/engine/client/library/clientUserInterface/src/shared/widget/CuiWidget3dObjectListViewer.cpp +++ b/src/engine/client/library/clientUserInterface/src/shared/widget/CuiWidget3dObjectListViewer.cpp @@ -2708,8 +2708,10 @@ void CuiWidget3dObjectListViewer::addObject (Object & obj) if (hasFlags (F_alterObjects)) { - if (obj.isInitialized() && (obj.alter(1.0f) != AlterResult::cms_kill)) + if (obj.isInitialized() && (obj.alter(Clock::frameTime()) != AlterResult::cms_kill)) + { obj.conclude(); + } } if (dynamic_cast(&obj)) diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAppearanceTab.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAppearanceTab.cpp index bd01f8bda..902dec7b5 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAppearanceTab.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiAppearanceTab.cpp @@ -70,7 +70,7 @@ namespace SwgCuiAppearanceTabNamespace const UILowerString DefaultViewerYaw = UILowerString ("DefaultViewerYaw"); } - // This order must corespond to the order of the pages in LayoutPage. + // This order must correspond to the order of the pages in LayoutPage. const char* ms_slotNames[] = { "hat",