Ticket #8574: scummvmds_090_branch.patch

C:/ndsdev/branch090/common/scummsys.h

@@ -355 +355 @@
         typedef unsigned long uint32_t;
         #endif
 
+#elif defined (__DS__) //NeilM
+
+        #define scumm_stricmp stricmp
+        #define scumm_strnicmp strnicmp
+
+        #define SCUMM_NEED_ALIGNMENT
+        #define SCUMM_LITTLE_ENDIAN 
+
+        #include "nds/jtypes.h"
+        #include <stdarg.h>
+        #include <ctype.h>
+        #include <string.h>
+        #include <math.h>
+    #include <time.h>
+
+        #define STRINGBUFLEN 256
+
 #else
 
         #error No system type defined

C:/ndsdev/branch090/common/system.h

@@ -440 +440 @@
          */
         virtual void setShakePos(int shakeOffset) = 0;
 
+        /**
+         * Sets the area of the screen that has the focus.  For example, when a character
+         * is speaking, they will have the focus.  Allows for pan-and-scan style views
+         * where the backend could follow the speaking character or area of interest on 
+         * the screen.
+         *
+         * The backend is responsible for clipping the rectangle and deciding how best to
+         * zoom the screen to show any shape and size rectangle the engine provides.
+         *
+         * @param rect A rectangle on the screen to be focused on
+         * @see clearFocusRectangle
+         */     
+        virtual void setFocusRectangle(const Common::Rect& rect) {}
+        
+        /**
+         * Clears the focus set by a call to setFocusRectangle().  This allows the engine
+         * to clear the focus during times when no particular area of the screen has the
+         * focus.
+         * @see setFocusRectangle
+         */
+        virtual void clearFocusRectangle() {}
+
+
         //@}
 
 

C:/ndsdev/branch090/engines/queen/display.cpp

@@ -851 +851 @@
         }
 }
 
+void Display::setFocusRect(const Common::Rect& rect) {
+        _system->setFocusRectangle(rect);
+}
+
 int Display::textCenterX(const char *text) const {
         return (GAME_SCREEN_WIDTH - textWidth(text)) / 2;
 }

C:/ndsdev/branch090/engines/queen/display.h

@@ -149 +149 @@
         //! change the text color for the specified texts list entry
         void textColor(uint16 y, uint8 color) { _texts[y].color = color; }
 
+        //! Set the focus rectangle to the speaking character
+        void setFocusRect(const Common::Rect& rect);
+
         int textCenterX(const char *text) const;
         uint16 textWidth(const char *text) const;
         uint16 textWidth(const char *text, uint16 len) const;

C:/ndsdev/branch090/engines/queen/talk.cpp

@@ -865 +865 @@
                 textY = bob->y;
         }
 
+        // Set the focus rectangle
+        // FIXME: This may not be correct!
+        BobFrame *pbf = _vm->bankMan()->fetchFrame(bob->frameNum);
+
+        int height = (pbf->height * bob->scale) / 100;
+        
+        Common::Rect focus(textX - 96, textY - height - 64, textX + 96, textY + height + 64);
+        _vm->display()->setFocusRect(focus);
+        
         //int SF = _vm->grid()->findScale(textX, textY);
 
         const SpeechParameters *parameters = NULL;

C:/ndsdev/branch090/engines/scumm/actor.cpp

@@ -22 +22 @@
  */
 
 #include "common/stdafx.h"
+#include "common/system.h"      // for setFocusRectangle/clearFocusRectangle
 #include "scumm/scumm.h"
 #include "scumm/actor.h"
 #include "scumm/akos.h"
