From 074644f82b163d601264d9d0adfc63921a619292 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 30 Apr 2012 12:45:16 +0200 Subject: [PATCH] simplify some linked list stuff --- qcsrc/menu/anim/animhost.c | 3 +-- qcsrc/menu/item/container.c | 11 +++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/qcsrc/menu/anim/animhost.c b/qcsrc/menu/anim/animhost.c index 7388ee845..ae84e0957 100644 --- a/qcsrc/menu/anim/animhost.c +++ b/qcsrc/menu/anim/animhost.c @@ -29,8 +29,7 @@ void AnimHost_addAnim(entity me, entity other) other.parent = me; - entity f, l; - f = me.firstChild; + entity l; l = me.lastChild; if(l) diff --git a/qcsrc/menu/item/container.c b/qcsrc/menu/item/container.c index 0e8fa9ea0..6241cee03 100644 --- a/qcsrc/menu/item/container.c +++ b/qcsrc/menu/item/container.c @@ -304,8 +304,7 @@ void Container_addItem(entity me, entity other, vector theOrigin, vector theSize other.Container_size = theSize; me.setAlphaOf(me, other, theAlpha); - entity f, l; - f = me.firstChild; + entity l; l = me.lastChild; if(l) @@ -330,9 +329,7 @@ void Container_removeItem(entity me, entity other) other.parent = NULL; - entity n, p, f, l; - f = me.firstChild; - l = me.lastChild; + entity n, p; n = other.nextSibling; p = other.prevSibling; @@ -371,13 +368,11 @@ void Container_setFocus(entity me, entity other) void Container_moveItemAfter(entity me, entity other, entity dest) { // first: remove other from the chain - entity n, p, f, l; + entity n, p; if(other.parent != me) error("Can't move in wrong container!"); - f = me.firstChild; - l = me.lastChild; n = other.nextSibling; p = other.prevSibling; -- 2.39.2