Bug fix and improve 2020/ferguson1/play.sh

It did not work if one did not choose to reconfigure colours and the alt
prog was not already compiled.

It now allows you to continue play after you end a game if you so
choose.

Shellcheck fixes.
This commit is contained in:
Cody Boone Ferguson committed 2023-04-15 10:11:40 -07:00
1 parent 66a7970881
commit ef140ddb7e
1 file changed
+25 -6
+25 -6
View File
@@ -84,7 +84,7 @@ function configure_colours()
for i in "WALL" "WALL (BACKGROUND)" "HEAD" "HEAD (BACKGROUND)" "BODY" "BODY (BACKGROUND)" "BUG" "BUG (BACKGROUND)"; do for i in "WALL" "WALL (BACKGROUND)" "HEAD" "HEAD (BACKGROUND)" "BODY" "BODY (BACKGROUND)" "BUG" "BUG (BACKGROUND)"; do
show_colours "${i}" show_colours "${i}"
x="${?}" x="${?}"
if [ "${x}" != 255 ]; then if [[ "${x}" != 255 ]]; then
COLOURS[$j]="${COLOURS[$j]}${COLOUR[$x]}" COLOURS[$j]="${COLOURS[$j]}${COLOUR[$x]}"
else else
COLOURS[$j]=${DFLT[$j]} COLOURS[$j]=${DFLT[$j]}
@@ -92,24 +92,34 @@ function configure_colours()
j=$j+1 j=$j+1
done done
echo cc -o prog.alt prog.alt.c -D'f(a,b)'='((a)<(b)?(a):(b))' ${COLOURS[0]} ${COLOURS[1]} \ echo cc -o prog.alt prog.alt.c -D'f(a,b)'='((a)<(b)?(a):(b))' "${COLOURS[0]}" "${COLOURS[1]}" \
${COLOURS[2]} ${COLOURS[3]} ${COLOURS[4]} ${COLOURS[5]} ${COLOURS[6]} ${COLOURS[7]} -lncurses "${COLOURS[2]}" "${COLOURS[3]}" "${COLOURS[4]}" "${COLOURS[5]}" "${COLOURS[6]}" "${COLOURS[7]}" -lncurses
cc -o prog.alt prog.alt.c -D'f(a,b)'='((a)<(b)?(a):(b))' ${COLOURS[0]} ${COLOURS[1]} \ cc -o prog.alt prog.alt.c -D'f(a,b)'='((a)<(b)?(a):(b))' "${COLOURS[0]}" "${COLOURS[1]}" \
${COLOURS[2]} ${COLOURS[3]} ${COLOURS[4]} ${COLOURS[5]} ${COLOURS[6]} ${COLOURS[7]} -lncurses || exit 1 "${COLOURS[2]}" "${COLOURS[3]}" "${COLOURS[4]}" "${COLOURS[5]}" "${COLOURS[6]}" "${COLOURS[7]}" -lncurses || exit 1
}
function just_compile()
{
echo cc -o prog.alt prog.alt.c -D'f(a,b)'='((a)<(b)?(a):(b))' "${DFLT[0]}" "${DFLT[1]}" \
"${DFLT[2]}" "${DFLT[3]}" "${DFLT[4]}" "${DFLT[5]}" "${DFLT[6]}" "${DFLT[7]}" -lncurses
cc -o prog.alt prog.alt.c -D'f(a,b)'='((a)<(b)?(a):(b))' "${DFLT[0]}" "${DFLT[1]}" \
"${DFLT[2]}" "${DFLT[3]}" "${DFLT[4]}" "${DFLT[5]}" "${DFLT[6]}" "${DFLT[7]}" -lncurses || exit 1
} }
function testcaps() function testcaps()
{ {
make || exit 1 make || exit 1
./termcaps ./termcaps
T="${?}" T="${?}"
if [ "${T}" -ne 0 ]; then if [[ "${T}" -ne 0 ]]; then
read -rp "Terminal issues detected; do you wish to continue anyway (Y/N) ? " ans read -rp "Terminal issues detected; do you wish to continue anyway (Y/N) ? " ans
[[ "${ans}" != "y" ]] && [[ "${ans}" != "Y" ]] && exit 1 [[ "${ans}" != "y" ]] && [[ "${ans}" != "Y" ]] && exit 1
fi fi
} }
function menu() function menu()
{ {
echo
printf "** GAME MODE SELECTION MENU **\n\n" printf "** GAME MODE SELECTION MENU **\n\n"
echo "(0) Drawing mode" echo "(0) Drawing mode"
@@ -211,9 +221,12 @@ function play()
configure_colours configure_colours
;; ;;
*) *)
just_compile
;; ;;
esac esac
while true; do
menu menu
read -rp "Make your selection (0 - 7 or any other key to exit): " mode read -rp "Make your selection (0 - 7 or any other key to exit): " mode
@@ -272,5 +285,11 @@ function play()
*) *)
exit 0 exit 0
esac esac
read -rp "Do you want to continue? " ans
if [[ "$ans" != "y" && "$ans" != "Y" ]]; then
break;
fi
done
} }
play play