diff --git a/CHANGELOG.md b/CHANGELOG.md index d082a93..80a6643 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * Removed now unnecessary workaround to stop mouse movement on the pause menu from changing in-game angles when unpausing * Fixed RPG being flagged as unusable while a rocket is loaded [#213](https://github.com/SamVanheer/halflife-updated/pull/213) (Thanks Toodles2You) * Have clients select weapons by ID, rather than by name [#217](https://github.com/SamVanheer/halflife-updated/pull/217) (Thanks Toodles2You) +* Copy delta.lst when building client or server to ensure mods have correct delta.lst file (Thanks P38TaKjYzY) ### Features diff --git a/filecopy.bat b/filecopy.bat index 510f21c..26ba0f7 100755 --- a/filecopy.bat +++ b/filecopy.bat @@ -1,4 +1,5 @@ @echo off +setlocal EnableDelayedExpansion rem Set this path to your mod directory. You can use environment variables to avoid hardcoding the path if your team members have different install locations. set mod_directory=C:/Program Files (x86)/Steam/steamapps/common/Half-Life/halflife_updated @@ -6,14 +7,21 @@ set mod_directory=C:/Program Files (x86)/Steam/steamapps/common/Half-Life/halfli rem Input paths may end with a backslash which will be interpreted as an escape character when passed into robocopy, so this needs to be escaped. set source=%~1 set source=%source:\=\\% -set destination=%mod_directory%/%~2 -set destination=%destination:\=\\% + +set destination=%mod_directory% + +if NOT "%~2" == "" ( + set destination=!destination!/%~2 +) + +set destination=!destination:\=\\! + set filename=%~3 -echo Installing "%destination%/%filename%" +echo Installing "!destination!/%filename%" rem If you are having problems with this command, remove the redirect to nul part (> nul) to get error messages from robocopy. -@robocopy "%source%" "%destination%" "%filename%" /njh /njs /ndl /nc /ns /np > nul +@robocopy "%source%" "!destination!" "%filename%" /njh /njs /ndl /nc /ns /np > nul rem Needed because robocopy returns a non-zero code for success which makes Visual Studio treat this as failure. exit /b 0 diff --git a/projects/vs2019/hl_cdll.vcxproj b/projects/vs2019/hl_cdll.vcxproj index c8792fd..1335c01 100644 --- a/projects/vs2019/hl_cdll.vcxproj +++ b/projects/vs2019/hl_cdll.vcxproj @@ -77,7 +77,8 @@ cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(OutDir)" "cl_dlls" "$(TargetFileName)"" -cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(OutDir)" "cl_dlls" "$(TargetName).pdb"" +cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(OutDir)" "cl_dlls" "$(TargetName).pdb"" +cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(SolutionDir)../../network" "" "delta.lst"" Installing client files @@ -109,7 +110,8 @@ cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(OutDir)" "cl_dlls" "$(TargetName).p cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(OutDir)" "cl_dlls" "$(TargetFileName)"" -cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(OutDir)" "cl_dlls" "$(TargetName).pdb"" +cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(OutDir)" "cl_dlls" "$(TargetName).pdb"" +cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(SolutionDir)../../network" "" "delta.lst"" Installing client files diff --git a/projects/vs2019/hldll.vcxproj b/projects/vs2019/hldll.vcxproj index 388f644..566de21 100644 --- a/projects/vs2019/hldll.vcxproj +++ b/projects/vs2019/hldll.vcxproj @@ -75,7 +75,8 @@ cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(OutDir)" "dlls" "$(TargetFileName)"" -cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(OutDir)" "dlls" "$(TargetName).pdb"" +cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(OutDir)" "dlls" "$(TargetName).pdb"" +cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(SolutionDir)../../network" "" "delta.lst"" Installing server files @@ -105,7 +106,8 @@ cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(OutDir)" "dlls" "$(TargetName).pdb" cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(OutDir)" "dlls" "$(TargetFileName)"" -cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(OutDir)" "dlls" "$(TargetName).pdb"" +cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(OutDir)" "dlls" "$(TargetName).pdb"" +cmd /c ""$(ProjectDir)..\..\filecopy.bat" "$(SolutionDir)../../network" "" "delta.lst"" Installing server files