Ticket #8199: sky-mutex.diff

scummvm/sky/intro.cpp

@@ -277 +277 @@
 
 void SkyState::showScreen(void) {
         
+        _system->lock_mutex(_mutex);    
         _system->copy_rect(_workScreen, 320, 0, 0, 320, 200);
         _system->update_screen();
+        _system->unlock_mutex(_mutex);
 }
 
 void prepare_text(void)

scummvm/sky/screen.cpp

@@ -110 +110 @@
                 do {
                         palette_fadedown_helper((uint32 *)_palette, 256);
                         _system->set_palette(_palette, 0, 256);
+                        _system->lock_mutex(_mutex);
                         _system->update_screen();
+                        _system->unlock_mutex(_mutex);
                         delay(10);
                         
                 } while (--i);
@@ -152 +154 @@
 
                 palette_fadeup_helper((uint32 *)_palette, (uint32 *)tmpPal, 256);
                 _system->set_palette(_palette, 0, 256);
+                _system->lock_mutex(_mutex);
                 _system->update_screen();
+                _system->unlock_mutex(_mutex);
                 delay(10);      
         } while (--i);
         

scummvm/sky/sky.cpp

@@ -51 +51 @@
 SkyState::SkyState(GameDetector *detector, OSystem *syst)
         : Engine(detector, syst) {
         
+        _mutex = _system->create_mutex();
         _game = detector->_gameId;
 
         if (!_mixer->bindToSystem(syst))
@@ -65 +66 @@
 
 SkyState::~SkyState() {
         
+        if (_mutex)
+                _system->delete_mutex(_mutex);
 }
 
 void SkyState::errorString(const char *buf1, char *buf2) {
@@ -146 +149 @@
         _rnd.getRandomNumber(2);
 
         do {
-                while (_system->poll_event(&event)) {
+                while (1) {
+                        bool result;
+
+                        _system->lock_mutex(_mutex);
+                        result = _system->poll_event(&event);
+                        _system->unlock_mutex(_mutex);
+
+                        if (!result)
+                                break;
+
                         switch (event.event_code) {
                                 case OSystem::EVENT_KEYDOWN:
                                         // Make sure backspace works right (this fixes a small issue on OS X)

scummvm/sky/sky.h

@@ -118 +118 @@
 
         RandomSource _rnd;
         SkyText *_skyText;
+
+private:
+        void *_mutex;
 };
 
 #endif