Ticket #8840: dsscalepatch.diff

backends/platform/ds/arm9/source/dsmain.cpp

@@ -213 +213 @@
 int gameHeight = 200;
 
 // Scale
-bool twoHundredPercentFixedScale = false;
+scaleSize fixedScaleSize = SCALESIZE_DYNAMIC;
 bool cpuScalerEnable = false;
 #define NUM_SUPPORTED_GAMES 20
 
@@ -481 +481 @@
         touchYOffset = y;
 }
 
-void set200PercentFixedScale(bool on) {
-        twoHundredPercentFixedScale = on;
+void setScaleSize(scaleSize size) {
+        fixedScaleSize = size;
 }
 
 void setUnscaledMode(bool enable) {
@@ -1854 +1854 @@
         int yCenter = subScTargetY + ((subScreenHeight >> 1) << 8);
 
         
-        if (twoHundredPercentFixedScale) {
+        if (fixedScaleSize == SCALESIZE_FIXED100) {
+                subScreenWidth = 256;
+                subScreenHeight = 192;
+        } else if (fixedScaleSize == SCALESIZE_FIXED200) {
                 subScreenWidth = 256 >> 1;
                 subScreenHeight = 192 >> 1;
         } else {

backends/platform/ds/arm9/source/dsmain.h

@@ -30 +30 @@
 
 namespace DS {
 
+enum scaleSize {
+        SCALESIZE_DYNAMIC = 0, SCALESIZE_FIXED100, SCALESIZE_FIXED200, SCALESIZE_NUM_MODES
+};
 
 enum controlType {
         CONT_SCUMM_ORIGINAL,
@@ -80 +83 @@
 
 void    setTalkPos(int x, int y);
 void    setTopScreenTarget(int x, int y);
-void    set200PercentFixedScale(bool on);
+void    setScaleSize(scaleSize size);
 
 // Timers
 void    setTimerCallback(OSystem_DS::TimerProc proc, int interval);             // Setup a callback function at a regular interval

backends/platform/ds/arm9/source/dsoptions.cpp

@@ -54 +54 @@
 
         new GUI::StaticTextWidget(this, 90, 10, 130, 15, "ScummVM DS Options", GUI::kTextAlignCenter);
 
-        _leftHandedCheckbox = new GUI::CheckboxWidget(this, 5, 70, 130, 20, "Left handed mode", 0, 'L');
+        _leftHandedCheckbox = new GUI::CheckboxWidget(this, 5, 85, 130, 20, "Left handed mode", 0, 'L');
         _indyFightCheckbox = new GUI::CheckboxWidget(this, 5, 40, 200, 20, "Indy fighting controls", 0, 'I');
-        _twoHundredPercentCheckbox = new GUI::CheckboxWidget(this, 5, 55, 230, 20, "Zoomed screen at fixed 200% zoom", 0, 'T');
+
+        _dynamicZoomCheckbox = new GUI::CheckboxWidget(this, 5, 55, 100, 20, "Dynamic Zoom", 0x20000003, 'T');
+        _oneHundredPercentCheckbox = new GUI::CheckboxWidget(this, 105, 55, 90, 20, "Zoom 100%", 0x20000001, 'T');
+        _twoHundredPercentCheckbox = new GUI::CheckboxWidget(this, 195, 55, 90, 20, "Zoom 200%", 0x20000002, 'T');
+
         _highQualityAudioCheckbox = new GUI::CheckboxWidget(this, 5, 25, 250, 20, "High quality audio (slower) (reboot)", 0, 'T');
-        _disablePowerOff = new GUI::CheckboxWidget(this, 5, 85, 130, 20, "Disable power off", 0, 'T');
-        _showCursorCheckbox = new GUI::CheckboxWidget(this, 5, 100, 130, 20, "Show mouse cursor", 0, 'T');
+        _disablePowerOff = new GUI::CheckboxWidget(this, 5, 100, 130, 20, "Disable power off", 0, 'T');
+        _showCursorCheckbox = new GUI::CheckboxWidget(this, 5, 130, 130, 20, "Show mouse cursor", 0, 'T');
 
 //#ifdef ALLOW_CPU_SCALER
 //      _cpuScaler = new GUI::CheckboxWidget(this, 160, 115, 90, 20, "CPU scaler", 0, 'T');
@@ -125 +129 @@
                 _unscaledCheckbox->setState(false);
         }
 
-        if (ConfMan.hasKey("twohundredpercent", "ds")) {
-                _twoHundredPercentCheckbox->setState(ConfMan.getBool("twohundredpercent", "ds"));
+        if (ConfMan.hasKey("scalesize", "ds")) {
+                int scalesize = ConfMan.getInt("scalesize", "ds");
+                _twoHundredPercentCheckbox->setState(scalesize == (int)SCALESIZE_FIXED200);
+                _oneHundredPercentCheckbox->setState(scalesize == (int)SCALESIZE_FIXED100);
+                _dynamicZoomCheckbox->setState((scalesize != (int)SCALESIZE_FIXED100)&&(scalesize != (int)SCALESIZE_FIXED200));
         } else {
                 _twoHundredPercentCheckbox->setState(false);
+                _oneHundredPercentCheckbox->setState(false);
+                _dynamicZoomCheckbox->setState(true);
         }
 
         if (ConfMan.hasKey("22khzaudio", "ds")) {
@@ -180 +189 @@
 void DSOptionsDialog::updateConfigManager() {
         ConfMan.setBool("lefthanded", _leftHandedCheckbox->getState(), "ds");
         ConfMan.setBool("unscaled", _unscaledCheckbox->getState(), "ds");
-        ConfMan.setBool("twohundredpercent", _twoHundredPercentCheckbox->getState(), "ds");
+
+        if (_twoHundredPercentCheckbox->getState()) {
+                ConfMan.setInt("scalesize", (int)SCALESIZE_FIXED200, "ds");
+        } else if (_oneHundredPercentCheckbox->getState()) {
+                ConfMan.setInt("scalesize", (int)SCALESIZE_FIXED100, "ds");
+        } else {
+                ConfMan.setInt("scalesize", (int)SCALESIZE_DYNAMIC, "ds");
+        }
+
         ConfMan.setBool("22khzaudio", _highQualityAudioCheckbox->getState(), "ds");
         ConfMan.setBool("disablepoweroff", _disablePowerOff->getState(), "ds");
 #ifdef ALLOW_CPU_SCALER
@@ -222 +239 @@
                                 _unscaledCheckbox->setState(true);
                         }
                 }
+                else if ((cmd & 0xFF000000) == 0x20000000)
+                {
+                        _dynamicZoomCheckbox->setState((sender == _dynamicZoomCheckbox) && (cmd == 0x20000003));
+                        _oneHundredPercentCheckbox->setState((sender == _oneHundredPercentCheckbox) && (cmd == 0x20000001));
+                        _twoHundredPercentCheckbox->setState((sender == _twoHundredPercentCheckbox) && (cmd == 0x20000002));
+                }
 
                 guard = false;
 
@@ -327 +350 @@
                 DS::setUnscaledMode(false);
         }
 
-        if (ConfMan.hasKey("twohundredpercent", "ds")) {
-                DS::set200PercentFixedScale(ConfMan.getBool("twohundredpercent", "ds"));
+        if (ConfMan.hasKey("scalesize", "ds")) {
+                DS::setScaleSize((scaleSize)ConfMan.getInt("scalesize", "ds"));
         } else {
-                DS::set200PercentFixedScale(false);
+                DS::setScaleSize(SCALESIZE_DYNAMIC);
         }
 
         if (ConfMan.hasKey("xoffset", "ds")) {

backends/platform/ds/arm9/source/dsoptions.h

@@ -50 +50 @@
         GUI::CheckboxWidget* _leftHandedCheckbox;
         GUI::CheckboxWidget* _unscaledCheckbox;
         GUI::CheckboxWidget* _twoHundredPercentCheckbox;
+        GUI::CheckboxWidget* _oneHundredPercentCheckbox;
+        GUI::CheckboxWidget* _dynamicZoomCheckbox;
         GUI::CheckboxWidget* _indyFightCheckbox;
         GUI::CheckboxWidget* _highQualityAudioCheckbox;
         GUI::CheckboxWidget* _disablePowerOff;