Merge pull request #159 from p2000t/develop

merging develop to main for v0.9.2
p2000t · Jun 4, 2024 · 165adbb · 165adbb
2 parents ed48b30 + b7ae2b6
commit 165adbb
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 21 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -22,7 +22,7 @@
             ],
             "group": {
                 "kind": "build",
-                //"isDefault": true
+                "isDefault": true
             },
             "problemMatcher": []
         },
@@ -68,7 +68,7 @@
             ],
             "group": {
                 "kind": "build",
-                "isDefault": true
+                //"isDefault": true
             },
             "problemMatcher": []
         }

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # M2000 - Philips P2000T Home Computer Emulator
-Version 0.9.1
+Version 0.9.2
 
 ![P2000T](/img/P2000T.png)
 

diff --git a/package/M2000.app/Contents/Info.plist b/package/M2000.app/Contents/Info.plist
@@ -11,7 +11,7 @@
   <key>CFBundleName</key>
     <string>M2000</string>
   <key>CFBundleShortVersionString</key>
-    <string>0.9</string>
+    <string>0.9.2</string>
   <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
   <key>CFBundlePackageType</key>

diff --git a/package/M2000_amd64/DEBIAN/control b/package/M2000_amd64/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: M2000
-Version: 0.9
+Version: 0.9.2
 Maintainer: M2000 team
 Architecture: amd64
 Depends: liballegro5.2 (>=5.2.7), liballegro-dialog5.2 (>=5.2.7), liballegro-audio5.2 (>=5.2.7), liballegro-image5.2 (>=5.2.7)

diff --git a/package/WiX/product.wxs b/package/WiX/product.wxs
@@ -10,9 +10,9 @@
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-   <Product Id="*" UpgradeCode="50c2a4d4-747d-4ee1-8aa5-cca780d1f543"
+   <Product Id="*" UpgradeCode="50c2a4d4-747d-4ee1-8aa5-cca780d1f544"
             Name="M2000"
-            Version="0.9.0"
+            Version="0.9.2"
             Manufacturer="M2000"
             Language="1033">
 
@@ -23,16 +23,16 @@
       <Icon Id="P2000T.ico" SourceFile="P2000T.ico"/>
       <Property Id="ARPPRODUCTICON" Value="P2000T.ico" />
 
-      <Upgrade Id="50c2a4d4-747d-4ee1-8aa5-cca780d1f543">
-         <UpgradeVersion Minimum="0.9.0" OnlyDetect="yes" Property="NEWERVERSIONDETECTED"/>
-         <UpgradeVersion Minimum="0.0.0" Maximum="0.9.0" IncludeMinimum="yes" IncludeMaximum="no" Property="OLDERVERSIONBEINGUPGRADED"/>
+      <Upgrade Id="50c2a4d4-747d-4ee1-8aa5-cca780d1f544">
+         <UpgradeVersion Minimum="0.9.2" OnlyDetect="yes" Property="NEWERVERSIONDETECTED"/>
+         <UpgradeVersion Minimum="0.0.0" Maximum="0.9.2" IncludeMinimum="yes" IncludeMaximum="no" Property="OLDERVERSIONBEINGUPGRADED"/>
       </Upgrade>
       <Condition Message="A newer version of this software is already installed.">NOT NEWERVERSIONDETECTED</Condition>
 
       <Directory Id="TARGETDIR" Name="SourceDir">
          <Directory Id="$(var.Program_Files)">
             <Directory Id="INSTALLDIR" Name="M2000">
-               <Component Id="ApplicationFiles" Guid="e5d50ebc-5354-45a1-8438-f0f51d5855e0">
+               <Component Id="ApplicationFiles" Guid="e5d50ebc-5354-45a1-8438-f0f51d5855e1">
                   <File Id="M2000.exe"           Source="..\..\M2000.exe" />
                   <File Id="cassette_blue.ico"   Source="cassette_blue.ico" />
                   <File Id="cassette_red.ico"    Source="cassette_red.ico" />
@@ -73,7 +73,7 @@
          </Directory>
          <Directory Id="ProgramMenuFolder">
             <Directory Id="ProgramMenuSubfolder" Name="M2000">
-               <Component Id="ApplicationShortcuts" Guid="973ec9a1-1d88-4c2c-bce5-413742fcf782">
+               <Component Id="ApplicationShortcuts" Guid="973ec9a1-1d88-4c2c-bce5-413742fcf783">
                   <Shortcut Id="ApplicationShortcut0"
                         Name="M2000 - Philips P2000 Emulator"
                         Description="M2000 - portable Philips P2000 Emulator"

diff --git a/src/P2000.c b/src/P2000.c
@@ -769,9 +769,9 @@ void RefreshScreen_T(void)
        reveal display */
     fg = 7;
     bg = 0;
-    si = 0;
+    si = 0; // superimpose
     gr = 0;
-    fl = 0;
+    fl = 0; // flashing
     cg = 1;
     hg = 0;
     conceal = 0;
@@ -831,14 +831,10 @@ void RefreshScreen_T(void)
           break;
         /* Normal height */
         case 0x0c:
-          if (si)
-            hg = 0;
           si = 0;
           break;
         /* Double height */
         case 0x0d:
-          if (!si)
-            hg = 0;
           si = 1;
           if (!found_si)
             found_si = 1;

diff --git a/src/P2000.h b/src/P2000.h
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "Z80.h"            /* Z80 emulation declarations    */
 
-#define EMULATOR_VERSION "0.9.1-develop"
+#define EMULATOR_VERSION "0.9.2"
 
 #if defined(_WIN32) // Windows
 #define PATH_SEPARATOR '\\'

diff --git a/src/libretro/info/m2000_libretro.info b/src/libretro/info/m2000_libretro.info
@@ -5,7 +5,7 @@ supported_extensions = "cas|p2000t"
 corename = "M2000"
 license = "GPLv3"
 permissions = ""
-display_version = "0.9.1"
+display_version = "0.9.2"
 categories = "Emulator"
 
 # Hardware Information

diff --git a/src/libretro/m2000_libretro.c b/src/libretro/m2000_libretro.c
@@ -470,7 +470,7 @@ void retro_get_system_info(struct retro_system_info *info)
 {
    memset(info, 0, sizeof(*info));
    info->library_name     = "M2000";
-   info->library_version  = "v0.9.1";
+   info->library_version  = "v0.9.2";
    info->need_fullpath    = true;
    info->valid_extensions = "cas|p2000t";
 }