From ccbe475156479bb7e19fb37a39ebf2ccfbff5d46 Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Thu, 22 Dec 2022 06:59:42 -0800
Subject: [PATCH] Hopefully have three d velocity working. Please test!

---
 audiogame-manager.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index f670aee..bd3edfd 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -540,7 +540,7 @@ install_wine_bottle() {
             { DISPLAY="" wineboot -u
             wine msiexec /i z:"$monoPath" /quiet
             wine msiexec /i z:"$geckoPath" /quiet
-            if [[ "${*}" =~ speechsdk ]]; then
+            if [[ "${*}" =~ (speechsdk|sapi) ]]; then
                 install_rhvoice
             fi
             if [[ "${WINEARCH}" == "win64" ]]; then
@@ -1064,7 +1064,7 @@ gameList=(
     "The Vale"
     "Thief"
     "Traders of Known Space"
-    #"Three D velocity"
+    "Three D velocity"
     "Tomb Hunter"
     "Top Speed 2"
     "Top Speed 3"
@@ -2719,13 +2719,16 @@ EOF
     ;;
     "Three D velocity")
         export winVer="win10"
-        install_wine_bottle  speechsdk faudio vcrun2008 ole32 oleaut32 gdiplus
+export WINEARCH=win64
+export norh=false # Must install a voice, and rhvoice works easily with 64 bit.
+        install_wine_bottle  sapi vcrun2008 gdiplus xact dotnet48 xna40
         # Dotnet is evil. That is all.
-        LC_ALL=C winetricks -q dotnet472 xna40
-        wineserver -k # Ha ha ha.
-        download "https://github.com/munawarb/Three-D-Velocity-Binaries/archive/master.zip" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient32.dll"
+#        LC_ALL=C winetricks -q dotnet48 
+#        wineserver -k # Ha ha ha.
+        download "https://github.com/munawarb/Three-D-Velocity-Binaries/archive/master.zip" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll"
         unzip -d "$WINEPREFIX/drive_c/Program Files" "${cache}/master.zip"
-        find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \;
+        find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvda2speechd32.dll" "{}" \;
+        find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \;
         add_launcher "c:\Program Files\Three-D-Velocity-Binaries-master\tdv.exe"
     ;;
     "Triple Triad")