Merge pull request #92 from fassisrosa/feature/win-2-0-42

Changes for Win32 build support (build 2.0.42)
ChilliHugger · Mar 29, 2022 · aa8de12 · aa8de12
2 parents 2b40a6d + 6ac6dfa
commit aa8de12
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/main/midnight/build.win32/midnight/installer/lords_of_midnight.vdproj b/main/midnight/build.win32/midnight/installer/lords_of_midnight.vdproj
@@ -7116,15 +7116,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Lords of Midnight"
-        "ProductCode" = "8:{5BFD2634-B0E3-4235-91BE-D3AC713F6A23}"
-        "PackageCode" = "8:{DF949C39-4054-4C66-BCD5-1EA648EE79C3}"
+        "ProductCode" = "8:{BCE65476-949A-4DD7-A89F-611686D69267}"
+        "PackageCode" = "8:{F5355842-44F0-4295-BEF0-58CD19DB564D}"
         "UpgradeCode" = "8:{50C10DF9-F125-49C5-948D-A546D0DB5861}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:2.0.36"
+        "ProductVersion" = "8:2.0.42"
         "Manufacturer" = "8:Chilli Hugger Software Ltd"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

diff --git a/main/midnight/build.win32/revenge/installer/doomdarks_revenge.vdproj b/main/midnight/build.win32/revenge/installer/doomdarks_revenge.vdproj
@@ -4286,15 +4286,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Doomdark's Revenge"
-        "ProductCode" = "8:{DBDB96E6-EC72-4FEA-A7A6-268F4A69D0F5}"
-        "PackageCode" = "8:{BF002BD7-733B-49B6-9C2B-B529BA579D5C}"
+        "ProductCode" = "8:{C0819A71-CA81-4CBB-AA94-A1F4743E7D4F}"
+        "PackageCode" = "8:{AD53F8FD-96A6-48DA-9808-05D840A8C70B}"
         "UpgradeCode" = "8:{775E658D-8EC9-46F1-A4DE-A554CDE21F51}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:2.0.36"
+        "ProductVersion" = "8:2.0.42"
         "Manufacturer" = "8:Chilli Hugger Software Ltd"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

diff --git a/main/midnight/src/panels/panel_look.cpp b/main/midnight/src/panels/panel_look.cpp
@@ -1630,13 +1630,13 @@ void panel_look::OnStopDrag(uidragevent* event)
 
     // GESTURE Move Forward
     if( allowDragDownMove()) {
-        if( abs(dx) < 0.01 and dy > MINIMUM_VERTICAL_DRAG_GESTURE) {
+        if( abs(dx) < 0.01 && dy > MINIMUM_VERTICAL_DRAG_GESTURE) {
             moveForward();
         }
     }
 
     // GESTURE Show map
-    if( abs(dx) < 0.01 and dy < -MINIMUM_VERTICAL_DRAG_GESTURE) {
+    if( abs(dx) < 0.01 && dy < -MINIMUM_VERTICAL_DRAG_GESTURE) {
         mr->panels->showMap();
     }
 

diff --git a/main/midnight/src/ui/uipanel.cpp b/main/midnight/src/ui/uipanel.cpp
@@ -500,6 +500,7 @@ void uipanel::setCursor(MOUSE_CURSOR cursor)
 
 bool uipanel::OnMouseMove( Vec2 pos )
 {
+    return true;
 }
 
 Node* uipanel::childFromPoint( Node* node, Vec2 pos )
-Original file line number
+Diff line change
@@ Expand Up / @@ -500,6 +500,7 @@ void uipanel::setCursor(MOUSE_CURSOR cursor) @@
     bool uipanel::OnMouseMove( Vec2 pos )
     {
+        return true;
     }
     Node* uipanel::childFromPoint( Node* node, Vec2 pos )
@@ Expand Down @@