From: Dale Weiler <killfieldengine@gmail.com>
Date: Tue, 27 Aug 2013 08:07:17 +0000 (-0400)
Subject: Merge branch 'divVerent/ftypeless-stores' of git://git.xonotic.org/xonotic/gmqcc... 
X-Git-Tag: 0.3.5~140
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=581d0dfc15825abeb38d781e9f87b98e67c04407;hp=f4f805f4c980f5e509447a965b4ef811c0741581

Merge branch 'divVerent/ftypeless-stores' of git://git.xonotic.org/xonotic/gmqcc into cooking
---

diff --git a/test.c b/test.c
index 7006b4a..6fdee51 100644
--- a/test.c
+++ b/test.c
@@ -445,9 +445,6 @@ static bool task_template_parse(const char *file, task_template_t *tmpl, FILE *f
                     goto failure;
                 }
 
-                if (value && (*value == ' ' || *value == '\t'))
-                    value++;
-
                 /*
                  * Value will contain a newline character at the end, we need to strip
                  * this otherwise kaboom, seriously, kaboom :P
diff --git a/tests/correct-logic-1-s.tmpl b/tests/correct-logic-1-s.tmpl
index e3f3451..8406ab7 100644
--- a/tests/correct-logic-1-s.tmpl
+++ b/tests/correct-logic-1-s.tmpl
@@ -2,7 +2,7 @@ I: correct-logic.qc
 D: vector logic flags
 T: -execute
 C: -std=fteqcc -fshort-logic
-M:          ! & | i N
+M:         ! & | i N
 M: 0, 0 -> 1 0 0 0 1
 M: 0, x -> 1 0 1 0 1
 M: x, 0 -> 0 0 1 1 0
diff --git a/tests/correct-logic-1.tmpl b/tests/correct-logic-1.tmpl
index b151f46..c007ffb 100644
--- a/tests/correct-logic-1.tmpl
+++ b/tests/correct-logic-1.tmpl
@@ -2,7 +2,7 @@ I: correct-logic.qc
 D: vector logic flags
 T: -execute
 C: -std=fteqcc
-M:          ! & | i N
+M:         ! & | i N
 M: 0, 0 -> 1 0 0 0 1
 M: 0, x -> 1 0 1 0 1
 M: x, 0 -> 0 0 1 1 0
diff --git a/tests/correct-logic-2-s.tmpl b/tests/correct-logic-2-s.tmpl
index a7ada6e..b1ce688 100644
--- a/tests/correct-logic-2-s.tmpl
+++ b/tests/correct-logic-2-s.tmpl
@@ -2,7 +2,7 @@ I: correct-logic.qc
 D: vector logic flags
 T: -execute
 C: -std=fteqcc -fcorrect-logic -fshort-logic
-M:          ! & | i N
+M:         ! & | i N
 M: 0, 0 -> 1 0 0 0 1
 M: 0, x -> 1 0 1 0 1
 M: x, 0 -> 0 0 1 1 0
diff --git a/tests/correct-logic-2.tmpl b/tests/correct-logic-2.tmpl
index 7ecd3df..2e79ec3 100644
--- a/tests/correct-logic-2.tmpl
+++ b/tests/correct-logic-2.tmpl
@@ -2,7 +2,7 @@ I: correct-logic.qc
 D: vector logic flags
 T: -execute
 C: -std=fteqcc -fcorrect-logic
-M:          ! & | i N
+M:         ! & | i N
 M: 0, 0 -> 1 0 0 0 1
 M: 0, x -> 1 0 1 0 1
 M: x, 0 -> 0 0 1 1 0
diff --git a/tests/truth-flags-1-s.tmpl b/tests/truth-flags-1-s.tmpl
index 770f306..90d3aff 100644
--- a/tests/truth-flags-1-s.tmpl
+++ b/tests/truth-flags-1-s.tmpl
@@ -2,7 +2,7 @@ I: truth-flags-2.qc
 D: logic flags
 T: -execute
 C: -std=fteqcc -fshort-logic
-M:                  ! & | i N
+M:                 ! & | i N
 M: 'str', 'str' -> 0 1 1 1 0
 M: 'str', ''    -> 0 1 1 1 0
 M: 'str', 0     -> 0 0 1 1 0
diff --git a/tests/truth-flags-1.tmpl b/tests/truth-flags-1.tmpl
index 7562374..93dfda3 100644
--- a/tests/truth-flags-1.tmpl
+++ b/tests/truth-flags-1.tmpl
@@ -2,7 +2,7 @@ I: truth-flags-2.qc
 D: logic flags
 T: -execute
 C: -std=fteqcc
-M:                  ! & | i N
+M:                 ! & | i N
 M: 'str', 'str' -> 0 1 1 1 0
 M: 'str', ''    -> 0 1 1 1 0
 M: 'str', 0     -> 0 0 1 1 0
diff --git a/tests/truth-flags-2-s.tmpl b/tests/truth-flags-2-s.tmpl
index 3de75eb..d964488 100644
--- a/tests/truth-flags-2-s.tmpl
+++ b/tests/truth-flags-2-s.tmpl
@@ -2,7 +2,7 @@ I: truth-flags-2.qc
 D: logic flags
 T: -execute
 C: -std=fteqcc -fshort-logic -ftrue-empty-strings
-M:                  ! & | i N
+M:                 ! & | i N
 M: 'str', 'str' -> 0 1 1 1 0
 M: 'str', ''    -> 0 1 1 1 0
 M: 'str', 0     -> 0 0 1 1 0
diff --git a/tests/truth-flags-2.tmpl b/tests/truth-flags-2.tmpl
index d9bb543..7e42221 100644
--- a/tests/truth-flags-2.tmpl
+++ b/tests/truth-flags-2.tmpl
@@ -2,7 +2,7 @@ I: truth-flags-2.qc
 D: logic flags
 T: -execute
 C: -std=fteqcc -ftrue-empty-strings
-M:                  ! & | i N
+M:                 ! & | i N
 M: 'str', 'str' -> 0 1 1 1 0
 M: 'str', ''    -> 0 1 1 1 0
 M: 'str', 0     -> 0 0 1 1 0
diff --git a/tests/truth-flags-3-s.tmpl b/tests/truth-flags-3-s.tmpl
index 1ebd56b..ec9808d 100644
--- a/tests/truth-flags-3-s.tmpl
+++ b/tests/truth-flags-3-s.tmpl
@@ -2,7 +2,7 @@ I: truth-flags-2.qc
 D: logic flags
 T: -execute
 C: -std=fteqcc -fshort-logic -ffalse-empty-strings
-M:                  ! & | i N
+M:                 ! & | i N
 M: 'str', 'str' -> 0 1 1 1 0
 M: 'str', ''    -> 0 0 1 1 0
 M: 'str', 0     -> 0 0 1 1 0
diff --git a/tests/truth-flags-3.tmpl b/tests/truth-flags-3.tmpl
index f166dda..a70f38d 100644
--- a/tests/truth-flags-3.tmpl
+++ b/tests/truth-flags-3.tmpl
@@ -2,7 +2,7 @@ I: truth-flags-2.qc
 D: logic flags
 T: -execute
 C: -std=fteqcc -ffalse-empty-strings
-M:                  ! & | i N
+M:                 ! & | i N
 M: 'str', 'str' -> 0 1 1 1 0
 M: 'str', ''    -> 0 0 1 1 0
 M: 'str', 0     -> 0 0 1 1 0