diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 20155b3..77d7775 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -185,9 +185,7 @@ custom_launch_parameters() { popd exit 0 fi - if [[ "${game[0]}" == "executioner's-rage" ]]; then - find "${WINEPREFIX}/drive_c/Program Files" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; - fi + # executioner's-rage: DLL replacement now handled by update_nvda_dlls() if [[ "${game[0]}" == "laser-breakout" ]]; then "${0%/*}/speech/speak_window_title.sh" play.exe & fi @@ -202,11 +200,7 @@ custom_launch_parameters() { if [[ -r "${cache}/bk3-dict.dat" ]] && [[ ! -d "${dictPath}/dict" ]]; then cp "${cache}/bk3-dict.dat" "${dictPath}/dict.dat" fi - if [[ -d "${dictPath}/dict" ]]; then - if [[ ! -e "${dictPath}/data/nvdaControllerClient.dll" ]]; then - cp "${cache}/nvda2speechd32.dll" "${dictPath}/data/nvdaControllerClient.dll" - fi - fi + # DLL replacement now handled by update_nvda_dlls() if [[ ! -d "${dictPath}/dict" ]] && [[ ! -r "${cache}/bk3-dict.dat" ]]; then find "${WINEPREFIX}/drive_c/nyanchangame/bk3" -type f -name 'nvdaControllerClient.dll' -exec rm -v "{}" \; "${0%/*}/speech/clipboard_translator.sh" play.exe bokurano-daibouken3 & @@ -225,9 +219,7 @@ custom_launch_parameters() { #find "${WINEPREFIX}/drive_c/" -type f -name 'nvdaControllerClient.dll' -exec rm -v "{}" \; #"${0%/*}/speech/clipboard_translator.sh" play_sr.exe shadow-line & #fi - if [[ "${game[0]}" == "sketchbook" ]]; then - find "${WINEPREFIX}" -type f -name 'nvdaControllerClient32.dll' -exec cp -v "${cache}/nvdaControllerClient32.dll" "{}" \; - fi + # sketchbook: DLL replacement now handled by update_nvda_dlls() if [[ "${game[0]}" == "audiodisc" ]]; then wine "$winePath\\$wineExec" exit 0 @@ -469,15 +461,7 @@ unset version export ipfsGateway="${ipfsGateway:-https://ipfs.stormux.org}" export nvdaControllerClientDll="${ipfsGateway}/ipfs/QmWu7YdSbKMk1Qm5DKvEA5hk1YuAK8wVkwhDf2CsmPkmF1?filename=nvdaControllerClient32.dll" -# Start nvda2speechd server - pgrep -u "$USER" nvda2speechd &> /dev/null || { - if [[ ! -f "${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd" ]]; then - download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd" - cp "${cache}/nvda2speechd" "${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd" - chmod +x "${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd" - fi - "${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd" ; -} +# nvda2speechd server startup is now handled in game_launcher() # Source helper functions