Use the weapon's position for muzzle flashes even when g_shootfromeye is enabled

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / yenc.qh

diff --git a/qcsrc/lib/yenc.qh b/qcsrc/lib/yenc.qh
index 3e57d7f5d5401e563bc6f1f10caacba993fde558..e71c68ef63683aa0caeb762f79971c32c83fb577 100644 (file)
--- a/qcsrc/lib/yenc.qh
+++ b/qcsrc/lib/yenc.qh
@@ -1,10 +1,9 @@
-#ifndef YENC_H
-#define YENC_H
+#pragma once
 
 #include "test.qh"
 
 #define yenc_single(c, ret) \
-       MACRO_BEGIN { \
+       MACRO_BEGIN \
                int conv = c; \
                conv += 42; \
                if (conv >= 256) conv -= 256; \
@@ -27,17 +26,15 @@
                                break; \
                        } \
                } \
-       } MACRO_END
+       MACRO_END
 
 #define ydec_single(stringiter, ret) \
-       MACRO_BEGIN { \
+       MACRO_BEGIN \
                int conv = STRING_ITERATOR_GET(stringiter); \
                if (conv <= 0) { \
                        ret = -1; \
                } else { \
-                       bool esc = false; \
                        if (conv == '=') { \
-                               esc = true; \
                                conv = STRING_ITERATOR_GET(stringiter); \
                                conv -= 64; \
                        } \
@@ -45,24 +42,22 @@
                        conv -= 42; \
                        ret = conv; \
                } \
-       } MACRO_END
+       MACRO_END
 
-TEST(yEncDec)
+TEST(yEnc, EncodeDecode)
 {
        for (int i = 0; i <= 255; ++i)
        {
                int expect = i;
 
-               string fragment;
+               string fragment = string_null;
                yenc_single(expect, fragment);
 
-               int encdec;
+               int encdec = 0;
                STRING_ITERATOR(fragmentiterator, fragment, 0);
                ydec_single(fragmentiterator, encdec);
 
-               TEST_Check(encdec == expect);
+               EXPECT_EQ(expect, encdec);
        }
-       TEST_OK();
+       SUCCEED();
 }
-
-#endif