[nq] Remove the workarounds for same-hierarchy parenting

With the hierarchy code fixed for intra-hierarchy parenting, there's no
longer any need to first pull the sub-hierarchy out of the main
hierarchy before changing the parent, resulting in less memory churn.
This commit is contained in:
Bill Currie 2022-11-06 23:18:32 +09:00
parent ddd6c958a9
commit 4dccad656f

View file

@ -1623,7 +1623,6 @@ set_hud_sbar (void)
view_t v; view_t v;
if (hud_sbar) { if (hud_sbar) {
View_SetParent (sbar_armament, nullview);//FIXME workaround for same-h
View_SetParent (sbar_armament, sbar_inventory); View_SetParent (sbar_armament, sbar_inventory);
View_SetPos (sbar_armament, 0, 0); View_SetPos (sbar_armament, 0, 0);
View_SetLen (sbar_armament, 202, 24); View_SetLen (sbar_armament, 202, 24);
@ -1663,7 +1662,6 @@ set_hud_sbar (void)
sbar_setcomponent (sbar_inventory, hud_pic, &sb_ibar); sbar_setcomponent (sbar_inventory, hud_pic, &sb_ibar);
sbar_setcomponent (sbar_statusbar, hud_pic, &sb_sbar); sbar_setcomponent (sbar_statusbar, hud_pic, &sb_sbar);
} else { } else {
View_SetParent (sbar_armament, nullview);//FIXME workaround for same-h
View_SetParent (sbar_armament, hud_view); View_SetParent (sbar_armament, hud_view);
View_SetPos (sbar_armament, 0, 48); View_SetPos (sbar_armament, 0, 48);
View_SetLen (sbar_armament, 42, 156); View_SetLen (sbar_armament, 42, 156);