From 1cd85e221710252fb1dc0122459d176f5344d5ac Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sun, 29 Aug 2021 17:46:04 +0200 Subject: [PATCH] install_from_cd.sh: Some minor paranoid fix. --- install_from_cd.sh | 5 ++++- src/shared/include.src | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/install_from_cd.sh b/install_from_cd.sh index 53b4676..c0539f1 100755 --- a/install_from_cd.sh +++ b/install_from_cd.sh @@ -87,13 +87,15 @@ read CHOICE if [[ "$CHOICE" == [Yy]* ]]; then # check if we require rippin tunes - if ! [ -f "$SCRPATH/music/track02.wav" ]; then + if ! [ -f "$SCRPATH/music/track02.wav" ] && ! [ -f "$SCRPATH/music/track02.ogg" ]; then if [ -x "$(command -v cdparanoia)" ]; then mkdir -p "./music" cd "./music" cdparanoia -B rename ".cdda." "." *.wav + # Maybe the user does not have the physical disc and cdp fails. + if [ -f "$SCRPATH/music/track02.wav" ]; then # I'd offer FLAC, but that also requires the ffmpeg plugin if [ -x "$(command -v oggenc)" ]; then printf "All done. Would you like to convert them to OGG for playback compatibility\nas well as space preservation (frees up ~150 MB)?\ny/n: " @@ -103,6 +105,7 @@ if [[ "$CHOICE" == [Yy]* ]]; then rm *.wav fi fi + fi else printf "cdparanoia is missing. Cannot rip music.\nPlease run the installer again once you've got it installed.\n" fi diff --git a/src/shared/include.src b/src/shared/include.src index 69597c5..f94437f 100644 --- a/src/shared/include.src +++ b/src/shared/include.src @@ -1,5 +1,6 @@ #includelist ../../../valve/src/shared/flags.h +../../../valve/src/shared/events.h player.qc ../../../base/src/shared/weapon_common.h ../../../valve/src/shared/animations.h @@ -8,6 +9,7 @@ player.qc ../../../valve/src/shared/pmove_water.qc ../../../valve/src/shared/fx_blood.qc +../../../valve/src/shared/fx_gaussbeam.qc ../../../valve/src/shared/fx_breakmodel.qc ../../../valve/src/shared/fx_explosion.qc ../../../valve/src/shared/fx_gibhuman.qc