Ticket #9019: 16bit_step2.patch

dists/msvc8/scumm.vcproj

@@ -1 +1 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
         ProjectType="Visual C++"
-        Version="8,00"
+        Version="8.00"
         Name="scumm"
         ProjectGUID="{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
         RootNamespace="scumm"
@@ -43 +43 @@
                                 Optimization="0"
                                 InlineFunctionExpansion="0"
                                 AdditionalIncludeDirectories="../../;../../engines"
-                                PreprocessorDefinitions="WIN32;_DEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB;USE_MAD;USE_VORBIS"
+                                PreprocessorDefinitions="WIN32;_DEBUG;ENABLE_SCUMM_7_8;ENABLE_HE;USE_ZLIB;USE_MAD;USE_VORBIS; ENABLE_16BIT"
                                 MinimalRebuild="true"
                                 ExceptionHandling="1"
                                 BasicRuntimeChecks="3"

engines/scumm/he/cup_player_he.cpp

@@ -69 +69 @@
                         _sfxQueuePos = 0;
                         _lastSfxChannel = -1;
 
+#ifdef ENABLE_16BIT
+                        _offscreenBuffer = (uint8 *)malloc(_width * _height * 2);
+                        memset(_offscreenBuffer, 0, _width * _height * 2);
+#else
                         _offscreenBuffer = (uint8 *)malloc(_width * _height);
                         memset(_offscreenBuffer, 0, _width * _height);
+#endif
 
                         opened = true;
                 }
@@ -91 +96 @@
 }
 
 void CUP_Player::play() {
+#ifdef ENABLE_16BIT
+        while (!_vm->shouldQuit()) {
+
+                for (int16 y = 0; y < _height; y++) {
+                        uint8 *dst = _offscreenBuffer + (y * _width * 2);
+                        for (int16 x = 0; x < _width; x++) {
+                                uint16 color = (x * y) & 0xFFFF;
+                                *dst++ = color & 0xFF;
+                                *dst++ = color >> 8;
+                        }
+                }
+                Common::Rect r;
+                r.top = 0;
+                r.left = 0;
+                r.bottom = _height - 1;
+                r.right = _width - 1;
+                copyRectToScreen(r);
+                updateScreen();
+        }
+#else
         while (parseNextHeaderTag(_fileStream)) {
                 if (_fileStream.ioFailed()) {
                         return;
@@ -116 +141 @@
                 _vm->parseEvents();
                 ticks = _system->getMillis();
         }
+        #endif
 }
 
 void CUP_Player::copyRectToScreen(const Common::Rect &r) {
         const uint8 *src = _offscreenBuffer + r.top * _width + r.left;
+#ifdef ENABLE_16BIT
+        _system->copyRectToScreen(src, _width * 2, r.left, r.top, r.width() + 1, r.height() + 1);
+#else
         _system->copyRectToScreen(src, _width, r.left, r.top, r.width() + 1, r.height() + 1);
+#endif  
 }
 
 void CUP_Player::updateScreen() {