#6092: Parse the first few action members

codereader · Sep 4, 2022 · 9c5815d · 9c5815d
1 parent 4b5a2ac
commit 9c5815d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/radiantcore/fx/FxAction.cpp b/radiantcore/fx/FxAction.cpp
@@ -1,5 +1,8 @@
 #include "FxAction.h"
 
+#include "parser/DefTokeniser.h"
+#include "string/case_conv.h"
+
 namespace fx
 {
 
@@ -20,7 +23,23 @@ bool FxAction::getIgnoreMaster()
 
 void FxAction::parseFromTokens(parser::DefTokeniser& tokeniser)
 {
-
+    while (tokeniser.hasMoreTokens())
+    {
+        auto token = tokeniser.nextToken();
+        string::to_lower(token);
+
+        // Hit a closing brace and we're done with this action
+        if (token == "}") return;
+
+        if (token == "ignoremaster")
+        {
+            _ignoreMaster = true;
+        }
+        else if (token == "delay")
+        {
+            _delayInSeconds = string::convert<float>(tokeniser.nextToken());
+        }
+    }
 }
 
 

diff --git a/test/Fx.cpp b/test/Fx.cpp
@@ -44,7 +44,7 @@ TEST_F(FxTest, ParseActionDelay)
 {
     EXPECT_EQ(getFxByName("fx/sparks")->getAction(0)->getDelay(), 0);
     EXPECT_EQ(getFxByName("fx/sparks")->getAction(1)->getDelay(), 2);
-    EXPECT_EQ(getFxByName("fx/sparks")->getAction(2)->getDelay(), 1.5);
+    EXPECT_EQ(getFxByName("fx/sparks")->getAction(2)->getDelay(), 1.5f);
 }
 
 TEST_F(FxTest, ParseActionIgnoreMaster)