Added support for locating the game in GOG library and copying music …

…from there.
hamu77 · Jun 11, 2019 · 50f7b94 · 50f7b94
1 parent 362a3ad
commit 50f7b94
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/setup/setup.nsi b/setup/setup.nsi
@@ -98,6 +98,7 @@ Section /o "Quake II Full Game" Section_FullGame
 
 	CopyFiles "$FullGameDir\baseq2\pak*.pak" "$INSTDIR\baseq2"
 	CopyFiles "$FullGameDir\baseq2\players" "$INSTDIR\baseq2"
+	CopyFiles "$FullGameDir\music" "$INSTDIR\music"
 
 SectionEnd
 

diff --git a/setup/setup_gamefiles.nsh b/setup/setup_gamefiles.nsh
@@ -4,12 +4,23 @@ Function FullGamePage_Pre
     	Abort
 	${EndIf}
 
+	Var /GLOBAL GogDir
 	Var /GLOBAL BethesdaDir
 	Var /GLOBAL SteamDir
 	Var /GLOBAL CurLine
 	Var /GLOBAL FileHandle
 	Var /GLOBAL CharIndex
 
+	; try to find Quake 2 in the GOG library - this is the most complete version
+	ReadRegStr $GogDir HKLM "SOFTWARE\WOW6432Node\GOG.com\Games\1441704824" "PATH"
+	${IfNot} ${Errors}
+		StrCpy $FullGameDir "$GogDir"
+		IfFileExists "$FullGameDir\quake2.exe" SearchDone
+
+		; not found - clear the variable
+		StrCpy $FullGameDir ""
+	${EndIf}
+
 	; try to find Quake 2 in the Bethesda library
 	ReadRegStr $BethesdaDir HKLM "SOFTWARE\Bethesda Softworks\Bethesda.net" "installLocation"
 	${IfNot} ${Errors}

diff --git a/setup/steam_setup.nsi b/setup/steam_setup.nsi
@@ -48,6 +48,7 @@ Section /o "Quake II Full Game" Section_FullGame
 
 	CopyFiles "$FullGameDir\baseq2\pak*.pak" "$INSTDIR\baseq2"
 	CopyFiles "$FullGameDir\baseq2\players" "$INSTDIR\baseq2"
+	CopyFiles "$FullGameDir\music" "$INSTDIR\music"
 
 SectionEnd