@@ -845 +846 @@
 }
 
 void ScummEngine::setTalkingActor(int value) {
+
+        if (value == 255) {
+                _system->clearFocusRectangle();
+        } else {
+                // Work out the screen co-ordinates of the actor
+                int x = _actors[value]._pos.x - (camera._cur.x - (_screenWidth >> 1));
+                int y = _actors[value]._top - (camera._cur.y - (_screenHeight >> 1));
+                
+                // Set the focus area to the calculated position
+                // TODO: Make the size adjust depending on what it's focusing on.
+                Common::Rect rect(x - 96, y - 64, x + 96, y + 64);
+                _system->setFocusRectangle(rect);
+        }
+
         if (_game.id == GID_MANIAC && _game.version <= 1 && !(_game.platform == Common::kPlatformNES))
                 _V1TalkingActor = value;
         else

C:/ndsdev/branch090/engines/scumm/dialogs.cpp

@@ -43 +43 @@
 #include "sound/mididrv.h"
 #include "sound/mixer.h"
 
+#ifdef __DS__
+#include "scummhelp.h"
+#endif
+
 #ifndef DISABLE_HELP
 #include "scumm/help.h"
 #endif
@@ -710 +714 @@
 
         String titleStr, *keyStr, *dscStr;
 
+#ifndef __DS__
         ScummHelp::updateStrings(_game.id, _game.version, _game.platform, _page, titleStr, keyStr, dscStr);
+#else
+        // DS version has a different help screen
+        DS::updateStrings(_game.id, _game.version, _game.platform, _page, titleStr, keyStr, dscStr);
+#endif
 
         _title->setLabel(titleStr);
         for (int i = 0; i < HELP_NUM_LINES; i++) {

C:/ndsdev/branch090/engines/scumm/gfx.cpp

@@ -32 +32 @@
 #include "scumm/resource.h"
 #include "scumm/usage_bits.h"
 #include "scumm/he/wiz_he.h"
+#ifdef __DS__
+#include "blitters.h"
+#endif
 
 namespace Scumm {
 
@@ -543 +546 @@
         if (_game.version < 7) {
                 // Handle the text mask in older games; newer (V7/V8) games do not use it anymore.
                 const byte *text = (byte *)_charset->_textSurface.pixels + x + y * _charset->_textSurface.pitch;
-        
+
+#ifdef __DS__
+                DS::asmDrawStripToScreen(height, width, text, src, dst, vs->pitch, _screenWidth, _charset->_textSurface.pitch);
+#else   
+
                 // Compose the text over the game graphics
                 for (int h = 0; h < height; ++h) {
                         for (int w = 0; w < width; ++w) {
@@ -556 +563 @@
                         dst += _screenWidth;
                         text += _charset->_textSurface.pitch;
                 }
+#endif
+
         } else {
                 // Just do a simple blit in V7/V8 games.
                 blit(dst, _screenWidth, src, vs->pitch, width, height);
@@ -973 +982 @@
 }
 
 static void copy8Col(byte *dst, int dstPitch, const byte *src, int height) {
-        do {
+#ifndef __DS__
+do {
 #if defined(SCUMM_NEED_ALIGNMENT)
                 memcpy(dst, src, 8);
 #else
@@ -983 +993 @@
                 dst += dstPitch;
                 src += dstPitch;
         } while (--height);
+#else   
+        DS::asmCopy8Col(dst, dstPitch, src, height);
+#endif
 }
 
 static void clear8Col(byte *dst, int dstPitch, int height) {

C:/ndsdev/branch090/engines/scumm/thumbnail.cpp

@@ -104 +104 @@
 void ScummEngine::saveThumbnail(Common::OutSaveFile *file) {
         Graphics::Surface thumb;
 
-#ifndef PALMOS_68K
+#if !defined(PALMOS_68K) && !defined(__DS__)
         if (!createThumbnailFromScreen(&thumb))
 #endif
                 thumb.create(kThumbnailWidth, kThumbnailHeight2, sizeof(uint16));

C:/ndsdev/branch090/engines/simon/simon.cpp

@@ -491 +491 @@
                 _textIndexBase = 1500 / 4;
                 _numTextBoxes = 20;
                 _numVideoOpcodes = 75;
-#ifndef PALMOS_68K
+#if     defined(PALMOS_68K)
+                _vgaMemSize = gVars->memory[kMemSimon2Games];
+#elif defined(__DS__)
+                _vgaMemSize = 1450000;
+#else
                 _vgaMemSize = 2000000;
-#else
-                _vgaMemSize = gVars->memory[kMemSimon2Games];
 #endif
                 _tableMemSize = 100000;
                 // Check whether to use MT-32 MIDI tracks in Simon the Sorcerer 2

C:/ndsdev/branch090/engines/sky/logic.cpp

@@ -2511 +2511 @@
         bool speechFileFound = false;
         if (SkyEngine::isCDVersion())
                 speechFileFound = _skySound->startSpeech((uint16)textNum);
+        
+        // Calculate the point where the character is
+        int x = (((uint32) (target->xcood)) * GAME_SCREEN_WIDTH) >> 9;
+        int y = ((((uint32) (target->ycood)) * GAME_SCREEN_HEIGHT) >> 9);
 
+        // Set the focus region to that area
+        // TODO: Make the box size change based on the object that has the focus
+        Common::Rect rect(x - 96, y - 64, x + 96, y + 64);
+        _skyScreen->setFocusRectangle(rect);
+
         if ((SkyEngine::_systemVars.systemFlags & SF_ALLOW_TEXT) || !speechFileFound) {
                 // form the text sprite, if player wants subtitles or
                 // if we couldn't find the speech file

C:/ndsdev/branch090/engines/sky/screen.cpp

@@ -105 +105 @@
         _system->updateScreen();
 }
 
+void Screen::setFocusRectangle(const Common::Rect& rect) {
+        _system->setFocusRectangle(rect);
+}
+
 //set a new palette, pal is a pointer to dos vga rgb components 0..63
 void Screen::setPalette(uint8 *pal) {
 

C:/ndsdev/branch090/engines/sky/screen.h

@@ -88 +88 @@
 
         void paintBox(uint16 x, uint16 y);
         void showGrid(uint8 *gridBuf);
+        void setFocusRectangle(const Common::Rect& rect);
 
 private:
         OSystem *_system;

C:/ndsdev/branch090/gui/options.cpp

@@ -35 +35 @@
 #include "sound/mididrv.h"
 #include "sound/mixer.h"
 
-#if (!( defined(PALMOS_MODE) || defined(__DC__) || defined(__GP32__) || defined(__amigaos4__) ) && !defined(_MSC_VER))
+#if (!( defined(PALMOS_MODE) || defined(__DC__) || defined(__GP32__) || defined(__amigaos4__) || defined(__DS__) ) && !defined(_MSC_VER))
 #include <sys/param.h>
 #include <unistd.h>
 #endif

C:/ndsdev/branch090/sound/fmopl.cpp

@@ -35 +35 @@
 
 #include "common/util.h"
 
-#if defined (_WIN32_WCE) || defined (__SYMBIAN32__) || defined(PALMOS_MODE) || defined(__GP32__) || defined (__MAEMO__)
+#if defined (_WIN32_WCE) || defined (__SYMBIAN32__) || defined(PALMOS_MODE) || defined(__GP32__) || defined (__MAEMO__) || defined(__DS__)
 #include "common/config-manager.h"
 #endif
 
@@ -637 +637 @@
         /* allocate dynamic tables */
         if((TL_TABLE = (int *)malloc(TL_MAX * 2 * sizeof(int))) == NULL)
                 return 0;
+#ifdef __DS__
+        // On the DS, use fast RAM for the sine table, since it thrashes the cache otherwise
+        // Unfotunately, this doesn't stop OPL emulation from taking up far too much CPU time, but it helps a fair bit.
+        SIN_TABLE = ((int **) (0x37F8000));
+#else
         if((SIN_TABLE = (int **)malloc(SIN_ENT * 4 * sizeof(int *))) == NULL) {
                 free(TL_TABLE);
                 return 0;
         }
+#endif
         if((AMS_TABLE = (int *)malloc(AMS_ENT * 2 * sizeof(int))) == NULL) {
                 free(TL_TABLE);
                 free(SIN_TABLE);
@@ -1172 +1178 @@
         // We need to emulate one YM3812 chip
         int env_bits = FMOPL_ENV_BITS_HQ;
         int eg_ent = FMOPL_EG_ENT_HQ;
-#if defined (_WIN32_WCE) || defined(__SYMBIAN32__) || defined(PALMOS_MODE) || defined(__GP32__) || defined(__MAEMO__)
+#if defined (_WIN32_WCE) || defined(__SYMBIAN32__) || defined(PALMOS_MODE) || defined(__GP32__) || defined(__MAEMO__) || defined(__DS__)
         if (ConfMan.hasKey("FM_high_quality") && ConfMan.getBool("FM_high_quality")) {
                 env_bits = FMOPL_ENV_BITS_HQ;
                 eg_ent = FMOPL_EG_ENT_HQ;