Support PS2 content

CHANGELOG.md

@@ -34,6 +34,16 @@ Since the first public release:
   modern renderers left the processor at full precision, and the
   collision tests came out differently. They now set it as the original
   did. (issue #43)
+- **The PlayStation 2 release's extra levels**, for a build from source
+  with your own PS2 disc image (`make modern PS2=1`; no public archive
+  yet). Young Cate's three "Nine years ago" flashbacks, as a thief in
+  London and Scotland, play inside missions 3, 5 and 13 as on the PS2,
+  with the lock pick and safe cracker; "A Man of Influence" gets the
+  Baron's secret training rooms under his courtyard. Interface options
+  can also put young Cate on the main menu, or any of the menu's other
+  Cates. The levels draw with the PS2's own textures. With the Thief mod
+  installed as well, the mod's versions of the same levels take their
+  place. ([`docs/MODERN.md`](docs/MODERN.md), P8)
 - **Sound effects at retail loudness.** OpenMiles played most sounds
   1.5-3 dB louder than Miles 6.0i (its volume curve was approximated, and
   it did not round as Miles does); its volume, master volume and pan now

Makefile

@@ -40,6 +40,7 @@ SRC_MOUNT := $(if $(NOLF_SOURCE),-v $(realpath $(NOLF_SOURCE)):/nolfsource:ro -e
 DOCKER_RUN = docker run --rm --init --name $(CONTAINER) \
 	-u $(shell id -u):$(shell id -g) -e HOME=/tmp/home $(if $(JOBS),-e NOLFSRC_JOBS=$(JOBS)) \
 	$(if $(NOLF_ARCHIVES),-e NOLF_ARCHIVES="$(NOLF_ARCHIVES)") \
+	$(if $(PS2),-e NOLFSRC_PS2=1) \
 	-v $(CURDIR):/repo -w /repo $(SRC_MOUNT) $(IMAGE)
 
 TOOLCHAIN_FILES = toolchains/msvc-6.00-9782/VC98/Bin/CL.EXE \
@@ -56,6 +57,9 @@ help:
 	@echo "make debug      the game with symbols and NOLFSRC_DEBUG logging, in out/nolf-legacy-debug/"
 	@echo "make modern     the game with NOLFSRC_MODERN (the retail bugs fixed), in out/nolf-modern-release/"
 	@echo "make modern-debug  both, in out/nolf-modern-debug/"
+	@echo "                (with PS2=1, the modern ones also get the PS2 release's levels: the three"
+	@echo "                \"Nine years ago\" flashbacks and the Baron's training rooms, from the PS2"
+	@echo "                disc in rez/isos/ps2/; no public archive)"
 	@echo "                (none of these is ever scored; build/variant.sh)"
 	@echo "make test       scripted playtest of out/nolf-legacy-release/ ($(TEST_LEVELS)), under Xvfb"
 	@echo "make test-modern  the same of out/nolf-modern-release/"

build/all.sh

@@ -137,6 +137,12 @@ python3 build/retailextract.py lithtechres "$RETAIL" src/engine/lithtech/res
 step "2c. Game of the Year text: the retail CRES.dll in $RETAIL -> src/game/ClientRes/goty/"
 python3 build/retailextract.py goty "$RETAIL" src/game/ClientRes/goty
 
+step "2d. the PS2 levels' text (modern build, make modern PS2=1): the PS2 disc in rez/isos/ps2/ -> src/game/ClientRes/goty/ps2.rc"
+case "${NOLFSRC_CFLAGS:-}" in
+    *NOLFSRC_MODERN*) bash build/ps2/ps2build.sh strings src/game/ClientRes/goty/ps2.rc ;;
+    *)                rm -f src/game/ClientRes/goty/ps2.rc ;;
+esac
+
 step "3. compile: libraries, game DLLs, engine (build/compile.sh: build/build.mk, ${NOLFSRC_JOBS:-$(nproc)} jobs)"
 GAME_CONFIG=final bash build/compile.sh all
 for f in src/engine/ltmsg/Release/ltmsg.dll src/engine/sres/Release/sres.dll \

build/build.mk

@@ -309,7 +309,9 @@ $(eval $(call compile,$(CRES)/Release/main.obj,$(CRES),main.cpp,$(ENV_GAME),$(CL
 CRES_RC := $(CRES)/goty/cres_goty.rc
 # (a printf format: \\ is one backslash)
 hash := \#
-CRES_RC_FMT := $(hash)include "..\\ClientRes.rc"\r\n$(hash)include "goty.rc"\r\n$(foreach r,$(if $(MODERN),$(notdir $(wildcard src/modern/cres/*.rc))),$(hash)include "..\\..\\..\\modern\\cres\\$(r)"\r\n)
+# The modern build adds the PS2 levels' text (goty/ps2.rc) when build/all.sh
+# made it from the PS2 disc (MODERN.md, P8).
+CRES_RC_FMT := $(hash)include "..\\ClientRes.rc"\r\n$(hash)include "goty.rc"\r\n$(foreach r,$(if $(MODERN),$(notdir $(wildcard src/modern/cres/*.rc))),$(hash)include "..\\..\\..\\modern\\cres\\$(r)"\r\n)$(if $(MODERN),$(if $(wildcard $(CRES)/goty/ps2.rc),$(hash)include "ps2.rc"\r\n))
 $(CRES_RC): FORCE
 	@test -f $(CRES)/goty/goty.rc -a -f $(CRES)/goty/credits.txt || \
 	  { echo "error: $(CRES)/goty/ is missing -- build/all.sh writes it" >&2; exit 1; }

build/package.sh

@@ -66,6 +66,13 @@ if [[ $ARCHIVES == *" private "* ]]; then
     echo "   $PKG: $(du -h "$PKG" | cut -f1) (unpacks to $NAME/)"
 fi
 [[ $ARCHIVES == *" public "* ]] || exit 0
+# Nor of a game directory with the PS2 levels (make modern PS2=1): they are
+# made from the PS2 disc, which the install scripts do not read.
+if [ -f "$OUT/custom/PS2-DATA.txt" ]; then
+    echo "   $PARENT/$NAME-public.tar.gz: skipped (the game directory has the PS2 levels, custom/PS2-DATA.txt)"
+    rm -f "$PARENT/$NAME-public.tar.gz"
+    exit 0
+fi
 
 # The public archive: the scripts beside the rest, the disc files left out.
 PUB="$PARENT/$NAME-public.tar.gz"