From e9802433c38e1512467031002de503dfa3780e26 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sun, 7 Feb 2021 09:23:37 +0100 Subject: [PATCH] build_editor.sh: Create separate entity definition files per mod. --- build_editor.sh | 12 +++++++++--- make_mapdef.sh | 32 ++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/build_editor.sh b/build_editor.sh index 99a54886..cd4ed3fe 100755 --- a/build_editor.sh +++ b/build_editor.sh @@ -172,6 +172,12 @@ mv_wsfile WorldSpawn_PATCH mv_wsfile worldspawn mv_wsfile vmap -cd ../../src -./mk_mapdef.sh -cp -v ./entities.def ../bin/platform.game/platform/entities.def +cd ../../ +./make_mapdef.sh valve +./make_mapdef.sh cstrike +./make_mapdef.sh gearbox +./make_mapdef.sh hunger +./make_mapdef.sh poke646 +./make_mapdef.sh rewolf +./make_mapdef.sh scihunt +./make_mapdef.sh tfc diff --git a/make_mapdef.sh b/make_mapdef.sh index 19e5b7c4..2a0d22b0 100755 --- a/make_mapdef.sh +++ b/make_mapdef.sh @@ -1,19 +1,23 @@ #!/bin/sh -ENT_OUTFILE="./entities.def" -rm "$ENT_OUTFILE" +ent_for_mod() +{ + mkdir -p ./bin/$1.game/$1/ + ENT_OUTFILE="./bin/$1.game/$1/entities.def" + rm "$ENT_OUTFILE" -find ./gs-entbase -type f \( -iname \*.cpp -o -iname \*.c \) | while read EDEF_N; do - echo "Scanning for definitions inside $EDEF_N" - sed -n '/\/*QUAKED/,/*\//p' $EDEF_N >> "$ENT_OUTFILE" -done; -find ./client -type f \( -iname \*.cpp -o -iname \*.c \) | while read EDEF_N; do - echo "Scanning for definitions inside $EDEF_N" - sed -n '/\/*QUAKED/,/*\//p' $EDEF_N >> "$ENT_OUTFILE" -done; - -find ./server -type f \( -iname \*.cpp -o -iname \*.c \) | while read EDEF_N; do - echo "Scanning for definitions inside $EDEF_N" - sed -n '/\/*QUAKED/,/*\//p' $EDEF_N >> "$ENT_OUTFILE" + find ./$1/src/ -type f \( -iname \*.cpp -o -iname \*.c \) | while read EDEF_N; do + echo "Scanning for definitions inside $EDEF_N" + sed -n '/\/*QUAKED/,/*\//p' $EDEF_N >> "$ENT_OUTFILE" + done; +} + +BASE_ENT=./bin/platform.game/platform/entities_base.def +rm "$BASE_ENT" + +find ./src/gs-entbase/ -type f \( -iname \*.cpp -o -iname \*.c \) | while read EDEF_N; do + echo "Scanning for definitions inside $EDEF_N" + sed -n '/\/*QUAKED/,/*\//p' $EDEF_N >> "$BASE_ENT" done; +ent_for_mod $1