Ticket #12601: space-ship-puzzle-fuzzy-logic-ver2.diff

engines/mohawk/myst_stacks/myst.cpp

@@ -2292 +2292 @@
         return (uint16)(9530 + (pos - 216) * 35.0 / 61.0);
 }
 
+
+uint16 Myst::rocketCheckSolutionLogicHelper(uint16 sound1, uint16 sound2, uint16 logictype) {
+
+        debugN("helper: %i %i %i (diff:%02i) ",sound1, sound2 , logictype, abs(sound1-sound2));
+        if (logictype==0) {
+
+                if (sound1 != sound2) {
+                        debugN("strict : false \n");
+                        return false;
+                }
+
+        } else {
+
+               if ( abs(sound1-sound2)>=5) {
+                        debugN(" fuzzy : false \n");
+                        return false;
+                }
+
+        }
+
+        debugN("either : true \n");
+        return true;
+
+}
+
 void Myst::rocketCheckSolution() {
         _vm->_cursor->hideCursor();
 
@@ -2302 +2327 @@
         _vm->_sound->playEffect(soundId);
         _rocketSlider1->drawConditionalDataToScreen(2);
         _vm->wait(250);
-        if (soundId != 9558)
+        if ( !rocketCheckSolutionLogicHelper(soundId,9558,0) )
                 solved = false;
 
         soundId = rocketSliderGetSound(_rocketSlider2->_pos.y);
         _vm->_sound->playEffect(soundId);
         _rocketSlider2->drawConditionalDataToScreen(2);
         _vm->wait(250);
-        if (soundId != 9546)
+        if ( !rocketCheckSolutionLogicHelper(soundId,9546,1) )
                 solved = false;
 
         soundId = rocketSliderGetSound(_rocketSlider3->_pos.y);
         _vm->_sound->playEffect(soundId);
         _rocketSlider3->drawConditionalDataToScreen(2);
         _vm->wait(250);
-        if (soundId != 9543)
+        if ( !rocketCheckSolutionLogicHelper(soundId,9543,1) )
                 solved = false;
 
         soundId = rocketSliderGetSound(_rocketSlider4->_pos.y);
         _vm->_sound->playEffect(soundId);
         _rocketSlider4->drawConditionalDataToScreen(2);
         _vm->wait(250);
-        if (soundId != 9553)
+        if ( !rocketCheckSolutionLogicHelper(soundId,9553,1) )
                 solved = false;
 
         soundId = rocketSliderGetSound(_rocketSlider5->_pos.y);
         _vm->_sound->playEffect(soundId);
         _rocketSlider5->drawConditionalDataToScreen(2);
         _vm->wait(250);
-        if (soundId != 9560)
+        if ( !rocketCheckSolutionLogicHelper(soundId,9560,1) )
                 solved = false;
 
         _vm->_sound->stopEffect();

engines/mohawk/myst_stacks/myst.h

@@ -312 +312 @@
 
         void rocketSliderMove();
         uint16 rocketSliderGetSound(uint16 pos);
+        uint16 rocketCheckSolutionLogicHelper(uint16 sound1, uint16 sound2, uint16 logictype);
         void rocketCheckSolution();
 
         void libraryBookPageTurnLeft();