From da3326ab31d0b1639159dbd4d395f5c526b16d01 Mon Sep 17 00:00:00 2001 From: zardoru Date: Thu, 5 Feb 2015 23:30:32 -0300 Subject: [PATCH] Add comments for posterity. --- src/NotesLoaderBMS.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/NotesLoaderBMS.cpp b/src/NotesLoaderBMS.cpp index 088da04828..773679592f 100644 --- a/src/NotesLoaderBMS.cpp +++ b/src/NotesLoaderBMS.cpp @@ -230,7 +230,6 @@ struct bmsCommandTree int conditionTriggerValue; // value which triggers this branch. does not apply to #ELSE }; - bool Triggered; BMSHeaders Commands; vector ChannelCommands; vector branches; @@ -238,7 +237,6 @@ struct bmsCommandTree bmsNodeS() { - Triggered = true; parent = NULL; conditionValue = 0; conditionType = CT_NULL; @@ -359,7 +357,6 @@ struct bmsCommandTree FOREACH(bmsNodeS*, node->branches, b) if (evaluateNode(*b, headersOut, linesOut)) { - node->Triggered = true; return true; } @@ -379,16 +376,13 @@ struct bmsCommandTree { appendNodeElements(node, headersOut, linesOut); triggerBranches(node, headersOut, linesOut); - return true; + return true; // returning true means to stop trying to triggering branches } break; case bmsNodeS::CT_ELSE: - if (!node->parent->Triggered) // we're the only branch left, so okay, evaluate. - { appendNodeElements(node, headersOut, linesOut); triggerBranches(node, headersOut, linesOut); return true; - } break; case bmsNodeS::CT_NULL: appendNodeElements(node, headersOut, linesOut); @@ -397,6 +391,7 @@ struct bmsCommandTree break; } + // returning false means to execute any other branches. return false; }