serum flags changed

PPUC · May 19, 2024 · 12f018c · 12f018c
1 parent 082a29f
commit 12f018c
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
+LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
+LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
+LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/linux/x64/external.sh b/platforms/linux/x64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
+LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/macos/arm64/external.sh b/platforms/macos/arm64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
+LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/macos/x64/external.sh b/platforms/macos/x64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
+LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
+LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/win/x64/external.sh b/platforms/win/x64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
+LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/win/x86/external.sh b/platforms/win/x86/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=ba3868fc3723f1179205f4ee6ff78fdc58fd2d2b
+LIBSERUM_SHA=ff0250e525fb2900262cef61366b40699b73f51c
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/src/DMD.cpp b/src/DMD.cpp
@@ -772,7 +772,7 @@ void DMD::SerumThread()
             dmdUpdate.hasSegData = false;
             dmdUpdate.hasSegData2 = false;
 
-            if (m_pSerum->flags & 4)
+            if (m_pSerum->flags == 0)
             {
               dmdUpdate.mode = Mode::SerumV1;
               dmdUpdate.depth = 6;
@@ -785,7 +785,7 @@ void DMD::SerumThread()
 
               QueueUpdate(dmdUpdate, false);
             }
-            else if ((m_pSerum->flags & 1) && !(m_pSerum->flags & 2))
+            else if ((m_pSerum->flags & FLAG_RETURNED_32P_FRAME_OK) && !(m_pSerum->flags & FLAG_RETURNED_64P_FRAME_OK))
             {
               dmdUpdate.mode = Mode::SerumV2_32;
               dmdUpdate.depth = 24;
@@ -795,7 +795,7 @@ void DMD::SerumThread()
 
               QueueUpdate(dmdUpdate, false);
             }
-            else if (!(m_pSerum->flags & 1) && (m_pSerum->flags & 2))
+            else if (!(m_pSerum->flags & FLAG_RETURNED_32P_FRAME_OK) && (m_pSerum->flags & FLAG_RETURNED_64P_FRAME_OK))
             {
               dmdUpdate.mode = Mode::SerumV2_64;
               dmdUpdate.depth = 24;
@@ -805,7 +805,7 @@ void DMD::SerumThread()
 
               QueueUpdate(dmdUpdate, false);
             }
-            else if ((m_pSerum->flags & 1) && (m_pSerum->flags & 2))
+            else if ((m_pSerum->flags & FLAG_RETURNED_32P_FRAME_OK) && (m_pSerum->flags & FLAG_RETURNED_64P_FRAME_OK))
             {
               dmdUpdate.mode = Mode::SerumV2_32_64;
               dmdUpdate.depth = 24;