Merge branch 'primary' of https://github.com/WalterBarrett/Mocha-Conquer

into primary
WalterBarrett · Mar 26, 2024 · 575ae61 · 575ae61
2 parents b0d3cef + 4cc46e1
commit 575ae61
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/common/vqatask.cpp b/common/vqatask.cpp
@@ -117,7 +117,7 @@ VQAErrorType VQA_Play(VQAHandle* handle, VQAPlayMode mode)
             }
 
             if (data->Flags & VQA_DATA_FLAG_VIDEO_MEMORY_SET) {
-                ++VQAMovieDone;
+                VQAMovieDone = true;
             } else {
                 rc = (VQAErrorType)VQA_LoadFrame(handle);
 

diff --git a/redalert/ending.cpp b/redalert/ending.cpp
@@ -105,7 +105,7 @@ void Nod_Ending(void)
     bool printedtext = false;
     while (!done) {
         if (!printedtext && !Is_Sample_Playing(kanefinl)) {
-            printedtext++;
+            printedtext = true;
             Alloc_Object(new ScorePrintClass(Text_String(TXT_SEL_TARGET), 0, 180, _tanpal));
             mouseshown = true;
             Show_Mouse();

diff --git a/tiberiandawn/ending.cpp b/tiberiandawn/ending.cpp
@@ -159,7 +159,7 @@ void Nod_Ending(void)
     bool printedtext = false;
     while (!done) {
         if (!printedtext && !Is_Sample_Playing(kanefinl)) {
-            printedtext++;
+            printedtext = true;
             Alloc_Object(new ScorePrintClass(Text_String(TXT_SEL_TARGET), 0, 180, _tanpal));
             mouseshown = true;
             Show_Mouse();
@@ -177,7 +177,7 @@ void Nod_Ending(void)
                     int mousex = Keyboard->MouseQX;
                     int mousey = Keyboard->MouseQY;
                     if (mousey >= 22 * factor && mousey <= 177 * factor) {
-                        done++;
+                        done = true;
                         if (mousex < 160 * factor && mousey < 100 * factor)
                             selection = 2;
                         if (mousex < 160 * factor && mousey >= 100 * factor)